diff --git a/bin/hadoop b/bin/hadoop
index 4b4e6e32..651ec0ce 100755
--- a/bin/hadoop
+++ b/bin/hadoop
@@ -68,9 +68,11 @@ if [ $# = 0 ]; then
   echo "  raidshell [options]  run RAID-shell utility"
   echo "  fs                   run a generic filesystem user client"
   echo "  balancer             run a cluster balancing utility"
+  echo "  avatarbalancer       run a avatar cluster balancing utility"
   echo "  jmxget               get JMX exported values from NameNode or DataNode."
   echo "  oiv                  apply the offline fsimage viewer to an fsimage"
   echo "  oev                  apply the offline edits viewer to an edits file"
+  echo "  oid                  apply the offline fsimage decompressor to an fsimage"
   echo "                       Use -help to see options"
   echo "  jobtracker           run the MapReduce job Tracker node"
   echo "  pipes                run a Pipes job"
@@ -122,6 +124,7 @@ fi
 # CLASSPATH initially contains $HADOOP_CONF_DIR
 JMX_OPTS=""
 CLASSPATH="${HADOOP_CONF_DIR}"
+CLASSPATH=${CLASSPATH}:$HADOOP_CLASSPATH
 CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
 # for developers, add Hadoop classes to CLASSPATH
@@ -174,12 +177,6 @@ for f in $HADOOP_HOME/build/hadoop-*-tools.jar; do
   TOOL_PATH=${TOOL_PATH}:$f;
 done
 
-# add user-specified CLASSPATH before corona so that a newer
-# corona jar can be specified to override the deployed one
-if [ "$HADOOP_CLASSPATH" != "" ]; then
-  CLASSPATH=${CLASSPATH}:${HADOOP_CLASSPATH}
-fi
-
 # CORONA_PATH for corona daemons
 if [ -d "$HADOOP_HOME/build/contrib/corona/classes" ]; then
   CORONA_PATH=${CORONA_PATH}:$HADOOP_HOME/build/contrib/corona/classes
@@ -197,6 +194,15 @@ for f in $HADOOP_HOME/contrib/corona/lib/*.jar; do
   CORONA_LIB_PATH=${CORONA_LIB_PATH}:$f;
 done
 
+# NOTIFIER_PATH for the namespace notifier server daemon
+if [ -d "$HADOOP_HOME/build/contrib/namespace-notifier/classes" ]; then
+  NOTIFIER_PATH=${NOTIFIER_PATH}:$HADOOP_HOME/build/contrib/namespace-notifier/classes
+fi
+
+for f in $HADOOP_HOME/contrib/namespace-notifier/*.jar; do
+  NOTIFIER_PATH=${NOTIFIER_PATH}:$f;
+done
+
 # default log directory & file
 if [ "$HADOOP_LOG_DIR" = "" ]; then
   HADOOP_LOG_DIR="$HADOOP_HOME/logs"
@@ -227,9 +233,13 @@ if [ "$COMMAND" = "namenode" ] ; then
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_GC_LOG_OPTS $HADOOP_NAMENODE_OPTS"
 elif [ "$COMMAND" = "avatarshell" ] ; then
   CLASS='org.apache.hadoop.hdfs.AvatarShell'
+  HADOOP_LOGFILE='avatarshell.log'
+  HADOOP_ROOT_LOGGER=INFO,DRFA
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_GC_LOG_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "avatarzk" ] ; then
   CLASS='org.apache.hadoop.hdfs.AvatarZKShell'
+  HADOOP_LOGFILE='avatarzkshell.log'
+  HADOOP_ROOT_LOGGER=INFO,DRFA
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_GC_LOG_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "avatarnode" ] ; then
   CLASS='org.apache.hadoop.hdfs.server.namenode.AvatarNode'
@@ -238,6 +248,31 @@ elif [ "$COMMAND" = "avatarnode" ] ; then
 elif [ "$COMMAND" = "secondarynamenode" ] ; then
   CLASS='org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode'
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_GC_LOG_OPTS $HADOOP_SECONDARYNAMENODE_OPTS"
+elif [ "$COMMAND" = "raidnode" ] ; then
+  CLASS='org.apache.hadoop.raid.RaidNode'
+  JMX_OPTS=$HADOOP_JMX_RAIDNODE_OPTS
+  HADOOP_OPTS="$HADOOP_OPTS $HADOOP_GC_LOG_OPTS"
+  CLASSPATH=${CORONA_LIB_PATH}:${CLASSPATH}
+elif [ "$COMMAND" = "notifier" ] ; then
+  CLASS='org.apache.hadoop.hdfs.notifier.server.ServerCore'
+  if [ "$NOTIFIER_PATH" != "" ]; then
+    CLASSPATH=${CLASSPATH}:${NOTIFIER_PATH}
+  fi
+  JMX_OPTS="$JMX_OPTS $NOTIFIER_JMX_OPTS"
+elif [ "$COMMAND" = "fsshellservice" ] ; then
+  CLASS='org.apache.hadoop.hdfs.fsshellservice.FsShellServiceImpl'
+  if [ -d "$HADOOP_HOME/build/contrib/corona/lib" ]; then
+    for f in $HADOOP_HOME/build/contrib/corona/lib/*.jar; do
+      CLASSPATH=${CLASSPATH}:$f;
+    done
+  fi
+  if [ -d "$HADOOP_HOME/build/contrib/fsshellservice/" ]; then
+    CLASSPATH=${CLASSPATH}:$HADOOP_HOME/build/contrib/fsshellservice/classes
+  fi
+  for f in $HADOOP_HOME/contrib/fsshellservice/*.jar; do
+    CLASSPATH=${CLASSPATH}:$f;
+  done
+  CLASSPATH=${CORONA_LIB_PATH}:${CLASSPATH}
 elif [ "$COMMAND" = "avatardatanode" ] ; then
   CLASS='org.apache.hadoop.hdfs.server.datanode.AvatarDataNode'
   JMX_OPTS=$HADOOP_JMX_DATANODE_OPTS
@@ -280,12 +315,19 @@ elif [ "$COMMAND" = "balancer" ] ; then
   CLASS=org.apache.hadoop.hdfs.server.balancer.Balancer
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_BALANCER_OPTS"
   CMDLINE_OPTS="$CMDLINE_OPTS $BALANCER_CMDLINE_OPTS"
+elif [ "$COMMAND" = "avatarbalancer" ] ; then
+  CLASS=org.apache.hadoop.hdfs.server.balancer.AvatarBalancer
+  HADOOP_OPTS="$HADOOP_OPTS $HADOOP_BALANCER_OPTS"
+  CMDLINE_OPTS="$CMDLINE_OPTS $BALANCER_CMDLINE_OPTS"
 elif [ "$COMMAND" = "oiv" ] ; then
   CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewer
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "oev" ] ; then
   CLASS=org.apache.hadoop.hdfs.tools.offlineEditsViewer.OfflineEditsViewer
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
+elif [ "$COMMAND" = "oid" ] ; then
+  CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageDecompressor
+  HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "jmxget" ] ; then
   CLASS=org.apache.hadoop.hdfs.tools.JMXGet
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
@@ -301,11 +343,14 @@ elif [ "$COMMAND" = "coronaclustermanager" ] ; then
   JMX_OPTS=$HADOOP_JMX_CORONACLUSTERMANAGER_OPTS
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_GC_LOG_OPTS $HADOOP_CORONACLUSTERMANAGER_OPTS"
   # Corona lib path should be first to ensure that it uses the right thrift JAR
-  CLASSPATH=${CORONA_LIB_PATH}:${CLASSPATH}
+  CLASSPATH=${CORONA_LIB_PATH}:${CLUSTER_MANAGER_LIB_PATH}:${CLASSPATH}
 elif [ "$COMMAND" = "coronatasktracker" ] ; then
   CLASS=org.apache.hadoop.mapred.CoronaTaskTracker
   JMX_OPTS=$HADOOP_JMX_TASKTRACKER_OPTS
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_GC_LOG_OPTS $HADOOP_TASKTRACKER_OPTS"
+  # For corona task trackers, the tasks should not get the thrift library.
+  MAPREDUCE_TASK_SYSTEM_CLASSPATH=${CLASSPATH}
+  export MAPREDUCE_TASK_SYSTEM_CLASSPATH
   # See coronaclustermanager comment
   CLASSPATH=${CORONA_LIB_PATH}:${CLASSPATH}
 elif [ "$COMMAND" = "coronaproxyjobtracker" ] ; then
diff --git a/bin/start-corona.sh b/bin/start-corona.sh
index b7098690..c4132a83 100755
--- a/bin/start-corona.sh
+++ b/bin/start-corona.sh
@@ -24,7 +24,8 @@ bin=`cd "$bin"; pwd`
 . "$bin"/hadoop-config.sh
 
 # start corona daemons
-# start clustermanager first to minimize connection errors at startup
-"$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR start coronaclustermanager
+# start start-proxyjt.sh first so that clustermanager can be started correctly
 "$bin"/start-proxyjt.sh --config $HADOOP_CONF_DIR
+sleep 1
+"$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR start coronaclustermanager
 "$bin"/hadoop-daemons.sh --config $HADOOP_CONF_DIR start coronatasktracker
diff --git a/bin/start-fsshellservice.sh b/bin/start-fsshellservice.sh
new file mode 100644
index 00000000..1c1d1ce7
--- /dev/null
+++ b/bin/start-fsshellservice.sh
@@ -0,0 +1,31 @@
+#!/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.
+
+usage="Usage: start-fsshellservice.sh"
+
+params=$#
+bin=`dirname "$0"`
+bin=`cd "$bin"; pwd`
+
+. "$bin"/hadoop-config.sh
+
+# get arguments
+if [ $# -ge 1 ]; then
+    echo $usage
+fi
+
+"$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR start fsshellservice
diff --git a/bin/start-namespace-notifier.sh b/bin/start-namespace-notifier.sh
new file mode 100644
index 00000000..946bf4d2
--- /dev/null
+++ b/bin/start-namespace-notifier.sh
@@ -0,0 +1,34 @@
+#!/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.
+
+usage="Usage: start-namespace-notifier.sh"
+
+params=$#
+bin=`dirname "$0"`
+bin=`cd "$bin"; pwd`
+
+. "$bin"/hadoop-config.sh
+. "$bin"/../conf/hadoop-env.sh
+
+# get arguments
+if [ $# -ge 1 ]; then
+    echo $usage
+fi
+
+export NOTIFIER_JMX_OPTS=" -Dcom.sun.management.jmxremote.port=$NOTIFIER_JMX_PORT -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+
+"$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR start notifier
diff --git a/bin/start-raidnode.sh b/bin/start-raidnode.sh
index 72f5cc16..b67fc44d 100755
--- a/bin/start-raidnode.sh
+++ b/bin/start-raidnode.sh
@@ -37,4 +37,4 @@ if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
 fi
 export HADOOP_DAEMON_OPTS=$HADOOP_RAIDNODE_OPTS
 
-"$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR start org.apache.hadoop.raid.RaidNode
+"$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR start raidnode
diff --git a/bin/stop-fsshellservice.sh b/bin/stop-fsshellservice.sh
new file mode 100644
index 00000000..271639f3
--- /dev/null
+++ b/bin/stop-fsshellservice.sh
@@ -0,0 +1,31 @@
+#!/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.
+
+usage="Usage: stop-fsshellservice.sh"
+
+params=$#
+bin=`dirname "$0"`
+bin=`cd "$bin"; pwd`
+
+. "$bin"/hadoop-config.sh
+
+# get arguments
+if [ $# -ge 1 ]; then
+    echo $usage
+fi
+
+"$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop fsshellservice
diff --git a/bin/stop-namespace-notifier.sh b/bin/stop-namespace-notifier.sh
new file mode 100644
index 00000000..f29734f1
--- /dev/null
+++ b/bin/stop-namespace-notifier.sh
@@ -0,0 +1,31 @@
+#!/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.
+
+usage="Usage: stop-namespace-notifier.sh"
+
+params=$#
+bin=`dirname "$0"`
+bin=`cd "$bin"; pwd`
+
+. "$bin"/hadoop-config.sh
+
+# get arguments
+if [ $# -ge 1 ]; then
+    echo $usage
+fi
+
+"$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop notifier
diff --git a/build.xml b/build.xml
index 20457e73..6f84bd0b 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@
 
   <property name="Name" value="Facebook's unified version of Apache Hadoop"/>
   <property name="name" value="hadoop"/>
-  <property name="version" value="0.20.1-dev"/>
+  <property name="version" value="0.20"/>
   <property name="final.name" value="${name}-${version}"/>
   <property name="year" value="2009"/>
 
@@ -107,7 +107,7 @@
   <property name="test.junit.fork.mode" value="perTest" />
   <property name="test.junit.printsummary" value="yes" />
   <property name="test.junit.haltonfailure" value="no" />
-  <property name="test.junit.maxmemory" value="512m" />
+  <property name="test.junit.maxmemory" value="1024m" />
   <property name="test.tools.input.dir" value="${basedir}/src/test/tools/data"/>
   <!-- The default user.home might have lots of dirs that will slow down
        tets that scan user.home, so allow a way to specify a custom,
@@ -203,15 +203,15 @@
   <property name="common.ivy.lib.dir" location="${build.ivy.lib.dir}/${ant.project.name}/common"/>
   <property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
   <property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven" />
-  <property name="build.ivy.maven.pom" location="${build.ivy.maven.dir}/hadoop-core-${hadoop.version}.pom" />
-  <property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-core-${hadoop.version}.jar" />
+  <property name="build.ivy.maven.pom" location="${build.ivy.maven.dir}/hadoop-core-${version}.pom" />
+  <property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-core-${version}.jar" />
 
   <!--this is the naming policy for artifacts we want pulled down-->
   <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
 
   <!--this is how artifacts that get built are named-->
   <property name="ivy.publish.pattern" value="hadoop-[revision]-core.[ext]"/>
-  <property name="hadoop.jar" location="${build.dir}/hadoop-${hadoop.version}-core.jar" />
+  <property name="hadoop.jar" location="${build.dir}/hadoop-${version}-core.jar" />
 
   <!-- jdiff.home property set -->
   <property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/>
@@ -229,6 +229,14 @@
     </and>
   </condition>
 
+  <!-- Indicate is Snappy native library should be bundled with Hadoop or not -->
+  <property name="bundle.snappy" value="true"/>
+
+  <!-- Snappy native library location -->
+  <property name="snappy.prefix" value="${native.src.dir}/lib/snappy"/>
+  <property name="snappy.lib" value="${snappy.prefix}/lib"/>
+  <property name="snappy.include" value="${snappy.prefix}/include"/>
+
   <!-- the normal classpath -->
   <path id="classpath">
     <pathelement location="${build.classes}"/>
@@ -499,6 +507,7 @@
 
     <mkdir dir="${build.native}/lib"/>
     <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/zlib"/>
+    <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/snappy"/>
     <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/lzma"/>
     <mkdir dir="${build.native}/src/org/apache/hadoop/syscall"/>
     <mkdir dir="${build.native}/src/org/apache/hadoop/util"/>
@@ -559,8 +568,20 @@
       <env key="OS_ARCH" value="${os.arch}"/>
       <env key="JVM_DATA_MODEL" value="${sun.arch.data.model}"/>
       <env key="HADOOP_NATIVE_SRCDIR" value="${native.src.dir}"/>
-      <arg line="${native.src.dir}/configure LDFLAGS='-L${basedir}/nativelib/lzma' CPPFLAGS='-I${basedir}/nativelib/lzma'"/>
-    </exec>
+      <arg line="${native.src.dir}/configure 
+          LDFLAGS='-L${snappy.lib} -L${basedir}/nativelib/lzma -lrt'
+          CPPFLAGS='-I${snappy.include} -I${basedir}/nativelib/lzma'"/>
+  	</exec>
+
+    <javah
+       classpath="${build.classes}"
+       destdir="${build.native}/src/org/apache/hadoop/io/compress/snappy"
+       force="yes"
+       verbose="yes"
+       >
+      <class name="org.apache.hadoop.io.compress.snappy.SnappyCompressor"/>
+      <class name="org.apache.hadoop.io.compress.snappy.SnappyDecompressor"/>
+    </javah>
 
     <exec dir="${build.native}" executable="${make.cmd}" failonerror="true">
       <env key="OS_NAME" value="${os.name}"/>
@@ -569,8 +590,16 @@
       <env key="HADOOP_NATIVE_SRCDIR" value="${native.src.dir}"/>
     </exec>
 
-    <exec dir="${build.native}" executable="sh" failonerror="true">
-      <arg line="${build.native}/libtool --mode=install cp ${build.native}/lib/libhadoop.la ${build.native}/lib"/>
+    <delete>
+      <fileset dir="${build.native}/lib" includes="libsnappy.*"/> 
+    </delete>
+    <copy todir="${build.native}/lib">
+      <fileset dir="${snappy.lib}" includes="libsnappy.*"/>
+      <fileset dir="${build.native}/src/org/apache/hadoop/io/compress/snappy/.libs/" includes="libhadoopsnappy.*"/>
+    </copy>
+
+  	<exec dir="${build.native}" executable="sh" failonerror="true">
+  	  <arg line="${build.native}/libtool --mode=install cp ${build.native}/lib/libhadoop.la ${build.native}/lib"/>
     </exec>
     <delete>
       <fileset dir="${build.native}/lib" includes="liblzma.so*"/>
@@ -763,6 +792,7 @@
     <mkdir dir="${test.debug.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/mapred/testscript.txt" todir="${test.debug.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.txt" todir="${test.cache.data}"/>
+    <copy file="${test.src.dir}/org/apache/hadoop/io/compress/snappy/testsnappy.txt" todir="${test.cache.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.jar" todir="${test.cache.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.zip" todir="${test.cache.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.tar" todir="${test.cache.data}"/>
@@ -842,7 +872,7 @@
       <sysproperty key="test.build.extraconf" value="${test.build.extraconf}" />
       <sysproperty key="hadoop.policy.file" value="hadoop-policy.xml"/>
       <sysproperty key="java.library.path"
-       value="${build.native}/lib:${lib.dir}/native/${build.platform}"/>
+        value="${build.native}/lib:${lib.dir}/native/${build.platform}:${snappy.lib}"/>
       <sysproperty key="install.c++.examples" value="${install.c++.examples}"/>
       <sysproperty key="user.home" value="${test.user.home}"/>
       <env key="LD_LIBRARY_PATH" value="${build.native}/lib${path.separator}${env.LD_LIBRARY_PATH}"/>
@@ -905,7 +935,7 @@
     </subant>
   </target>
 
-  <target name="test" depends="clean, compile" description="Run core, contrib unit tests">
+  <target name="test" depends="clean, compile, compile-native" description="Run core, contrib unit tests">
     <subant target="test-core" failonerror="false">
       <fileset file="build.xml"/>
     </subant>
@@ -1214,6 +1244,8 @@
 	  <env key="BASE_NATIVE_LIB_DIR" value="${lib.dir}/native"/>
 	  <env key="BUILD_NATIVE_DIR" value="${build.dir}/native"/>
 	  <env key="DIST_LIB_DIR" value="${dist.dir}/lib/native"/>
+    <env key="BUNDLE_SNAPPY_LIB" value="${bundle.snappy}"/>
+    <env key="SNAPPY_LIB_DIR" value="${snappy.prefix}/lib"/>
 	  <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
     </exec>
 
@@ -1306,6 +1338,17 @@
     </macro_tar>
   </target>
 
+  <target name="superjar" depends="bin-package">        
+    <jar jarfile="${build.dir}/${final.name}-super.jar">        
+        <zipgroupfileset dir="lib" includes="*jar"/>    
+        <zipgroupfileset dir="build" includes="*jar"/>  
+        <zipgroupfileset dir="build/contrib/corona" includes="*jar"/>   
+        <zipgroupfileset dir="build/contrib/corona/lib" includes="*jar"/>       
+        <zipgroupfileset dir="build/ivy/lib/Hadoop/common/" includes="*jar"/>   
+        <zipgroupfileset dir="build/ivy/lib/corona/common/" includes="*jar"/>   
+    </jar>      
+  </target>     
+
   <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
 		description="assembles artifacts for binary target">
     <mkdir dir="${dist.dir}"/>
@@ -1327,6 +1370,8 @@
 	  <env key="BASE_NATIVE_LIB_DIR" value="${lib.dir}/native"/>
 	  <env key="BUILD_NATIVE_DIR" value="${build.dir}/native"/>
 	  <env key="DIST_LIB_DIR" value="${dist.dir}/lib/native"/>
+    <env key="BUNDLE_SNAPPY_LIB" value="${bundle.snappy}"/>
+    <env key="SNAPPY_LIB_DIR" value="${snappy.prefix}/lib"/>
 	  <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
     </exec>
 
@@ -1378,6 +1423,11 @@
   </target>
 
   <target name="binary" depends="bin-package" description="Make tarball without source and documentation">
+    <copy todir="${build.dir}/${final.name}" includeEmptyDirs="false">
+      <fileset dir="${build.dir}/ivy/maven/">
+        <include name="generated.pom"/>
+      </fileset>
+    </copy>
     <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
       <param.listofitems>
         <tarfileset dir="${build.dir}" mode="664">
@@ -1388,6 +1438,7 @@
         </tarfileset>
         <tarfileset dir="${build.dir}" mode="755">
           <include name="${final.name}/bin/*" />
+          <include name="${final.name}/generated.pom"/>
         </tarfileset>
       </param.listofitems>
     </macro_tar>
@@ -1911,7 +1962,7 @@
     <ivy:publish
       settingsRef="${ant.project.name}.ivy.settings"
       resolver="local"
-      pubrevision="${hadoop.version}"
+      pubrevision="${version}"
       overwrite="true"
       artifactspattern="${build.dir}/${ivy.publish.pattern}" />
   </target>
@@ -2006,5 +2057,9 @@
     </exec>
   </target>
   <!-- end of task-controller target -->
+
+  <target name="print-version">
+    <echo message="${version}" />
+  </target>
 </project>
 
diff --git a/conf/hadoop-env.sh b/conf/hadoop-env.sh
index ecf3eea8..2d8bb4fe 100644
--- a/conf/hadoop-env.sh
+++ b/conf/hadoop-env.sh
@@ -1,68 +1,74 @@
-# Set Hadoop-specific environment variables here.
+# This if statement insures that this file will be sources only once
+if [[ "$IS_HADOOP_ENV_ALREADY_SOURCED" != "true" ]]; then
+  export IS_HADOOP_ENV_ALREADY_SOURCED="true";
 
-# The only required environment variable is JAVA_HOME.  All others are
-# optional.  When running a distributed configuration it is best to
-# set JAVA_HOME in this file, so that it is correctly defined on
-# remote nodes.
+  # Set Hadoop-specific environment variables here.
 
-# The java implementation to use.  Required.
-# export JAVA_HOME=/usr/lib/j2sdk1.5-sun
+  # The only required environment variable is JAVA_HOME.  All others are
+  # optional.  When running a distributed configuration it is best to
+  # set JAVA_HOME in this file, so that it is correctly defined on
+  # remote nodes.
 
-# Extra Java CLASSPATH elements.  Optional.
-# export HADOOP_CLASSPATH=
+  # The java implementation to use.  Required.
+  # export JAVA_HOME=/usr/lib/j2sdk1.5-sun
 
-# The maximum amount of heap to use, in MB. Default is 1000.
-# export HADOOP_HEAPSIZE=2000
+  # Extra Java CLASSPATH elements.  Optional.
+  # export HADOOP_CLASSPATH=
 
-# Extra Java runtime options.  Empty by default.
-# export HADOOP_OPTS=-server
+  # The maximum amount of heap to use, in MB. Default is 1000.
+  # export HADOOP_HEAPSIZE=2000
 
-# Command specific options appended to HADOOP_OPTS when specified
-export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_NAMENODE_OPTS"
-export HADOOP_SECONDARYNAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_SECONDARYNAMENODE_OPTS"
-export HADOOP_DATANODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_DATANODE_OPTS"
-export HADOOP_BALANCER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_BALANCER_OPTS"
-export HADOOP_JOBTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_JOBTRACKER_OPTS"
-export HADOOP_RAIDNODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_RAIDNODE_OPTS"
-export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote.port=8998 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+  # Extra Java runtime options.  Empty by default.
+  # export HADOOP_OPTS=-server
 
-# The only user who can start hadoop daemons. 
-# If this is not set, any user can start hadoop daemons.  
-export HADOOP_USERNAME="hadoop"
+  # Command specific options appended to HADOOP_OPTS when specified
+  export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_NAMENODE_OPTS"
+  export HADOOP_SECONDARYNAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_SECONDARYNAMENODE_OPTS"
+  export HADOOP_DATANODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_DATANODE_OPTS"
+  export HADOOP_BALANCER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_BALANCER_OPTS"
+  export HADOOP_JOBTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_JOBTRACKER_OPTS"
+  export HADOOP_RAIDNODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_RAIDNODE_OPTS"
+  export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote.port=8998 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 
-# Java Runtime garbage collection options to pass to all Hadoop
-# servers (Namenode, Jobtracker, Datanode, Tasktracker). This must end
-# with a colon ; to which the dynamically generated gc log filename will
-# be appended to. The below defaults work for the Sun JVM, for example
-# in IBM GC, use '-Xverbosegclog:'.
-#export HADOOP_GC_LOG_OPTS="-XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:"
+  # The only user who can start hadoop daemons.
+  # If this is not set, any user can start hadoop daemons.
+  export HADOOP_USERNAME="hadoop"
 
-# export HADOOP_TASKTRACKER_OPTS=
-# The following applies to multiple commands (fs, dfs, fsck, distcp etc)
-# export HADOOP_CLIENT_OPTS
+  # Java Runtime garbage collection options to pass to all Hadoop
+  # servers (Namenode, Jobtracker, Datanode, Tasktracker). This must end
+  # with a colon ; to which the dynamically generated gc log filename will
+  # be appended to. The below defaults work for the Sun JVM, for example
+  # in IBM GC, use '-Xverbosegclog:'.
+  #export HADOOP_GC_LOG_OPTS="-XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:"
 
-# Extra ssh options.  Empty by default.
-# export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
+  # export HADOOP_TASKTRACKER_OPTS=
+  # The following applies to multiple commands (fs, dfs, fsck, distcp etc)
+  # export HADOOP_CLIENT_OPTS
 
-# Where log files are stored.  $HADOOP_HOME/logs by default.
-# export HADOOP_LOG_DIR=${HADOOP_HOME}/logs
+  # Extra ssh options.  Empty by default.
+  # export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
 
-# File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.
-# export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
+  # Where log files are stored.  $HADOOP_HOME/logs by default.
+  # export HADOOP_LOG_DIR=${HADOOP_HOME}/logs
 
-# host:path where hadoop code should be rsync'd from.  Unset by default.
-# export HADOOP_MASTER=master:/home/$USER/src/hadoop
+  # File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.
+  # export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
 
-# Seconds to sleep between slave commands.  Unset by default.  This
-# can be useful in large clusters, where, e.g., slave rsyncs can
-# otherwise arrive faster than the master can service them.
-# export HADOOP_SLAVE_SLEEP=0.1
+  # host:path where hadoop code should be rsync'd from.  Unset by default.
+  # export HADOOP_MASTER=master:/home/$USER/src/hadoop
 
-# The directory where pid files are stored. /tmp by default.
-# export HADOOP_PID_DIR=/var/hadoop/pids
+  # Seconds to sleep between slave commands.  Unset by default.  This
+  # can be useful in large clusters, where, e.g., slave rsyncs can
+  # otherwise arrive faster than the master can service them.
+  # export HADOOP_SLAVE_SLEEP=0.1
 
-# A string representing this instance of hadoop. $USER by default.
-# export HADOOP_IDENT_STRING=$USER
+  # The directory where pid files are stored. /tmp by default.
+  # export HADOOP_PID_DIR=/var/hadoop/pids
 
-# The scheduling priority for daemon processes.  See 'man nice'.
-# export HADOOP_NICENESS=10
+  # A string representing this instance of hadoop. $USER by default.
+  # export HADOOP_IDENT_STRING=$USER
+
+  # The scheduling priority for daemon processes.  See 'man nice'.
+  # export HADOOP_NICENESS=10
+
+fi
diff --git a/conf/hadoop-env.sh.template b/conf/hadoop-env.sh.template
index ecf3eea8..2d8bb4fe 100644
--- a/conf/hadoop-env.sh.template
+++ b/conf/hadoop-env.sh.template
@@ -1,68 +1,74 @@
-# Set Hadoop-specific environment variables here.
+# This if statement insures that this file will be sources only once
+if [[ "$IS_HADOOP_ENV_ALREADY_SOURCED" != "true" ]]; then
+  export IS_HADOOP_ENV_ALREADY_SOURCED="true";
 
-# The only required environment variable is JAVA_HOME.  All others are
-# optional.  When running a distributed configuration it is best to
-# set JAVA_HOME in this file, so that it is correctly defined on
-# remote nodes.
+  # Set Hadoop-specific environment variables here.
 
-# The java implementation to use.  Required.
-# export JAVA_HOME=/usr/lib/j2sdk1.5-sun
+  # The only required environment variable is JAVA_HOME.  All others are
+  # optional.  When running a distributed configuration it is best to
+  # set JAVA_HOME in this file, so that it is correctly defined on
+  # remote nodes.
 
-# Extra Java CLASSPATH elements.  Optional.
-# export HADOOP_CLASSPATH=
+  # The java implementation to use.  Required.
+  # export JAVA_HOME=/usr/lib/j2sdk1.5-sun
 
-# The maximum amount of heap to use, in MB. Default is 1000.
-# export HADOOP_HEAPSIZE=2000
+  # Extra Java CLASSPATH elements.  Optional.
+  # export HADOOP_CLASSPATH=
 
-# Extra Java runtime options.  Empty by default.
-# export HADOOP_OPTS=-server
+  # The maximum amount of heap to use, in MB. Default is 1000.
+  # export HADOOP_HEAPSIZE=2000
 
-# Command specific options appended to HADOOP_OPTS when specified
-export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_NAMENODE_OPTS"
-export HADOOP_SECONDARYNAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_SECONDARYNAMENODE_OPTS"
-export HADOOP_DATANODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_DATANODE_OPTS"
-export HADOOP_BALANCER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_BALANCER_OPTS"
-export HADOOP_JOBTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_JOBTRACKER_OPTS"
-export HADOOP_RAIDNODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_RAIDNODE_OPTS"
-export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote.port=8998 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+  # Extra Java runtime options.  Empty by default.
+  # export HADOOP_OPTS=-server
 
-# The only user who can start hadoop daemons. 
-# If this is not set, any user can start hadoop daemons.  
-export HADOOP_USERNAME="hadoop"
+  # Command specific options appended to HADOOP_OPTS when specified
+  export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_NAMENODE_OPTS"
+  export HADOOP_SECONDARYNAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_SECONDARYNAMENODE_OPTS"
+  export HADOOP_DATANODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_DATANODE_OPTS"
+  export HADOOP_BALANCER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_BALANCER_OPTS"
+  export HADOOP_JOBTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_JOBTRACKER_OPTS"
+  export HADOOP_RAIDNODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_RAIDNODE_OPTS"
+  export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote.port=8998 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 
-# Java Runtime garbage collection options to pass to all Hadoop
-# servers (Namenode, Jobtracker, Datanode, Tasktracker). This must end
-# with a colon ; to which the dynamically generated gc log filename will
-# be appended to. The below defaults work for the Sun JVM, for example
-# in IBM GC, use '-Xverbosegclog:'.
-#export HADOOP_GC_LOG_OPTS="-XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:"
+  # The only user who can start hadoop daemons.
+  # If this is not set, any user can start hadoop daemons.
+  export HADOOP_USERNAME="hadoop"
 
-# export HADOOP_TASKTRACKER_OPTS=
-# The following applies to multiple commands (fs, dfs, fsck, distcp etc)
-# export HADOOP_CLIENT_OPTS
+  # Java Runtime garbage collection options to pass to all Hadoop
+  # servers (Namenode, Jobtracker, Datanode, Tasktracker). This must end
+  # with a colon ; to which the dynamically generated gc log filename will
+  # be appended to. The below defaults work for the Sun JVM, for example
+  # in IBM GC, use '-Xverbosegclog:'.
+  #export HADOOP_GC_LOG_OPTS="-XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:"
 
-# Extra ssh options.  Empty by default.
-# export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
+  # export HADOOP_TASKTRACKER_OPTS=
+  # The following applies to multiple commands (fs, dfs, fsck, distcp etc)
+  # export HADOOP_CLIENT_OPTS
 
-# Where log files are stored.  $HADOOP_HOME/logs by default.
-# export HADOOP_LOG_DIR=${HADOOP_HOME}/logs
+  # Extra ssh options.  Empty by default.
+  # export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
 
-# File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.
-# export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
+  # Where log files are stored.  $HADOOP_HOME/logs by default.
+  # export HADOOP_LOG_DIR=${HADOOP_HOME}/logs
 
-# host:path where hadoop code should be rsync'd from.  Unset by default.
-# export HADOOP_MASTER=master:/home/$USER/src/hadoop
+  # File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.
+  # export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
 
-# Seconds to sleep between slave commands.  Unset by default.  This
-# can be useful in large clusters, where, e.g., slave rsyncs can
-# otherwise arrive faster than the master can service them.
-# export HADOOP_SLAVE_SLEEP=0.1
+  # host:path where hadoop code should be rsync'd from.  Unset by default.
+  # export HADOOP_MASTER=master:/home/$USER/src/hadoop
 
-# The directory where pid files are stored. /tmp by default.
-# export HADOOP_PID_DIR=/var/hadoop/pids
+  # Seconds to sleep between slave commands.  Unset by default.  This
+  # can be useful in large clusters, where, e.g., slave rsyncs can
+  # otherwise arrive faster than the master can service them.
+  # export HADOOP_SLAVE_SLEEP=0.1
 
-# A string representing this instance of hadoop. $USER by default.
-# export HADOOP_IDENT_STRING=$USER
+  # The directory where pid files are stored. /tmp by default.
+  # export HADOOP_PID_DIR=/var/hadoop/pids
 
-# The scheduling priority for daemon processes.  See 'man nice'.
-# export HADOOP_NICENESS=10
+  # A string representing this instance of hadoop. $USER by default.
+  # export HADOOP_IDENT_STRING=$USER
+
+  # The scheduling priority for daemon processes.  See 'man nice'.
+  # export HADOOP_NICENESS=10
+
+fi
diff --git a/conf/log4j.properties b/conf/log4j.properties
index 402f3a71..7e04cbc1 100644
--- a/conf/log4j.properties
+++ b/conf/log4j.properties
@@ -34,7 +34,7 @@ log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
 log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
 
 # Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c{1}: %m%n
 # Debugging Pattern format
 #log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
 
diff --git a/conf/log4j.properties.scribeappender b/conf/log4j.properties.scribeappender
new file mode 100644
index 00000000..958b0f22
--- /dev/null
+++ b/conf/log4j.properties.scribeappender
@@ -0,0 +1,135 @@
+# Define some default values that can be overridden by system properties
+hadoop.root.logger=INFO,console
+hadoop.log.dir=.
+hadoop.log.file=hadoop.log
+
+# Define the root logger to the system property "hadoop.root.logger".
+log4j.rootLogger=${hadoop.root.logger}, EventCounter
+
+# Logging Threshold
+log4j.threshhold=ALL
+
+#
+# Daily Rolling File Appender
+#
+
+log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DRFA.File=${hadoop.log.dir}/${hadoop.log.file}
+
+# Rollver at midnight
+#log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
+
+# Rollver at the top of every hour
+log4j.appender.DRFA.DatePattern=.yyyy-MM-dd-HH
+
+# 30-day backup
+#log4j.appender.DRFA.MaxBackupIndex=30
+log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
+
+# Pattern format: Date LogLevel LoggerName LogMessage
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c{1}: %m%n
+# Debugging Pattern format
+#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+
+#
+# logmonitor understood
+# This format is the one that logmonitor can understand. It is heavyweight so
+# should only be used for WARN and above
+#
+
+log4j.appender.LM=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.LM.threshold=WARN
+log4j.appender.LM.File=${hadoop.log.dir}/logmonitor-${hadoop.log.file}
+log4j.appender.LM.DatePattern=.yyyy-MM-dd-HH
+log4j.appender.LM.layout=org.apache.log4j.PatternLayout
+log4j.appender.LM.layout.ConversionPattern=[%c{3},%L] [%d{EEE MMM dd HH:mm:ss yyyy}] %p: %m%n
+
+#
+# console
+# Add "console" to rootlogger above if you want to use this 
+#
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
+
+#
+# TaskLog Appender
+#
+
+#Default values
+hadoop.tasklog.taskid=null
+hadoop.tasklog.noKeepSplits=4
+hadoop.tasklog.totalLogFileSize=100
+hadoop.tasklog.purgeLogSplits=true
+hadoop.tasklog.logsRetainHours=12
+
+log4j.appender.TLA=org.apache.hadoop.mapred.TaskLogAppender
+log4j.appender.TLA.taskId=${hadoop.tasklog.taskid}
+log4j.appender.TLA.totalLogFileSize=${hadoop.tasklog.totalLogFileSize}
+
+log4j.appender.TLA.layout=org.apache.log4j.PatternLayout
+log4j.appender.TLA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+
+#
+# Rolling File Appender
+#
+
+#log4j.appender.RFA=org.apache.log4j.RollingFileAppender
+#log4j.appender.RFA.File=${hadoop.log.dir}/${hadoop.log.file}
+
+# Logfile size and and 30-day backups
+#log4j.appender.RFA.MaxFileSize=1MB
+#log4j.appender.RFA.MaxBackupIndex=30
+
+#log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
+#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} - %m%n
+#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+
+#
+# FSNamesystem Audit logging
+# All audit events are logged at INFO level
+#
+log4j.logger.org.apache.hadoop.hdfs.server.FSNamesystem.audit=INFO
+
+# Custom Logging levels
+
+#log4j.logger.org.apache.hadoop.mapred.JobTracker=DEBUG
+#log4j.logger.org.apache.hadoop.mapred.TaskTracker=DEBUG
+#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG
+
+# Jets3t library
+log4j.logger.org.jets3t.service.impl.rest.httpclient.RestS3Service=ERROR
+
+#
+# Event Counter Appender
+# Sends counts of logging messages at different severity levels to Hadoop Metrics.
+#
+log4j.appender.EventCounter=org.apache.hadoop.metrics.jvm.EventCounter
+
+# Special appender for RAID metrics.
+log4j.logger.RaidMetrics=INFO,SCRIBE_RAID_METRICS_APPENDER
+
+# RaidMetrics
+log4j.appender.SCRIBE_RAID_METRICS_APPENDER=com.facebook.logging.ScribeAppender
+log4j.appender.SCRIBE_RAID_METRICS_APPENDER.tag=${hadoop.tasklog.taskid}
+log4j.appender.SCRIBE_RAID_METRICS_APPENDER.application=raid
+log4j.appender.SCRIBE_RAID_METRICS_APPENDER.installation=${hadoop.installationid}
+log4j.appender.SCRIBE_RAID_METRICS_APPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.SCRIBE_RAID_METRICS_APPENDER.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
+log4j.appender.SCRIBE_RAID_METRICS_APPENDER.Threshold=INFO
+
+#
+# This is a scribe appender. The data will be sent directly to scribe
+#
+#
+log4j.appender.scribe=com.facebook.logging.ScribeAppender
+log4j.appender.scribe.tag=${hadoop.tasklog.taskid}
+log4j.appender.scribe.application=${hadoop.application}
+log4j.appender.scribe.installation=${hadoop.installationid}
+log4j.appender.scribe.layout=org.apache.log4j.PatternLayout
+log4j.appender.scribe.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
+log4j.appender.scribe.threshold=WARN
+
+log4j.logger.com.facebook.smc.SmcUtil=INFO,console
diff --git a/copy-hdfs-jars-to-maven.sh b/copy-hdfs-jars-to-maven.sh
index 7ffdf8f1..45033901 100755
--- a/copy-hdfs-jars-to-maven.sh
+++ b/copy-hdfs-jars-to-maven.sh
@@ -5,59 +5,68 @@
 # and test) built in titan/VENDOR/hadoop-0.20/.
 #
 
+set -e -u -o pipefail
 BASEDIR=`dirname $0`
 cd ${BASEDIR}
 
-if [ ! -f build/hadoop-0.20.1-dev-core.jar ]; then
- if [ ! -f build/hadoop-0.20-core.jar ]; then
-  echo "core jar not found. Running 'ant jar'..."
-  ant jar | grep BUILD;
- fi
+VERSION=$( ant -q print-version | head -1 | awk '{print $2}' )
+if [ -z "$VERSION" ]; then
+  echo "Unable to determine Hadoop version" >&2
+  exit 1
 fi
 
-if [ ! -f build/hadoop-0.20.1-dev-test.jar ]; then
- if [ ! -f build/hadoop-0.20-test.jar ]; then
-   echo "test jar not found. Running 'ant jar-test'..."
-   ant jar-test | grep BUILD;
- fi
+TARGETS=""
+
+CORE_JAR=build/hadoop-$VERSION-core.jar
+if [ ! -f $CORE_JAR ]; then
+  TARGETS="$TARGETS jar"
 fi
 
+CORE_POM=build/ivy/maven/generated.pom
+if [ ! -f $CORE_POM ]; then
+  TARGETS="$TARGETS makepom"
+fi
 
-#
-# The names of core/test jar name depend
-# on whether they were generated using 
-# build_all.sh script or just the vanilla
-# simple ant jar/jar-test
-#
-if [ -f build/hadoop-0.20.1-dev-core.jar ]; then
-  CORE_JAR=build/hadoop-0.20.1-dev-core.jar
-else
-  CORE_JAR=build/hadoop-0.20-core.jar
+TEST_JAR=build/hadoop-$VERSION-test.jar
+if [ ! -f $TEST_JAR ]; then
+  TARGETS="$TARGETS jar-test"
 fi
 
-if [ -f build/hadoop-0.20.1-dev-test.jar ]; then
-  TEST_JAR=build/hadoop-0.20.1-dev-test.jar
-else
-  TEST_JAR=build/hadoop-0.20-test.jar
+if [ -n "$TARGETS" ]; then
+  ant $TARGETS
 fi
 
+# Clear the optional flag on Hadoop dependencies so these dependencies can be
+# included transitively in other projects.
+CORE_POM_MODIFIED=$CORE_POM.new
+./edit_generated_pom.py >$CORE_POM_MODIFIED
+
 echo "** Publishing hadoop* core & test jars "
 echo "** to "
 echo "**   your local maven repo (~/.m2/repository). "
 echo "** HBase builds will  pick up the HDFS* jars from the local maven repo."
 
-mvn install:install-file \
-    -DgeneratePom=true \
+# When running under Commander, use the setting.xml file that specifies
+# the localRepository for a central mvn repo that can be shared between
+# all of the build/test agents
+OPTS=""
+if [[ -n "${COMMANDER_WORKSPACE:-}" || "$USER" == "svcscm" ]]; then
+    OPTS="-s /scm/git/electric/hadoop_builds/settings.xml"
+fi
+
+mvn $OPTS install:install-file \
+    -DpomFile=$CORE_POM_MODIFIED \
     -DgroupId=org.apache.hadoop \
     -DartifactId=hadoop-core \
-    -Dversion=0.20 \
+    -Dversion=$VERSION \
     -Dpackaging=jar \
     -Dfile=${CORE_JAR}
 
-mvn install:install-file \
+mvn $OPTS install:install-file \
     -DgeneratePom=true \
     -DgroupId=org.apache.hadoop \
     -DartifactId=hadoop-test \
-    -Dversion=0.20 \
+    -Dversion=$VERSION \
     -Dpackaging=jar \
     -Dfile=${TEST_JAR}
+
diff --git a/edit_generated_pom.py b/edit_generated_pom.py
new file mode 100644
index 00000000..c2f88d39
--- /dev/null
+++ b/edit_generated_pom.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+
+'''
+Reads the automatically generated Hadoop pom file, removes the "optional"
+flag from dependencies so that they could be included transitively into other
+projects such as HBase, and removes certain dependencies that are not required
+and could even break the code (e.g. an old version of xerces). Writes the
+modified project object model XML to standard output.
+'''
+
+import os
+import re
+import sys
+
+from xml.dom.minidom import parse
+
+NON_TRANSITIVE_DEPS = [
+    # Old version, breaks HBase
+    'xerces',
+
+    # Not used in production
+    'checkstyle',
+    'jdiff',
+
+    # A release audit tool, probably not used in prod
+    'rat-lib',
+]
+
+POM_FILE = 'build/ivy/maven/generated.pom'
+doc = parse(POM_FILE)
+deps = doc.getElementsByTagName('dependencies')[0]
+
+for dep in deps.getElementsByTagName('dependency'):
+    for c in dep.childNodes:
+        if (c.nodeName == 'artifactId' and
+            c.firstChild and
+            c.firstChild.nodeValue and
+            c.firstChild.nodeValue.strip() in NON_TRANSITIVE_DEPS):
+            deps.removeChild(dep)
+            break
+
+    for o in dep.getElementsByTagName('optional'):
+        dep.removeChild(o)
+
+out_lines = doc.toprettyxml(indent=' ' * 2)
+lines = []
+for l in out_lines.split('\n'):
+    l = l.rstrip()
+    if l:
+        lines.append(l)
+output = '\n'.join(lines)
+
+# Make sure values stay on the same line: <element>value</element>
+output = re.sub(
+    r'(<([a-zA-Z]+)>)'
+    r'\s*([^<>]+?)\s*'
+    r'(</\2>)', r'\1\3\4', output)
+
+print output
+
diff --git a/hdfs-autoconf/README.md b/hdfs-autoconf/README.md
new file mode 100644
index 00000000..e47bbfa2
--- /dev/null
+++ b/hdfs-autoconf/README.md
@@ -0,0 +1,213 @@
+What is this?
+=============
+
+This is autoconfigurator and autolauncher for a local HDFS cluster.
+It is supposed to be mainly used for developer purposes, and it provides
+you with bunch of scripts for setting everything up in a minute.. or maybe two.
+Enjoy!
+
+DISCLAIMER: The scripts are written and tested on the GNU system and relies
+on GNU tools. At least two of them (`sed` & `readlink`) are known
+to be incompatible with their BSD implementations.
+
+
+
+STARTING CLUSTER
+================
+
+1. Make sure you have a zookeeper quorum started somewhere and that file
+  `config-meta/avatar-shared.sed` has a `zookeeper-quorum` entry that points
+  to the quorum. If not, you can start a local zookeeper via
+  `zookeeper.sh start` command
+2. `./build.sh` - builds all sources needed to start HDFS cluster
+3. `./avatar-format` - formats cluster directories
+4. `./start-dev-cluster --count 3` - starts local cluster with 3 datanodes.
+
+[OPTIONAL] If you want to change any `core-site.xml` or `hdfs-site.xml`
+  properties, make the necessary changes in the `config-templates/core-site.xml.template` and
+  `config-meta/hdfs-site.xml.template` files. If you want to configure cluster
+  directories, please refer to FAQ questions "Where do namenodes store their data?" and
+  "Where do datanodes store their data?".
+
+
+
+F.A.Q
+=====
+
+Where do I find cluster log files?
+----------------------------------
+
+Logs directory is specified by `$LOGS_DIRECTORY` variable, which defauls to
+`$HADOOP_VERSION/logs`.
+
+
+Where do namenodes store their data?
+------------------------------------
+
+1. The directory that is used as a local directory for the active namenode is
+  specified in the `./config-meta/avatar-zero.sed` file.
+2. Similar to the active namenode, the local directory for the standby
+  specified in the `./config-meta/avatar-one.sed` file.
+3. The shared namenodes directory is specified in the
+  `./config-meta/avatar-shared.sed` file
+
+
+Where do datanodes store their data?
+------------------------------------
+
+Each datanode has a set of volumes, and autotool maps volumes
+to distinct local directories. These directories are specified in
+datanode configuration file which is only one line long and has the following
+entry:
+
+```
+s:{{DataNode-volumes}}:<path-to-volume-1-directory>[,<path-to-volume-2-directory>...]:g
+```
+
+In case of starting cluster with `./start-dev-cluster --count 5` command,
+every of 5 datanodes will be started with a configuration file produced with the
+help of `./config-meta/avatar-datanode.template` template. Consider having the following
+template:
+
+```
+s:{{DataNode-volumes}}:/tmp/hadoop-datanode-XXX-vol0/,/tmp/hadoop-datanode-XXX-vol1/:g
+```
+
+This would mean that the first datanode has two volumes mapped to
+`/tmp/hadoop-datanode-1-vol0/` and `/tmp/hadoop-datanode-1-vol1/` directories, and the
+forth one has `/tmp/hadoop-datanode-4-vol0/` and `/tmp/hadoop-datanode-4-vol1/`.
+That is because the "XXX" sequence in the `avatar-datanode.template` file is
+substituted with the sequential datanode number to provide it with unique
+directories on the local machine.
+
+
+What is the format of files in `config-meta` directory?
+-------------------------------------------------------
+
+These files are SED (Stream Editor) scripts. Though the syntax of SED scripts
+is not coincise, autoconf tool utilizes only `substitute` command.
+
+The substitution command basically looks like this:
+
+```
+s:cat:dog:g
+```
+
+This example will substitute every 'cat' for 'dog'. The 's' letter stands for
+'substitute' command, and the trailing 'g' is a flag that enforces sed to substitute
+every entry of 'cat'; otherwise it would be done only for first occurences of
+'cat' per line.
+
+Any symbol could be used as a command delimeter. Thus said, the followings are fully
+equal to the previous example
+```
+  s_cat_dog_g
+  s%cat%dog%g
+  s/cat/dog/g
+```
+
+This feature could be utilized to avoid escaping inside of sed scripts. Consider
+looking at the following example
+```
+  s:some-folder:/tmp/foo:g
+  s_URL_localhost:7777_g
+```
+
+
+How do I add new datanode configuration file?
+---------------------------------------------
+
+1. create a file with the name that matches format 'avatar-datanode-*.sed'
+(the format of the datanode configuration files is specified by
+`$DATANODE_CONFIG_FILES` variable in `config.sh` file)
+
+2. Fill in the file with the following content
+```
+s:{{DataNode-volumes}}:<path-to-volume-1-directory>[,<path-to-volume-2-directory>...]:g
+```
+
+
+What is an example of datanode config file with multiple volumes?
+-----------------------------------------------------------------
+
+A datanode with two volumes, each resides in its own directory, will look the
+following way
+
+```
+s:{{DataNode-volumes}}:/tmp/mydatanode-volume-1/,/tmp/mydatanode-volume-2/:g
+```
+
+So the directories should be listed one after another, separated with comma
+delimeter.
+NOTE: Make sure you do not put any spaces!
+
+
+What exactly does autoconf tool do?
+-----------------------------------
+
+Whenever autoconf tool starts some HDFS instance, it does the following
+sequence of actions:
+
+1. Picks template files from `config-templates` direcotry
+2. Runs `sed` scripts from `config-meta` directory over them
+3. Puts results of sed execution to the `hadoop-0.20/bin` directory (the path
+  to `hadoop-0.20` directory is specified via `$HADOOP_VERSION`)
+4. Launches the HDFS instance
+
+
+PRO stuff: multiple hadoop checkouts
+------------------------------------
+
+To switch between multiple hadoop checkouts just edit `./config.sh` file,
+setting a `$HADOOP_VERSION` variable to the path of checkout you would like.
+
+
+
+Files overview
+==============
+
+Client scripts
+--------------
+
+This is the list of scripts that are designed to be used by user. For more
+information, you can refer to the source code of every script or just
+run it with `--help` argument.
+
+* `./build.sh` - builds everything
+* `./avatar-format` - formats directories for avatar namenodes (both active and
+  standby)
+* `./avatar-zero-start` - starts active avatar
+* `./avatar-one-start` - starts standby avatar
+* `./avatar-datanode-start` - allows you to choose a config and start a datanode
+  instance configured according to it.
+  instance. Zookeeper is absolutely necessary for the cluster functioning, and
+  it is started and stopped automatically with cluster
+* `./start-dev-cluster.sh` - starts all the nodes as daemons for the local cluster
+* `./stop-dev-cluster.sh` - stops instantiated developer cluster (simply killing
+  all the processes with `avatar` in the name)
+* `./zookeeper.sh` - this script is used to start and stop local zookeeper
+
+
+Other directory files
+---------------------
+
+* `./config-meta` - the directory that contains all the options for the local
+  cluster
+  - `./config-meta/avatar-shared.sed` - configuration of shared directories, used by
+    both Active and Stand-by avatar nodes
+  - `./config-meta/avatar-zero.sed` - configuration of local directories for node zero
+  - `./config-meta/avatar-one.sed` - configuration of local directories for node one
+  - `./config-meta/avatar-datanode*.sed` - configuration files for datanodes, one file per
+    node.
+  - `./config-meta/avatar-datanode.template` - configuration file that is used
+    to automatically generate datanode configuration files. Read more about this
+    file in the FIXME
+* `./config-templates` - stores all the files that are been run substitutions over.
+* `./launchpad` - that stores generated scripts, should not be used
+  unless you _really_ know what you do.
+* `./scripts` - here you can find scripts that do the dirty job
+* `./README.md` - markdown README in best github traditions.
+* `./config.sh` - this file exports a `$HADOOP_VERSION` variable as well as
+  couple of other variables. You might refer to the file often if you have
+  multiple hadoop checkouts
+
diff --git a/hdfs-autoconf/avatar-datanode-start b/hdfs-autoconf/avatar-datanode-start
new file mode 100644
index 00000000..f2fe90aa
--- /dev/null
+++ b/hdfs-autoconf/avatar-datanode-start
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+# Usage: bash avatar-datanode-start [--conf configFile] [--daemon]
+set -e
+
+usage="USAGE
+  bash $(basename $0) [--help] [--format] [--conf configFile] [--daemon]
+
+DESCRIPTION
+  Starts locally an avatar datanode with one of the configurations. If
+  the --conf options is not specified, the script brings up a menu listing
+  all the found datanode configuration files and letting user to make his
+  choice.
+
+OPTIONS
+  --help - shows this help message
+  --format - forces datanode to format its directories before it starts. If this
+      option is not given, then datanode does not format directories unless
+      they do not exist
+  --conf - specifies which configuration to use for starting datanode.
+  --daemon - starts datanode as a daemon process. Logs will go to
+      the directory specified by \$LOGS_DIRECTORY variable
+"
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  echo "The script should be launched from ./hdfs-autoconf directory. Exiting.."
+  exit 1
+fi
+
+if (( $# >= 1 )); then
+  if [[ "$1" == "--help" ]]; then
+    echo "$usage"
+    exit 0
+  fi
+fi
+
+format="false"
+if (( $# >= 1 )); then
+  if [[ "$1" == "--format" ]]; then
+    format="true"
+    shift;
+  fi
+fi
+
+if (( $# >= 2 )); then
+  if [[ "$1" == "--conf" ]]; then
+    shift;
+    datanodeConfig=$1;
+    shift;
+  fi
+fi
+
+daemon=false;
+if (( $# >= 1 )); then
+  if [[ "$1" == "--daemon" ]]; then
+    daemon=true;
+    shift;
+  fi
+fi
+
+if (( $# > 0 )); then
+  echo "$usage"
+  exit 1;
+fi
+
+source scripts/common.sh
+
+
+function showUserMenu {
+  echo -e "Searching for configurations ${cWHITE}$DATANODE_CONFIG_FILES${cRESET}..."
+  echo -e "Select config for this instance of datanode:"
+
+  counter=0;
+  for i in $(ls -1 $DATANODE_CONFIG_FILES); do
+    counter=$(expr $counter + 1);
+    echo -e "  ${cWHITE}[$counter]${cRESET} $i"
+  done;
+
+  amount=$counter
+
+  if (( $amount == 0 )); then
+    fail "No configuration files found"
+  fi
+
+  read -p "
+  Which one to start (1-$amount): "
+  if [[ $REPLY == "" ]]; then
+    echo "Exiting...";
+    exit 0;
+  fi
+
+  if ! [[ $REPLY =~ ^[0-9]+$ ]]; then
+    fail "Command must be a number (no whitespaces!)"
+  fi
+  if !(( $REPLY > 0 && $REPLY <= $amount )); then
+    fail "Wrong command!"
+  fi
+
+  datanodeConfig=$(ls -1 $DATANODE_CONFIG_FILES | head -$REPLY | tail -1);
+}
+
+if [[ "$daemon" == "true" ]]; then
+  # HACK: we're removing *.pid files from logs directory so that hadoop
+  # daemon will allow us to start multiple instances
+  rm -f ${LOGS_DIRECTORY}/*.pid
+fi
+
+if [[ $datanodeConfig == "" ]]; then
+  showUserMenu
+fi
+
+
+# creating logs subdirectory from the name of config file
+datanodeLogsDirectory=${datanodeConfig##*/}
+datanodeLogsDirectory=${datanodeLogsDirectory%.*}
+export HADOOP_LOG_DIR=${LOGS_DIRECTORY}/$datanodeLogsDirectory
+./scripts/gen-datanode $datanodeConfig
+if [[ $format == "true" ]]; then
+  ./$LAUNCHPAD_DIR/dn-format --hard
+else
+  ./$LAUNCHPAD_DIR/dn-format --soft
+fi
+
+runArgs="";
+if [[ "$daemon" == "true" ]]; then
+  runArgs="$runArgs --daemon";
+fi
+
+./$LAUNCHPAD_DIR/run $runArgs
+
+# wait some time to make sure the running instance actually
+# read all the config files
+sleep 3
diff --git a/hdfs-autoconf/avatar-format b/hdfs-autoconf/avatar-format
new file mode 100644
index 00000000..6fd73a02
--- /dev/null
+++ b/hdfs-autoconf/avatar-format
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+set -e
+
+usage="USAGE
+  bash $(basename $0) [--help]
+
+DESCRIPTION
+  Formats directories that are used for both Active and Standby namenodes.
+
+OPTIONS
+  --help - show this help message
+"
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  echo "The script should be launched from ./hdfs-autoconf directory. Exiting.."
+  exit 1
+fi
+
+if (( $# >= 1 )); then
+  if [[ $1 == "--help" ]]; then
+    echo "$usage";
+    exit 0;
+  fi
+fi
+
+if (( $# > 0 )); then
+  echo "$usage";
+  exit 1;
+fi
+
+source scripts/common.sh
+
+# populate config
+./scripts/gen-avatar zero
+
+# creating directory formatters
+LOCAL_DIR_FORMATTER="$TEMPLATES_DIR/format-avatarnode-local-dir.sh.template"
+SHARED_DIR_FORMATTER="$TEMPLATES_DIR/format-avatarnode-shared-dir.sh.template"
+
+AVATAR_LOCAL_ZERO="$LAUNCHPAD_DIR/avatar-zero-local-dir.sh"
+cp $LOCAL_DIR_FORMATTER $AVATAR_LOCAL_ZERO
+patch $AVATAR_LOCAL_ZERO $METACONF_DIR/avatar-zero.sed
+
+AVATAR_LOCAL_ONE="$LAUNCHPAD_DIR/avatar-one-local-dir.sh"
+cp $LOCAL_DIR_FORMATTER $AVATAR_LOCAL_ONE
+patch $AVATAR_LOCAL_ONE $METACONF_DIR/avatar-one.sed
+
+AVATAR_SHARED="$LAUNCHPAD_DIR/avatar-shared-dir.sh"
+cp $SHARED_DIR_FORMATTER $AVATAR_SHARED
+patch $AVATAR_SHARED $METACONF_DIR/avatar-shared.sed
+
+echo "Creating avatar directories"
+bash $AVATAR_LOCAL_ZERO
+bash $AVATAR_LOCAL_ONE
+bash $AVATAR_SHARED
+
+
+echo "Formatting avatar..."
+source config.sh
+cd ${HADOOP_VERSION}/bin
+./hadoop avatarzk -updateZK -zero -force
+./hadoop avatarnode -format
+echo -e "${cGREEN}Done.${cRESET}"
+
diff --git a/hdfs-autoconf/avatar-one-start b/hdfs-autoconf/avatar-one-start
new file mode 100644
index 00000000..d6353f4f
--- /dev/null
+++ b/hdfs-autoconf/avatar-one-start
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Usage: bash avatar-one-start [--daemon]
+
+set -e
+usage="USAGE
+  bash $(basename $0) [--help] [--daemon]
+
+DESCRIPTION
+  Starts locally an avatar namenode which is stand-by default.
+
+OPTIONS
+  --help - shows this help message
+  --daemon - starts avatar as a daemon process. Logs will go to
+      the directory specified by \$LOGS_DIRECTORY variable
+"
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  echo "The script should be launched from ./hdfs-autoconf directory. Exiting.."
+  exit 1
+fi
+
+if (( $# >= 1)); then
+  if [[ $1 == "--help" ]]; then
+    echo "$usage";
+    exit 0;
+  fi
+fi
+
+daemon="false";
+if (( $# >= 1 )); then
+  if [[ $1 == "--daemon" ]]; then
+    daemon="true"
+    shift;
+  fi;
+fi
+
+if (( $# > 0 )); then
+  echo "$usage";
+  exit 1;
+fi
+
+source config.sh
+
+runArgs="";
+if [[ "$daemon" == "true" ]]; then
+  # HACK: after every launch we should remove `pid` file so that
+  # `hadoop-daemon.sh` that is actually called in the depth)
+  # won't complain about instances that are already started
+  rm -f ${LOGS_DIRECTORY}/*.pid
+  runArgs="--daemon";
+fi
+
+export HADOOP_LOG_DIR=${LOGS_DIRECTORY}/avatar-one-logs
+
+./scripts/gen-avatar one
+$LAUNCHPAD_DIR/run $runArgs
+
+# wait some time to make sure the running instance actually
+# read all the config files
+sleep 3
diff --git a/hdfs-autoconf/avatar-zero-start b/hdfs-autoconf/avatar-zero-start
new file mode 100644
index 00000000..9eaf1642
--- /dev/null
+++ b/hdfs-autoconf/avatar-zero-start
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Usage: bash avatar-one-start [--daemon]
+set -e
+
+usage="USAGE
+  bash $(basename $0) [--help] [--daemon]
+
+DESCRIPTION
+  Starts locally an avatar namenode which is active by default.
+
+OPTIONS
+  --help - shows this help message
+  --daemon - starts avatar as a daemon process. Logs will go to
+      the directory specified by \$LOGS_DIRECTORY variable
+"
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  echo "The script should be launched from ./hdfs-autoconf directory. Exiting.."
+  exit 1
+fi
+
+if (( $# >= 1)); then
+  if [[ $1 == "--help" ]]; then
+    echo "$usage";
+    exit 0;
+  fi
+fi
+
+daemon="false";
+if (( $# >= 1 )); then
+  if [[ $1 == "--daemon" ]]; then
+    daemon="true";
+    shift;
+  fi
+fi
+
+if (( $# > 0 )); then
+  echo "$usage"
+  exit 1
+fi
+
+source config.sh
+
+runArgs=""
+if [[ "$daemon" == "true" ]]; then
+  # HACK: after every launch we should remove `pid` file so that
+  # `hadoop-daemon.sh` that is actually called in the depth)
+  # won't complain about instances that are already started
+  rm -f ${LOGS_DIRECTORY}/*.pid
+
+  runArgs="$runArgs --daemon"
+fi
+
+./scripts/gen-avatar zero
+
+cd ${HADOOP_VERSION}/bin
+./hadoop avatarzk -updateZK -zero -force
+cd -
+
+export HADOOP_LOG_DIR=${LOGS_DIRECTORY}/avatar-zero-logs
+
+$LAUNCHPAD_DIR/run $runArgs
+
+# wait some time to make sure the running instance actually
+# read all the config files
+sleep 3
diff --git a/hdfs-autoconf/build.sh b/hdfs-autoconf/build.sh
new file mode 100644
index 00000000..79a95444
--- /dev/null
+++ b/hdfs-autoconf/build.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+set -e
+
+usage="USAGE
+  $(basename $0) [--help] [--fast]
+
+DESCRIPTION
+  Builds HDFS from sources.
+
+OPTIONS
+  --help - shows this help
+  --fast - EXPERIMENTAL option, does some build 3 times faster than default
+      build.
+"
+
+if (( $# >= 1 )); then
+  if [[ $1 == "--help" ]]; then
+    echo "$usage";
+    exit 0;
+  fi
+fi
+
+compile="full"
+if (( $# >= 1 )); then
+  if [[ $1 == "--fast" ]]; then
+    compile="fast"
+    shift
+  fi
+fi
+
+if (( $# > 0 )); then
+  echo "$usage"
+  exit 1
+fi
+
+source config.sh
+
+cd ${HADOOP_VERSION};
+
+if [[ $compile == "full" ]]; then
+  ant clean compile
+elif [[ $compile == "fast" ]]; then
+  ant clean compile-core
+  cd src/contrib/highavailability
+  ant clean compile
+fi
+
+
diff --git a/hdfs-autoconf/config-meta/avatar-datanode-1.sed b/hdfs-autoconf/config-meta/avatar-datanode-1.sed
new file mode 100644
index 00000000..72c70745
--- /dev/null
+++ b/hdfs-autoconf/config-meta/avatar-datanode-1.sed
@@ -0,0 +1,2 @@
+# datanode volumes: list without spaces, comma-delimeted
+s:{{DataNode-volumes}}:/tmp/hadoop-datanode-0-vol0/,/tmp/hadoop-datanode-0-vol1/:g
diff --git a/hdfs-autoconf/config-meta/avatar-datanode-2.sed b/hdfs-autoconf/config-meta/avatar-datanode-2.sed
new file mode 100644
index 00000000..b0536216
--- /dev/null
+++ b/hdfs-autoconf/config-meta/avatar-datanode-2.sed
@@ -0,0 +1,2 @@
+# datanode config
+s:{{DataNode-volumes}}:/tmp/hadoop-datanode-1-vol0/,/tmp/hadoop-datanode-1-vol1/:g
diff --git a/hdfs-autoconf/config-meta/avatar-datanode.template b/hdfs-autoconf/config-meta/avatar-datanode.template
new file mode 100644
index 00000000..79c1f451
--- /dev/null
+++ b/hdfs-autoconf/config-meta/avatar-datanode.template
@@ -0,0 +1,6 @@
+# This file is used as a template for generating datanode config files
+# automatically. Instead of "XXX" it will subsitute sequential number
+# of a datanode instance. This way you can specify the format and amount
+# of volumes for the automatically generated datanode configuration files
+#
+s:{{DataNode-volumes}}:/tmp/hadoop-datanode-XXX-vol0/,/tmp/hadoop-datanode-XXX-vol1/:g
diff --git a/hdfs-autoconf/config-meta/avatar-one.sed b/hdfs-autoconf/config-meta/avatar-one.sed
new file mode 100644
index 00000000..b8898837
--- /dev/null
+++ b/hdfs-autoconf/config-meta/avatar-one.sed
@@ -0,0 +1,5 @@
+# local avatar 1 config
+s:{{NameNode-local}}:/tmp/hadoop-avatar-1-local/:g
+s:{{NameNode-local-fsimage}}:/tmp/hadoop-avatar-1-local/fsimage/:g
+s:{{NameNode-local-fsedits}}:/tmp/hadoop-avatar-1-local/fsedits/:g
+
diff --git a/hdfs-autoconf/config-meta/avatar-shared.sed b/hdfs-autoconf/config-meta/avatar-shared.sed
new file mode 100644
index 00000000..3bacef0f
--- /dev/null
+++ b/hdfs-autoconf/config-meta/avatar-shared.sed
@@ -0,0 +1,10 @@
+# setting up shared avatar directories
+# all these paths will be created relatively to /tmp directory
+s:{{NameNode-shared}}:/tmp/hadoop-avatar-shared/:g
+s:{{NameNode-shared-fsimage-0}}:/tmp/hadoop-avatar-shared/fsimage-zero/:g
+s:{{NameNode-shared-fsedits-0}}:/tmp/hadoop-avatar-shared/fsedits-zero/:g
+s:{{NameNode-shared-fsimage-1}}:/tmp/hadoop-avatar-shared/fsimage-one/:g
+s:{{NameNode-shared-fsedits-1}}:/tmp/hadoop-avatar-shared/fsedits-one/:g
+
+# ground may be a separator as well
+s_{{zookeeper-quorum}}_localhost_g
diff --git a/hdfs-autoconf/config-meta/avatar-zero.sed b/hdfs-autoconf/config-meta/avatar-zero.sed
new file mode 100644
index 00000000..e00c462c
--- /dev/null
+++ b/hdfs-autoconf/config-meta/avatar-zero.sed
@@ -0,0 +1,5 @@
+# local avatar 0 config
+s:{{NameNode-local}}:/tmp/hadoop-avatar-0-local/:g
+s:{{NameNode-local-fsimage}}:/tmp/hadoop-avatar-0-local/fsimage/:g
+s:{{NameNode-local-fsedits}}:/tmp/hadoop-avatar-0-local/fsedits/:g
+
diff --git a/hdfs-autoconf/config-templates/avatar-site.xml.template b/hdfs-autoconf/config-templates/avatar-site.xml.template
new file mode 100644
index 00000000..531049b7
--- /dev/null
+++ b/hdfs-autoconf/config-templates/avatar-site.xml.template
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+<property>
+  <name>dfs.http.address0</name>
+  <value>localhost:50070</value>
+  <description>
+    The address and the base port where the dfs namenode web ui will listen on.
+    If the port is 0 then the server will start on a free port.
+  </description>
+</property>
+
+<property>
+  <name>dfs.http.address1</name>
+  <value>localhost:50080</value>
+  <description>
+    The address and the base port where the dfs namenode web ui will listen on.
+    If the port is 0 then the server will start on a free port.
+  </description>
+</property>
+
+<property>
+  <name>dfs.name.dir</name>
+  <value>{{NameNode-local-fsimage}}</value>
+  <description>Determines where on the local filesystem the DFS name node
+      should store the name table(fsimage).  If this is a comma-delimited list
+      of directories then the name table is replicated in all of the
+      directories, for redundancy. </description>
+</property>
+
+<property>
+  <name>dfs.name.edits.dir</name>
+  <value>{{NameNode-local-fsedits}}</value>
+  <description>Determines where on the local filesystem the DFS name node
+      should store the transaction (edits) file. If this is a comma-delimited list of directories then the transaction file is replicated in all of the
+      directories, for redundancy. Default value is same as dfs.name.dir
+  </description>
+</property>
+
+<property>
+  <name>dfs.name.dir.shared0</name>
+  <value>{{NameNode-shared-fsimage-0}}</value>
+  <description>Determines where on the filer the AvatarNode
+      should store the name table(fsimage).
+      </description>
+</property>
+
+<property>
+  <name>dfs.name.dir.shared1</name>
+  <value>{{NameNode-shared-fsimage-1}}</value>
+  <description>Determines where on the filer the other instance of the AvatarNode
+      should store the name table(fsimage).
+      </description>
+</property>
+
+<property>
+  <name>dfs.name.edits.dir.shared0</name>
+  <value>{{NameNode-shared-fsedits-0}}</value>
+  <description>Determines where on the filer the AvatarNode
+      should store the transaction (edits) file. If this is a comma-delimited list of directories then the transaction file is replicated in all of the
+      directories, for redundancy. Default value is same as dfs.name.dir
+  </description>
+</property>
+
+<property>
+  <name>dfs.name.edits.dir.shared1</name>
+  <value>{{NameNode-shared-fsedits-1}}</value>
+  <description>Determines where on the filer the other instance of the AvatarNode
+      should store the transaction (edits) file.
+  </description>
+</property>
+
+<property>
+  <name>fs.checkpoint.enabled</name>
+  <value>true</value>
+</property>
+
+<property>
+  <name>standby.image.copies.tokeep</name>
+  <value>5</value>
+  <description>The number of backup copies of the image
+  and fsedits to keep around.
+  </description>
+</property>
+
+<property>
+  <name>standby.image.days.tokeep</name>
+  <value>2</value>
+  <description>How old should the backup image
+  be to get deleted.
+  </description>
+</property>
+
+<property>
+  <name>dfs.namenode.dn-address0</name>
+  <value>localhost:9005</value>
+  <description>
+  The address and port to run the RPC server which will be processing
+  requests from datanodes in the cluster.
+  </description>
+</property>
+
+<property>
+  <name>dfs.namenode.dn-address1</name>
+  <value>localhost:9006</value>
+  <description>
+  The address and port to run the RPC server which will be processing
+  requests from datanodes in the cluster.
+  </description>
+</property>
+
+
+</configuration>
diff --git a/hdfs-autoconf/config-templates/core-site.xml.template b/hdfs-autoconf/config-templates/core-site.xml.template
new file mode 100644
index 00000000..9d74a635
--- /dev/null
+++ b/hdfs-autoconf/config-templates/core-site.xml.template
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+
+<property>
+  <name>fs.default.name</name>
+  <value>hdfs://localhost:9000</value>
+  <description>The name of the default file system.  A URI whose
+  scheme and authority determine the FileSystem implementation.  The
+  uri's scheme determines the config property (fs.SCHEME.impl) naming
+  the FileSystem implementation class.  The uri's authority is used to
+  determine the host, port, etc. for a filesystem.</description>
+</property>
+
+<property>
+  <name>fs.default.name0</name>
+  <value>hdfs://localhost:9000</value>
+  <description>The name of the default file system.  A URI whose
+  scheme and authority determine the FileSystem implementation.  The
+  uri's scheme determines the config property (fs.SCHEME.impl) naming
+  the FileSystem implementation class.  The uri's authority is used to
+  determine the host, port, etc. for a filesystem.</description>
+</property>
+
+<property>
+  <name>fs.default.name1</name>
+  <value>hdfs://localhost:9010</value>
+  <description>The name of the default file system.  A URI whose
+  scheme and authority determine the FileSystem implementation.  The
+  uri's scheme determines the config property (fs.SCHEME.impl) naming
+  the FileSystem implementation class.  The uri's authority is used to
+  determine the host, port, etc. for a filesystem.</description>
+</property>
+
+<property>
+  <name>fs.checkpoint.period</name>
+  <value>600</value>
+  <description>
+  The number of seconds between two periodic checkpoints
+  </description>
+</property>
+
+<property>
+  <name>fs.checkpoint.size</name>
+  <value>10000000</value>
+  <description>
+  Defines the size of the edits log file that forces an urgent checkpoint even
+  if the maximum checkpoint delay is not reached.
+  </description>
+</property>
+
+<property>
+  <name>fs.ha.zookeeper.quorum</name>
+  <value>{{zookeeper-quorum}}</value>
+  <description>The list of ZK servers DAFS will be connecting to</description>
+</property>
+
+<property>
+  <name>ipc.client.connect.max.retries</name>
+  <value>10</value>
+</property>
+
+<property>
+  <name>ipc.client.connect.timeout</name>
+  <value>5</value>
+</property>
+
+
+<property>
+  <name>fs.hdfs.impl</name>
+  <value>org.apache.hadoop.hdfs.DistributedAvatarFileSystem</value>
+</property>
+
+<property>
+  <name>fs.ha.zookeeper.cache</name>
+  <value>true</value>
+</property>
+
+<property>
+  <name>fs.ha.zookeeper.timeout</name>
+  <value>30000</value>
+  <description> Indicates the session timeout for a zookeeper client connection</description>
+</property>
+
+<property>
+  <name>fs.ha.retrywrites</name>
+  <value>true</value>
+  <description>retry writes or not</description>
+</property>
+
+</configuration>
+
diff --git a/hdfs-autoconf/config-templates/format-avatardatanode.sh.template b/hdfs-autoconf/config-templates/format-avatardatanode.sh.template
new file mode 100644
index 00000000..11f90ab9
--- /dev/null
+++ b/hdfs-autoconf/config-templates/format-avatardatanode.sh.template
@@ -0,0 +1,53 @@
+#!/bin/bash
+set -e
+
+usage="USAGE
+  bash $(basename $0) [--help] [--soft]
+
+DESCRIPTION
+  Formats all the directories needed for every datanodes' volume.
+  In case the directory for volume already exists, it recreates it
+  thus deleting all the underlying data (this is also called HARD mode),
+  unless --soft option is given
+
+OPTIONS
+  --help - shows this help message
+  --soft - does not recreate directory if it already exists. This
+      option is used to preserve the data of the datanode
+"
+
+if (( $# >= 1 )); then
+  if [[ "$1" == "--help" ]]; then
+    echo "$usage"
+    exit 0
+  fi
+fi
+
+soft="false";
+if (( $# >= 1 )); then
+  if [[ "$1" == "--soft" ]]; then
+    soft="true";
+    shift;
+  fi
+fi
+
+volumeDirs=$(echo {{DataNode-volumes}} | tr ',' '\n');
+echo "Volume dirs: $volumeDirs"
+
+if [[ "$soft" == "true" ]]; then
+  echo "Datanode is formatted in a SOFT mode"
+  for i in $volumeDirs; do
+    if ! [[ -d $i ]]; then
+      mkdir $i;
+    fi
+  done;
+elif [[ "$soft" == "false" ]]; then
+  echo "Datanode is formatted in a HARD mode"
+  for i in $volumeDirs; do
+    rm -rf $i;
+    mkdir $i;
+  done;
+else
+  echo "This is a bug. Local variable \$soft has a bad value of $soft"
+  exit 1
+fi
diff --git a/hdfs-autoconf/config-templates/format-avatarnode-local-dir.sh.template b/hdfs-autoconf/config-templates/format-avatarnode-local-dir.sh.template
new file mode 100644
index 00000000..186c566f
--- /dev/null
+++ b/hdfs-autoconf/config-templates/format-avatarnode-local-dir.sh.template
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -rf {{NameNode-local}};
+mkdir -p {{NameNode-local-fsimage}};
+mkdir -p {{NameNode-local-fsedits}};
+
diff --git a/hdfs-autoconf/config-templates/format-avatarnode-shared-dir.sh.template b/hdfs-autoconf/config-templates/format-avatarnode-shared-dir.sh.template
new file mode 100644
index 00000000..28263713
--- /dev/null
+++ b/hdfs-autoconf/config-templates/format-avatarnode-shared-dir.sh.template
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+rm -rf {{NameNode-shared}};
+mkdir -p {{NameNode-shared-fsimage-0}};
+mkdir -p {{NameNode-shared-fsedits-0}};
+mkdir -p {{NameNode-shared-fsimage-1}};
+mkdir -p {{NameNode-shared-fsedits-1}};
diff --git a/hdfs-autoconf/config-templates/hadoop-env-avatar-one.sh b/hdfs-autoconf/config-templates/hadoop-env-avatar-one.sh
new file mode 100644
index 00000000..a051a4d7
--- /dev/null
+++ b/hdfs-autoconf/config-templates/hadoop-env-avatar-one.sh
@@ -0,0 +1,71 @@
+if [[ "$IS_HADOOP_ENV_ALREADY_SOURCED" != "true" ]]; then
+  export IS_HADOOP_ENV_ALREADY_SOURCED="true"
+  # Set Hadoop-specific environment variables here.
+
+  # The only required environment variable is JAVA_HOME.  All others are
+  # optional.  When running a distributed configuration it is best to
+  # set JAVA_HOME in this file, so that it is correctly defined on
+  # remote nodes.
+
+  # The java implementation to use.  Required.
+  # export JAVA_HOME=/usr/lib/j2sdk1.5-sun
+
+  # Extra Java CLASSPATH elements.  Optional.
+  export HADOOP_CLASSPATH=${HADOOP_TRUNK_MAIN}/VENDOR/hadoop-0.20/lib/
+
+  # The maximum amount of heap to use, in MB. Default is 1000.
+  # export HADOOP_HEAPSIZE=2000
+
+  # Extra Java runtime options.  Empty by default.
+  # export HADOOP_OPTS=-server
+
+  # Command specific options appended to HADOOP_OPTS when specified
+  export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_NAMENODE_OPTS"
+  export HADOOP_SECONDARYNAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_SECONDARYNAMENODE_OPTS"
+  export HADOOP_DATANODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_DATANODE_OPTS"
+  export HADOOP_BALANCER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_BALANCER_OPTS"
+  export HADOOP_JOBTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_JOBTRACKER_OPTS"
+  export HADOOP_RAIDNODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_RAIDNODE_OPTS"
+  export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote.port=8998 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+
+  # The only user who can start hadoop daemons.
+  # If this is not set, any user can start hadoop daemons.
+  # export HADOOP_USERNAME="hadoop"
+
+  # Java Runtime garbage collection options to pass to all Hadoop
+  # servers (Namenode, Jobtracker, Datanode, Tasktracker). This must end
+  # with a colon ; to which the dynamically generated gc log filename will
+  # be appended to. The below defaults work for the Sun JVM, for example
+  # in IBM GC, use '-Xverbosegclog:'.
+  #export HADOOP_GC_LOG_OPTS="-XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:"
+
+  # export HADOOP_TASKTRACKER_OPTS=
+  # The following applies to multiple commands (fs, dfs, fsck, distcp etc)
+  # export HADOOP_CLIENT_OPTS
+
+  # Extra ssh options.  Empty by default.
+  # export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
+
+  # Where log files are stored.  $HADOOP_HOME/logs by default.
+  # export HADOOP_LOG_DIR=${HADOOP_HOME}/logs
+
+  # File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.
+  # export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
+
+  # host:path where hadoop code should be rsync'd from.  Unset by default.
+  # export HADOOP_MASTER=master:/home/$USER/src/hadoop
+
+  # Seconds to sleep between slave commands.  Unset by default.  This
+  # can be useful in large clusters, where, e.g., slave rsyncs can
+  # otherwise arrive faster than the master can service them.
+  # export HADOOP_SLAVE_SLEEP=0.1
+
+  # The directory where pid files are stored. /tmp by default.
+  # export HADOOP_PID_DIR=/var/hadoop/pids
+
+  # A string representing this instance of hadoop. $USER by default.
+  # export HADOOP_IDENT_STRING=$USER
+
+  # The scheduling priority for daemon processes.  See 'man nice'.
+  # export HADOOP_NICENESS=10
+fi
diff --git a/hdfs-autoconf/config-templates/hadoop-env-avatar-zero.sh b/hdfs-autoconf/config-templates/hadoop-env-avatar-zero.sh
new file mode 100644
index 00000000..e1a2d0af
--- /dev/null
+++ b/hdfs-autoconf/config-templates/hadoop-env-avatar-zero.sh
@@ -0,0 +1,71 @@
+if [[ "$IS_HADOOP_ENV_ALREADY_SOURCED" != "true" ]]; then
+  export IS_HADOOP_ENV_ALREADY_SOURCED="true"
+  # Set Hadoop-specific environment variables here.
+
+  # The only required environment variable is JAVA_HOME.  All others are
+  # optional.  When running a distributed configuration it is best to
+  # set JAVA_HOME in this file, so that it is correctly defined on
+  # remote nodes.
+
+  # The java implementation to use.  Required.
+  # export JAVA_HOME=/usr/lib/j2sdk1.5-sun
+
+  # Extra Java CLASSPATH elements.  Optional.
+  #export HADOOP_CLASSPATH=${HADOOP_TRUNK_MAIN}/VENDOR/hadoop-0.20/lib/
+
+  # The maximum amount of heap to use, in MB. Default is 1000.
+  export HADOOP_HEAPSIZE=2000
+
+  # Extra Java runtime options.  Empty by default.
+  # export HADOOP_OPTS=-server
+
+  # Command specific options appended to HADOOP_OPTS when specified
+  export HADOOP_SECONDARYNAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_SECONDARYNAMENODE_OPTS"
+  export HADOOP_DATANODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_DATANODE_OPTS"
+  export HADOOP_BALANCER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_BALANCER_OPTS"
+  export HADOOP_JOBTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_JOBTRACKER_OPTS"
+  export HADOOP_RAIDNODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_RAIDNODE_OPTS"
+  export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote -Xmx3g -Xms3g $HADOOP_NAMENODE_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=9070"
+  #export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote.port=8998 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+
+  # The only user who can start hadoop daemons.
+  # If this is not set, any user can start hadoop daemons.
+  #export HADOOP_USERNAME="hadoop"
+
+  # Java Runtime garbage collection options to pass to all Hadoop
+  # servers (Namenode, Jobtracker, Datanode, Tasktracker). This must end
+  # with a colon ; to which the dynamically generated gc log filename will
+  # be appended to. The below defaults work for the Sun JVM, for example
+  # in IBM GC, use '-Xverbosegclog:'.
+  #export HADOOP_GC_LOG_OPTS="-XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:"
+
+  # export HADOOP_TASKTRACKER_OPTS=
+  # The following applies to multiple commands (fs, dfs, fsck, distcp etc)
+  # export HADOOP_CLIENT_OPTS
+
+  # Extra ssh options.  Empty by default.
+  # export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
+
+  # Where log files are stored.  $HADOOP_HOME/logs by default.
+  # export HADOOP_LOG_DIR=${HADOOP_HOME}/logs
+
+  # File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.
+  # export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
+
+  # host:path where hadoop code should be rsync'd from.  Unset by default.
+  # export HADOOP_MASTER=master:/home/$USER/src/hadoop
+
+  # Seconds to sleep between slave commands.  Unset by default.  This
+  # can be useful in large clusters, where, e.g., slave rsyncs can
+  # otherwise arrive faster than the master can service them.
+  # export HADOOP_SLAVE_SLEEP=0.1
+
+  # The directory where pid files are stored. /tmp by default.
+  # export HADOOP_PID_DIR=/var/hadoop/pids
+
+  # A string representing this instance of hadoop. $USER by default.
+  # export HADOOP_IDENT_STRING=$USER
+
+  # The scheduling priority for daemon processes.  See 'man nice'.
+  # export HADOOP_NICENESS=10
+fi
diff --git a/hdfs-autoconf/config-templates/hadoop-env-datanode.sh b/hdfs-autoconf/config-templates/hadoop-env-datanode.sh
new file mode 100644
index 00000000..81870a56
--- /dev/null
+++ b/hdfs-autoconf/config-templates/hadoop-env-datanode.sh
@@ -0,0 +1,71 @@
+if [[ "$IS_HADOOP_ENV_ALREADY_SOURCED" != "true" ]]; then
+  export IS_HADOOP_ENV_ALREADY_SOURCED="true"
+  # Set Hadoop-specific environment variables here.
+
+  # The only required environment variable is JAVA_HOME.  All others are
+  # optional.  When running a distributed configuration it is best to
+  # set JAVA_HOME in this file, so that it is correctly defined on
+  # remote nodes.
+
+  # The java implementation to use.  Required.
+  # export JAVA_HOME=/usr/lib/j2sdk1.5-sun
+
+  # Extra Java CLASSPATH elements.  Optional.
+  # export HADOOP_CLASSPATH=
+
+  # The maximum amount of heap to use, in MB. Default is 1000.
+  # export HADOOP_HEAPSIZE=2000
+
+  # Extra Java runtime options.  Empty by default.
+  # export HADOOP_OPTS=-server
+
+  # Command specific options appended to HADOOP_OPTS when specified
+  export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_NAMENODE_OPTS"
+  export HADOOP_SECONDARYNAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_SECONDARYNAMENODE_OPTS"
+  export HADOOP_DATANODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_DATANODE_OPTS"
+  export HADOOP_BALANCER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_BALANCER_OPTS"
+  export HADOOP_JOBTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_JOBTRACKER_OPTS"
+  export HADOOP_RAIDNODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_RAIDNODE_OPTS"
+  #export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote.port=8998 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+
+  # The only user who can start hadoop daemons.
+  # If this is not set, any user can start hadoop daemons.
+  # export HADOOP_USERNAME="hadoop"
+
+  # Java Runtime garbage collection options to pass to all Hadoop
+  # servers (Namenode, Jobtracker, Datanode, Tasktracker). This must end
+  # with a colon ; to which the dynamically generated gc log filename will
+  # be appended to. The below defaults work for the Sun JVM, for example
+  # in IBM GC, use '-Xverbosegclog:'.
+  #export HADOOP_GC_LOG_OPTS="-XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:"
+
+  # export HADOOP_TASKTRACKER_OPTS=
+  # The following applies to multiple commands (fs, dfs, fsck, distcp etc)
+  # export HADOOP_CLIENT_OPTS
+
+  # Extra ssh options.  Empty by default.
+  # export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
+
+  # Where log files are stored.  $HADOOP_HOME/logs by default.
+  # export HADOOP_LOG_DIR=${HADOOP_HOME}/logs
+
+  # File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.
+  # export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
+
+  # host:path where hadoop code should be rsync'd from.  Unset by default.
+  # export HADOOP_MASTER=master:/home/$USER/src/hadoop
+
+  # Seconds to sleep between slave commands.  Unset by default.  This
+  # can be useful in large clusters, where, e.g., slave rsyncs can
+  # otherwise arrive faster than the master can service them.
+  # export HADOOP_SLAVE_SLEEP=0.1
+
+  # The directory where pid files are stored. /tmp by default.
+  # export HADOOP_PID_DIR=/var/hadoop/pids
+
+  # A string representing this instance of hadoop. $USER by default.
+  # export HADOOP_IDENT_STRING=$USER
+
+  # The scheduling priority for daemon processes.  See 'man nice'.
+  # export HADOOP_NICENESS=10
+fi
diff --git a/hdfs-autoconf/config-templates/hdfs-site.xml.template b/hdfs-autoconf/config-templates/hdfs-site.xml.template
new file mode 100644
index 00000000..f7d3d73e
--- /dev/null
+++ b/hdfs-autoconf/config-templates/hdfs-site.xml.template
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+
+<property>
+<name>dfs.replication</name>
+<value>1</value>
+</property>
+
+<property>
+  <name>dfs.http.address</name>
+  <value>127.0.0.1:50070</value>
+  <description>
+    The address and the base port where the dfs namenode web ui will listen on.
+    If the port is 0 then the server will start on a free port.
+  </description>
+</property>
+
+<property>
+  <name>dfs.secondary.http.address</name>
+  <value>0.0.0.0:0</value>
+  <description>
+    The secondary namenode http server address and port.
+    If the port is 0 then the server will start on a free port.
+  </description>
+</property>
+
+<property>
+  <name>dfs.blockreport.intervalMsec</name>
+  <value>300000</value>
+  <description>Determines block reporting interval in milliseconds.</description>
+</property>
+
+<property>
+  <name>dfs.fullblockreport.magnifier</name>
+  <value>2</value>
+  <description>
+    Determines the full block reporting interval, which is magnifier
+    times the delete block report interval.
+  </description>
+</property>
+
+<property>
+  <name>dfs.datanode.address</name>
+  <value>0.0.0.0:0</value>
+  <description>
+    The address where the datanode server will listen to.
+    If the port is 0 then the server will start on a free port.
+  </description>
+</property>
+
+<property>
+  <name>dfs.datanode.http.address</name>
+  <value>0.0.0.0:0</value>
+  <description>
+    The datanode http server address and port.
+    If the port is 0 then the server will start on a free port.
+  </description>
+</property>
+
+<property>
+  <name>dfs.datanode.ipc.address</name>
+  <value>0.0.0.0:0</value>
+  <description>
+    The datanode ipc server address and port.
+    If the port is 0 then the server will start on a free port.
+  </description>
+</property>
+
+<property>
+  <name>dfs.datanode.handler.count</name>
+  <value>3</value>
+  <description>The number of server threads for the datanode.</description>
+</property>
+
+<property>
+  <name>dfs.permissions</name>
+  <value>false</value>
+</property>
+
+<property>
+  <name>dfs.data.dir</name>
+  <value>{{DataNode-volumes}}</value>
+  <description>Determines where on the local filesystem an DFS data node
+  should store its blocks.  If this is a comma-delimited
+  list of directories, then data will be stored in all named
+  directories, typically on different devices.
+  Directories that do not exist are ignored.
+  </description>
+</property>
+
+<property>
+ <name>dfs.block.invalidate.limit</name>
+ <value>100</value>
+</property>
+
+<property>
+  <name>dfs.safemode.extension</name>
+  <value>10000</value>
+  <description>
+    Determines extension of safe mode in milliseconds
+    after the threshold level is reached.
+  </description>
+</property>
+
+<property>
+  <name>dfs.namenode.dn-address</name>
+  <value>localhost:9015</value>
+  <description>
+  The address and port to run the RPC server which will be processing
+  requests from datanodes in the cluster.
+  </description>
+</property>
+
+</configuration>
diff --git a/hdfs-autoconf/config-templates/run-datanode.sh b/hdfs-autoconf/config-templates/run-datanode.sh
new file mode 100644
index 00000000..95e116ca
--- /dev/null
+++ b/hdfs-autoconf/config-templates/run-datanode.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#Usage: bash $LAUNCHPAD_DIR/run.sh [--daemon]
+
+source config.sh
+
+cd ${HADOOP_VERSION}/bin
+if [[ $# > 0 && $1 == "--daemon" ]]; then
+  export HADOOP_PID_DIR="$LOGS_DIRECTORY" && ./hadoop-daemon.sh start avatardatanode
+else
+  ./hadoop avatardatanode
+fi
+
diff --git a/hdfs-autoconf/config-templates/run-one.template b/hdfs-autoconf/config-templates/run-one.template
new file mode 100644
index 00000000..a24524c5
--- /dev/null
+++ b/hdfs-autoconf/config-templates/run-one.template
@@ -0,0 +1,12 @@
+#!/bin/bash
+#Usage: bash $LAUNCHPAD_DIR/run.sh [--daemon]
+
+source config.sh
+
+cd $HADOOP_VERSION/bin
+if [[ $# > 0 && $1 == "--daemon" ]]; then
+  echo "daemon mode"
+  export HADOOP_PID_DIR="$LOGS_DIRECTORY" && ./hadoop-daemon.sh start avatarnode -one -standby;
+else
+  ./hadoop avatarnode -one -standby;
+fi
diff --git a/hdfs-autoconf/config-templates/run-zero.template b/hdfs-autoconf/config-templates/run-zero.template
new file mode 100644
index 00000000..21491edc
--- /dev/null
+++ b/hdfs-autoconf/config-templates/run-zero.template
@@ -0,0 +1,12 @@
+#!/bin/bash
+#Usage: bash $LAUNCHPAD_DIR/run.sh [--daemon]
+
+source config.sh
+
+cd $HADOOP_VERSION/bin
+
+if [[ $# > 0 && $1 == "--daemon" ]]; then
+  export HADOOP_PID_DIR="$LOGS_DIRECTORY" && ./hadoop-daemon.sh start avatarnode -zero;
+else
+  ./hadoop avatarnode -zero;
+fi
diff --git a/hdfs-autoconf/config-templates/zoo.cfg b/hdfs-autoconf/config-templates/zoo.cfg
new file mode 100644
index 00000000..aafb3247
--- /dev/null
+++ b/hdfs-autoconf/config-templates/zoo.cfg
@@ -0,0 +1,25 @@
+# The number of milliseconds of each tick
+tickTime=2000
+# The number of ticks that the initial 
+# synchronization phase can take
+initLimit=10
+# The number of ticks that can pass between 
+# sending a request and getting an acknowledgement
+syncLimit=5
+# the directory where the snapshot is stored.
+# do not use /tmp for storage, /tmp here is just 
+# example sakes.
+dataDir=/tmp/zookeeper
+# the port at which the clients will connect
+clientPort=2181
+#
+# Be sure to read the maintenance section of the 
+# administrator guide before turning on autopurge.
+#
+# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
+#
+# The number of snapshots to retain in dataDir
+#autopurge.snapRetainCount=3
+# Purge task interval in hours
+# Set to "0" to disable auto purge feature
+#autopurge.purgeInterval=1
diff --git a/hdfs-autoconf/config.sh b/hdfs-autoconf/config.sh
new file mode 100644
index 00000000..133e29e0
--- /dev/null
+++ b/hdfs-autoconf/config.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# This script is sources by every other script.
+
+# let's stop execution when some simlpe command fails
+set -e
+
+# ==================================================
+#         CONFIGURE BEFORE USE
+# ==================================================
+
+# This argument specifies the hadoop checkout. So the binaries will be run
+# from ${HADOOP_VERSION}/bin directory, and configuration files assumed to be
+# located in ${HADOOP_VERSION}/conf directory.
+# HADOOP_VERSION=
+if [[ -z $HADOOP_VERSION ]]; then
+  HADOOP_VERSION=$(readlink -f ../)
+fi
+
+# This is the directory that will hold all the log files for different
+# instances.
+# DISCLAIMER: Full path must be specified here!
+if [[ -z $LOGS_DIRECTORY ]]; then
+  LOGS_DIRECTORY=$HADOOP_VERSION/logs
+fi
+
+# ===================================================
+# ===================================================
+
+
+METACONF_DIR="./config-meta"
+TEMPLATES_DIR="./config-templates"
+LAUNCHPAD_DIR="./launchpad"
+# This is the pattern that will be searched for the datanode configuration files
+DATANODE_CONFIG_FILES="$METACONF_DIR/avatar-datanode*.sed"
+# This is the file that will exist as long as the cluster is running.
+# Used by start-dev-cluster and stop-dev-cluster scripts
+CLUSTER_IS_RUNNING=$LOGS_DIRECTORY/cluster-is-running-now
+
+
+if ! [[ -d $METACONF_DIR ]]; then
+  echo "Cannot find $METACONF_DIR directory; check config.sh to correct the dir"
+  exit 1
+fi
+
+if ! [[ -d $TEMPLATES_DIR ]]; then
+  echo "Cannot find $TEMPLATES_DIR directory; check config.sh to correct the dir"
+  exit 1
+fi
+
+if ! [[ -d $LAUNCHPAD_DIR ]]; then
+  mkdir -p $LAUNCHPAD_DIR
+fi
+
+if [[ -z $ZOOKEEPER_PATH ]]; then
+  ZOOKEEPER_PATH="`pwd`/../../../VENDOR.zookeeper/fb-trunk/"
+fi
diff --git a/hdfs-autoconf/scripts/common.sh b/hdfs-autoconf/scripts/common.sh
new file mode 100644
index 00000000..9e330b9d
--- /dev/null
+++ b/hdfs-autoconf/scripts/common.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+source config.sh
+
+# Colors!
+# How to use them? See example:
+#   echo -e "See the real ${cRED}RED${cRESET} color"
+
+cBLACK='\E[0;30m'
+cRED='\E[0;31m'
+cGREEN='\E[0;32m'
+cYELLOW='\E[0;33m'
+cBLUE='\E[0;34m'
+cMAGENTA='\E[0;35m'
+cCYAN='\E[0;36m'
+cWHITE='\E[1;37m'
+cRESET='\E[00m'
+
+# just print a message in red color
+function fail {
+  echo -e "${cRED}$1${cRESET}"
+  exit 1
+}
+
+# The script patches a template file with sed scripts. All changes
+# are made in-place
+#
+# Usage
+# bash patcher.sh <template file> <sed script 1> <sed script 2> ...
+function patch {
+  if [[ $# < 2 ]]; then
+    echo "usage: bash patcher.sh <temlpate file> <sed 1> [<sed 2>...]"
+    exit 1
+  fi
+  # first argument is a template file to patch
+  template=$1;
+  shift;
+
+  for sedScript in $@; do
+    sed -f $sedScript -i $template
+  done;
+}
+
+function cleanLaunchpad {
+  if [[ -e $LAUNCHPAD_DIR ]]; then
+    echo "Cleaning $LAUNCHPAD_DIR/ directory.."
+    rm -r $LAUNCHPAD_DIR
+    mkdir $LAUNCHPAD_DIR
+  fi
+}
+
+function genAvatarConfigFiles {
+  if [[ $# < 1 ]]; then
+    echo "Usage: genAvatarConfigFiles <avatar config files>"
+    exit 1;
+  fi
+
+  cp $TEMPLATES_DIR/avatar-site.xml.template ${HADOOP_VERSION}/conf/avatar-site.xml
+  patch ${HADOOP_VERSION}/conf/avatar-site.xml $@
+
+  cp $TEMPLATES_DIR/core-site.xml.template ${HADOOP_VERSION}/conf/core-site.xml
+  patch ${HADOOP_VERSION}/conf/core-site.xml $@
+
+  echo "Config files created."
+}
+
+function genDatanodeLaunchpadFiles {
+  if [[ $# < 1 ]]; then
+    echo "Usage: generateDatanodeLaunchpadFiles <datanode config file>"
+    exit 1;
+  fi
+
+  cp $TEMPLATES_DIR/format-avatardatanode.sh.template $LAUNCHPAD_DIR/dn-format
+  patch $LAUNCHPAD_DIR/dn-format $@
+
+  cp $TEMPLATES_DIR/run-datanode.sh $LAUNCHPAD_DIR/run
+}
diff --git a/hdfs-autoconf/scripts/gen-avatar b/hdfs-autoconf/scripts/gen-avatar
new file mode 100644
index 00000000..991a837c
--- /dev/null
+++ b/hdfs-autoconf/scripts/gen-avatar
@@ -0,0 +1,82 @@
+#!/bin/bash
+set -e
+
+if [[ -e scripts ]]; then
+  source scripts/common.sh
+else
+  echo "Lacking /scripts directory. Probably I'm not launched from autoconf
+  directory. Exiting.."
+  exit 1
+fi
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  fail "The script should be launched from ./hdfs-autoconf directory"
+fi
+
+usage="USAGE
+  bash $(basename $0) [--help] [zero|one]
+
+DESCRIPTION
+  Creates configuration and launch files for active or standby avatar namenode
+  entity by applying appropriate sed scripts from $METACONF_DIR directory
+  to the template configuration files and bash scripts from $TEMPLATES_DIR. The
+  scripts used for formatting and launching the nodes could be found in
+  $LAUNCHPAD_DIR.
+
+OPTIONS
+  --help - show this help message
+  zero - generate configuration and bashscripts for launching active avatar
+    namenode
+  one - generate configuration and bashscripts for launching standby avatar
+    namenode
+"
+
+if (( $# >= 1 )); then
+  if [[ $1 == "--help" ]]; then
+    echo "$usage";
+    exit 0;
+  fi
+fi
+
+function usageFail {
+  fail "Usage: bash gen-avatar-files.sh [--help] [zero|one]"
+}
+
+# Checking arguments
+if [[ $# == 0 ]]; then
+  echo -e "${cWHITE}NOTE${cRESET}: Niether of arguments (zero|one) given; assuming ZERO as default"
+  echo -e "------"
+  avatarName="zero"
+elif [[ $# == 1 ]]; then
+  avatarName=$(echo $1 | tr '[A-Z]' '[a-z]')
+  if [[ $avatarName != "one" && $avatarName != "zero" ]]; then
+    usageFail
+  fi
+elif [[ $# > 1 ]]; then
+  usageFail
+fi
+
+# setting up a capital name of avatar for future convenience
+capitalAvatarName=$(echo ${avatarName} | tr '[a-z]' '[A-Z]')
+
+# setting up set of configuration files
+configFiles="$METACONF_DIR/avatar-shared.sed $METACONF_DIR/avatar-${avatarName}.sed"
+
+# create files in conf/ directory of HADOOP_VERSION
+echo -e "Populating ${cWHITE}${HADOOP_VERSION}/conf${cRESET} with config files for avatar ${cGREEN}${capitalAvatarName}${cRESET}"
+genAvatarConfigFiles $configFiles
+# copying environment config
+cp $TEMPLATES_DIR/hadoop-env-avatar-${avatarName}.sh ${HADOOP_VERSION}/conf/hadoop-env.sh
+
+# creating $LAUNCHPAD_DIR shellscripts; they will be used to run and format avatar node
+cleanLaunchpad;
+echo -e "Creating $LAUNCHPAD_DIR files for avatar ${cGREEN}${capitalAvatarName}${cRESET}.."
+cp $TEMPLATES_DIR/run-${avatarName}.template $LAUNCHPAD_DIR/run
+
+# Finish
+echo -e "${cGREEN}AVATAR SUCCESS${cRESET}
+${cWHITE}${HADOOP_VERSION}/conf${cRESET} is configured for avatar node ${cGREEN}${capitalAvatarName}${cRESET}.
+------
+You can start avatar node ${capitalAvatarName} via ${cWHITE}./$LAUNCHPAD_DIR/run${cRESET}"
+
+
diff --git a/hdfs-autoconf/scripts/gen-datanode b/hdfs-autoconf/scripts/gen-datanode
new file mode 100644
index 00000000..b0ad3ce6
--- /dev/null
+++ b/hdfs-autoconf/scripts/gen-datanode
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+if [[ -e scripts ]]; then
+  source scripts/common.sh
+else
+  echo "Lacking /scripts directory. Probably I'm not launched from autoconf
+  directory. Exiting.."
+  exit 1
+fi
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  fail "The script should be launched from ./hdfs-autoconf directory"
+fi
+
+
+usage="USAGE
+  bash $(basename $0) [--help] <path to node configuration>
+
+DESCRIPTION
+  Creates configuration and launch files for avatar datanode
+  entity by applying given sed script to the template configuration files and
+  bash scripts from $TEMPLATES_DIR. The scripts used for formatting and
+  launching the datanode could be found in $LAUNCHPAD_DIR.
+
+OPTIONS
+  --help - show this help message
+  <path to node configuration> - a path that specifies datanode configuration
+    sed script. More info about this in README.md
+"
+
+if (( $# >= 1 )); then
+  if [[ $1 == "--help" ]]; then
+    echo "$usage";
+    exit 0;
+  fi
+fi
+if [[ $# < 1 ]]; then
+  fail "$usage"
+fi
+
+cleanLaunchpad;
+
+echo -e "Populating ${cWHITE}${HADOOP_VERSION}/conf${cRESET} with hdfs-site.xml.."
+cp $TEMPLATES_DIR/hdfs-site.xml.template ${HADOOP_VERSION}/conf/hdfs-site.xml
+patch ${HADOOP_VERSION}/conf/hdfs-site.xml $1
+cp $TEMPLATES_DIR/hadoop-env-datanode.sh ${HADOOP_VERSION}/conf/hadoop-env.sh
+
+echo -e "Creating $LAUNCHPAD_DIR files.."
+genDatanodeLaunchpadFiles $1
+
+
+# Finish
+echo -e "${cGREEN}DATANODE SUCCESS${cRESET}
+${cWHITE}${HADOOP_VERSION}/conf${cRESET} is configured for data node.
+------
+You can format configured directories via ${cWHITE}./$LAUNCHPAD_DIR/dn-format${cRESET}
+You can start data node ${capitalAvatarName} via ${cWHITE}./$LAUNCHPAD_DIR/run${cRESET}"
+
diff --git a/hdfs-autoconf/start-dev-cluster.sh b/hdfs-autoconf/start-dev-cluster.sh
new file mode 100644
index 00000000..8fda85f4
--- /dev/null
+++ b/hdfs-autoconf/start-dev-cluster.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+set -e
+
+usage="USAGE
+  bash $(basename $0) [--help] [--format] [--count number | --seekconfig]
+
+DESCRIPTION
+  Launching without arguments equals to '--seekconfig'
+  specified argument
+
+  Starts locally two avatar namenodes and, depending on the option
+  given, some amount of datanodes. All the instances are launched
+  as daemons, logs could be tailed from \$LOGS_DIRECTORY.
+
+OPTIONS
+  --help - show this help message
+  --format - formats both namenode and datanode directories for the
+      cluster
+  --count - if this parameter is given, the script runs the specified
+      number of datanodes simultaniously. Each datanode's configuration file is
+      generated automatically with the template file
+      '\$METACONF_DIR/avatar-datanode.template' by substituting
+      every entrance of XXX sequence with the datanode's sequential number.
+      After that a datanode instance is run via 'avatar-datanode-start --conf
+      <generated_config> --daemon' command.
+  --seekconfig - this option might be used if someone needs
+      more control on cluster structure. With this option given,
+      the script looks up for all avatar datanode configuration
+      files and launches a single datanode per every config file.
+      (the avatar datanode configuration file is the one which name
+      satisfies to pattern \$DATANODE_CONFIG_FILES)
+"
+
+if (( $# >= 1 )); then
+  if [[ $1 == "--help" ]]; then
+    echo "$usage"
+    exit 0;
+  fi
+fi
+
+format=""
+if (( $# >= 1 )); then
+  if [[ $1 == "--format" ]]; then
+    format="--format";
+    shift;
+  fi
+fi
+
+mode="seek";
+
+if (( $# >= 1 )); then
+  if [[ $1 == "--seekconfig" ]]; then
+    shift;
+  elif [[ $1 == "--count" ]]; then
+    shift;
+    mode=$1;
+    shift;
+  fi
+fi
+
+if (( $# > 0 )); then
+  echo "$usage";
+  exit 1;
+fi
+
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  echo "The script should be launched from ./hdfs-autoconf directory. Exiting.."
+  exit 1
+fi
+
+source scripts/common.sh
+
+if [[ -e $CLUSTER_IS_RUNNING ]]; then
+  fail "The developer cluster is already running!"
+fi
+
+if [[ "$format" == "--format" ]]; then
+  ./avatar-format
+fi
+
+touch $CLUSTER_IS_RUNNING;
+./avatar-zero-start --daemon
+./avatar-one-start --daemon
+
+if [[ $mode == "seek" ]]; then
+  num=0
+  for i in $(ls -1 $DATANODE_CONFIG_FILES); do
+    num=$((num+1))
+    export HADOOP_LOG_DIR=${LOGS_DIRECTORY}/datanode-$num-logs
+    ./avatar-datanode-start $format --conf $i --daemon
+  done
+else
+  while (( $mode > 0 )); do
+    tmp=$(mktemp -t avatar-datanode-autoconfig-$mode.XXX)
+    args="$format --conf $tmp --daemon"
+    cp ${METACONF_DIR}/avatar-datanode.template $tmp
+    sed -i -e "s/XXX/$mode/g" $tmp
+    ./avatar-datanode-start $args
+    rm -f $tmp
+    mode=$((mode-1));
+  done
+fi
+
diff --git a/hdfs-autoconf/stop-dev-cluster.sh b/hdfs-autoconf/stop-dev-cluster.sh
new file mode 100644
index 00000000..72ce27c1
--- /dev/null
+++ b/hdfs-autoconf/stop-dev-cluster.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+usage="USAGE
+  bash $(basename $0) [--help]
+
+DESCRIPTION
+  Stops all the avatar instances that are currently running on the local
+  machine.
+
+OPTIONS
+  --help - show this help message
+"
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  echo "The script should be launched from ./hdfs-autoconf directory. Exiting.."
+  exit 1
+fi
+
+if (( $# >= 1 )); then
+  if [[ $1 == "--help" ]]; then
+    echo "$usage";
+    exit 0;
+  fi
+fi
+
+if (( $# > 0 )); then
+  echo "$usage";
+  exit 1;
+fi
+
+source scripts/common.sh
+
+for i in $(ps aux | grep avatar | grep java | tr -s ' ' | cut -d' ' -f2); do
+  kill -9 $i
+done
+
+if [[ -e $CLUSTER_IS_RUNNING ]]; then
+  rm $CLUSTER_IS_RUNNING;
+fi
+
diff --git a/hdfs-autoconf/zookeeper.sh b/hdfs-autoconf/zookeeper.sh
new file mode 100644
index 00000000..cf90b41a
--- /dev/null
+++ b/hdfs-autoconf/zookeeper.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Use this script to start local zookeeper service. This is necessary for
+# the local developer cluster to work.
+#
+# Usage: bash zookeeper.sh [start|stop]
+#
+
+set -e
+usage="USAGE
+bash $(basename $0) [--help] (start|stop)
+
+OPTIONS
+  --help - show this help message
+  start - starts zookeeper
+  stop - stops zookeeper
+"
+
+if [[ ${PWD##*/} != "hdfs-autoconf" ]]; then
+  echo "The script should be launched from ./hdfs-autoconf directory. Exiting.."
+  exit 1
+fi
+
+if (( $# >= 1 )); then
+  if [[ $1 == "--help" ]]; then
+    echo $usage;
+    exit 0;
+  fi
+fi
+
+if (( $# > 0 )); then
+  if [[ "$1" == "start" ]]; then
+    command="start";
+    shift;
+  elif [[ "$1" == "stop" ]]; then
+    command="stop";
+    shift;
+  fi
+fi
+
+if (( $# > 0 )); then
+  echo "$usage"
+  exit 1;
+fi
+
+source config.sh
+
+export ZOO_LOG_DIR=$LOGS_DIRECTORY
+if ! [[ -e $ZOO_LOG_DIR ]]; then
+  mkdir -p $ZOO_LOG_DIR;
+fi
+$ZOOKEEPER_PATH/bin/zkServer.sh $command $PWD/$TEMPLATES_DIR/zoo.cfg
+
diff --git a/ivy.xml b/ivy.xml
index 28983085..43e855f0 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -274,7 +274,7 @@
       conf="common->master"/>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
-      rev="1.0.1"
+      rev="1.7.9"
       conf="common->default"/>
     </dependencies>
   
diff --git a/ivy/ivy-2.0.0-rc2.jar b/ivy/ivy-2.1.0.jar
similarity index 55%
rename from ivy/ivy-2.0.0-rc2.jar
rename to ivy/ivy-2.1.0.jar
index fa9ef21c..3902b6fd 100644
Binary files a/ivy/ivy-2.0.0-rc2.jar and b/ivy/ivy-2.1.0.jar differ
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index dedb8090..e371b632 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -40,7 +40,7 @@ guava.version=r09
 hsqldb.version=1.8.0.10
 
 #ivy.version=2.0.0-beta2
-ivy.version=2.0.0-rc2
+ivy.version=2.1.0
 
 jasper.version=5.5.12
 #not able to figureout the version of jsp & jsp-api version to get it resolved throught ivy
diff --git a/lib/zookeeper-3.3.1.jar b/lib/zookeeper-3.3.1.jar
deleted file mode 100644
index 3b4cca85..00000000
Binary files a/lib/zookeeper-3.3.1.jar and /dev/null differ
diff --git a/lib/zookeeper-3.4.3.jar b/lib/zookeeper-3.4.3.jar
new file mode 100644
index 00000000..1aeb1c39
Binary files /dev/null and b/lib/zookeeper-3.4.3.jar differ
diff --git a/singleNodeHadoop/coronaConf/corona.xml b/singleNodeHadoop/coronaConf/corona.xml
index 16daa2eb..e435a5af 100755
--- a/singleNodeHadoop/coronaConf/corona.xml
+++ b/singleNodeHadoop/coronaConf/corona.xml
@@ -7,4 +7,6 @@
   <shareStarvingRatio>0.9</shareStarvingRatio>
   <starvingTimeForShare>60000</starvingTimeForShare>
   <starvingTimeForMinimum>30000</starvingTimeForMinimum>
+  <redirect source="test.source" destination="group_a.pool_sla" />
+  <redirect source="group_b.pool_redirectsource" destination="group_b.pool_sla" />
 </configuration>
diff --git a/singleNodeHadoop/coronaConf/coronapools.xml b/singleNodeHadoop/coronaConf/coronapools.xml
index af5e2958..4a48091c 100755
--- a/singleNodeHadoop/coronaConf/coronapools.xml
+++ b/singleNodeHadoop/coronaConf/coronapools.xml
@@ -24,5 +24,8 @@
     <pool name="pool_sla">
       <minMAP>100</minMAP>
     </pool>
+    <pool name="pool_redirectsource">
+      <minMAP>10</minMAP>
+    </pool>
   </group>
 </configuration>
diff --git a/singleNodeHadoop/coronaConf/mapred-site.xml b/singleNodeHadoop/coronaConf/mapred-site.xml
index f48afb24..b2c20e82 100644
--- a/singleNodeHadoop/coronaConf/mapred-site.xml
+++ b/singleNodeHadoop/coronaConf/mapred-site.xml
@@ -5,6 +5,17 @@
 
 <configuration>
 
+<property>                                                                  
+  <name>cm.heartbeat.delay.max</name>                               
+  <value>300000</value>     
+</property>  
+
+<property>                                                                  
+  <name>cm.config.reload.period.ms</name>                               
+  <value>5000</value>     
+  <description>How often to reload the config</description>      
+</property>  
+
 <property>                                                                  
   <name>cm.pools.config.file</name>                               
   <value>coronapools.xml</value>     
diff --git a/singleNodeHadoop/singleNodeSwitch.sh b/singleNodeHadoop/singleNodeSwitch.sh
index a2571a5e..b4d62b72 100755
--- a/singleNodeHadoop/singleNodeSwitch.sh
+++ b/singleNodeHadoop/singleNodeSwitch.sh
@@ -8,7 +8,9 @@ else
     echo "If this is run for the first time, you should execute 'hadoop namenode -format'."
     echo "Then, you can start HDFS with 'start-dfs'."
     echo "The HDFS web ui is http://localhost:50070"
-    export HADOOP_HOME="$BASE_DIR/../"    
+    export HADOOP_HOME="$BASE_DIR/../" 
+    export HADOOP_LOG_DIR="$HADOOP_HOME/logs"
+    export HADOOP_PID_DIR="${HADOOP_LOG_DIR}" 
     if [ "$1" == "corona" ]; then
 	export HADOOP_CONF_DIR="$BASE_DIR/coronaConf"
 	export HADOOP_CLASSPATH="${HADOOP_HOME}/src/contrib/corona/lib/libthrift-0.7.0.jar"
diff --git a/src/contrib/benchmark/ivy.xml b/src/contrib/benchmark/ivy.xml
index b1bc1d6e..7da22d85 100644
--- a/src/contrib/benchmark/ivy.xml
+++ b/src/contrib/benchmark/ivy.xml
@@ -40,7 +40,7 @@
       conf="common->default"/>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
-      rev="1.0.1"
+      rev="1.7.9"
       conf="common->default"/>
   </dependencies>
 </ivy-module>
diff --git a/src/contrib/benchmark/src/java/org/apache/hadoop/mapred/SleepJobRunner.java b/src/contrib/benchmark/src/java/org/apache/hadoop/mapred/SleepJobRunner.java
index 233a3c75..b0543578 100644
--- a/src/contrib/benchmark/src/java/org/apache/hadoop/mapred/SleepJobRunner.java
+++ b/src/contrib/benchmark/src/java/org/apache/hadoop/mapred/SleepJobRunner.java
@@ -191,11 +191,12 @@ public static void main(String[] args) throws Exception {
       if (t.getNumMappers() == largeJobMappers &&
           t.getNumReducers() == largeJobReducers) {
         largeJobRuntimes.add(Double.valueOf(t.getRuntime()/1000.0));
-      } else if (t.getNumMappers() == largeJobMappers &&
-          t.getNumReducers() == largeJobReducers) {
+      } else if (t.getNumMappers() == smallJobMappers &&
+          t.getNumReducers() == smallJobReducers) {
         smallJobRuntimes.add(Double.valueOf(t.getRuntime()/1000.0));
       } else {
-        throw new RuntimeException("Invalid mapper/reducer counts");
+        throw new RuntimeException("Invalid mapper/reducer counts: " +
+            t.getNumMappers() + ", " + t.getNumReducers());
       }
     }
 
diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml
index 7847ac4b..9ab54959 100644
--- a/src/contrib/build-contrib.xml
+++ b/src/contrib/build-contrib.xml
@@ -42,7 +42,9 @@
   <property name="conf.dir" location="${hadoop.root}/conf"/>
   <property name="test.junit.output.format" value="plain"/>
   <property name="test.output" value="no"/>
+  <property name="test.include" value="Test*"/>
   <property name="test.timeout" value="900000"/>
+  <property name="test.junit.maxmemory" value="1024m" />
   <property name="build.dir" location="${hadoop.root}/build/contrib/${name}"/>
   <property name="build.classes" location="${build.dir}/classes"/>
   <property name="build.test" location="${build.dir}/test"/>
@@ -261,9 +263,10 @@
 
     <junit
       printsummary="yes" showoutput="${test.output}"
-      haltonfailure="no" fork="yes" maxmemory="384m"
+      haltonfailure="no" fork="yes" 
       errorProperty="tests.failed" failureProperty="tests.failed"
-      timeout="${test.timeout}">
+      timeout="${test.timeout}"
+      maxmemory="${test.junit.maxmemory}">
 
       <sysproperty key="test.build.data" value="${build.test}/data"/>
       <sysproperty key="build.test" value="${build.test}"/>
@@ -290,7 +293,7 @@
       <formatter type="${test.junit.output.format}" />
       <batchtest todir="${build.test}" unless="testcase">
         <fileset dir="${src.test}"
-                 includes="**/Test*.java" excludes="**/${test.exclude}.java" />
+          includes="**/${test.include}.java" excludes="**/${test.exclude}.java" />
       </batchtest>
       <batchtest todir="${build.test}" if="testcase">
         <fileset dir="${src.test}" includes="**/${testcase}.java"/>
diff --git a/src/contrib/build.xml b/src/contrib/build.xml
index 08cf66a0..16d932cd 100644
--- a/src/contrib/build.xml
+++ b/src/contrib/build.xml
@@ -36,6 +36,7 @@
       <fileset dir="." includes="gridmix/build.xml"/>
       <fileset dir="." includes="corona/build.xml"/>
       <fileset dir="." includes="seekablecompression/build.xml"/>
+      <fileset dir="." includes="fsshellservice/build.xml" />
     </subant>
   </target>
 
@@ -44,7 +45,10 @@
   <!-- ====================================================== -->
   <target name="package">
     <subant target="package">
-      <fileset dir="." includes="*/build.xml" excludes=""/>
+      <fileset dir="." includes="*/build.xml"> 
+        <exclude name="namespace-notifier/build.xml"/>
+        <exclude name="snapshot/build.xml"/>
+      </fileset>
     </subant>
   </target>
 
@@ -74,7 +78,7 @@
       <fileset dir="." includes="highavailability/build.xml"/>
     </subant>
     <subant target="test" failonerror="false">
-      <fileset dir="." includes="snapshot/build.xml"/>
+      <fileset dir="." includes="fsshellservice/build.xml"/>
     </subant>
   </target>
 
@@ -88,9 +92,6 @@
     <subant target="test" failonerror="false">
       <fileset dir="." includes="highavailability/build.xml"/>
     </subant>
-    <subant target="test" failonerror="false">
-      <fileset dir="." includes="snapshot/build.xml"/>
-    </subant>
   </target>
 
   <!-- ====================================================== -->
@@ -105,7 +106,6 @@
       <fileset dir="." includes="raid/build.xml"/>
       <fileset dir="." includes="corona/build.xml"/>
       <fileset dir="." includes="highavailability/build.xml"/>
-      <fileset dir="." includes="snapshot/build.xml"/>
       <fileset dir="." includes="seekablecompression/build.xml"/>
     </subant>
   </target>
diff --git a/src/contrib/corona/README.txt b/src/contrib/corona/README.txt
new file mode 100644
index 00000000..3858b62f
--- /dev/null
+++ b/src/contrib/corona/README.txt
@@ -0,0 +1,17 @@
+Overview
+---------
+Hadoop Corona is the next version of Map-Reduce. The current Map-Reduce has a single Job Tracker that reached its limits at Facebook. The Job Tracker manages the cluster resource and tracks the state of each job. In Hadoop Corona, the cluster resources are tracked by a central Cluster Manager. Each job gets its own Corona Job Tracker which tracks just that one job. The design provides some key improvements:
+
+- Scalability - The Cluster Manager tracks a small amount of information per job, and the individual Corona Job Trackers do the tracking of the tasks. This provides much better scalability with the number and size of jobs, and removes the need for Admission Control.
+- Latency - task scheduling works in push model. A Corona Job Tracker pushes resource requests to the Cluster Manager and the Cluster Manager pushes resource grants back to the Corona Job Tracker. After receiving resource grants, the Corona Job Tracker pushes tasks to the Corona Task Tracker. This is contrast to the current Map-Reduce, where such scheduling decisions happen when heartbeats are received. The latency associated with the heartbeat model becomes important for small jobs.
+- Fairness - generally Fair Scheduler in Corona does a better job of allocating fair shares of the resources to the pools when compared to Map-Reduce v1.
+- Cluster Utilization - because of a lower scheduling overhead Corona does a better job of supplying Task Trackers with work. This way the cluster is more heavily utilized.
+
+Understanding Corona
+--------------------
+A Corona Map-Reduce cluster consists of the following components:
+
+Cluster Manager: There is only one Cluster Manager per cluster. It is responsible for allocating slots to different Jobs (using the Fair Scheduler). The Cluster Manager only keeps track of the utilization of different machines in the cluster and the assignment of compute resources to different Jobs. It's not responsible for actually running the jobs. The Cluster Manager is agnostic to map-reduce. It can (in the future) be used to schedule compute resources for any parallel computing framework
+Task Trackers: This is same as Hadoop Classic. All TT's communicate with the Cluster Manager to report available compute resources. They also communicate with the Job Trackers to actually run Map-Reduce Tasks.
+Corona Job Tracker: The job tracking functionality is implemented by this. It can run in two different modes: as a part of the client running the job, or as a task on one of the Task Trackers in the cluster. The first approach gives small jobs better latencies, the second approach is better for larger jobs to minimize the amount of heartbeat traffic going in and out of the cluster.
+Proxy Job Tracker: The job details page for a job is served by the Corona Job Tracker while it runs. When the job finishes the Corona Job Tracker shuts down so we need another server to show the job details. To make this seamless, the Job URL always points to a Proxy Job Tracker. While the job is running, the proxy redirects to the Corona Job Tracker. When the job is done, a file is written to HDFS, and the Proxy Job Tracker reads this file to get the job details. Additionally the Proxy Job Tracker also stores and reports all of the job metrics aggregated in the cluster.
diff --git a/src/contrib/corona/build.xml b/src/contrib/corona/build.xml
index b789cf77..5257c30b 100644
--- a/src/contrib/corona/build.xml
+++ b/src/contrib/corona/build.xml
@@ -117,6 +117,7 @@
      deprecation="${javac.deprecation}">
      <classpath refid="contrib-classpath"/>
     </javac>
+    <copy file="${src.dir}/error.xml" todir="${build.classes}"/>
   </target>
 
   <target name="copy.libs">
diff --git a/src/contrib/corona/interface/ClusterManager.thrift b/src/contrib/corona/interface/ClusterManager.thrift
index 43f7af4e..92293e49 100644
--- a/src/contrib/corona/interface/ClusterManager.thrift
+++ b/src/contrib/corona/interface/ClusterManager.thrift
@@ -41,7 +41,7 @@ struct ClusterNodeInfo {
   1: required string                    name,
   2: required InetAddress               address,
   3: required ComputeSpecs              total,
-  4: optional ComputeSpecs              used,
+  4: optional ComputeSpecs              free,
   5: optional map<ResourceType, string> resourceInfos
 }
 
@@ -105,6 +105,7 @@ enum SessionStatus {
   KILLED,
   TIMED_OUT,
   KILLED_ABORTED,
+  FAILED_JOBTRACKER,
 }
 
 typedef string SessionHandle
@@ -126,6 +127,11 @@ struct SessionInfo {
   9: optional i64               deadline
 }
 
+struct HeartbeatArgs{
+  1: required ResourceRequestId requestId,
+  2: required ResourceRequestId grantId,
+}
+
 struct ClusterManagerInfo {
   1: required string            url,
   2: required string            jobHistoryLocation,
@@ -146,6 +152,19 @@ struct RunningSession {
     6: optional i64                     deadline,
     7: optional map<ResourceType, i32>  runningResources,
 }
+
+struct NodeHeartbeatResponse{
+  1: required bool restartFlag,
+}
+
+struct RestartNodesArgs {
+  1: required bool force,
+  2: required i32 batchSize,
+}
+
+struct RestartNodesResponse {
+}
+
 exception InvalidSessionHandle {
   1: required string            handle
 }
@@ -154,6 +173,13 @@ exception DisallowedNode {
   1: required string            host;
 }
 
+exception InvalidPoolInfo { 
+  1: required string            poolInfo;
+} 
+
+exception SafeModeException {
+}
+
 /**
  * The Session Driver manages the session for clients.
  * The APIs below are invoked by the ClusterManager to convey information back to the
@@ -173,46 +199,61 @@ service SessionDriverService {
  * Cluster Manager Service API.
  */
 service ClusterManagerService {
+
+  // Get the redirect pool info given the user specified pool info
+  PoolInfoStrings getActualPoolInfo(1: PoolInfoStrings poolInfoString) throws (1: InvalidPoolInfo e, 2: SafeModeException f),
+
   // Get a unique session id.
-  SessionHandle getNextSessionId(),
+  SessionHandle getNextSessionId() throws (1: SafeModeException e),
 
   // Register a session start, return a handle to the session.
-  SessionRegistrationData sessionStart(1: SessionHandle handle, 2: SessionInfo info) throws (1: InvalidSessionHandle e),
+  SessionRegistrationData sessionStart(1: SessionHandle handle, 2: SessionInfo info) throws (1: InvalidSessionHandle e, 2: SafeModeException f),
 
   // Register a URL for the session. An extra call is provided because the URL
   // URL may depend on the sessionId obtained from sessionStart
-  void sessionUpdateInfo(1: SessionHandle handle, 2: SessionInfo info) throws (1: InvalidSessionHandle e),
+  void sessionUpdateInfo(1: SessionHandle handle, 2: SessionInfo info) throws (1: InvalidSessionHandle e, 2: SafeModeException f),
 
   // Notify session end.
-  void sessionEnd(1: SessionHandle handle, 2: SessionStatus status) throws (1: InvalidSessionHandle e),
+  void sessionEnd(1: SessionHandle handle, 2: SessionStatus status) throws (1: InvalidSessionHandle e, 2: SafeModeException f),
 
   // Heartbeat a session.
-  void sessionHeartbeat(1: SessionHandle handle) throws (1: InvalidSessionHandle e),
+  void sessionHeartbeat(1: SessionHandle handle) throws (1: InvalidSessionHandle e, 2: SafeModeException f),
+
+  void sessionHeartbeatV2(1: SessionHandle handle, 2: HeartbeatArgs heartbeatArgs) throws (1: InvalidSessionHandle e, 2: SafeModeException f),
 
   // Request additional resources. A request is required for each resource
   // requested.
-  void requestResource(1: SessionHandle handle, 2: list<ResourceRequest> requestList) throws (1: InvalidSessionHandle e),
+  void requestResource(1: SessionHandle handle, 2: list<ResourceRequest> requestList) throws (1: InvalidSessionHandle e, 2: SafeModeException f),
 
   // Release granted/requested resources.
-  void releaseResource(1: SessionHandle handle, 2: list<ResourceRequestId> idList) throws (1: InvalidSessionHandle e),
+  void releaseResource(1: SessionHandle handle, 2: list<ResourceRequestId> idList) throws (1: InvalidSessionHandle e, 2: SafeModeException f),
 
   // Heartbeat a cluster node. This is an implicit advertisement of the node's resources
-  void nodeHeartbeat(1: ClusterNodeInfo node) throws (1: DisallowedNode e),
+  NodeHeartbeatResponse nodeHeartbeat(1: ClusterNodeInfo node) throws (1: DisallowedNode e, 2: SafeModeException f),
 
   // Feedback from a session on the resources that it was given.
   void nodeFeedback(
     1: SessionHandle handle,
     2: list<ResourceType> resourceTypes,
-    3: list<NodeUsageReport> stats) throws (1: InvalidSessionHandle e),
+    3: list<NodeUsageReport> stats) throws (1: InvalidSessionHandle e, 2: SafeModeException f),
 
   // Refresh node information.
-  void refreshNodes(),
+  void refreshNodes() throws (1: SafeModeException e),
+
+  // Restart task tracker.
+  RestartNodesResponse restartNodes(1: RestartNodesArgs restartNodesArgs) throws (1: SafeModeException e),
 
   // Get the list of currently running sessions
-  list<RunningSession> getSessions(),
+  list<RunningSession> getSessions() throws (1: SafeModeException e),
 
   // Kill one of the currently running sessions
-  void killSession(1: string sessionId)
+  void killSession(1: string sessionId) throws (1: SafeModeException e),
+
+  // Switch the Cluster Manager to Safe Mode
+  bool setSafeMode(1: bool safeMode),
+
+  // Persist the Cluster Manager state to disk
+  bool persistState()
 }
 
 /**
@@ -225,3 +266,14 @@ service CoronaTaskTrackerService {
   // Tell task tracker to reject all actions from this session
   void blacklistSession(1: SessionHandle handle) throws (1: InvalidSessionHandle e),
 }
+
+/**
+ * Corona ProxyJobTracker Service API.
+ */
+service CoronaProxyJobTrackerService {
+  // Set the clusterManagerSafeMode flag appropriately on the CPJT
+  void setClusterManagerSafeModeFlag(1: bool flagValue)
+
+  // Get the clusterManagerSafeMode flag
+  bool getClusterManagerSafeModeFlag()
+}
diff --git a/src/contrib/corona/ivy.xml b/src/contrib/corona/ivy.xml
index 7e041ddc..3036b434 100644
--- a/src/contrib/corona/ivy.xml
+++ b/src/contrib/corona/ivy.xml
@@ -85,6 +85,10 @@
       name="netty"
       rev="${netty.version}"
       conf="common->master"/>
+    <dependency org="org.json"
+      name="json"
+      rev="${json.version}"
+      conf="common->default"/>
   </dependencies>
 
 </ivy-module>
diff --git a/src/contrib/corona/ivy/libraries.properties b/src/contrib/corona/ivy/libraries.properties
index 6391be22..6fd346cf 100644
--- a/src/contrib/corona/ivy/libraries.properties
+++ b/src/contrib/corona/ivy/libraries.properties
@@ -23,6 +23,9 @@ checkstyle.version=5.0
 
 guava.version=r09
 
-jackson.version=1.0.1
+jackson.version=1.7.9
+
+json.version=20090211
 
 netty.version=3.2.2.Final
+
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/ClusterManagerService.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/ClusterManagerService.java
index 7730a97e..eadad0b4 100644
--- a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/ClusterManagerService.java
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/ClusterManagerService.java
@@ -27,34 +27,46 @@ public class ClusterManagerService {
    */
   public interface Iface {
 
-    public String getNextSessionId() throws org.apache.thrift.TException;
+    public PoolInfoStrings getActualPoolInfo(PoolInfoStrings poolInfoString) throws InvalidPoolInfo, SafeModeException, org.apache.thrift.TException;
 
-    public SessionRegistrationData sessionStart(String handle, SessionInfo info) throws InvalidSessionHandle, org.apache.thrift.TException;
+    public String getNextSessionId() throws SafeModeException, org.apache.thrift.TException;
 
-    public void sessionUpdateInfo(String handle, SessionInfo info) throws InvalidSessionHandle, org.apache.thrift.TException;
+    public SessionRegistrationData sessionStart(String handle, SessionInfo info) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException;
 
-    public void sessionEnd(String handle, SessionStatus status) throws InvalidSessionHandle, org.apache.thrift.TException;
+    public void sessionUpdateInfo(String handle, SessionInfo info) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException;
 
-    public void sessionHeartbeat(String handle) throws InvalidSessionHandle, org.apache.thrift.TException;
+    public void sessionEnd(String handle, SessionStatus status) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException;
 
-    public void requestResource(String handle, List<ResourceRequest> requestList) throws InvalidSessionHandle, org.apache.thrift.TException;
+    public void sessionHeartbeat(String handle) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException;
 
-    public void releaseResource(String handle, List<Integer> idList) throws InvalidSessionHandle, org.apache.thrift.TException;
+    public void sessionHeartbeatV2(String handle, HeartbeatArgs heartbeatArgs) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException;
 
-    public void nodeHeartbeat(ClusterNodeInfo node) throws DisallowedNode, org.apache.thrift.TException;
+    public void requestResource(String handle, List<ResourceRequest> requestList) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException;
 
-    public void nodeFeedback(String handle, List<ResourceType> resourceTypes, List<NodeUsageReport> stats) throws InvalidSessionHandle, org.apache.thrift.TException;
+    public void releaseResource(String handle, List<Integer> idList) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException;
 
-    public void refreshNodes() throws org.apache.thrift.TException;
+    public NodeHeartbeatResponse nodeHeartbeat(ClusterNodeInfo node) throws DisallowedNode, SafeModeException, org.apache.thrift.TException;
 
-    public List<RunningSession> getSessions() throws org.apache.thrift.TException;
+    public void nodeFeedback(String handle, List<ResourceType> resourceTypes, List<NodeUsageReport> stats) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException;
 
-    public void killSession(String sessionId) throws org.apache.thrift.TException;
+    public void refreshNodes() throws SafeModeException, org.apache.thrift.TException;
+
+    public RestartNodesResponse restartNodes(RestartNodesArgs restartNodesArgs) throws SafeModeException, org.apache.thrift.TException;
+
+    public List<RunningSession> getSessions() throws SafeModeException, org.apache.thrift.TException;
+
+    public void killSession(String sessionId) throws SafeModeException, org.apache.thrift.TException;
+
+    public boolean setSafeMode(boolean safeMode) throws org.apache.thrift.TException;
+
+    public boolean persistState() throws org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
+    public void getActualPoolInfo(PoolInfoStrings poolInfoString, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getActualPoolInfo_call> resultHandler) throws org.apache.thrift.TException;
+
     public void getNextSessionId(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getNextSessionId_call> resultHandler) throws org.apache.thrift.TException;
 
     public void sessionStart(String handle, SessionInfo info, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.sessionStart_call> resultHandler) throws org.apache.thrift.TException;
@@ -65,6 +77,8 @@ public interface AsyncIface {
 
     public void sessionHeartbeat(String handle, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.sessionHeartbeat_call> resultHandler) throws org.apache.thrift.TException;
 
+    public void sessionHeartbeatV2(String handle, HeartbeatArgs heartbeatArgs, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.sessionHeartbeatV2_call> resultHandler) throws org.apache.thrift.TException;
+
     public void requestResource(String handle, List<ResourceRequest> requestList, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.requestResource_call> resultHandler) throws org.apache.thrift.TException;
 
     public void releaseResource(String handle, List<Integer> idList, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.releaseResource_call> resultHandler) throws org.apache.thrift.TException;
@@ -75,10 +89,16 @@ public interface AsyncIface {
 
     public void refreshNodes(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.refreshNodes_call> resultHandler) throws org.apache.thrift.TException;
 
+    public void restartNodes(RestartNodesArgs restartNodesArgs, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.restartNodes_call> resultHandler) throws org.apache.thrift.TException;
+
     public void getSessions(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getSessions_call> resultHandler) throws org.apache.thrift.TException;
 
     public void killSession(String sessionId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.killSession_call> resultHandler) throws org.apache.thrift.TException;
 
+    public void setSafeMode(boolean safeMode, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.setSafeMode_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void persistState(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.persistState_call> resultHandler) throws org.apache.thrift.TException;
+
   }
 
   public static class Client extends org.apache.thrift.TServiceClient implements Iface {
@@ -101,7 +121,36 @@ public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.prot
       super(iprot, oprot);
     }
 
-    public String getNextSessionId() throws org.apache.thrift.TException
+    public PoolInfoStrings getActualPoolInfo(PoolInfoStrings poolInfoString) throws InvalidPoolInfo, SafeModeException, org.apache.thrift.TException
+    {
+      send_getActualPoolInfo(poolInfoString);
+      return recv_getActualPoolInfo();
+    }
+
+    public void send_getActualPoolInfo(PoolInfoStrings poolInfoString) throws org.apache.thrift.TException
+    {
+      getActualPoolInfo_args args = new getActualPoolInfo_args();
+      args.setPoolInfoString(poolInfoString);
+      sendBase("getActualPoolInfo", args);
+    }
+
+    public PoolInfoStrings recv_getActualPoolInfo() throws InvalidPoolInfo, SafeModeException, org.apache.thrift.TException
+    {
+      getActualPoolInfo_result result = new getActualPoolInfo_result();
+      receiveBase(result, "getActualPoolInfo");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      if (result.f != null) {
+        throw result.f;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getActualPoolInfo failed: unknown result");
+    }
+
+    public String getNextSessionId() throws SafeModeException, org.apache.thrift.TException
     {
       send_getNextSessionId();
       return recv_getNextSessionId();
@@ -113,17 +162,20 @@ public void send_getNextSessionId() throws org.apache.thrift.TException
       sendBase("getNextSessionId", args);
     }
 
-    public String recv_getNextSessionId() throws org.apache.thrift.TException
+    public String recv_getNextSessionId() throws SafeModeException, org.apache.thrift.TException
     {
       getNextSessionId_result result = new getNextSessionId_result();
       receiveBase(result, "getNextSessionId");
       if (result.isSetSuccess()) {
         return result.success;
       }
+      if (result.e != null) {
+        throw result.e;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getNextSessionId failed: unknown result");
     }
 
-    public SessionRegistrationData sessionStart(String handle, SessionInfo info) throws InvalidSessionHandle, org.apache.thrift.TException
+    public SessionRegistrationData sessionStart(String handle, SessionInfo info) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       send_sessionStart(handle, info);
       return recv_sessionStart();
@@ -137,7 +189,7 @@ public void send_sessionStart(String handle, SessionInfo info) throws org.apache
       sendBase("sessionStart", args);
     }
 
-    public SessionRegistrationData recv_sessionStart() throws InvalidSessionHandle, org.apache.thrift.TException
+    public SessionRegistrationData recv_sessionStart() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       sessionStart_result result = new sessionStart_result();
       receiveBase(result, "sessionStart");
@@ -147,10 +199,13 @@ public SessionRegistrationData recv_sessionStart() throws InvalidSessionHandle,
       if (result.e != null) {
         throw result.e;
       }
+      if (result.f != null) {
+        throw result.f;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "sessionStart failed: unknown result");
     }
 
-    public void sessionUpdateInfo(String handle, SessionInfo info) throws InvalidSessionHandle, org.apache.thrift.TException
+    public void sessionUpdateInfo(String handle, SessionInfo info) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       send_sessionUpdateInfo(handle, info);
       recv_sessionUpdateInfo();
@@ -164,17 +219,20 @@ public void send_sessionUpdateInfo(String handle, SessionInfo info) throws org.a
       sendBase("sessionUpdateInfo", args);
     }
 
-    public void recv_sessionUpdateInfo() throws InvalidSessionHandle, org.apache.thrift.TException
+    public void recv_sessionUpdateInfo() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       sessionUpdateInfo_result result = new sessionUpdateInfo_result();
       receiveBase(result, "sessionUpdateInfo");
       if (result.e != null) {
         throw result.e;
       }
+      if (result.f != null) {
+        throw result.f;
+      }
       return;
     }
 
-    public void sessionEnd(String handle, SessionStatus status) throws InvalidSessionHandle, org.apache.thrift.TException
+    public void sessionEnd(String handle, SessionStatus status) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       send_sessionEnd(handle, status);
       recv_sessionEnd();
@@ -188,17 +246,20 @@ public void send_sessionEnd(String handle, SessionStatus status) throws org.apac
       sendBase("sessionEnd", args);
     }
 
-    public void recv_sessionEnd() throws InvalidSessionHandle, org.apache.thrift.TException
+    public void recv_sessionEnd() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       sessionEnd_result result = new sessionEnd_result();
       receiveBase(result, "sessionEnd");
       if (result.e != null) {
         throw result.e;
       }
+      if (result.f != null) {
+        throw result.f;
+      }
       return;
     }
 
-    public void sessionHeartbeat(String handle) throws InvalidSessionHandle, org.apache.thrift.TException
+    public void sessionHeartbeat(String handle) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       send_sessionHeartbeat(handle);
       recv_sessionHeartbeat();
@@ -211,17 +272,47 @@ public void send_sessionHeartbeat(String handle) throws org.apache.thrift.TExcep
       sendBase("sessionHeartbeat", args);
     }
 
-    public void recv_sessionHeartbeat() throws InvalidSessionHandle, org.apache.thrift.TException
+    public void recv_sessionHeartbeat() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       sessionHeartbeat_result result = new sessionHeartbeat_result();
       receiveBase(result, "sessionHeartbeat");
       if (result.e != null) {
         throw result.e;
       }
+      if (result.f != null) {
+        throw result.f;
+      }
+      return;
+    }
+
+    public void sessionHeartbeatV2(String handle, HeartbeatArgs heartbeatArgs) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
+    {
+      send_sessionHeartbeatV2(handle, heartbeatArgs);
+      recv_sessionHeartbeatV2();
+    }
+
+    public void send_sessionHeartbeatV2(String handle, HeartbeatArgs heartbeatArgs) throws org.apache.thrift.TException
+    {
+      sessionHeartbeatV2_args args = new sessionHeartbeatV2_args();
+      args.setHandle(handle);
+      args.setHeartbeatArgs(heartbeatArgs);
+      sendBase("sessionHeartbeatV2", args);
+    }
+
+    public void recv_sessionHeartbeatV2() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
+    {
+      sessionHeartbeatV2_result result = new sessionHeartbeatV2_result();
+      receiveBase(result, "sessionHeartbeatV2");
+      if (result.e != null) {
+        throw result.e;
+      }
+      if (result.f != null) {
+        throw result.f;
+      }
       return;
     }
 
-    public void requestResource(String handle, List<ResourceRequest> requestList) throws InvalidSessionHandle, org.apache.thrift.TException
+    public void requestResource(String handle, List<ResourceRequest> requestList) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       send_requestResource(handle, requestList);
       recv_requestResource();
@@ -235,17 +326,20 @@ public void send_requestResource(String handle, List<ResourceRequest> requestLis
       sendBase("requestResource", args);
     }
 
-    public void recv_requestResource() throws InvalidSessionHandle, org.apache.thrift.TException
+    public void recv_requestResource() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       requestResource_result result = new requestResource_result();
       receiveBase(result, "requestResource");
       if (result.e != null) {
         throw result.e;
       }
+      if (result.f != null) {
+        throw result.f;
+      }
       return;
     }
 
-    public void releaseResource(String handle, List<Integer> idList) throws InvalidSessionHandle, org.apache.thrift.TException
+    public void releaseResource(String handle, List<Integer> idList) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       send_releaseResource(handle, idList);
       recv_releaseResource();
@@ -259,20 +353,23 @@ public void send_releaseResource(String handle, List<Integer> idList) throws org
       sendBase("releaseResource", args);
     }
 
-    public void recv_releaseResource() throws InvalidSessionHandle, org.apache.thrift.TException
+    public void recv_releaseResource() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       releaseResource_result result = new releaseResource_result();
       receiveBase(result, "releaseResource");
       if (result.e != null) {
         throw result.e;
       }
+      if (result.f != null) {
+        throw result.f;
+      }
       return;
     }
 
-    public void nodeHeartbeat(ClusterNodeInfo node) throws DisallowedNode, org.apache.thrift.TException
+    public NodeHeartbeatResponse nodeHeartbeat(ClusterNodeInfo node) throws DisallowedNode, SafeModeException, org.apache.thrift.TException
     {
       send_nodeHeartbeat(node);
-      recv_nodeHeartbeat();
+      return recv_nodeHeartbeat();
     }
 
     public void send_nodeHeartbeat(ClusterNodeInfo node) throws org.apache.thrift.TException
@@ -282,17 +379,23 @@ public void send_nodeHeartbeat(ClusterNodeInfo node) throws org.apache.thrift.TE
       sendBase("nodeHeartbeat", args);
     }
 
-    public void recv_nodeHeartbeat() throws DisallowedNode, org.apache.thrift.TException
+    public NodeHeartbeatResponse recv_nodeHeartbeat() throws DisallowedNode, SafeModeException, org.apache.thrift.TException
     {
       nodeHeartbeat_result result = new nodeHeartbeat_result();
       receiveBase(result, "nodeHeartbeat");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
       if (result.e != null) {
         throw result.e;
       }
-      return;
+      if (result.f != null) {
+        throw result.f;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "nodeHeartbeat failed: unknown result");
     }
 
-    public void nodeFeedback(String handle, List<ResourceType> resourceTypes, List<NodeUsageReport> stats) throws InvalidSessionHandle, org.apache.thrift.TException
+    public void nodeFeedback(String handle, List<ResourceType> resourceTypes, List<NodeUsageReport> stats) throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       send_nodeFeedback(handle, resourceTypes, stats);
       recv_nodeFeedback();
@@ -307,17 +410,20 @@ public void send_nodeFeedback(String handle, List<ResourceType> resourceTypes, L
       sendBase("nodeFeedback", args);
     }
 
-    public void recv_nodeFeedback() throws InvalidSessionHandle, org.apache.thrift.TException
+    public void recv_nodeFeedback() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException
     {
       nodeFeedback_result result = new nodeFeedback_result();
       receiveBase(result, "nodeFeedback");
       if (result.e != null) {
         throw result.e;
       }
+      if (result.f != null) {
+        throw result.f;
+      }
       return;
     }
 
-    public void refreshNodes() throws org.apache.thrift.TException
+    public void refreshNodes() throws SafeModeException, org.apache.thrift.TException
     {
       send_refreshNodes();
       recv_refreshNodes();
@@ -329,14 +435,43 @@ public void send_refreshNodes() throws org.apache.thrift.TException
       sendBase("refreshNodes", args);
     }
 
-    public void recv_refreshNodes() throws org.apache.thrift.TException
+    public void recv_refreshNodes() throws SafeModeException, org.apache.thrift.TException
     {
       refreshNodes_result result = new refreshNodes_result();
       receiveBase(result, "refreshNodes");
+      if (result.e != null) {
+        throw result.e;
+      }
       return;
     }
 
-    public List<RunningSession> getSessions() throws org.apache.thrift.TException
+    public RestartNodesResponse restartNodes(RestartNodesArgs restartNodesArgs) throws SafeModeException, org.apache.thrift.TException
+    {
+      send_restartNodes(restartNodesArgs);
+      return recv_restartNodes();
+    }
+
+    public void send_restartNodes(RestartNodesArgs restartNodesArgs) throws org.apache.thrift.TException
+    {
+      restartNodes_args args = new restartNodes_args();
+      args.setRestartNodesArgs(restartNodesArgs);
+      sendBase("restartNodes", args);
+    }
+
+    public RestartNodesResponse recv_restartNodes() throws SafeModeException, org.apache.thrift.TException
+    {
+      restartNodes_result result = new restartNodes_result();
+      receiveBase(result, "restartNodes");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "restartNodes failed: unknown result");
+    }
+
+    public List<RunningSession> getSessions() throws SafeModeException, org.apache.thrift.TException
     {
       send_getSessions();
       return recv_getSessions();
@@ -348,17 +483,20 @@ public void send_getSessions() throws org.apache.thrift.TException
       sendBase("getSessions", args);
     }
 
-    public List<RunningSession> recv_getSessions() throws org.apache.thrift.TException
+    public List<RunningSession> recv_getSessions() throws SafeModeException, org.apache.thrift.TException
     {
       getSessions_result result = new getSessions_result();
       receiveBase(result, "getSessions");
       if (result.isSetSuccess()) {
         return result.success;
       }
+      if (result.e != null) {
+        throw result.e;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSessions failed: unknown result");
     }
 
-    public void killSession(String sessionId) throws org.apache.thrift.TException
+    public void killSession(String sessionId) throws SafeModeException, org.apache.thrift.TException
     {
       send_killSession(sessionId);
       recv_killSession();
@@ -371,13 +509,61 @@ public void send_killSession(String sessionId) throws org.apache.thrift.TExcepti
       sendBase("killSession", args);
     }
 
-    public void recv_killSession() throws org.apache.thrift.TException
+    public void recv_killSession() throws SafeModeException, org.apache.thrift.TException
     {
       killSession_result result = new killSession_result();
       receiveBase(result, "killSession");
+      if (result.e != null) {
+        throw result.e;
+      }
       return;
     }
 
+    public boolean setSafeMode(boolean safeMode) throws org.apache.thrift.TException
+    {
+      send_setSafeMode(safeMode);
+      return recv_setSafeMode();
+    }
+
+    public void send_setSafeMode(boolean safeMode) throws org.apache.thrift.TException
+    {
+      setSafeMode_args args = new setSafeMode_args();
+      args.setSafeMode(safeMode);
+      sendBase("setSafeMode", args);
+    }
+
+    public boolean recv_setSafeMode() throws org.apache.thrift.TException
+    {
+      setSafeMode_result result = new setSafeMode_result();
+      receiveBase(result, "setSafeMode");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "setSafeMode failed: unknown result");
+    }
+
+    public boolean persistState() throws org.apache.thrift.TException
+    {
+      send_persistState();
+      return recv_persistState();
+    }
+
+    public void send_persistState() throws org.apache.thrift.TException
+    {
+      persistState_args args = new persistState_args();
+      sendBase("persistState", args);
+    }
+
+    public boolean recv_persistState() throws org.apache.thrift.TException
+    {
+      persistState_result result = new persistState_result();
+      receiveBase(result, "persistState");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "persistState failed: unknown result");
+    }
+
   }
   public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
     public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
@@ -396,6 +582,38 @@ public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory,
       super(protocolFactory, clientManager, transport);
     }
 
+    public void getActualPoolInfo(PoolInfoStrings poolInfoString, org.apache.thrift.async.AsyncMethodCallback<getActualPoolInfo_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getActualPoolInfo_call method_call = new getActualPoolInfo_call(poolInfoString, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getActualPoolInfo_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private PoolInfoStrings poolInfoString;
+      public getActualPoolInfo_call(PoolInfoStrings poolInfoString, org.apache.thrift.async.AsyncMethodCallback<getActualPoolInfo_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.poolInfoString = poolInfoString;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getActualPoolInfo", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getActualPoolInfo_args args = new getActualPoolInfo_args();
+        args.setPoolInfoString(poolInfoString);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public PoolInfoStrings getResult() throws InvalidPoolInfo, SafeModeException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getActualPoolInfo();
+      }
+    }
+
     public void getNextSessionId(org.apache.thrift.async.AsyncMethodCallback<getNextSessionId_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getNextSessionId_call method_call = new getNextSessionId_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -415,7 +633,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws org.apache.thrift.TException {
+      public String getResult() throws SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -450,7 +668,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public SessionRegistrationData getResult() throws InvalidSessionHandle, org.apache.thrift.TException {
+      public SessionRegistrationData getResult() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -485,7 +703,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws InvalidSessionHandle, org.apache.thrift.TException {
+      public void getResult() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -520,7 +738,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws InvalidSessionHandle, org.apache.thrift.TException {
+      public void getResult() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -552,7 +770,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws InvalidSessionHandle, org.apache.thrift.TException {
+      public void getResult() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -562,6 +780,41 @@ public void getResult() throws InvalidSessionHandle, org.apache.thrift.TExceptio
       }
     }
 
+    public void sessionHeartbeatV2(String handle, HeartbeatArgs heartbeatArgs, org.apache.thrift.async.AsyncMethodCallback<sessionHeartbeatV2_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      sessionHeartbeatV2_call method_call = new sessionHeartbeatV2_call(handle, heartbeatArgs, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class sessionHeartbeatV2_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String handle;
+      private HeartbeatArgs heartbeatArgs;
+      public sessionHeartbeatV2_call(String handle, HeartbeatArgs heartbeatArgs, org.apache.thrift.async.AsyncMethodCallback<sessionHeartbeatV2_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.handle = handle;
+        this.heartbeatArgs = heartbeatArgs;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("sessionHeartbeatV2", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        sessionHeartbeatV2_args args = new sessionHeartbeatV2_args();
+        args.setHandle(handle);
+        args.setHeartbeatArgs(heartbeatArgs);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_sessionHeartbeatV2();
+      }
+    }
+
     public void requestResource(String handle, List<ResourceRequest> requestList, org.apache.thrift.async.AsyncMethodCallback<requestResource_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       requestResource_call method_call = new requestResource_call(handle, requestList, resultHandler, this, ___protocolFactory, ___transport);
@@ -587,7 +840,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws InvalidSessionHandle, org.apache.thrift.TException {
+      public void getResult() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -622,7 +875,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws InvalidSessionHandle, org.apache.thrift.TException {
+      public void getResult() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -654,13 +907,13 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws DisallowedNode, org.apache.thrift.TException {
+      public NodeHeartbeatResponse getResult() throws DisallowedNode, SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_nodeHeartbeat();
+        return (new Client(prot)).recv_nodeHeartbeat();
       }
     }
 
@@ -692,7 +945,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws InvalidSessionHandle, org.apache.thrift.TException {
+      public void getResult() throws InvalidSessionHandle, SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -721,7 +974,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws org.apache.thrift.TException {
+      public void getResult() throws SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -731,6 +984,38 @@ public void getResult() throws org.apache.thrift.TException {
       }
     }
 
+    public void restartNodes(RestartNodesArgs restartNodesArgs, org.apache.thrift.async.AsyncMethodCallback<restartNodes_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      restartNodes_call method_call = new restartNodes_call(restartNodesArgs, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class restartNodes_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private RestartNodesArgs restartNodesArgs;
+      public restartNodes_call(RestartNodesArgs restartNodesArgs, org.apache.thrift.async.AsyncMethodCallback<restartNodes_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.restartNodesArgs = restartNodesArgs;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("restartNodes", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        restartNodes_args args = new restartNodes_args();
+        args.setRestartNodesArgs(restartNodesArgs);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public RestartNodesResponse getResult() throws SafeModeException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_restartNodes();
+      }
+    }
+
     public void getSessions(org.apache.thrift.async.AsyncMethodCallback<getSessions_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getSessions_call method_call = new getSessions_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -750,7 +1035,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public List<RunningSession> getResult() throws org.apache.thrift.TException {
+      public List<RunningSession> getResult() throws SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -782,7 +1067,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws org.apache.thrift.TException {
+      public void getResult() throws SafeModeException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -792,6 +1077,67 @@ public void getResult() throws org.apache.thrift.TException {
       }
     }
 
+    public void setSafeMode(boolean safeMode, org.apache.thrift.async.AsyncMethodCallback<setSafeMode_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      setSafeMode_call method_call = new setSafeMode_call(safeMode, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class setSafeMode_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private boolean safeMode;
+      public setSafeMode_call(boolean safeMode, org.apache.thrift.async.AsyncMethodCallback<setSafeMode_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.safeMode = safeMode;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setSafeMode", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        setSafeMode_args args = new setSafeMode_args();
+        args.setSafeMode(safeMode);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_setSafeMode();
+      }
+    }
+
+    public void persistState(org.apache.thrift.async.AsyncMethodCallback<persistState_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      persistState_call method_call = new persistState_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class persistState_call extends org.apache.thrift.async.TAsyncMethodCall {
+      public persistState_call(org.apache.thrift.async.AsyncMethodCallback<persistState_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("persistState", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        persistState_args args = new persistState_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_persistState();
+      }
+    }
+
   }
 
   public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
@@ -805,21 +1151,48 @@ protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ?
     }
 
     private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      processMap.put("getActualPoolInfo", new getActualPoolInfo());
       processMap.put("getNextSessionId", new getNextSessionId());
       processMap.put("sessionStart", new sessionStart());
       processMap.put("sessionUpdateInfo", new sessionUpdateInfo());
       processMap.put("sessionEnd", new sessionEnd());
       processMap.put("sessionHeartbeat", new sessionHeartbeat());
+      processMap.put("sessionHeartbeatV2", new sessionHeartbeatV2());
       processMap.put("requestResource", new requestResource());
       processMap.put("releaseResource", new releaseResource());
       processMap.put("nodeHeartbeat", new nodeHeartbeat());
       processMap.put("nodeFeedback", new nodeFeedback());
       processMap.put("refreshNodes", new refreshNodes());
+      processMap.put("restartNodes", new restartNodes());
       processMap.put("getSessions", new getSessions());
       processMap.put("killSession", new killSession());
+      processMap.put("setSafeMode", new setSafeMode());
+      processMap.put("persistState", new persistState());
       return processMap;
     }
 
+    private static class getActualPoolInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getActualPoolInfo_args> {
+      public getActualPoolInfo() {
+        super("getActualPoolInfo");
+      }
+
+      protected getActualPoolInfo_args getEmptyArgsInstance() {
+        return new getActualPoolInfo_args();
+      }
+
+      protected getActualPoolInfo_result getResult(I iface, getActualPoolInfo_args args) throws org.apache.thrift.TException {
+        getActualPoolInfo_result result = new getActualPoolInfo_result();
+        try {
+          result.success = iface.getActualPoolInfo(args.poolInfoString);
+        } catch (InvalidPoolInfo e) {
+          result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
+        }
+        return result;
+      }
+    }
+
     private static class getNextSessionId<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getNextSessionId_args> {
       public getNextSessionId() {
         super("getNextSessionId");
@@ -831,7 +1204,11 @@ protected getNextSessionId_args getEmptyArgsInstance() {
 
       protected getNextSessionId_result getResult(I iface, getNextSessionId_args args) throws org.apache.thrift.TException {
         getNextSessionId_result result = new getNextSessionId_result();
-        result.success = iface.getNextSessionId();
+        try {
+          result.success = iface.getNextSessionId();
+        } catch (SafeModeException e) {
+          result.e = e;
+        }
         return result;
       }
     }
@@ -851,6 +1228,8 @@ protected sessionStart_result getResult(I iface, sessionStart_args args) throws
           result.success = iface.sessionStart(args.handle, args.info);
         } catch (InvalidSessionHandle e) {
           result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
         }
         return result;
       }
@@ -871,6 +1250,8 @@ protected sessionUpdateInfo_result getResult(I iface, sessionUpdateInfo_args arg
           iface.sessionUpdateInfo(args.handle, args.info);
         } catch (InvalidSessionHandle e) {
           result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
         }
         return result;
       }
@@ -891,6 +1272,8 @@ protected sessionEnd_result getResult(I iface, sessionEnd_args args) throws org.
           iface.sessionEnd(args.handle, args.status);
         } catch (InvalidSessionHandle e) {
           result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
         }
         return result;
       }
@@ -911,6 +1294,30 @@ protected sessionHeartbeat_result getResult(I iface, sessionHeartbeat_args args)
           iface.sessionHeartbeat(args.handle);
         } catch (InvalidSessionHandle e) {
           result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
+        }
+        return result;
+      }
+    }
+
+    private static class sessionHeartbeatV2<I extends Iface> extends org.apache.thrift.ProcessFunction<I, sessionHeartbeatV2_args> {
+      public sessionHeartbeatV2() {
+        super("sessionHeartbeatV2");
+      }
+
+      protected sessionHeartbeatV2_args getEmptyArgsInstance() {
+        return new sessionHeartbeatV2_args();
+      }
+
+      protected sessionHeartbeatV2_result getResult(I iface, sessionHeartbeatV2_args args) throws org.apache.thrift.TException {
+        sessionHeartbeatV2_result result = new sessionHeartbeatV2_result();
+        try {
+          iface.sessionHeartbeatV2(args.handle, args.heartbeatArgs);
+        } catch (InvalidSessionHandle e) {
+          result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
         }
         return result;
       }
@@ -931,6 +1338,8 @@ protected requestResource_result getResult(I iface, requestResource_args args) t
           iface.requestResource(args.handle, args.requestList);
         } catch (InvalidSessionHandle e) {
           result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
         }
         return result;
       }
@@ -951,6 +1360,8 @@ protected releaseResource_result getResult(I iface, releaseResource_args args) t
           iface.releaseResource(args.handle, args.idList);
         } catch (InvalidSessionHandle e) {
           result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
         }
         return result;
       }
@@ -968,9 +1379,11 @@ protected nodeHeartbeat_args getEmptyArgsInstance() {
       protected nodeHeartbeat_result getResult(I iface, nodeHeartbeat_args args) throws org.apache.thrift.TException {
         nodeHeartbeat_result result = new nodeHeartbeat_result();
         try {
-          iface.nodeHeartbeat(args.node);
+          result.success = iface.nodeHeartbeat(args.node);
         } catch (DisallowedNode e) {
           result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
         }
         return result;
       }
@@ -991,6 +1404,8 @@ protected nodeFeedback_result getResult(I iface, nodeFeedback_args args) throws
           iface.nodeFeedback(args.handle, args.resourceTypes, args.stats);
         } catch (InvalidSessionHandle e) {
           result.e = e;
+        } catch (SafeModeException f) {
+          result.f = f;
         }
         return result;
       }
@@ -1007,7 +1422,31 @@ protected refreshNodes_args getEmptyArgsInstance() {
 
       protected refreshNodes_result getResult(I iface, refreshNodes_args args) throws org.apache.thrift.TException {
         refreshNodes_result result = new refreshNodes_result();
-        iface.refreshNodes();
+        try {
+          iface.refreshNodes();
+        } catch (SafeModeException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
+    private static class restartNodes<I extends Iface> extends org.apache.thrift.ProcessFunction<I, restartNodes_args> {
+      public restartNodes() {
+        super("restartNodes");
+      }
+
+      protected restartNodes_args getEmptyArgsInstance() {
+        return new restartNodes_args();
+      }
+
+      protected restartNodes_result getResult(I iface, restartNodes_args args) throws org.apache.thrift.TException {
+        restartNodes_result result = new restartNodes_result();
+        try {
+          result.success = iface.restartNodes(args.restartNodesArgs);
+        } catch (SafeModeException e) {
+          result.e = e;
+        }
         return result;
       }
     }
@@ -1023,7 +1462,11 @@ protected getSessions_args getEmptyArgsInstance() {
 
       protected getSessions_result getResult(I iface, getSessions_args args) throws org.apache.thrift.TException {
         getSessions_result result = new getSessions_result();
-        result.success = iface.getSessions();
+        try {
+          result.success = iface.getSessions();
+        } catch (SafeModeException e) {
+          result.e = e;
+        }
         return result;
       }
     }
@@ -1039,21 +1482,61 @@ protected killSession_args getEmptyArgsInstance() {
 
       protected killSession_result getResult(I iface, killSession_args args) throws org.apache.thrift.TException {
         killSession_result result = new killSession_result();
-        iface.killSession(args.sessionId);
-        return result;
+        try {
+          iface.killSession(args.sessionId);
+        } catch (SafeModeException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
+    private static class setSafeMode<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setSafeMode_args> {
+      public setSafeMode() {
+        super("setSafeMode");
+      }
+
+      protected setSafeMode_args getEmptyArgsInstance() {
+        return new setSafeMode_args();
+      }
+
+      protected setSafeMode_result getResult(I iface, setSafeMode_args args) throws org.apache.thrift.TException {
+        setSafeMode_result result = new setSafeMode_result();
+        result.success = iface.setSafeMode(args.safeMode);
+        result.setSuccessIsSet(true);
+        return result;
+      }
+    }
+
+    private static class persistState<I extends Iface> extends org.apache.thrift.ProcessFunction<I, persistState_args> {
+      public persistState() {
+        super("persistState");
+      }
+
+      protected persistState_args getEmptyArgsInstance() {
+        return new persistState_args();
+      }
+
+      protected persistState_result getResult(I iface, persistState_args args) throws org.apache.thrift.TException {
+        persistState_result result = new persistState_result();
+        result.success = iface.persistState();
+        result.setSuccessIsSet(true);
+        return result;
       }
     }
 
   }
 
-  public static class getNextSessionId_args implements org.apache.thrift.TBase<getNextSessionId_args, getNextSessionId_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getNextSessionId_args");
+  public static class getActualPoolInfo_args implements org.apache.thrift.TBase<getActualPoolInfo_args, getActualPoolInfo_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getActualPoolInfo_args");
 
+    private static final org.apache.thrift.protocol.TField POOL_INFO_STRING_FIELD_DESC = new org.apache.thrift.protocol.TField("poolInfoString", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
+    public PoolInfoStrings poolInfoString; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
+      POOL_INFO_STRING((short)1, "poolInfoString");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -1068,6 +1551,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 1: // POOL_INFO_STRING
+            return POOL_INFO_STRING;
           default:
             return null;
         }
@@ -1106,37 +1591,88 @@ public String getFieldName() {
         return _fieldName;
       }
     }
+
+    // isset id assignments
+
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.POOL_INFO_STRING, new org.apache.thrift.meta_data.FieldMetaData("poolInfoString", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PoolInfoStrings.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getNextSessionId_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getActualPoolInfo_args.class, metaDataMap);
     }
 
-    public getNextSessionId_args() {
+    public getActualPoolInfo_args() {
+    }
+
+    public getActualPoolInfo_args(
+      PoolInfoStrings poolInfoString)
+    {
+      this();
+      this.poolInfoString = poolInfoString;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getNextSessionId_args(getNextSessionId_args other) {
+    public getActualPoolInfo_args(getActualPoolInfo_args other) {
+      if (other.isSetPoolInfoString()) {
+        this.poolInfoString = new PoolInfoStrings(other.poolInfoString);
+      }
     }
 
-    public getNextSessionId_args deepCopy() {
-      return new getNextSessionId_args(this);
+    public getActualPoolInfo_args deepCopy() {
+      return new getActualPoolInfo_args(this);
     }
 
     @Override
     public void clear() {
+      this.poolInfoString = null;
+    }
+
+    public PoolInfoStrings getPoolInfoString() {
+      return this.poolInfoString;
+    }
+
+    public getActualPoolInfo_args setPoolInfoString(PoolInfoStrings poolInfoString) {
+      this.poolInfoString = poolInfoString;
+      return this;
+    }
+
+    public void unsetPoolInfoString() {
+      this.poolInfoString = null;
+    }
+
+    /** Returns true if field poolInfoString is set (has been assigned a value) and false otherwise */
+    public boolean isSetPoolInfoString() {
+      return this.poolInfoString != null;
+    }
+
+    public void setPoolInfoStringIsSet(boolean value) {
+      if (!value) {
+        this.poolInfoString = null;
+      }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case POOL_INFO_STRING:
+        if (value == null) {
+          unsetPoolInfoString();
+        } else {
+          setPoolInfoString((PoolInfoStrings)value);
+        }
+        break;
+
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case POOL_INFO_STRING:
+        return getPoolInfoString();
+
       }
       throw new IllegalStateException();
     }
@@ -1148,6 +1684,8 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
+      case POOL_INFO_STRING:
+        return isSetPoolInfoString();
       }
       throw new IllegalStateException();
     }
@@ -1156,15 +1694,24 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getNextSessionId_args)
-        return this.equals((getNextSessionId_args)that);
+      if (that instanceof getActualPoolInfo_args)
+        return this.equals((getActualPoolInfo_args)that);
       return false;
     }
 
-    public boolean equals(getNextSessionId_args that) {
+    public boolean equals(getActualPoolInfo_args that) {
       if (that == null)
         return false;
 
+      boolean this_present_poolInfoString = true && this.isSetPoolInfoString();
+      boolean that_present_poolInfoString = true && that.isSetPoolInfoString();
+      if (this_present_poolInfoString || that_present_poolInfoString) {
+        if (!(this_present_poolInfoString && that_present_poolInfoString))
+          return false;
+        if (!this.poolInfoString.equals(that.poolInfoString))
+          return false;
+      }
+
       return true;
     }
 
@@ -1173,14 +1720,24 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(getNextSessionId_args other) {
+    public int compareTo(getActualPoolInfo_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getNextSessionId_args typedOther = (getNextSessionId_args)other;
+      getActualPoolInfo_args typedOther = (getActualPoolInfo_args)other;
 
+      lastComparison = Boolean.valueOf(isSetPoolInfoString()).compareTo(typedOther.isSetPoolInfoString());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPoolInfoString()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.poolInfoString, typedOther.poolInfoString);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -1198,6 +1755,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
+          case 1: // POOL_INFO_STRING
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.poolInfoString = new PoolInfoStrings();
+              this.poolInfoString.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -1213,15 +1778,27 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
+      if (this.poolInfoString != null) {
+        oprot.writeFieldBegin(POOL_INFO_STRING_FIELD_DESC);
+        this.poolInfoString.write(oprot);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getNextSessionId_args(");
+      StringBuilder sb = new StringBuilder("getActualPoolInfo_args(");
       boolean first = true;
 
+      sb.append("poolInfoString:");
+      if (this.poolInfoString == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.poolInfoString);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -1248,16 +1825,22 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class getNextSessionId_result implements org.apache.thrift.TBase<getNextSessionId_result, getNextSessionId_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getNextSessionId_result");
+  public static class getActualPoolInfo_result implements org.apache.thrift.TBase<getActualPoolInfo_result, getActualPoolInfo_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getActualPoolInfo_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    public String success; // required
+    public PoolInfoStrings success; // required
+    public InvalidPoolInfo e; // required
+    public SafeModeException f; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      SUCCESS((short)0, "success");
+      SUCCESS((short)0, "success"),
+      E((short)1, "e"),
+      F((short)2, "f");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -1274,6 +1857,10 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
             return SUCCESS;
+          case 1: // E
+            return E;
+          case 2: // F
+            return F;
           default:
             return null;
         }
@@ -1319,44 +1906,60 @@ public String getFieldName() {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PoolInfoStrings.class)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getNextSessionId_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getActualPoolInfo_result.class, metaDataMap);
     }
 
-    public getNextSessionId_result() {
+    public getActualPoolInfo_result() {
     }
 
-    public getNextSessionId_result(
-      String success)
+    public getActualPoolInfo_result(
+      PoolInfoStrings success,
+      InvalidPoolInfo e,
+      SafeModeException f)
     {
       this();
       this.success = success;
+      this.e = e;
+      this.f = f;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getNextSessionId_result(getNextSessionId_result other) {
+    public getActualPoolInfo_result(getActualPoolInfo_result other) {
       if (other.isSetSuccess()) {
-        this.success = other.success;
+        this.success = new PoolInfoStrings(other.success);
+      }
+      if (other.isSetE()) {
+        this.e = new InvalidPoolInfo(other.e);
+      }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
       }
     }
 
-    public getNextSessionId_result deepCopy() {
-      return new getNextSessionId_result(this);
+    public getActualPoolInfo_result deepCopy() {
+      return new getActualPoolInfo_result(this);
     }
 
     @Override
     public void clear() {
       this.success = null;
+      this.e = null;
+      this.f = null;
     }
 
-    public String getSuccess() {
+    public PoolInfoStrings getSuccess() {
       return this.success;
     }
 
-    public getNextSessionId_result setSuccess(String success) {
+    public getActualPoolInfo_result setSuccess(PoolInfoStrings success) {
       this.success = success;
       return this;
     }
@@ -1376,13 +1979,77 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    public InvalidPoolInfo getE() {
+      return this.e;
+    }
+
+    public getActualPoolInfo_result setE(InvalidPoolInfo e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public getActualPoolInfo_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((String)value);
+          setSuccess((PoolInfoStrings)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((InvalidPoolInfo)value);
+        }
+        break;
+
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
         }
         break;
 
@@ -1394,6 +2061,12 @@ public Object getFieldValue(_Fields field) {
       case SUCCESS:
         return getSuccess();
 
+      case E:
+        return getE();
+
+      case F:
+        return getF();
+
       }
       throw new IllegalStateException();
     }
@@ -1407,6 +2080,10 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
+      case E:
+        return isSetE();
+      case F:
+        return isSetF();
       }
       throw new IllegalStateException();
     }
@@ -1415,12 +2092,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getNextSessionId_result)
-        return this.equals((getNextSessionId_result)that);
+      if (that instanceof getActualPoolInfo_result)
+        return this.equals((getActualPoolInfo_result)that);
       return false;
     }
 
-    public boolean equals(getNextSessionId_result that) {
+    public boolean equals(getActualPoolInfo_result that) {
       if (that == null)
         return false;
 
@@ -1433,6 +2110,24 @@ public boolean equals(getNextSessionId_result that) {
           return false;
       }
 
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
       return true;
     }
 
@@ -1441,13 +2136,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(getNextSessionId_result other) {
+    public int compareTo(getActualPoolInfo_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getNextSessionId_result typedOther = (getNextSessionId_result)other;
+      getActualPoolInfo_result typedOther = (getActualPoolInfo_result)other;
 
       lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
@@ -1459,6 +2154,26 @@ public int compareTo(getNextSessionId_result other) {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -1477,8 +2192,25 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
         }
         switch (field.id) {
           case 0: // SUCCESS
-            if (field.type == org.apache.thrift.protocol.TType.STRING) {
-              this.success = iprot.readString();
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new PoolInfoStrings();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new InvalidPoolInfo();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
@@ -1499,7 +2231,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeString(this.success);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -1508,7 +2248,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getNextSessionId_result(");
+      StringBuilder sb = new StringBuilder("getActualPoolInfo_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -1518,6 +2258,22 @@ public String toString() {
         sb.append(this.success);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -1544,19 +2300,14 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class sessionStart_args implements org.apache.thrift.TBase<sessionStart_args, sessionStart_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionStart_args");
+  public static class getNextSessionId_args implements org.apache.thrift.TBase<getNextSessionId_args, getNextSessionId_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getNextSessionId_args");
 
-    private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("info", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    public String handle; // required
-    public SessionInfo info; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      HANDLE((short)1, "handle"),
-      INFO((short)2, "info");
+;
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -1571,10 +2322,6 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // HANDLE
-            return HANDLE;
-          case 2: // INFO
-            return INFO;
           default:
             return null;
         }
@@ -1613,131 +2360,37 @@ public String getFieldName() {
         return _fieldName;
       }
     }
-
-    // isset id assignments
-
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
-      tmpMap.put(_Fields.INFO, new org.apache.thrift.meta_data.FieldMetaData("info", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SessionInfo.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionStart_args.class, metaDataMap);
-    }
-
-    public sessionStart_args() {
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getNextSessionId_args.class, metaDataMap);
     }
 
-    public sessionStart_args(
-      String handle,
-      SessionInfo info)
-    {
-      this();
-      this.handle = handle;
-      this.info = info;
+    public getNextSessionId_args() {
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public sessionStart_args(sessionStart_args other) {
-      if (other.isSetHandle()) {
-        this.handle = other.handle;
-      }
-      if (other.isSetInfo()) {
-        this.info = new SessionInfo(other.info);
-      }
+    public getNextSessionId_args(getNextSessionId_args other) {
     }
 
-    public sessionStart_args deepCopy() {
-      return new sessionStart_args(this);
+    public getNextSessionId_args deepCopy() {
+      return new getNextSessionId_args(this);
     }
 
     @Override
     public void clear() {
-      this.handle = null;
-      this.info = null;
-    }
-
-    public String getHandle() {
-      return this.handle;
-    }
-
-    public sessionStart_args setHandle(String handle) {
-      this.handle = handle;
-      return this;
-    }
-
-    public void unsetHandle() {
-      this.handle = null;
-    }
-
-    /** Returns true if field handle is set (has been assigned a value) and false otherwise */
-    public boolean isSetHandle() {
-      return this.handle != null;
-    }
-
-    public void setHandleIsSet(boolean value) {
-      if (!value) {
-        this.handle = null;
-      }
-    }
-
-    public SessionInfo getInfo() {
-      return this.info;
-    }
-
-    public sessionStart_args setInfo(SessionInfo info) {
-      this.info = info;
-      return this;
-    }
-
-    public void unsetInfo() {
-      this.info = null;
-    }
-
-    /** Returns true if field info is set (has been assigned a value) and false otherwise */
-    public boolean isSetInfo() {
-      return this.info != null;
-    }
-
-    public void setInfoIsSet(boolean value) {
-      if (!value) {
-        this.info = null;
-      }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case HANDLE:
-        if (value == null) {
-          unsetHandle();
-        } else {
-          setHandle((String)value);
-        }
-        break;
-
-      case INFO:
-        if (value == null) {
-          unsetInfo();
-        } else {
-          setInfo((SessionInfo)value);
-        }
-        break;
-
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case HANDLE:
-        return getHandle();
-
-      case INFO:
-        return getInfo();
-
       }
       throw new IllegalStateException();
     }
@@ -1749,10 +2402,6 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
-      case HANDLE:
-        return isSetHandle();
-      case INFO:
-        return isSetInfo();
       }
       throw new IllegalStateException();
     }
@@ -1761,33 +2410,15 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof sessionStart_args)
-        return this.equals((sessionStart_args)that);
+      if (that instanceof getNextSessionId_args)
+        return this.equals((getNextSessionId_args)that);
       return false;
     }
 
-    public boolean equals(sessionStart_args that) {
+    public boolean equals(getNextSessionId_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_handle = true && this.isSetHandle();
-      boolean that_present_handle = true && that.isSetHandle();
-      if (this_present_handle || that_present_handle) {
-        if (!(this_present_handle && that_present_handle))
-          return false;
-        if (!this.handle.equals(that.handle))
-          return false;
-      }
-
-      boolean this_present_info = true && this.isSetInfo();
-      boolean that_present_info = true && that.isSetInfo();
-      if (this_present_info || that_present_info) {
-        if (!(this_present_info && that_present_info))
-          return false;
-        if (!this.info.equals(that.info))
-          return false;
-      }
-
       return true;
     }
 
@@ -1796,34 +2427,14 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(sessionStart_args other) {
+    public int compareTo(getNextSessionId_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      sessionStart_args typedOther = (sessionStart_args)other;
+      getNextSessionId_args typedOther = (getNextSessionId_args)other;
 
-      lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetHandle()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.handle, typedOther.handle);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetInfo()).compareTo(typedOther.isSetInfo());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetInfo()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.info, typedOther.info);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -1841,21 +2452,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
-          case 1: // HANDLE
-            if (field.type == org.apache.thrift.protocol.TType.STRING) {
-              this.handle = iprot.readString();
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 2: // INFO
-            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-              this.info = new SessionInfo();
-              this.info.read(iprot);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -1871,40 +2467,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.handle != null) {
-        oprot.writeFieldBegin(HANDLE_FIELD_DESC);
-        oprot.writeString(this.handle);
-        oprot.writeFieldEnd();
-      }
-      if (this.info != null) {
-        oprot.writeFieldBegin(INFO_FIELD_DESC);
-        this.info.write(oprot);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("sessionStart_args(");
+      StringBuilder sb = new StringBuilder("getNextSessionId_args(");
       boolean first = true;
 
-      sb.append("handle:");
-      if (this.handle == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.handle);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("info:");
-      if (this.info == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.info);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -1931,14 +2502,14 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class sessionStart_result implements org.apache.thrift.TBase<sessionStart_result, sessionStart_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionStart_result");
+  public static class getNextSessionId_result implements org.apache.thrift.TBase<getNextSessionId_result, getNextSessionId_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getNextSessionId_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
     private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    public SessionRegistrationData success; // required
-    public InvalidSessionHandle e; // required
+    public String success; // required
+    public SafeModeException e; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -2007,19 +2578,19 @@ public String getFieldName() {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SessionRegistrationData.class)));
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
       tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionStart_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getNextSessionId_result.class, metaDataMap);
     }
 
-    public sessionStart_result() {
+    public getNextSessionId_result() {
     }
 
-    public sessionStart_result(
-      SessionRegistrationData success,
-      InvalidSessionHandle e)
+    public getNextSessionId_result(
+      String success,
+      SafeModeException e)
     {
       this();
       this.success = success;
@@ -2029,17 +2600,17 @@ public sessionStart_result(
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public sessionStart_result(sessionStart_result other) {
+    public getNextSessionId_result(getNextSessionId_result other) {
       if (other.isSetSuccess()) {
-        this.success = new SessionRegistrationData(other.success);
+        this.success = other.success;
       }
       if (other.isSetE()) {
-        this.e = new InvalidSessionHandle(other.e);
+        this.e = new SafeModeException(other.e);
       }
     }
 
-    public sessionStart_result deepCopy() {
-      return new sessionStart_result(this);
+    public getNextSessionId_result deepCopy() {
+      return new getNextSessionId_result(this);
     }
 
     @Override
@@ -2048,11 +2619,11 @@ public void clear() {
       this.e = null;
     }
 
-    public SessionRegistrationData getSuccess() {
+    public String getSuccess() {
       return this.success;
     }
 
-    public sessionStart_result setSuccess(SessionRegistrationData success) {
+    public getNextSessionId_result setSuccess(String success) {
       this.success = success;
       return this;
     }
@@ -2072,11 +2643,11 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
-    public InvalidSessionHandle getE() {
+    public SafeModeException getE() {
       return this.e;
     }
 
-    public sessionStart_result setE(InvalidSessionHandle e) {
+    public getNextSessionId_result setE(SafeModeException e) {
       this.e = e;
       return this;
     }
@@ -2102,7 +2673,7 @@ public void setFieldValue(_Fields field, Object value) {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((SessionRegistrationData)value);
+          setSuccess((String)value);
         }
         break;
 
@@ -2110,7 +2681,7 @@ public void setFieldValue(_Fields field, Object value) {
         if (value == null) {
           unsetE();
         } else {
-          setE((InvalidSessionHandle)value);
+          setE((SafeModeException)value);
         }
         break;
 
@@ -2148,12 +2719,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof sessionStart_result)
-        return this.equals((sessionStart_result)that);
+      if (that instanceof getNextSessionId_result)
+        return this.equals((getNextSessionId_result)that);
       return false;
     }
 
-    public boolean equals(sessionStart_result that) {
+    public boolean equals(getNextSessionId_result that) {
       if (that == null)
         return false;
 
@@ -2183,13 +2754,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(sessionStart_result other) {
+    public int compareTo(getNextSessionId_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      sessionStart_result typedOther = (sessionStart_result)other;
+      getNextSessionId_result typedOther = (getNextSessionId_result)other;
 
       lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
@@ -2229,16 +2800,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
         }
         switch (field.id) {
           case 0: // SUCCESS
-            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-              this.success = new SessionRegistrationData();
-              this.success.read(iprot);
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.success = iprot.readString();
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           case 1: // E
             if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-              this.e = new InvalidSessionHandle();
+              this.e = new SafeModeException();
               this.e.read(iprot);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
@@ -2260,7 +2830,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        this.success.write(oprot);
+        oprot.writeString(this.success);
         oprot.writeFieldEnd();
       } else if (this.isSetE()) {
         oprot.writeFieldBegin(E_FIELD_DESC);
@@ -2273,7 +2843,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("sessionStart_result(");
+      StringBuilder sb = new StringBuilder("getNextSessionId_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -2317,8 +2887,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class sessionUpdateInfo_args implements org.apache.thrift.TBase<sessionUpdateInfo_args, sessionUpdateInfo_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionUpdateInfo_args");
+  public static class sessionStart_args implements org.apache.thrift.TBase<sessionStart_args, sessionStart_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionStart_args");
 
     private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("info", org.apache.thrift.protocol.TType.STRUCT, (short)2);
@@ -2397,13 +2967,13 @@ public String getFieldName() {
       tmpMap.put(_Fields.INFO, new org.apache.thrift.meta_data.FieldMetaData("info", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SessionInfo.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionUpdateInfo_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionStart_args.class, metaDataMap);
     }
 
-    public sessionUpdateInfo_args() {
+    public sessionStart_args() {
     }
 
-    public sessionUpdateInfo_args(
+    public sessionStart_args(
       String handle,
       SessionInfo info)
     {
@@ -2415,7 +2985,7 @@ public sessionUpdateInfo_args(
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public sessionUpdateInfo_args(sessionUpdateInfo_args other) {
+    public sessionStart_args(sessionStart_args other) {
       if (other.isSetHandle()) {
         this.handle = other.handle;
       }
@@ -2424,8 +2994,8 @@ public sessionUpdateInfo_args(sessionUpdateInfo_args other) {
       }
     }
 
-    public sessionUpdateInfo_args deepCopy() {
-      return new sessionUpdateInfo_args(this);
+    public sessionStart_args deepCopy() {
+      return new sessionStart_args(this);
     }
 
     @Override
@@ -2438,7 +3008,7 @@ public String getHandle() {
       return this.handle;
     }
 
-    public sessionUpdateInfo_args setHandle(String handle) {
+    public sessionStart_args setHandle(String handle) {
       this.handle = handle;
       return this;
     }
@@ -2462,7 +3032,7 @@ public SessionInfo getInfo() {
       return this.info;
     }
 
-    public sessionUpdateInfo_args setInfo(SessionInfo info) {
+    public sessionStart_args setInfo(SessionInfo info) {
       this.info = info;
       return this;
     }
@@ -2534,12 +3104,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof sessionUpdateInfo_args)
-        return this.equals((sessionUpdateInfo_args)that);
+      if (that instanceof sessionStart_args)
+        return this.equals((sessionStart_args)that);
       return false;
     }
 
-    public boolean equals(sessionUpdateInfo_args that) {
+    public boolean equals(sessionStart_args that) {
       if (that == null)
         return false;
 
@@ -2569,13 +3139,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(sessionUpdateInfo_args other) {
+    public int compareTo(sessionStart_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      sessionUpdateInfo_args typedOther = (sessionUpdateInfo_args)other;
+      sessionStart_args typedOther = (sessionStart_args)other;
 
       lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
       if (lastComparison != 0) {
@@ -2660,7 +3230,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("sessionUpdateInfo_args(");
+      StringBuilder sb = new StringBuilder("sessionStart_args(");
       boolean first = true;
 
       sb.append("handle:");
@@ -2704,16 +3274,22 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class sessionUpdateInfo_result implements org.apache.thrift.TBase<sessionUpdateInfo_result, sessionUpdateInfo_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionUpdateInfo_result");
+  public static class sessionStart_result implements org.apache.thrift.TBase<sessionStart_result, sessionStart_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionStart_result");
 
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
     private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
+    public SessionRegistrationData success; // required
     public InvalidSessionHandle e; // required
+    public SafeModeException f; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      E((short)1, "e");
+      SUCCESS((short)0, "success"),
+      E((short)1, "e"),
+      F((short)2, "f");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -2728,8 +3304,12 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
           case 1: // E
             return E;
+          case 2: // F
+            return F;
           default:
             return null;
         }
@@ -2774,45 +3354,85 @@ public String getFieldName() {
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SessionRegistrationData.class)));
       tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionUpdateInfo_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionStart_result.class, metaDataMap);
     }
 
-    public sessionUpdateInfo_result() {
+    public sessionStart_result() {
     }
 
-    public sessionUpdateInfo_result(
-      InvalidSessionHandle e)
+    public sessionStart_result(
+      SessionRegistrationData success,
+      InvalidSessionHandle e,
+      SafeModeException f)
     {
       this();
+      this.success = success;
       this.e = e;
+      this.f = f;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public sessionUpdateInfo_result(sessionUpdateInfo_result other) {
+    public sessionStart_result(sessionStart_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new SessionRegistrationData(other.success);
+      }
       if (other.isSetE()) {
         this.e = new InvalidSessionHandle(other.e);
       }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
+      }
     }
 
-    public sessionUpdateInfo_result deepCopy() {
-      return new sessionUpdateInfo_result(this);
+    public sessionStart_result deepCopy() {
+      return new sessionStart_result(this);
     }
 
     @Override
     public void clear() {
+      this.success = null;
       this.e = null;
+      this.f = null;
+    }
+
+    public SessionRegistrationData getSuccess() {
+      return this.success;
+    }
+
+    public sessionStart_result setSuccess(SessionRegistrationData success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
     }
 
     public InvalidSessionHandle getE() {
       return this.e;
     }
 
-    public sessionUpdateInfo_result setE(InvalidSessionHandle e) {
+    public sessionStart_result setE(InvalidSessionHandle e) {
       this.e = e;
       return this;
     }
@@ -2832,8 +3452,40 @@ public void setEIsSet(boolean value) {
       }
     }
 
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public sessionStart_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((SessionRegistrationData)value);
+        }
+        break;
+
       case E:
         if (value == null) {
           unsetE();
@@ -2842,14 +3494,28 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
+        }
+        break;
+
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
       case E:
         return getE();
 
+      case F:
+        return getF();
+
       }
       throw new IllegalStateException();
     }
@@ -2861,8 +3527,12 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
       case E:
         return isSetE();
+      case F:
+        return isSetF();
       }
       throw new IllegalStateException();
     }
@@ -2871,15 +3541,24 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof sessionUpdateInfo_result)
-        return this.equals((sessionUpdateInfo_result)that);
+      if (that instanceof sessionStart_result)
+        return this.equals((sessionStart_result)that);
       return false;
     }
 
-    public boolean equals(sessionUpdateInfo_result that) {
+    public boolean equals(sessionStart_result that) {
       if (that == null)
         return false;
 
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
       boolean this_present_e = true && this.isSetE();
       boolean that_present_e = true && that.isSetE();
       if (this_present_e || that_present_e) {
@@ -2889,6 +3568,15 @@ public boolean equals(sessionUpdateInfo_result that) {
           return false;
       }
 
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
       return true;
     }
 
@@ -2897,14 +3585,24 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(sessionUpdateInfo_result other) {
+    public int compareTo(sessionStart_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      sessionUpdateInfo_result typedOther = (sessionUpdateInfo_result)other;
+      sessionStart_result typedOther = (sessionStart_result)other;
 
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
       if (lastComparison != 0) {
         return lastComparison;
@@ -2915,6 +3613,16 @@ public int compareTo(sessionUpdateInfo_result other) {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -2932,6 +3640,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new SessionRegistrationData();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           case 1: // E
             if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.e = new InvalidSessionHandle();
@@ -2940,6 +3656,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -2954,10 +3678,18 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetE()) {
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
         oprot.writeFieldBegin(E_FIELD_DESC);
         this.e.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -2965,9 +3697,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("sessionUpdateInfo_result(");
+      StringBuilder sb = new StringBuilder("sessionStart_result(");
       boolean first = true;
 
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("e:");
       if (this.e == null) {
         sb.append("null");
@@ -2975,6 +3715,14 @@ public String toString() {
         sb.append(this.e);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -3001,27 +3749,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class sessionEnd_args implements org.apache.thrift.TBase<sessionEnd_args, sessionEnd_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionEnd_args");
+  public static class sessionUpdateInfo_args implements org.apache.thrift.TBase<sessionUpdateInfo_args, sessionUpdateInfo_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionUpdateInfo_args");
 
     private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.I32, (short)2);
+    private static final org.apache.thrift.protocol.TField INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("info", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     public String handle; // required
-    /**
-     * 
-     * @see SessionStatus
-     */
-    public SessionStatus status; // required
+    public SessionInfo info; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       HANDLE((short)1, "handle"),
-      /**
-       * 
-       * @see SessionStatus
-       */
-      STATUS((short)2, "status");
+      INFO((short)2, "info");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -3038,8 +3778,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // HANDLE
             return HANDLE;
-          case 2: // STATUS
-            return STATUS;
+          case 2: // INFO
+            return INFO;
           default:
             return null;
         }
@@ -3086,51 +3826,51 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
-      tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SessionStatus.class)));
+      tmpMap.put(_Fields.INFO, new org.apache.thrift.meta_data.FieldMetaData("info", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SessionInfo.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionEnd_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionUpdateInfo_args.class, metaDataMap);
     }
 
-    public sessionEnd_args() {
+    public sessionUpdateInfo_args() {
     }
 
-    public sessionEnd_args(
+    public sessionUpdateInfo_args(
       String handle,
-      SessionStatus status)
+      SessionInfo info)
     {
       this();
       this.handle = handle;
-      this.status = status;
+      this.info = info;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public sessionEnd_args(sessionEnd_args other) {
+    public sessionUpdateInfo_args(sessionUpdateInfo_args other) {
       if (other.isSetHandle()) {
         this.handle = other.handle;
       }
-      if (other.isSetStatus()) {
-        this.status = other.status;
+      if (other.isSetInfo()) {
+        this.info = new SessionInfo(other.info);
       }
     }
 
-    public sessionEnd_args deepCopy() {
-      return new sessionEnd_args(this);
+    public sessionUpdateInfo_args deepCopy() {
+      return new sessionUpdateInfo_args(this);
     }
 
     @Override
     public void clear() {
       this.handle = null;
-      this.status = null;
+      this.info = null;
     }
 
     public String getHandle() {
       return this.handle;
     }
 
-    public sessionEnd_args setHandle(String handle) {
+    public sessionUpdateInfo_args setHandle(String handle) {
       this.handle = handle;
       return this;
     }
@@ -3150,35 +3890,27 @@ public void setHandleIsSet(boolean value) {
       }
     }
 
-    /**
-     * 
-     * @see SessionStatus
-     */
-    public SessionStatus getStatus() {
-      return this.status;
+    public SessionInfo getInfo() {
+      return this.info;
     }
 
-    /**
-     * 
-     * @see SessionStatus
-     */
-    public sessionEnd_args setStatus(SessionStatus status) {
-      this.status = status;
-      return this;
+    public sessionUpdateInfo_args setInfo(SessionInfo info) {
+      this.info = info;
+      return this;
     }
 
-    public void unsetStatus() {
-      this.status = null;
+    public void unsetInfo() {
+      this.info = null;
     }
 
-    /** Returns true if field status is set (has been assigned a value) and false otherwise */
-    public boolean isSetStatus() {
-      return this.status != null;
+    /** Returns true if field info is set (has been assigned a value) and false otherwise */
+    public boolean isSetInfo() {
+      return this.info != null;
     }
 
-    public void setStatusIsSet(boolean value) {
+    public void setInfoIsSet(boolean value) {
       if (!value) {
-        this.status = null;
+        this.info = null;
       }
     }
 
@@ -3192,11 +3924,11 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
-      case STATUS:
+      case INFO:
         if (value == null) {
-          unsetStatus();
+          unsetInfo();
         } else {
-          setStatus((SessionStatus)value);
+          setInfo((SessionInfo)value);
         }
         break;
 
@@ -3208,8 +3940,8 @@ public Object getFieldValue(_Fields field) {
       case HANDLE:
         return getHandle();
 
-      case STATUS:
-        return getStatus();
+      case INFO:
+        return getInfo();
 
       }
       throw new IllegalStateException();
@@ -3224,8 +3956,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case HANDLE:
         return isSetHandle();
-      case STATUS:
-        return isSetStatus();
+      case INFO:
+        return isSetInfo();
       }
       throw new IllegalStateException();
     }
@@ -3234,12 +3966,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof sessionEnd_args)
-        return this.equals((sessionEnd_args)that);
+      if (that instanceof sessionUpdateInfo_args)
+        return this.equals((sessionUpdateInfo_args)that);
       return false;
     }
 
-    public boolean equals(sessionEnd_args that) {
+    public boolean equals(sessionUpdateInfo_args that) {
       if (that == null)
         return false;
 
@@ -3252,12 +3984,12 @@ public boolean equals(sessionEnd_args that) {
           return false;
       }
 
-      boolean this_present_status = true && this.isSetStatus();
-      boolean that_present_status = true && that.isSetStatus();
-      if (this_present_status || that_present_status) {
-        if (!(this_present_status && that_present_status))
+      boolean this_present_info = true && this.isSetInfo();
+      boolean that_present_info = true && that.isSetInfo();
+      if (this_present_info || that_present_info) {
+        if (!(this_present_info && that_present_info))
           return false;
-        if (!this.status.equals(that.status))
+        if (!this.info.equals(that.info))
           return false;
       }
 
@@ -3269,13 +4001,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(sessionEnd_args other) {
+    public int compareTo(sessionUpdateInfo_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      sessionEnd_args typedOther = (sessionEnd_args)other;
+      sessionUpdateInfo_args typedOther = (sessionUpdateInfo_args)other;
 
       lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
       if (lastComparison != 0) {
@@ -3287,12 +4019,12 @@ public int compareTo(sessionEnd_args other) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus());
+      lastComparison = Boolean.valueOf(isSetInfo()).compareTo(typedOther.isSetInfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetStatus()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status);
+      if (isSetInfo()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.info, typedOther.info);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3321,9 +4053,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 2: // STATUS
-            if (field.type == org.apache.thrift.protocol.TType.I32) {
-              this.status = SessionStatus.findByValue(iprot.readI32());
+          case 2: // INFO
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.info = new SessionInfo();
+              this.info.read(iprot);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
@@ -3348,9 +4081,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeString(this.handle);
         oprot.writeFieldEnd();
       }
-      if (this.status != null) {
-        oprot.writeFieldBegin(STATUS_FIELD_DESC);
-        oprot.writeI32(this.status.getValue());
+      if (this.info != null) {
+        oprot.writeFieldBegin(INFO_FIELD_DESC);
+        this.info.write(oprot);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -3359,7 +4092,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("sessionEnd_args(");
+      StringBuilder sb = new StringBuilder("sessionUpdateInfo_args(");
       boolean first = true;
 
       sb.append("handle:");
@@ -3370,11 +4103,11 @@ public String toString() {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("status:");
-      if (this.status == null) {
+      sb.append("info:");
+      if (this.info == null) {
         sb.append("null");
       } else {
-        sb.append(this.status);
+        sb.append(this.info);
       }
       first = false;
       sb.append(")");
@@ -3403,16 +4136,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class sessionEnd_result implements org.apache.thrift.TBase<sessionEnd_result, sessionEnd_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionEnd_result");
+  public static class sessionUpdateInfo_result implements org.apache.thrift.TBase<sessionUpdateInfo_result, sessionUpdateInfo_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionUpdateInfo_result");
 
     private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     public InvalidSessionHandle e; // required
+    public SafeModeException f; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      E((short)1, "e");
+      E((short)1, "e"),
+      F((short)2, "f");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -3429,6 +4165,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // E
             return E;
+          case 2: // F
+            return F;
           default:
             return null;
         }
@@ -3475,43 +4213,51 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionEnd_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionUpdateInfo_result.class, metaDataMap);
     }
 
-    public sessionEnd_result() {
+    public sessionUpdateInfo_result() {
     }
 
-    public sessionEnd_result(
-      InvalidSessionHandle e)
+    public sessionUpdateInfo_result(
+      InvalidSessionHandle e,
+      SafeModeException f)
     {
       this();
       this.e = e;
+      this.f = f;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public sessionEnd_result(sessionEnd_result other) {
+    public sessionUpdateInfo_result(sessionUpdateInfo_result other) {
       if (other.isSetE()) {
         this.e = new InvalidSessionHandle(other.e);
       }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
+      }
     }
 
-    public sessionEnd_result deepCopy() {
-      return new sessionEnd_result(this);
+    public sessionUpdateInfo_result deepCopy() {
+      return new sessionUpdateInfo_result(this);
     }
 
     @Override
     public void clear() {
       this.e = null;
+      this.f = null;
     }
 
     public InvalidSessionHandle getE() {
       return this.e;
     }
 
-    public sessionEnd_result setE(InvalidSessionHandle e) {
+    public sessionUpdateInfo_result setE(InvalidSessionHandle e) {
       this.e = e;
       return this;
     }
@@ -3531,6 +4277,30 @@ public void setEIsSet(boolean value) {
       }
     }
 
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public sessionUpdateInfo_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case E:
@@ -3541,6 +4311,14 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
+        }
+        break;
+
       }
     }
 
@@ -3549,6 +4327,9 @@ public Object getFieldValue(_Fields field) {
       case E:
         return getE();
 
+      case F:
+        return getF();
+
       }
       throw new IllegalStateException();
     }
@@ -3562,6 +4343,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case E:
         return isSetE();
+      case F:
+        return isSetF();
       }
       throw new IllegalStateException();
     }
@@ -3570,12 +4353,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof sessionEnd_result)
-        return this.equals((sessionEnd_result)that);
+      if (that instanceof sessionUpdateInfo_result)
+        return this.equals((sessionUpdateInfo_result)that);
       return false;
     }
 
-    public boolean equals(sessionEnd_result that) {
+    public boolean equals(sessionUpdateInfo_result that) {
       if (that == null)
         return false;
 
@@ -3588,6 +4371,15 @@ public boolean equals(sessionEnd_result that) {
           return false;
       }
 
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
       return true;
     }
 
@@ -3596,13 +4388,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(sessionEnd_result other) {
+    public int compareTo(sessionUpdateInfo_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      sessionEnd_result typedOther = (sessionEnd_result)other;
+      sessionUpdateInfo_result typedOther = (sessionUpdateInfo_result)other;
 
       lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
       if (lastComparison != 0) {
@@ -3614,6 +4406,16 @@ public int compareTo(sessionEnd_result other) {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -3639,6 +4441,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -3657,6 +4467,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeFieldBegin(E_FIELD_DESC);
         this.e.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -3664,7 +4478,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("sessionEnd_result(");
+      StringBuilder sb = new StringBuilder("sessionUpdateInfo_result(");
       boolean first = true;
 
       sb.append("e:");
@@ -3674,6 +4488,14 @@ public String toString() {
         sb.append(this.e);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -3700,16 +4522,27 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class sessionHeartbeat_args implements org.apache.thrift.TBase<sessionHeartbeat_args, sessionHeartbeat_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionHeartbeat_args");
+  public static class sessionEnd_args implements org.apache.thrift.TBase<sessionEnd_args, sessionEnd_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionEnd_args");
 
     private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.I32, (short)2);
 
     public String handle; // required
+    /**
+     * 
+     * @see SessionStatus
+     */
+    public SessionStatus status; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      HANDLE((short)1, "handle");
+      HANDLE((short)1, "handle"),
+      /**
+       * 
+       * @see SessionStatus
+       */
+      STATUS((short)2, "status");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -3726,6 +4559,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // HANDLE
             return HANDLE;
+          case 2: // STATUS
+            return STATUS;
           default:
             return null;
         }
@@ -3772,43 +4607,51 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
+      tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SessionStatus.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionHeartbeat_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionEnd_args.class, metaDataMap);
     }
 
-    public sessionHeartbeat_args() {
+    public sessionEnd_args() {
     }
 
-    public sessionHeartbeat_args(
-      String handle)
+    public sessionEnd_args(
+      String handle,
+      SessionStatus status)
     {
       this();
       this.handle = handle;
+      this.status = status;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public sessionHeartbeat_args(sessionHeartbeat_args other) {
+    public sessionEnd_args(sessionEnd_args other) {
       if (other.isSetHandle()) {
         this.handle = other.handle;
       }
+      if (other.isSetStatus()) {
+        this.status = other.status;
+      }
     }
 
-    public sessionHeartbeat_args deepCopy() {
-      return new sessionHeartbeat_args(this);
+    public sessionEnd_args deepCopy() {
+      return new sessionEnd_args(this);
     }
 
     @Override
     public void clear() {
       this.handle = null;
+      this.status = null;
     }
 
     public String getHandle() {
       return this.handle;
     }
 
-    public sessionHeartbeat_args setHandle(String handle) {
+    public sessionEnd_args setHandle(String handle) {
       this.handle = handle;
       return this;
     }
@@ -3828,6 +4671,38 @@ public void setHandleIsSet(boolean value) {
       }
     }
 
+    /**
+     * 
+     * @see SessionStatus
+     */
+    public SessionStatus getStatus() {
+      return this.status;
+    }
+
+    /**
+     * 
+     * @see SessionStatus
+     */
+    public sessionEnd_args setStatus(SessionStatus status) {
+      this.status = status;
+      return this;
+    }
+
+    public void unsetStatus() {
+      this.status = null;
+    }
+
+    /** Returns true if field status is set (has been assigned a value) and false otherwise */
+    public boolean isSetStatus() {
+      return this.status != null;
+    }
+
+    public void setStatusIsSet(boolean value) {
+      if (!value) {
+        this.status = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case HANDLE:
@@ -3838,6 +4713,14 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
+      case STATUS:
+        if (value == null) {
+          unsetStatus();
+        } else {
+          setStatus((SessionStatus)value);
+        }
+        break;
+
       }
     }
 
@@ -3846,6 +4729,9 @@ public Object getFieldValue(_Fields field) {
       case HANDLE:
         return getHandle();
 
+      case STATUS:
+        return getStatus();
+
       }
       throw new IllegalStateException();
     }
@@ -3859,6 +4745,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case HANDLE:
         return isSetHandle();
+      case STATUS:
+        return isSetStatus();
       }
       throw new IllegalStateException();
     }
@@ -3867,12 +4755,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof sessionHeartbeat_args)
-        return this.equals((sessionHeartbeat_args)that);
+      if (that instanceof sessionEnd_args)
+        return this.equals((sessionEnd_args)that);
       return false;
     }
 
-    public boolean equals(sessionHeartbeat_args that) {
+    public boolean equals(sessionEnd_args that) {
       if (that == null)
         return false;
 
@@ -3885,6 +4773,15 @@ public boolean equals(sessionHeartbeat_args that) {
           return false;
       }
 
+      boolean this_present_status = true && this.isSetStatus();
+      boolean that_present_status = true && that.isSetStatus();
+      if (this_present_status || that_present_status) {
+        if (!(this_present_status && that_present_status))
+          return false;
+        if (!this.status.equals(that.status))
+          return false;
+      }
+
       return true;
     }
 
@@ -3893,13 +4790,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(sessionHeartbeat_args other) {
+    public int compareTo(sessionEnd_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      sessionHeartbeat_args typedOther = (sessionHeartbeat_args)other;
+      sessionEnd_args typedOther = (sessionEnd_args)other;
 
       lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
       if (lastComparison != 0) {
@@ -3911,6 +4808,16 @@ public int compareTo(sessionHeartbeat_args other) {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetStatus()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -3935,6 +4842,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // STATUS
+            if (field.type == org.apache.thrift.protocol.TType.I32) {
+              this.status = SessionStatus.findByValue(iprot.readI32());
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -3955,13 +4869,18 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeString(this.handle);
         oprot.writeFieldEnd();
       }
+      if (this.status != null) {
+        oprot.writeFieldBegin(STATUS_FIELD_DESC);
+        oprot.writeI32(this.status.getValue());
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("sessionHeartbeat_args(");
+      StringBuilder sb = new StringBuilder("sessionEnd_args(");
       boolean first = true;
 
       sb.append("handle:");
@@ -3971,6 +4890,14 @@ public String toString() {
         sb.append(this.handle);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("status:");
+      if (this.status == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.status);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -3997,16 +4924,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class sessionHeartbeat_result implements org.apache.thrift.TBase<sessionHeartbeat_result, sessionHeartbeat_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionHeartbeat_result");
+  public static class sessionEnd_result implements org.apache.thrift.TBase<sessionEnd_result, sessionEnd_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionEnd_result");
 
     private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     public InvalidSessionHandle e; // required
+    public SafeModeException f; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      E((short)1, "e");
+      E((short)1, "e"),
+      F((short)2, "f");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -4023,6 +4953,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // E
             return E;
+          case 2: // F
+            return F;
           default:
             return null;
         }
@@ -4069,43 +5001,51 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionHeartbeat_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionEnd_result.class, metaDataMap);
     }
 
-    public sessionHeartbeat_result() {
+    public sessionEnd_result() {
     }
 
-    public sessionHeartbeat_result(
-      InvalidSessionHandle e)
+    public sessionEnd_result(
+      InvalidSessionHandle e,
+      SafeModeException f)
     {
       this();
       this.e = e;
+      this.f = f;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public sessionHeartbeat_result(sessionHeartbeat_result other) {
+    public sessionEnd_result(sessionEnd_result other) {
       if (other.isSetE()) {
         this.e = new InvalidSessionHandle(other.e);
       }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
+      }
     }
 
-    public sessionHeartbeat_result deepCopy() {
-      return new sessionHeartbeat_result(this);
+    public sessionEnd_result deepCopy() {
+      return new sessionEnd_result(this);
     }
 
     @Override
     public void clear() {
       this.e = null;
+      this.f = null;
     }
 
     public InvalidSessionHandle getE() {
       return this.e;
     }
 
-    public sessionHeartbeat_result setE(InvalidSessionHandle e) {
+    public sessionEnd_result setE(InvalidSessionHandle e) {
       this.e = e;
       return this;
     }
@@ -4125,6 +5065,30 @@ public void setEIsSet(boolean value) {
       }
     }
 
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public sessionEnd_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case E:
@@ -4135,6 +5099,14 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
+        }
+        break;
+
       }
     }
 
@@ -4143,6 +5115,9 @@ public Object getFieldValue(_Fields field) {
       case E:
         return getE();
 
+      case F:
+        return getF();
+
       }
       throw new IllegalStateException();
     }
@@ -4156,6 +5131,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case E:
         return isSetE();
+      case F:
+        return isSetF();
       }
       throw new IllegalStateException();
     }
@@ -4164,12 +5141,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof sessionHeartbeat_result)
-        return this.equals((sessionHeartbeat_result)that);
+      if (that instanceof sessionEnd_result)
+        return this.equals((sessionEnd_result)that);
       return false;
     }
 
-    public boolean equals(sessionHeartbeat_result that) {
+    public boolean equals(sessionEnd_result that) {
       if (that == null)
         return false;
 
@@ -4182,6 +5159,15 @@ public boolean equals(sessionHeartbeat_result that) {
           return false;
       }
 
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
       return true;
     }
 
@@ -4190,13 +5176,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(sessionHeartbeat_result other) {
+    public int compareTo(sessionEnd_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      sessionHeartbeat_result typedOther = (sessionHeartbeat_result)other;
+      sessionEnd_result typedOther = (sessionEnd_result)other;
 
       lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
       if (lastComparison != 0) {
@@ -4208,6 +5194,16 @@ public int compareTo(sessionHeartbeat_result other) {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -4233,6 +5229,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -4251,6 +5255,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeFieldBegin(E_FIELD_DESC);
         this.e.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -4258,7 +5266,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("sessionHeartbeat_result(");
+      StringBuilder sb = new StringBuilder("sessionEnd_result(");
       boolean first = true;
 
       sb.append("e:");
@@ -4268,6 +5276,14 @@ public String toString() {
         sb.append(this.e);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -4294,19 +5310,16 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class requestResource_args implements org.apache.thrift.TBase<requestResource_args, requestResource_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("requestResource_args");
+  public static class sessionHeartbeat_args implements org.apache.thrift.TBase<sessionHeartbeat_args, sessionHeartbeat_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionHeartbeat_args");
 
     private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField REQUEST_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("requestList", org.apache.thrift.protocol.TType.LIST, (short)2);
 
     public String handle; // required
-    public List<ResourceRequest> requestList; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      HANDLE((short)1, "handle"),
-      REQUEST_LIST((short)2, "requestList");
+      HANDLE((short)1, "handle");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -4323,8 +5336,6 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // HANDLE
             return HANDLE;
-          case 2: // REQUEST_LIST
-            return REQUEST_LIST;
           default:
             return null;
         }
@@ -4371,56 +5382,43 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
-      tmpMap.put(_Fields.REQUEST_LIST, new org.apache.thrift.meta_data.FieldMetaData("requestList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ResourceRequest.class))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestResource_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionHeartbeat_args.class, metaDataMap);
     }
 
-    public requestResource_args() {
+    public sessionHeartbeat_args() {
     }
 
-    public requestResource_args(
-      String handle,
-      List<ResourceRequest> requestList)
+    public sessionHeartbeat_args(
+      String handle)
     {
       this();
       this.handle = handle;
-      this.requestList = requestList;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public requestResource_args(requestResource_args other) {
+    public sessionHeartbeat_args(sessionHeartbeat_args other) {
       if (other.isSetHandle()) {
         this.handle = other.handle;
       }
-      if (other.isSetRequestList()) {
-        List<ResourceRequest> __this__requestList = new ArrayList<ResourceRequest>();
-        for (ResourceRequest other_element : other.requestList) {
-          __this__requestList.add(new ResourceRequest(other_element));
-        }
-        this.requestList = __this__requestList;
-      }
     }
 
-    public requestResource_args deepCopy() {
-      return new requestResource_args(this);
+    public sessionHeartbeat_args deepCopy() {
+      return new sessionHeartbeat_args(this);
     }
 
     @Override
     public void clear() {
       this.handle = null;
-      this.requestList = null;
     }
 
     public String getHandle() {
       return this.handle;
     }
 
-    public requestResource_args setHandle(String handle) {
+    public sessionHeartbeat_args setHandle(String handle) {
       this.handle = handle;
       return this;
     }
@@ -4440,45 +5438,6 @@ public void setHandleIsSet(boolean value) {
       }
     }
 
-    public int getRequestListSize() {
-      return (this.requestList == null) ? 0 : this.requestList.size();
-    }
-
-    public java.util.Iterator<ResourceRequest> getRequestListIterator() {
-      return (this.requestList == null) ? null : this.requestList.iterator();
-    }
-
-    public void addToRequestList(ResourceRequest elem) {
-      if (this.requestList == null) {
-        this.requestList = new ArrayList<ResourceRequest>();
-      }
-      this.requestList.add(elem);
-    }
-
-    public List<ResourceRequest> getRequestList() {
-      return this.requestList;
-    }
-
-    public requestResource_args setRequestList(List<ResourceRequest> requestList) {
-      this.requestList = requestList;
-      return this;
-    }
-
-    public void unsetRequestList() {
-      this.requestList = null;
-    }
-
-    /** Returns true if field requestList is set (has been assigned a value) and false otherwise */
-    public boolean isSetRequestList() {
-      return this.requestList != null;
-    }
-
-    public void setRequestListIsSet(boolean value) {
-      if (!value) {
-        this.requestList = null;
-      }
-    }
-
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case HANDLE:
@@ -4489,14 +5448,6 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
-      case REQUEST_LIST:
-        if (value == null) {
-          unsetRequestList();
-        } else {
-          setRequestList((List<ResourceRequest>)value);
-        }
-        break;
-
       }
     }
 
@@ -4505,9 +5456,6 @@ public Object getFieldValue(_Fields field) {
       case HANDLE:
         return getHandle();
 
-      case REQUEST_LIST:
-        return getRequestList();
-
       }
       throw new IllegalStateException();
     }
@@ -4521,8 +5469,6 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case HANDLE:
         return isSetHandle();
-      case REQUEST_LIST:
-        return isSetRequestList();
       }
       throw new IllegalStateException();
     }
@@ -4531,12 +5477,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof requestResource_args)
-        return this.equals((requestResource_args)that);
+      if (that instanceof sessionHeartbeat_args)
+        return this.equals((sessionHeartbeat_args)that);
       return false;
     }
 
-    public boolean equals(requestResource_args that) {
+    public boolean equals(sessionHeartbeat_args that) {
       if (that == null)
         return false;
 
@@ -4549,15 +5495,6 @@ public boolean equals(requestResource_args that) {
           return false;
       }
 
-      boolean this_present_requestList = true && this.isSetRequestList();
-      boolean that_present_requestList = true && that.isSetRequestList();
-      if (this_present_requestList || that_present_requestList) {
-        if (!(this_present_requestList && that_present_requestList))
-          return false;
-        if (!this.requestList.equals(that.requestList))
-          return false;
-      }
-
       return true;
     }
 
@@ -4566,13 +5503,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(requestResource_args other) {
+    public int compareTo(sessionHeartbeat_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      requestResource_args typedOther = (requestResource_args)other;
+      sessionHeartbeat_args typedOther = (sessionHeartbeat_args)other;
 
       lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
       if (lastComparison != 0) {
@@ -4584,16 +5521,6 @@ public int compareTo(requestResource_args other) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetRequestList()).compareTo(typedOther.isSetRequestList());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetRequestList()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestList, typedOther.requestList);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -4618,24 +5545,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 2: // REQUEST_LIST
-            if (field.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
-                this.requestList = new ArrayList<ResourceRequest>(_list30.size);
-                for (int _i31 = 0; _i31 < _list30.size; ++_i31)
-                {
-                  ResourceRequest _elem32; // required
-                  _elem32 = new ResourceRequest();
-                  _elem32.read(iprot);
-                  this.requestList.add(_elem32);
-                }
-                iprot.readListEnd();
-              }
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -4656,25 +5565,13 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeString(this.handle);
         oprot.writeFieldEnd();
       }
-      if (this.requestList != null) {
-        oprot.writeFieldBegin(REQUEST_LIST_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.requestList.size()));
-          for (ResourceRequest _iter33 : this.requestList)
-          {
-            _iter33.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("requestResource_args(");
+      StringBuilder sb = new StringBuilder("sessionHeartbeat_args(");
       boolean first = true;
 
       sb.append("handle:");
@@ -4684,14 +5581,6 @@ public String toString() {
         sb.append(this.handle);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("requestList:");
-      if (this.requestList == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.requestList);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -4718,16 +5607,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class requestResource_result implements org.apache.thrift.TBase<requestResource_result, requestResource_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("requestResource_result");
+  public static class sessionHeartbeat_result implements org.apache.thrift.TBase<sessionHeartbeat_result, sessionHeartbeat_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionHeartbeat_result");
 
     private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     public InvalidSessionHandle e; // required
+    public SafeModeException f; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      E((short)1, "e");
+      E((short)1, "e"),
+      F((short)2, "f");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -4744,6 +5636,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // E
             return E;
+          case 2: // F
+            return F;
           default:
             return null;
         }
@@ -4790,43 +5684,51 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestResource_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionHeartbeat_result.class, metaDataMap);
     }
 
-    public requestResource_result() {
+    public sessionHeartbeat_result() {
     }
 
-    public requestResource_result(
-      InvalidSessionHandle e)
+    public sessionHeartbeat_result(
+      InvalidSessionHandle e,
+      SafeModeException f)
     {
       this();
       this.e = e;
+      this.f = f;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public requestResource_result(requestResource_result other) {
+    public sessionHeartbeat_result(sessionHeartbeat_result other) {
       if (other.isSetE()) {
         this.e = new InvalidSessionHandle(other.e);
       }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
+      }
     }
 
-    public requestResource_result deepCopy() {
-      return new requestResource_result(this);
+    public sessionHeartbeat_result deepCopy() {
+      return new sessionHeartbeat_result(this);
     }
 
     @Override
     public void clear() {
       this.e = null;
+      this.f = null;
     }
 
     public InvalidSessionHandle getE() {
       return this.e;
     }
 
-    public requestResource_result setE(InvalidSessionHandle e) {
+    public sessionHeartbeat_result setE(InvalidSessionHandle e) {
       this.e = e;
       return this;
     }
@@ -4846,6 +5748,30 @@ public void setEIsSet(boolean value) {
       }
     }
 
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public sessionHeartbeat_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case E:
@@ -4856,6 +5782,14 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
+        }
+        break;
+
       }
     }
 
@@ -4864,6 +5798,9 @@ public Object getFieldValue(_Fields field) {
       case E:
         return getE();
 
+      case F:
+        return getF();
+
       }
       throw new IllegalStateException();
     }
@@ -4877,6 +5814,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case E:
         return isSetE();
+      case F:
+        return isSetF();
       }
       throw new IllegalStateException();
     }
@@ -4885,12 +5824,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof requestResource_result)
-        return this.equals((requestResource_result)that);
+      if (that instanceof sessionHeartbeat_result)
+        return this.equals((sessionHeartbeat_result)that);
       return false;
     }
 
-    public boolean equals(requestResource_result that) {
+    public boolean equals(sessionHeartbeat_result that) {
       if (that == null)
         return false;
 
@@ -4903,6 +5842,15 @@ public boolean equals(requestResource_result that) {
           return false;
       }
 
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
       return true;
     }
 
@@ -4911,13 +5859,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(requestResource_result other) {
+    public int compareTo(sessionHeartbeat_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      requestResource_result typedOther = (requestResource_result)other;
+      sessionHeartbeat_result typedOther = (sessionHeartbeat_result)other;
 
       lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
       if (lastComparison != 0) {
@@ -4929,6 +5877,16 @@ public int compareTo(requestResource_result other) {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -4954,6 +5912,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -4972,6 +5938,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeFieldBegin(E_FIELD_DESC);
         this.e.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -4979,7 +5949,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("requestResource_result(");
+      StringBuilder sb = new StringBuilder("sessionHeartbeat_result(");
       boolean first = true;
 
       sb.append("e:");
@@ -4989,6 +5959,14 @@ public String toString() {
         sb.append(this.e);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -5015,19 +5993,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class releaseResource_args implements org.apache.thrift.TBase<releaseResource_args, releaseResource_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("releaseResource_args");
+  public static class sessionHeartbeatV2_args implements org.apache.thrift.TBase<sessionHeartbeatV2_args, sessionHeartbeatV2_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionHeartbeatV2_args");
 
     private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("idList", org.apache.thrift.protocol.TType.LIST, (short)2);
+    private static final org.apache.thrift.protocol.TField HEARTBEAT_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("heartbeatArgs", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     public String handle; // required
-    public List<Integer> idList; // required
+    public HeartbeatArgs heartbeatArgs; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       HANDLE((short)1, "handle"),
-      ID_LIST((short)2, "idList");
+      HEARTBEAT_ARGS((short)2, "heartbeatArgs");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -5044,8 +6022,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // HANDLE
             return HANDLE;
-          case 2: // ID_LIST
-            return ID_LIST;
+          case 2: // HEARTBEAT_ARGS
+            return HEARTBEAT_ARGS;
           default:
             return null;
         }
@@ -5092,56 +6070,51 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
-      tmpMap.put(_Fields.ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("idList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32              , "ResourceRequestId"))));
+      tmpMap.put(_Fields.HEARTBEAT_ARGS, new org.apache.thrift.meta_data.FieldMetaData("heartbeatArgs", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HeartbeatArgs.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(releaseResource_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionHeartbeatV2_args.class, metaDataMap);
     }
 
-    public releaseResource_args() {
+    public sessionHeartbeatV2_args() {
     }
 
-    public releaseResource_args(
+    public sessionHeartbeatV2_args(
       String handle,
-      List<Integer> idList)
+      HeartbeatArgs heartbeatArgs)
     {
       this();
       this.handle = handle;
-      this.idList = idList;
+      this.heartbeatArgs = heartbeatArgs;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public releaseResource_args(releaseResource_args other) {
+    public sessionHeartbeatV2_args(sessionHeartbeatV2_args other) {
       if (other.isSetHandle()) {
         this.handle = other.handle;
       }
-      if (other.isSetIdList()) {
-        List<Integer> __this__idList = new ArrayList<Integer>();
-        for (Integer other_element : other.idList) {
-          __this__idList.add(other_element);
-        }
-        this.idList = __this__idList;
+      if (other.isSetHeartbeatArgs()) {
+        this.heartbeatArgs = new HeartbeatArgs(other.heartbeatArgs);
       }
     }
 
-    public releaseResource_args deepCopy() {
-      return new releaseResource_args(this);
+    public sessionHeartbeatV2_args deepCopy() {
+      return new sessionHeartbeatV2_args(this);
     }
 
     @Override
     public void clear() {
       this.handle = null;
-      this.idList = null;
+      this.heartbeatArgs = null;
     }
 
     public String getHandle() {
       return this.handle;
     }
 
-    public releaseResource_args setHandle(String handle) {
+    public sessionHeartbeatV2_args setHandle(String handle) {
       this.handle = handle;
       return this;
     }
@@ -5161,42 +6134,27 @@ public void setHandleIsSet(boolean value) {
       }
     }
 
-    public int getIdListSize() {
-      return (this.idList == null) ? 0 : this.idList.size();
-    }
-
-    public java.util.Iterator<Integer> getIdListIterator() {
-      return (this.idList == null) ? null : this.idList.iterator();
-    }
-
-    public void addToIdList(int elem) {
-      if (this.idList == null) {
-        this.idList = new ArrayList<Integer>();
-      }
-      this.idList.add(elem);
-    }
-
-    public List<Integer> getIdList() {
-      return this.idList;
+    public HeartbeatArgs getHeartbeatArgs() {
+      return this.heartbeatArgs;
     }
 
-    public releaseResource_args setIdList(List<Integer> idList) {
-      this.idList = idList;
+    public sessionHeartbeatV2_args setHeartbeatArgs(HeartbeatArgs heartbeatArgs) {
+      this.heartbeatArgs = heartbeatArgs;
       return this;
     }
 
-    public void unsetIdList() {
-      this.idList = null;
+    public void unsetHeartbeatArgs() {
+      this.heartbeatArgs = null;
     }
 
-    /** Returns true if field idList is set (has been assigned a value) and false otherwise */
-    public boolean isSetIdList() {
-      return this.idList != null;
+    /** Returns true if field heartbeatArgs is set (has been assigned a value) and false otherwise */
+    public boolean isSetHeartbeatArgs() {
+      return this.heartbeatArgs != null;
     }
 
-    public void setIdListIsSet(boolean value) {
+    public void setHeartbeatArgsIsSet(boolean value) {
       if (!value) {
-        this.idList = null;
+        this.heartbeatArgs = null;
       }
     }
 
@@ -5210,11 +6168,11 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
-      case ID_LIST:
+      case HEARTBEAT_ARGS:
         if (value == null) {
-          unsetIdList();
+          unsetHeartbeatArgs();
         } else {
-          setIdList((List<Integer>)value);
+          setHeartbeatArgs((HeartbeatArgs)value);
         }
         break;
 
@@ -5226,8 +6184,8 @@ public Object getFieldValue(_Fields field) {
       case HANDLE:
         return getHandle();
 
-      case ID_LIST:
-        return getIdList();
+      case HEARTBEAT_ARGS:
+        return getHeartbeatArgs();
 
       }
       throw new IllegalStateException();
@@ -5242,8 +6200,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case HANDLE:
         return isSetHandle();
-      case ID_LIST:
-        return isSetIdList();
+      case HEARTBEAT_ARGS:
+        return isSetHeartbeatArgs();
       }
       throw new IllegalStateException();
     }
@@ -5252,12 +6210,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof releaseResource_args)
-        return this.equals((releaseResource_args)that);
+      if (that instanceof sessionHeartbeatV2_args)
+        return this.equals((sessionHeartbeatV2_args)that);
       return false;
     }
 
-    public boolean equals(releaseResource_args that) {
+    public boolean equals(sessionHeartbeatV2_args that) {
       if (that == null)
         return false;
 
@@ -5270,12 +6228,12 @@ public boolean equals(releaseResource_args that) {
           return false;
       }
 
-      boolean this_present_idList = true && this.isSetIdList();
-      boolean that_present_idList = true && that.isSetIdList();
-      if (this_present_idList || that_present_idList) {
-        if (!(this_present_idList && that_present_idList))
+      boolean this_present_heartbeatArgs = true && this.isSetHeartbeatArgs();
+      boolean that_present_heartbeatArgs = true && that.isSetHeartbeatArgs();
+      if (this_present_heartbeatArgs || that_present_heartbeatArgs) {
+        if (!(this_present_heartbeatArgs && that_present_heartbeatArgs))
           return false;
-        if (!this.idList.equals(that.idList))
+        if (!this.heartbeatArgs.equals(that.heartbeatArgs))
           return false;
       }
 
@@ -5287,13 +6245,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(releaseResource_args other) {
+    public int compareTo(sessionHeartbeatV2_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      releaseResource_args typedOther = (releaseResource_args)other;
+      sessionHeartbeatV2_args typedOther = (sessionHeartbeatV2_args)other;
 
       lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
       if (lastComparison != 0) {
@@ -5305,12 +6263,12 @@ public int compareTo(releaseResource_args other) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetIdList()).compareTo(typedOther.isSetIdList());
+      lastComparison = Boolean.valueOf(isSetHeartbeatArgs()).compareTo(typedOther.isSetHeartbeatArgs());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetIdList()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.idList, typedOther.idList);
+      if (isSetHeartbeatArgs()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.heartbeatArgs, typedOther.heartbeatArgs);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5339,19 +6297,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 2: // ID_LIST
-            if (field.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
-                this.idList = new ArrayList<Integer>(_list34.size);
-                for (int _i35 = 0; _i35 < _list34.size; ++_i35)
-                {
-                  int _elem36; // required
-                  _elem36 = iprot.readI32();
-                  this.idList.add(_elem36);
-                }
-                iprot.readListEnd();
-              }
+          case 2: // HEARTBEAT_ARGS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.heartbeatArgs = new HeartbeatArgs();
+              this.heartbeatArgs.read(iprot);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
@@ -5376,16 +6325,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeString(this.handle);
         oprot.writeFieldEnd();
       }
-      if (this.idList != null) {
-        oprot.writeFieldBegin(ID_LIST_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, this.idList.size()));
-          for (int _iter37 : this.idList)
-          {
-            oprot.writeI32(_iter37);
-          }
-          oprot.writeListEnd();
-        }
+      if (this.heartbeatArgs != null) {
+        oprot.writeFieldBegin(HEARTBEAT_ARGS_FIELD_DESC);
+        this.heartbeatArgs.write(oprot);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -5394,7 +6336,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("releaseResource_args(");
+      StringBuilder sb = new StringBuilder("sessionHeartbeatV2_args(");
       boolean first = true;
 
       sb.append("handle:");
@@ -5405,11 +6347,11 @@ public String toString() {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("idList:");
-      if (this.idList == null) {
+      sb.append("heartbeatArgs:");
+      if (this.heartbeatArgs == null) {
         sb.append("null");
       } else {
-        sb.append(this.idList);
+        sb.append(this.heartbeatArgs);
       }
       first = false;
       sb.append(")");
@@ -5438,16 +6380,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class releaseResource_result implements org.apache.thrift.TBase<releaseResource_result, releaseResource_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("releaseResource_result");
+  public static class sessionHeartbeatV2_result implements org.apache.thrift.TBase<sessionHeartbeatV2_result, sessionHeartbeatV2_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sessionHeartbeatV2_result");
 
     private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     public InvalidSessionHandle e; // required
+    public SafeModeException f; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      E((short)1, "e");
+      E((short)1, "e"),
+      F((short)2, "f");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -5464,6 +6409,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // E
             return E;
+          case 2: // F
+            return F;
           default:
             return null;
         }
@@ -5510,43 +6457,51 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(releaseResource_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sessionHeartbeatV2_result.class, metaDataMap);
     }
 
-    public releaseResource_result() {
+    public sessionHeartbeatV2_result() {
     }
 
-    public releaseResource_result(
-      InvalidSessionHandle e)
+    public sessionHeartbeatV2_result(
+      InvalidSessionHandle e,
+      SafeModeException f)
     {
       this();
       this.e = e;
+      this.f = f;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public releaseResource_result(releaseResource_result other) {
+    public sessionHeartbeatV2_result(sessionHeartbeatV2_result other) {
       if (other.isSetE()) {
         this.e = new InvalidSessionHandle(other.e);
       }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
+      }
     }
 
-    public releaseResource_result deepCopy() {
-      return new releaseResource_result(this);
+    public sessionHeartbeatV2_result deepCopy() {
+      return new sessionHeartbeatV2_result(this);
     }
 
     @Override
     public void clear() {
       this.e = null;
+      this.f = null;
     }
 
     public InvalidSessionHandle getE() {
       return this.e;
     }
 
-    public releaseResource_result setE(InvalidSessionHandle e) {
+    public sessionHeartbeatV2_result setE(InvalidSessionHandle e) {
       this.e = e;
       return this;
     }
@@ -5566,6 +6521,30 @@ public void setEIsSet(boolean value) {
       }
     }
 
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public sessionHeartbeatV2_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case E:
@@ -5576,6 +6555,14 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
+        }
+        break;
+
       }
     }
 
@@ -5584,6 +6571,9 @@ public Object getFieldValue(_Fields field) {
       case E:
         return getE();
 
+      case F:
+        return getF();
+
       }
       throw new IllegalStateException();
     }
@@ -5597,6 +6587,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case E:
         return isSetE();
+      case F:
+        return isSetF();
       }
       throw new IllegalStateException();
     }
@@ -5605,12 +6597,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof releaseResource_result)
-        return this.equals((releaseResource_result)that);
+      if (that instanceof sessionHeartbeatV2_result)
+        return this.equals((sessionHeartbeatV2_result)that);
       return false;
     }
 
-    public boolean equals(releaseResource_result that) {
+    public boolean equals(sessionHeartbeatV2_result that) {
       if (that == null)
         return false;
 
@@ -5623,6 +6615,15 @@ public boolean equals(releaseResource_result that) {
           return false;
       }
 
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
       return true;
     }
 
@@ -5631,13 +6632,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(releaseResource_result other) {
+    public int compareTo(sessionHeartbeatV2_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      releaseResource_result typedOther = (releaseResource_result)other;
+      sessionHeartbeatV2_result typedOther = (sessionHeartbeatV2_result)other;
 
       lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
       if (lastComparison != 0) {
@@ -5649,6 +6650,16 @@ public int compareTo(releaseResource_result other) {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -5674,6 +6685,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -5692,6 +6711,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeFieldBegin(E_FIELD_DESC);
         this.e.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -5699,7 +6722,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("releaseResource_result(");
+      StringBuilder sb = new StringBuilder("sessionHeartbeatV2_result(");
       boolean first = true;
 
       sb.append("e:");
@@ -5709,6 +6732,14 @@ public String toString() {
         sb.append(this.e);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -5735,16 +6766,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class nodeHeartbeat_args implements org.apache.thrift.TBase<nodeHeartbeat_args, nodeHeartbeat_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("nodeHeartbeat_args");
-
-    private static final org.apache.thrift.protocol.TField NODE_FIELD_DESC = new org.apache.thrift.protocol.TField("node", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+  public static class requestResource_args implements org.apache.thrift.TBase<requestResource_args, requestResource_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("requestResource_args");
 
-    public ClusterNodeInfo node; // required
+    private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField REQUEST_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("requestList", org.apache.thrift.protocol.TType.LIST, (short)2);
+
+    public String handle; // required
+    public List<ResourceRequest> requestList; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      NODE((short)1, "node");
+      HANDLE((short)1, "handle"),
+      REQUEST_LIST((short)2, "requestList");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -5759,8 +6793,10 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // NODE
-            return NODE;
+          case 1: // HANDLE
+            return HANDLE;
+          case 2: // REQUEST_LIST
+            return REQUEST_LIST;
           default:
             return null;
         }
@@ -5805,71 +6841,131 @@ public String getFieldName() {
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.NODE, new org.apache.thrift.meta_data.FieldMetaData("node", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ClusterNodeInfo.class)));
+      tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
+      tmpMap.put(_Fields.REQUEST_LIST, new org.apache.thrift.meta_data.FieldMetaData("requestList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ResourceRequest.class))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(nodeHeartbeat_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestResource_args.class, metaDataMap);
     }
 
-    public nodeHeartbeat_args() {
+    public requestResource_args() {
     }
 
-    public nodeHeartbeat_args(
-      ClusterNodeInfo node)
+    public requestResource_args(
+      String handle,
+      List<ResourceRequest> requestList)
     {
       this();
-      this.node = node;
+      this.handle = handle;
+      this.requestList = requestList;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public nodeHeartbeat_args(nodeHeartbeat_args other) {
-      if (other.isSetNode()) {
-        this.node = new ClusterNodeInfo(other.node);
+    public requestResource_args(requestResource_args other) {
+      if (other.isSetHandle()) {
+        this.handle = other.handle;
+      }
+      if (other.isSetRequestList()) {
+        List<ResourceRequest> __this__requestList = new ArrayList<ResourceRequest>();
+        for (ResourceRequest other_element : other.requestList) {
+          __this__requestList.add(new ResourceRequest(other_element));
+        }
+        this.requestList = __this__requestList;
       }
     }
 
-    public nodeHeartbeat_args deepCopy() {
-      return new nodeHeartbeat_args(this);
+    public requestResource_args deepCopy() {
+      return new requestResource_args(this);
     }
 
     @Override
     public void clear() {
-      this.node = null;
+      this.handle = null;
+      this.requestList = null;
     }
 
-    public ClusterNodeInfo getNode() {
-      return this.node;
+    public String getHandle() {
+      return this.handle;
     }
 
-    public nodeHeartbeat_args setNode(ClusterNodeInfo node) {
-      this.node = node;
+    public requestResource_args setHandle(String handle) {
+      this.handle = handle;
       return this;
     }
 
-    public void unsetNode() {
-      this.node = null;
+    public void unsetHandle() {
+      this.handle = null;
     }
 
-    /** Returns true if field node is set (has been assigned a value) and false otherwise */
-    public boolean isSetNode() {
-      return this.node != null;
+    /** Returns true if field handle is set (has been assigned a value) and false otherwise */
+    public boolean isSetHandle() {
+      return this.handle != null;
     }
 
-    public void setNodeIsSet(boolean value) {
+    public void setHandleIsSet(boolean value) {
       if (!value) {
-        this.node = null;
+        this.handle = null;
+      }
+    }
+
+    public int getRequestListSize() {
+      return (this.requestList == null) ? 0 : this.requestList.size();
+    }
+
+    public java.util.Iterator<ResourceRequest> getRequestListIterator() {
+      return (this.requestList == null) ? null : this.requestList.iterator();
+    }
+
+    public void addToRequestList(ResourceRequest elem) {
+      if (this.requestList == null) {
+        this.requestList = new ArrayList<ResourceRequest>();
+      }
+      this.requestList.add(elem);
+    }
+
+    public List<ResourceRequest> getRequestList() {
+      return this.requestList;
+    }
+
+    public requestResource_args setRequestList(List<ResourceRequest> requestList) {
+      this.requestList = requestList;
+      return this;
+    }
+
+    public void unsetRequestList() {
+      this.requestList = null;
+    }
+
+    /** Returns true if field requestList is set (has been assigned a value) and false otherwise */
+    public boolean isSetRequestList() {
+      return this.requestList != null;
+    }
+
+    public void setRequestListIsSet(boolean value) {
+      if (!value) {
+        this.requestList = null;
       }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case NODE:
+      case HANDLE:
         if (value == null) {
-          unsetNode();
+          unsetHandle();
         } else {
-          setNode((ClusterNodeInfo)value);
+          setHandle((String)value);
+        }
+        break;
+
+      case REQUEST_LIST:
+        if (value == null) {
+          unsetRequestList();
+        } else {
+          setRequestList((List<ResourceRequest>)value);
         }
         break;
 
@@ -5878,8 +6974,11 @@ public void setFieldValue(_Fields field, Object value) {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case NODE:
-        return getNode();
+      case HANDLE:
+        return getHandle();
+
+      case REQUEST_LIST:
+        return getRequestList();
 
       }
       throw new IllegalStateException();
@@ -5892,8 +6991,10 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
-      case NODE:
-        return isSetNode();
+      case HANDLE:
+        return isSetHandle();
+      case REQUEST_LIST:
+        return isSetRequestList();
       }
       throw new IllegalStateException();
     }
@@ -5902,21 +7003,30 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof nodeHeartbeat_args)
-        return this.equals((nodeHeartbeat_args)that);
+      if (that instanceof requestResource_args)
+        return this.equals((requestResource_args)that);
       return false;
     }
 
-    public boolean equals(nodeHeartbeat_args that) {
+    public boolean equals(requestResource_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_node = true && this.isSetNode();
-      boolean that_present_node = true && that.isSetNode();
-      if (this_present_node || that_present_node) {
-        if (!(this_present_node && that_present_node))
+      boolean this_present_handle = true && this.isSetHandle();
+      boolean that_present_handle = true && that.isSetHandle();
+      if (this_present_handle || that_present_handle) {
+        if (!(this_present_handle && that_present_handle))
           return false;
-        if (!this.node.equals(that.node))
+        if (!this.handle.equals(that.handle))
+          return false;
+      }
+
+      boolean this_present_requestList = true && this.isSetRequestList();
+      boolean that_present_requestList = true && that.isSetRequestList();
+      if (this_present_requestList || that_present_requestList) {
+        if (!(this_present_requestList && that_present_requestList))
+          return false;
+        if (!this.requestList.equals(that.requestList))
           return false;
       }
 
@@ -5928,20 +7038,30 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(nodeHeartbeat_args other) {
+    public int compareTo(requestResource_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      nodeHeartbeat_args typedOther = (nodeHeartbeat_args)other;
+      requestResource_args typedOther = (requestResource_args)other;
 
-      lastComparison = Boolean.valueOf(isSetNode()).compareTo(typedOther.isSetNode());
+      lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetNode()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.node, typedOther.node);
+      if (isSetHandle()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.handle, typedOther.handle);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetRequestList()).compareTo(typedOther.isSetRequestList());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetRequestList()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestList, typedOther.requestList);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5963,10 +7083,27 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
-          case 1: // NODE
-            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-              this.node = new ClusterNodeInfo();
-              this.node.read(iprot);
+          case 1: // HANDLE
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.handle = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // REQUEST_LIST
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
+                this.requestList = new ArrayList<ResourceRequest>(_list30.size);
+                for (int _i31 = 0; _i31 < _list30.size; ++_i31)
+                {
+                  ResourceRequest _elem32; // required
+                  _elem32 = new ResourceRequest();
+                  _elem32.read(iprot);
+                  this.requestList.add(_elem32);
+                }
+                iprot.readListEnd();
+              }
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
@@ -5986,9 +7123,21 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.node != null) {
-        oprot.writeFieldBegin(NODE_FIELD_DESC);
-        this.node.write(oprot);
+      if (this.handle != null) {
+        oprot.writeFieldBegin(HANDLE_FIELD_DESC);
+        oprot.writeString(this.handle);
+        oprot.writeFieldEnd();
+      }
+      if (this.requestList != null) {
+        oprot.writeFieldBegin(REQUEST_LIST_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.requestList.size()));
+          for (ResourceRequest _iter33 : this.requestList)
+          {
+            _iter33.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -5997,14 +7146,22 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("nodeHeartbeat_args(");
+      StringBuilder sb = new StringBuilder("requestResource_args(");
       boolean first = true;
 
-      sb.append("node:");
-      if (this.node == null) {
+      sb.append("handle:");
+      if (this.handle == null) {
         sb.append("null");
       } else {
-        sb.append(this.node);
+        sb.append(this.handle);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("requestList:");
+      if (this.requestList == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.requestList);
       }
       first = false;
       sb.append(")");
@@ -6033,16 +7190,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class nodeHeartbeat_result implements org.apache.thrift.TBase<nodeHeartbeat_result, nodeHeartbeat_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("nodeHeartbeat_result");
+  public static class requestResource_result implements org.apache.thrift.TBase<requestResource_result, requestResource_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("requestResource_result");
 
     private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    public DisallowedNode e; // required
+    public InvalidSessionHandle e; // required
+    public SafeModeException f; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      E((short)1, "e");
+      E((short)1, "e"),
+      F((short)2, "f");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -6059,6 +7219,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // E
             return E;
+          case 2: // F
+            return F;
           default:
             return null;
         }
@@ -6105,43 +7267,51 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(nodeHeartbeat_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestResource_result.class, metaDataMap);
     }
 
-    public nodeHeartbeat_result() {
+    public requestResource_result() {
     }
 
-    public nodeHeartbeat_result(
-      DisallowedNode e)
+    public requestResource_result(
+      InvalidSessionHandle e,
+      SafeModeException f)
     {
       this();
       this.e = e;
+      this.f = f;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public nodeHeartbeat_result(nodeHeartbeat_result other) {
+    public requestResource_result(requestResource_result other) {
       if (other.isSetE()) {
-        this.e = new DisallowedNode(other.e);
+        this.e = new InvalidSessionHandle(other.e);
+      }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
       }
     }
 
-    public nodeHeartbeat_result deepCopy() {
-      return new nodeHeartbeat_result(this);
+    public requestResource_result deepCopy() {
+      return new requestResource_result(this);
     }
 
     @Override
     public void clear() {
       this.e = null;
+      this.f = null;
     }
 
-    public DisallowedNode getE() {
+    public InvalidSessionHandle getE() {
       return this.e;
     }
 
-    public nodeHeartbeat_result setE(DisallowedNode e) {
+    public requestResource_result setE(InvalidSessionHandle e) {
       this.e = e;
       return this;
     }
@@ -6161,13 +7331,45 @@ public void setEIsSet(boolean value) {
       }
     }
 
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public requestResource_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case E:
         if (value == null) {
           unsetE();
         } else {
-          setE((DisallowedNode)value);
+          setE((InvalidSessionHandle)value);
+        }
+        break;
+
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
         }
         break;
 
@@ -6179,6 +7381,9 @@ public Object getFieldValue(_Fields field) {
       case E:
         return getE();
 
+      case F:
+        return getF();
+
       }
       throw new IllegalStateException();
     }
@@ -6192,6 +7397,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case E:
         return isSetE();
+      case F:
+        return isSetF();
       }
       throw new IllegalStateException();
     }
@@ -6200,12 +7407,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof nodeHeartbeat_result)
-        return this.equals((nodeHeartbeat_result)that);
+      if (that instanceof requestResource_result)
+        return this.equals((requestResource_result)that);
       return false;
     }
 
-    public boolean equals(nodeHeartbeat_result that) {
+    public boolean equals(requestResource_result that) {
       if (that == null)
         return false;
 
@@ -6218,6 +7425,15 @@ public boolean equals(nodeHeartbeat_result that) {
           return false;
       }
 
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
       return true;
     }
 
@@ -6226,13 +7442,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(nodeHeartbeat_result other) {
+    public int compareTo(requestResource_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      nodeHeartbeat_result typedOther = (nodeHeartbeat_result)other;
+      requestResource_result typedOther = (requestResource_result)other;
 
       lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
       if (lastComparison != 0) {
@@ -6244,6 +7460,16 @@ public int compareTo(nodeHeartbeat_result other) {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -6263,12 +7489,20 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
         switch (field.id) {
           case 1: // E
             if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-              this.e = new DisallowedNode();
+              this.e = new InvalidSessionHandle();
               this.e.read(iprot);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -6287,6 +7521,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeFieldBegin(E_FIELD_DESC);
         this.e.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -6294,7 +7532,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("nodeHeartbeat_result(");
+      StringBuilder sb = new StringBuilder("requestResource_result(");
       boolean first = true;
 
       sb.append("e:");
@@ -6304,6 +7542,14 @@ public String toString() {
         sb.append(this.e);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -6330,22 +7576,19 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class nodeFeedback_args implements org.apache.thrift.TBase<nodeFeedback_args, nodeFeedback_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("nodeFeedback_args");
+  public static class releaseResource_args implements org.apache.thrift.TBase<releaseResource_args, releaseResource_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("releaseResource_args");
 
     private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField RESOURCE_TYPES_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceTypes", org.apache.thrift.protocol.TType.LIST, (short)2);
-    private static final org.apache.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("stats", org.apache.thrift.protocol.TType.LIST, (short)3);
+    private static final org.apache.thrift.protocol.TField ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("idList", org.apache.thrift.protocol.TType.LIST, (short)2);
 
     public String handle; // required
-    public List<ResourceType> resourceTypes; // required
-    public List<NodeUsageReport> stats; // required
+    public List<Integer> idList; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       HANDLE((short)1, "handle"),
-      RESOURCE_TYPES((short)2, "resourceTypes"),
-      STATS((short)3, "stats");
+      ID_LIST((short)2, "idList");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -6362,10 +7605,8 @@ public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // HANDLE
             return HANDLE;
-          case 2: // RESOURCE_TYPES
-            return RESOURCE_TYPES;
-          case 3: // STATS
-            return STATS;
+          case 2: // ID_LIST
+            return ID_LIST;
           default:
             return null;
         }
@@ -6412,69 +7653,56 @@ public String getFieldName() {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
-      tmpMap.put(_Fields.RESOURCE_TYPES, new org.apache.thrift.meta_data.FieldMetaData("resourceTypes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceType.class))));
-      tmpMap.put(_Fields.STATS, new org.apache.thrift.meta_data.FieldMetaData("stats", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+      tmpMap.put(_Fields.ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("idList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NodeUsageReport.class))));
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32              , "ResourceRequestId"))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(nodeFeedback_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(releaseResource_args.class, metaDataMap);
     }
 
-    public nodeFeedback_args() {
+    public releaseResource_args() {
     }
 
-    public nodeFeedback_args(
+    public releaseResource_args(
       String handle,
-      List<ResourceType> resourceTypes,
-      List<NodeUsageReport> stats)
+      List<Integer> idList)
     {
       this();
       this.handle = handle;
-      this.resourceTypes = resourceTypes;
-      this.stats = stats;
+      this.idList = idList;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public nodeFeedback_args(nodeFeedback_args other) {
+    public releaseResource_args(releaseResource_args other) {
       if (other.isSetHandle()) {
         this.handle = other.handle;
       }
-      if (other.isSetResourceTypes()) {
-        List<ResourceType> __this__resourceTypes = new ArrayList<ResourceType>();
-        for (ResourceType other_element : other.resourceTypes) {
-          __this__resourceTypes.add(other_element);
-        }
-        this.resourceTypes = __this__resourceTypes;
-      }
-      if (other.isSetStats()) {
-        List<NodeUsageReport> __this__stats = new ArrayList<NodeUsageReport>();
-        for (NodeUsageReport other_element : other.stats) {
-          __this__stats.add(new NodeUsageReport(other_element));
+      if (other.isSetIdList()) {
+        List<Integer> __this__idList = new ArrayList<Integer>();
+        for (Integer other_element : other.idList) {
+          __this__idList.add(other_element);
         }
-        this.stats = __this__stats;
+        this.idList = __this__idList;
       }
     }
 
-    public nodeFeedback_args deepCopy() {
-      return new nodeFeedback_args(this);
+    public releaseResource_args deepCopy() {
+      return new releaseResource_args(this);
     }
 
     @Override
     public void clear() {
       this.handle = null;
-      this.resourceTypes = null;
-      this.stats = null;
+      this.idList = null;
     }
 
     public String getHandle() {
       return this.handle;
     }
 
-    public nodeFeedback_args setHandle(String handle) {
+    public releaseResource_args setHandle(String handle) {
       this.handle = handle;
       return this;
     }
@@ -6494,81 +7722,42 @@ public void setHandleIsSet(boolean value) {
       }
     }
 
-    public int getResourceTypesSize() {
-      return (this.resourceTypes == null) ? 0 : this.resourceTypes.size();
-    }
-
-    public java.util.Iterator<ResourceType> getResourceTypesIterator() {
-      return (this.resourceTypes == null) ? null : this.resourceTypes.iterator();
-    }
-
-    public void addToResourceTypes(ResourceType elem) {
-      if (this.resourceTypes == null) {
-        this.resourceTypes = new ArrayList<ResourceType>();
-      }
-      this.resourceTypes.add(elem);
-    }
-
-    public List<ResourceType> getResourceTypes() {
-      return this.resourceTypes;
-    }
-
-    public nodeFeedback_args setResourceTypes(List<ResourceType> resourceTypes) {
-      this.resourceTypes = resourceTypes;
-      return this;
-    }
-
-    public void unsetResourceTypes() {
-      this.resourceTypes = null;
-    }
-
-    /** Returns true if field resourceTypes is set (has been assigned a value) and false otherwise */
-    public boolean isSetResourceTypes() {
-      return this.resourceTypes != null;
-    }
-
-    public void setResourceTypesIsSet(boolean value) {
-      if (!value) {
-        this.resourceTypes = null;
-      }
-    }
-
-    public int getStatsSize() {
-      return (this.stats == null) ? 0 : this.stats.size();
+    public int getIdListSize() {
+      return (this.idList == null) ? 0 : this.idList.size();
     }
 
-    public java.util.Iterator<NodeUsageReport> getStatsIterator() {
-      return (this.stats == null) ? null : this.stats.iterator();
+    public java.util.Iterator<Integer> getIdListIterator() {
+      return (this.idList == null) ? null : this.idList.iterator();
     }
 
-    public void addToStats(NodeUsageReport elem) {
-      if (this.stats == null) {
-        this.stats = new ArrayList<NodeUsageReport>();
+    public void addToIdList(int elem) {
+      if (this.idList == null) {
+        this.idList = new ArrayList<Integer>();
       }
-      this.stats.add(elem);
+      this.idList.add(elem);
     }
 
-    public List<NodeUsageReport> getStats() {
-      return this.stats;
+    public List<Integer> getIdList() {
+      return this.idList;
     }
 
-    public nodeFeedback_args setStats(List<NodeUsageReport> stats) {
-      this.stats = stats;
+    public releaseResource_args setIdList(List<Integer> idList) {
+      this.idList = idList;
       return this;
     }
 
-    public void unsetStats() {
-      this.stats = null;
+    public void unsetIdList() {
+      this.idList = null;
     }
 
-    /** Returns true if field stats is set (has been assigned a value) and false otherwise */
-    public boolean isSetStats() {
-      return this.stats != null;
+    /** Returns true if field idList is set (has been assigned a value) and false otherwise */
+    public boolean isSetIdList() {
+      return this.idList != null;
     }
 
-    public void setStatsIsSet(boolean value) {
+    public void setIdListIsSet(boolean value) {
       if (!value) {
-        this.stats = null;
+        this.idList = null;
       }
     }
 
@@ -6582,19 +7771,11 @@ public void setFieldValue(_Fields field, Object value) {
         }
         break;
 
-      case RESOURCE_TYPES:
-        if (value == null) {
-          unsetResourceTypes();
-        } else {
-          setResourceTypes((List<ResourceType>)value);
-        }
-        break;
-
-      case STATS:
+      case ID_LIST:
         if (value == null) {
-          unsetStats();
+          unsetIdList();
         } else {
-          setStats((List<NodeUsageReport>)value);
+          setIdList((List<Integer>)value);
         }
         break;
 
@@ -6606,11 +7787,8 @@ public Object getFieldValue(_Fields field) {
       case HANDLE:
         return getHandle();
 
-      case RESOURCE_TYPES:
-        return getResourceTypes();
-
-      case STATS:
-        return getStats();
+      case ID_LIST:
+        return getIdList();
 
       }
       throw new IllegalStateException();
@@ -6625,10 +7803,8 @@ public boolean isSet(_Fields field) {
       switch (field) {
       case HANDLE:
         return isSetHandle();
-      case RESOURCE_TYPES:
-        return isSetResourceTypes();
-      case STATS:
-        return isSetStats();
+      case ID_LIST:
+        return isSetIdList();
       }
       throw new IllegalStateException();
     }
@@ -6637,12 +7813,12 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof nodeFeedback_args)
-        return this.equals((nodeFeedback_args)that);
+      if (that instanceof releaseResource_args)
+        return this.equals((releaseResource_args)that);
       return false;
     }
 
-    public boolean equals(nodeFeedback_args that) {
+    public boolean equals(releaseResource_args that) {
       if (that == null)
         return false;
 
@@ -6655,21 +7831,12 @@ public boolean equals(nodeFeedback_args that) {
           return false;
       }
 
-      boolean this_present_resourceTypes = true && this.isSetResourceTypes();
-      boolean that_present_resourceTypes = true && that.isSetResourceTypes();
-      if (this_present_resourceTypes || that_present_resourceTypes) {
-        if (!(this_present_resourceTypes && that_present_resourceTypes))
+      boolean this_present_idList = true && this.isSetIdList();
+      boolean that_present_idList = true && that.isSetIdList();
+      if (this_present_idList || that_present_idList) {
+        if (!(this_present_idList && that_present_idList))
           return false;
-        if (!this.resourceTypes.equals(that.resourceTypes))
-          return false;
-      }
-
-      boolean this_present_stats = true && this.isSetStats();
-      boolean that_present_stats = true && that.isSetStats();
-      if (this_present_stats || that_present_stats) {
-        if (!(this_present_stats && that_present_stats))
-          return false;
-        if (!this.stats.equals(that.stats))
+        if (!this.idList.equals(that.idList))
           return false;
       }
 
@@ -6681,13 +7848,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(nodeFeedback_args other) {
+    public int compareTo(releaseResource_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      nodeFeedback_args typedOther = (nodeFeedback_args)other;
+      releaseResource_args typedOther = (releaseResource_args)other;
 
       lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
       if (lastComparison != 0) {
@@ -6699,22 +7866,12 @@ public int compareTo(nodeFeedback_args other) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetResourceTypes()).compareTo(typedOther.isSetResourceTypes());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetResourceTypes()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceTypes, typedOther.resourceTypes);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetStats()).compareTo(typedOther.isSetStats());
+      lastComparison = Boolean.valueOf(isSetIdList()).compareTo(typedOther.isSetIdList());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetStats()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, typedOther.stats);
+      if (isSetIdList()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.idList, typedOther.idList);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -6743,34 +7900,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 2: // RESOURCE_TYPES
-            if (field.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list38 = iprot.readListBegin();
-                this.resourceTypes = new ArrayList<ResourceType>(_list38.size);
-                for (int _i39 = 0; _i39 < _list38.size; ++_i39)
-                {
-                  ResourceType _elem40; // required
-                  _elem40 = ResourceType.findByValue(iprot.readI32());
-                  this.resourceTypes.add(_elem40);
-                }
-                iprot.readListEnd();
-              }
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 3: // STATS
+          case 2: // ID_LIST
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list41 = iprot.readListBegin();
-                this.stats = new ArrayList<NodeUsageReport>(_list41.size);
-                for (int _i42 = 0; _i42 < _list41.size; ++_i42)
+                org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
+                this.idList = new ArrayList<Integer>(_list34.size);
+                for (int _i35 = 0; _i35 < _list34.size; ++_i35)
                 {
-                  NodeUsageReport _elem43; // required
-                  _elem43 = new NodeUsageReport();
-                  _elem43.read(iprot);
-                  this.stats.add(_elem43);
+                  int _elem36; // required
+                  _elem36 = iprot.readI32();
+                  this.idList.add(_elem36);
                 }
                 iprot.readListEnd();
               }
@@ -6798,25 +7937,13 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
         oprot.writeString(this.handle);
         oprot.writeFieldEnd();
       }
-      if (this.resourceTypes != null) {
-        oprot.writeFieldBegin(RESOURCE_TYPES_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, this.resourceTypes.size()));
-          for (ResourceType _iter44 : this.resourceTypes)
-          {
-            oprot.writeI32(_iter44.getValue());
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      if (this.stats != null) {
-        oprot.writeFieldBegin(STATS_FIELD_DESC);
+      if (this.idList != null) {
+        oprot.writeFieldBegin(ID_LIST_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.stats.size()));
-          for (NodeUsageReport _iter45 : this.stats)
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, this.idList.size()));
+          for (int _iter37 : this.idList)
           {
-            _iter45.write(oprot);
+            oprot.writeI32(_iter37);
           }
           oprot.writeListEnd();
         }
@@ -6828,7 +7955,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("nodeFeedback_args(");
+      StringBuilder sb = new StringBuilder("releaseResource_args(");
       boolean first = true;
 
       sb.append("handle:");
@@ -6839,21 +7966,3493 @@ public String toString() {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("resourceTypes:");
-      if (this.resourceTypes == null) {
+      sb.append("idList:");
+      if (this.idList == null) {
         sb.append("null");
       } else {
-        sb.append(this.resourceTypes);
+        sb.append(this.idList);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("stats:");
-      if (this.stats == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.stats);
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class releaseResource_result implements org.apache.thrift.TBase<releaseResource_result, releaseResource_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("releaseResource_result");
+
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public InvalidSessionHandle e; // required
+    public SafeModeException f; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      E((short)1, "e"),
+      F((short)2, "f");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // E
+            return E;
+          case 2: // F
+            return F;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(releaseResource_result.class, metaDataMap);
+    }
+
+    public releaseResource_result() {
+    }
+
+    public releaseResource_result(
+      InvalidSessionHandle e,
+      SafeModeException f)
+    {
+      this();
+      this.e = e;
+      this.f = f;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public releaseResource_result(releaseResource_result other) {
+      if (other.isSetE()) {
+        this.e = new InvalidSessionHandle(other.e);
+      }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
+      }
+    }
+
+    public releaseResource_result deepCopy() {
+      return new releaseResource_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.e = null;
+      this.f = null;
+    }
+
+    public InvalidSessionHandle getE() {
+      return this.e;
+    }
+
+    public releaseResource_result setE(InvalidSessionHandle e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public releaseResource_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((InvalidSessionHandle)value);
+        }
+        break;
+
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case E:
+        return getE();
+
+      case F:
+        return getF();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case E:
+        return isSetE();
+      case F:
+        return isSetF();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof releaseResource_result)
+        return this.equals((releaseResource_result)that);
+      return false;
+    }
+
+    public boolean equals(releaseResource_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(releaseResource_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      releaseResource_result typedOther = (releaseResource_result)other;
+
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new InvalidSessionHandle();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("releaseResource_result(");
+      boolean first = true;
+
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class nodeHeartbeat_args implements org.apache.thrift.TBase<nodeHeartbeat_args, nodeHeartbeat_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("nodeHeartbeat_args");
+
+    private static final org.apache.thrift.protocol.TField NODE_FIELD_DESC = new org.apache.thrift.protocol.TField("node", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ClusterNodeInfo node; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      NODE((short)1, "node");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // NODE
+            return NODE;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.NODE, new org.apache.thrift.meta_data.FieldMetaData("node", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ClusterNodeInfo.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(nodeHeartbeat_args.class, metaDataMap);
+    }
+
+    public nodeHeartbeat_args() {
+    }
+
+    public nodeHeartbeat_args(
+      ClusterNodeInfo node)
+    {
+      this();
+      this.node = node;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public nodeHeartbeat_args(nodeHeartbeat_args other) {
+      if (other.isSetNode()) {
+        this.node = new ClusterNodeInfo(other.node);
+      }
+    }
+
+    public nodeHeartbeat_args deepCopy() {
+      return new nodeHeartbeat_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.node = null;
+    }
+
+    public ClusterNodeInfo getNode() {
+      return this.node;
+    }
+
+    public nodeHeartbeat_args setNode(ClusterNodeInfo node) {
+      this.node = node;
+      return this;
+    }
+
+    public void unsetNode() {
+      this.node = null;
+    }
+
+    /** Returns true if field node is set (has been assigned a value) and false otherwise */
+    public boolean isSetNode() {
+      return this.node != null;
+    }
+
+    public void setNodeIsSet(boolean value) {
+      if (!value) {
+        this.node = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case NODE:
+        if (value == null) {
+          unsetNode();
+        } else {
+          setNode((ClusterNodeInfo)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case NODE:
+        return getNode();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case NODE:
+        return isSetNode();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof nodeHeartbeat_args)
+        return this.equals((nodeHeartbeat_args)that);
+      return false;
+    }
+
+    public boolean equals(nodeHeartbeat_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_node = true && this.isSetNode();
+      boolean that_present_node = true && that.isSetNode();
+      if (this_present_node || that_present_node) {
+        if (!(this_present_node && that_present_node))
+          return false;
+        if (!this.node.equals(that.node))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(nodeHeartbeat_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      nodeHeartbeat_args typedOther = (nodeHeartbeat_args)other;
+
+      lastComparison = Boolean.valueOf(isSetNode()).compareTo(typedOther.isSetNode());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetNode()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.node, typedOther.node);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // NODE
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.node = new ClusterNodeInfo();
+              this.node.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.node != null) {
+        oprot.writeFieldBegin(NODE_FIELD_DESC);
+        this.node.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("nodeHeartbeat_args(");
+      boolean first = true;
+
+      sb.append("node:");
+      if (this.node == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.node);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class nodeHeartbeat_result implements org.apache.thrift.TBase<nodeHeartbeat_result, nodeHeartbeat_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("nodeHeartbeat_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public NodeHeartbeatResponse success; // required
+    public DisallowedNode e; // required
+    public SafeModeException f; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e"),
+      F((short)2, "f");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          case 2: // F
+            return F;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NodeHeartbeatResponse.class)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(nodeHeartbeat_result.class, metaDataMap);
+    }
+
+    public nodeHeartbeat_result() {
+    }
+
+    public nodeHeartbeat_result(
+      NodeHeartbeatResponse success,
+      DisallowedNode e,
+      SafeModeException f)
+    {
+      this();
+      this.success = success;
+      this.e = e;
+      this.f = f;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public nodeHeartbeat_result(nodeHeartbeat_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new NodeHeartbeatResponse(other.success);
+      }
+      if (other.isSetE()) {
+        this.e = new DisallowedNode(other.e);
+      }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
+      }
+    }
+
+    public nodeHeartbeat_result deepCopy() {
+      return new nodeHeartbeat_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.e = null;
+      this.f = null;
+    }
+
+    public NodeHeartbeatResponse getSuccess() {
+      return this.success;
+    }
+
+    public nodeHeartbeat_result setSuccess(NodeHeartbeatResponse success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public DisallowedNode getE() {
+      return this.e;
+    }
+
+    public nodeHeartbeat_result setE(DisallowedNode e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public nodeHeartbeat_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((NodeHeartbeatResponse)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((DisallowedNode)value);
+        }
+        break;
+
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case E:
+        return getE();
+
+      case F:
+        return getF();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      case F:
+        return isSetF();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof nodeHeartbeat_result)
+        return this.equals((nodeHeartbeat_result)that);
+      return false;
+    }
+
+    public boolean equals(nodeHeartbeat_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(nodeHeartbeat_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      nodeHeartbeat_result typedOther = (nodeHeartbeat_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new NodeHeartbeatResponse();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new DisallowedNode();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("nodeHeartbeat_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class nodeFeedback_args implements org.apache.thrift.TBase<nodeFeedback_args, nodeFeedback_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("nodeFeedback_args");
+
+    private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField RESOURCE_TYPES_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceTypes", org.apache.thrift.protocol.TType.LIST, (short)2);
+    private static final org.apache.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("stats", org.apache.thrift.protocol.TType.LIST, (short)3);
+
+    public String handle; // required
+    public List<ResourceType> resourceTypes; // required
+    public List<NodeUsageReport> stats; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      HANDLE((short)1, "handle"),
+      RESOURCE_TYPES((short)2, "resourceTypes"),
+      STATS((short)3, "stats");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // HANDLE
+            return HANDLE;
+          case 2: // RESOURCE_TYPES
+            return RESOURCE_TYPES;
+          case 3: // STATS
+            return STATS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "SessionHandle")));
+      tmpMap.put(_Fields.RESOURCE_TYPES, new org.apache.thrift.meta_data.FieldMetaData("resourceTypes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceType.class))));
+      tmpMap.put(_Fields.STATS, new org.apache.thrift.meta_data.FieldMetaData("stats", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NodeUsageReport.class))));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(nodeFeedback_args.class, metaDataMap);
+    }
+
+    public nodeFeedback_args() {
+    }
+
+    public nodeFeedback_args(
+      String handle,
+      List<ResourceType> resourceTypes,
+      List<NodeUsageReport> stats)
+    {
+      this();
+      this.handle = handle;
+      this.resourceTypes = resourceTypes;
+      this.stats = stats;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public nodeFeedback_args(nodeFeedback_args other) {
+      if (other.isSetHandle()) {
+        this.handle = other.handle;
+      }
+      if (other.isSetResourceTypes()) {
+        List<ResourceType> __this__resourceTypes = new ArrayList<ResourceType>();
+        for (ResourceType other_element : other.resourceTypes) {
+          __this__resourceTypes.add(other_element);
+        }
+        this.resourceTypes = __this__resourceTypes;
+      }
+      if (other.isSetStats()) {
+        List<NodeUsageReport> __this__stats = new ArrayList<NodeUsageReport>();
+        for (NodeUsageReport other_element : other.stats) {
+          __this__stats.add(new NodeUsageReport(other_element));
+        }
+        this.stats = __this__stats;
+      }
+    }
+
+    public nodeFeedback_args deepCopy() {
+      return new nodeFeedback_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.handle = null;
+      this.resourceTypes = null;
+      this.stats = null;
+    }
+
+    public String getHandle() {
+      return this.handle;
+    }
+
+    public nodeFeedback_args setHandle(String handle) {
+      this.handle = handle;
+      return this;
+    }
+
+    public void unsetHandle() {
+      this.handle = null;
+    }
+
+    /** Returns true if field handle is set (has been assigned a value) and false otherwise */
+    public boolean isSetHandle() {
+      return this.handle != null;
+    }
+
+    public void setHandleIsSet(boolean value) {
+      if (!value) {
+        this.handle = null;
+      }
+    }
+
+    public int getResourceTypesSize() {
+      return (this.resourceTypes == null) ? 0 : this.resourceTypes.size();
+    }
+
+    public java.util.Iterator<ResourceType> getResourceTypesIterator() {
+      return (this.resourceTypes == null) ? null : this.resourceTypes.iterator();
+    }
+
+    public void addToResourceTypes(ResourceType elem) {
+      if (this.resourceTypes == null) {
+        this.resourceTypes = new ArrayList<ResourceType>();
+      }
+      this.resourceTypes.add(elem);
+    }
+
+    public List<ResourceType> getResourceTypes() {
+      return this.resourceTypes;
+    }
+
+    public nodeFeedback_args setResourceTypes(List<ResourceType> resourceTypes) {
+      this.resourceTypes = resourceTypes;
+      return this;
+    }
+
+    public void unsetResourceTypes() {
+      this.resourceTypes = null;
+    }
+
+    /** Returns true if field resourceTypes is set (has been assigned a value) and false otherwise */
+    public boolean isSetResourceTypes() {
+      return this.resourceTypes != null;
+    }
+
+    public void setResourceTypesIsSet(boolean value) {
+      if (!value) {
+        this.resourceTypes = null;
+      }
+    }
+
+    public int getStatsSize() {
+      return (this.stats == null) ? 0 : this.stats.size();
+    }
+
+    public java.util.Iterator<NodeUsageReport> getStatsIterator() {
+      return (this.stats == null) ? null : this.stats.iterator();
+    }
+
+    public void addToStats(NodeUsageReport elem) {
+      if (this.stats == null) {
+        this.stats = new ArrayList<NodeUsageReport>();
+      }
+      this.stats.add(elem);
+    }
+
+    public List<NodeUsageReport> getStats() {
+      return this.stats;
+    }
+
+    public nodeFeedback_args setStats(List<NodeUsageReport> stats) {
+      this.stats = stats;
+      return this;
+    }
+
+    public void unsetStats() {
+      this.stats = null;
+    }
+
+    /** Returns true if field stats is set (has been assigned a value) and false otherwise */
+    public boolean isSetStats() {
+      return this.stats != null;
+    }
+
+    public void setStatsIsSet(boolean value) {
+      if (!value) {
+        this.stats = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case HANDLE:
+        if (value == null) {
+          unsetHandle();
+        } else {
+          setHandle((String)value);
+        }
+        break;
+
+      case RESOURCE_TYPES:
+        if (value == null) {
+          unsetResourceTypes();
+        } else {
+          setResourceTypes((List<ResourceType>)value);
+        }
+        break;
+
+      case STATS:
+        if (value == null) {
+          unsetStats();
+        } else {
+          setStats((List<NodeUsageReport>)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case HANDLE:
+        return getHandle();
+
+      case RESOURCE_TYPES:
+        return getResourceTypes();
+
+      case STATS:
+        return getStats();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case HANDLE:
+        return isSetHandle();
+      case RESOURCE_TYPES:
+        return isSetResourceTypes();
+      case STATS:
+        return isSetStats();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof nodeFeedback_args)
+        return this.equals((nodeFeedback_args)that);
+      return false;
+    }
+
+    public boolean equals(nodeFeedback_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_handle = true && this.isSetHandle();
+      boolean that_present_handle = true && that.isSetHandle();
+      if (this_present_handle || that_present_handle) {
+        if (!(this_present_handle && that_present_handle))
+          return false;
+        if (!this.handle.equals(that.handle))
+          return false;
+      }
+
+      boolean this_present_resourceTypes = true && this.isSetResourceTypes();
+      boolean that_present_resourceTypes = true && that.isSetResourceTypes();
+      if (this_present_resourceTypes || that_present_resourceTypes) {
+        if (!(this_present_resourceTypes && that_present_resourceTypes))
+          return false;
+        if (!this.resourceTypes.equals(that.resourceTypes))
+          return false;
+      }
+
+      boolean this_present_stats = true && this.isSetStats();
+      boolean that_present_stats = true && that.isSetStats();
+      if (this_present_stats || that_present_stats) {
+        if (!(this_present_stats && that_present_stats))
+          return false;
+        if (!this.stats.equals(that.stats))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(nodeFeedback_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      nodeFeedback_args typedOther = (nodeFeedback_args)other;
+
+      lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetHandle()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.handle, typedOther.handle);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetResourceTypes()).compareTo(typedOther.isSetResourceTypes());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetResourceTypes()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceTypes, typedOther.resourceTypes);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetStats()).compareTo(typedOther.isSetStats());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetStats()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, typedOther.stats);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // HANDLE
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.handle = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // RESOURCE_TYPES
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list38 = iprot.readListBegin();
+                this.resourceTypes = new ArrayList<ResourceType>(_list38.size);
+                for (int _i39 = 0; _i39 < _list38.size; ++_i39)
+                {
+                  ResourceType _elem40; // required
+                  _elem40 = ResourceType.findByValue(iprot.readI32());
+                  this.resourceTypes.add(_elem40);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // STATS
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list41 = iprot.readListBegin();
+                this.stats = new ArrayList<NodeUsageReport>(_list41.size);
+                for (int _i42 = 0; _i42 < _list41.size; ++_i42)
+                {
+                  NodeUsageReport _elem43; // required
+                  _elem43 = new NodeUsageReport();
+                  _elem43.read(iprot);
+                  this.stats.add(_elem43);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.handle != null) {
+        oprot.writeFieldBegin(HANDLE_FIELD_DESC);
+        oprot.writeString(this.handle);
+        oprot.writeFieldEnd();
+      }
+      if (this.resourceTypes != null) {
+        oprot.writeFieldBegin(RESOURCE_TYPES_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, this.resourceTypes.size()));
+          for (ResourceType _iter44 : this.resourceTypes)
+          {
+            oprot.writeI32(_iter44.getValue());
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (this.stats != null) {
+        oprot.writeFieldBegin(STATS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.stats.size()));
+          for (NodeUsageReport _iter45 : this.stats)
+          {
+            _iter45.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("nodeFeedback_args(");
+      boolean first = true;
+
+      sb.append("handle:");
+      if (this.handle == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.handle);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("resourceTypes:");
+      if (this.resourceTypes == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.resourceTypes);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("stats:");
+      if (this.stats == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.stats);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class nodeFeedback_result implements org.apache.thrift.TBase<nodeFeedback_result, nodeFeedback_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("nodeFeedback_result");
+
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public InvalidSessionHandle e; // required
+    public SafeModeException f; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      E((short)1, "e"),
+      F((short)2, "f");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // E
+            return E;
+          case 2: // F
+            return F;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(nodeFeedback_result.class, metaDataMap);
+    }
+
+    public nodeFeedback_result() {
+    }
+
+    public nodeFeedback_result(
+      InvalidSessionHandle e,
+      SafeModeException f)
+    {
+      this();
+      this.e = e;
+      this.f = f;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public nodeFeedback_result(nodeFeedback_result other) {
+      if (other.isSetE()) {
+        this.e = new InvalidSessionHandle(other.e);
+      }
+      if (other.isSetF()) {
+        this.f = new SafeModeException(other.f);
+      }
+    }
+
+    public nodeFeedback_result deepCopy() {
+      return new nodeFeedback_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.e = null;
+      this.f = null;
+    }
+
+    public InvalidSessionHandle getE() {
+      return this.e;
+    }
+
+    public nodeFeedback_result setE(InvalidSessionHandle e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public SafeModeException getF() {
+      return this.f;
+    }
+
+    public nodeFeedback_result setF(SafeModeException f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((InvalidSessionHandle)value);
+        }
+        break;
+
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((SafeModeException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case E:
+        return getE();
+
+      case F:
+        return getF();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case E:
+        return isSetE();
+      case F:
+        return isSetF();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof nodeFeedback_result)
+        return this.equals((nodeFeedback_result)that);
+      return false;
+    }
+
+    public boolean equals(nodeFeedback_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(nodeFeedback_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      nodeFeedback_result typedOther = (nodeFeedback_result)other;
+
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new InvalidSessionHandle();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.f = new SafeModeException();
+              this.f.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetF()) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        this.f.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("nodeFeedback_result(");
+      boolean first = true;
+
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class refreshNodes_args implements org.apache.thrift.TBase<refreshNodes_args, refreshNodes_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("refreshNodes_args");
+
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(refreshNodes_args.class, metaDataMap);
+    }
+
+    public refreshNodes_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public refreshNodes_args(refreshNodes_args other) {
+    }
+
+    public refreshNodes_args deepCopy() {
+      return new refreshNodes_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof refreshNodes_args)
+        return this.equals((refreshNodes_args)that);
+      return false;
+    }
+
+    public boolean equals(refreshNodes_args that) {
+      if (that == null)
+        return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(refreshNodes_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      refreshNodes_args typedOther = (refreshNodes_args)other;
+
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("refreshNodes_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class refreshNodes_result implements org.apache.thrift.TBase<refreshNodes_result, refreshNodes_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("refreshNodes_result");
+
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public SafeModeException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(refreshNodes_result.class, metaDataMap);
+    }
+
+    public refreshNodes_result() {
+    }
+
+    public refreshNodes_result(
+      SafeModeException e)
+    {
+      this();
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public refreshNodes_result(refreshNodes_result other) {
+      if (other.isSetE()) {
+        this.e = new SafeModeException(other.e);
+      }
+    }
+
+    public refreshNodes_result deepCopy() {
+      return new refreshNodes_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.e = null;
+    }
+
+    public SafeModeException getE() {
+      return this.e;
+    }
+
+    public refreshNodes_result setE(SafeModeException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((SafeModeException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof refreshNodes_result)
+        return this.equals((refreshNodes_result)that);
+      return false;
+    }
+
+    public boolean equals(refreshNodes_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(refreshNodes_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      refreshNodes_result typedOther = (refreshNodes_result)other;
+
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new SafeModeException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("refreshNodes_result(");
+      boolean first = true;
+
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class restartNodes_args implements org.apache.thrift.TBase<restartNodes_args, restartNodes_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("restartNodes_args");
+
+    private static final org.apache.thrift.protocol.TField RESTART_NODES_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("restartNodesArgs", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public RestartNodesArgs restartNodesArgs; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      RESTART_NODES_ARGS((short)1, "restartNodesArgs");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // RESTART_NODES_ARGS
+            return RESTART_NODES_ARGS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.RESTART_NODES_ARGS, new org.apache.thrift.meta_data.FieldMetaData("restartNodesArgs", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RestartNodesArgs.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(restartNodes_args.class, metaDataMap);
+    }
+
+    public restartNodes_args() {
+    }
+
+    public restartNodes_args(
+      RestartNodesArgs restartNodesArgs)
+    {
+      this();
+      this.restartNodesArgs = restartNodesArgs;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public restartNodes_args(restartNodes_args other) {
+      if (other.isSetRestartNodesArgs()) {
+        this.restartNodesArgs = new RestartNodesArgs(other.restartNodesArgs);
+      }
+    }
+
+    public restartNodes_args deepCopy() {
+      return new restartNodes_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.restartNodesArgs = null;
+    }
+
+    public RestartNodesArgs getRestartNodesArgs() {
+      return this.restartNodesArgs;
+    }
+
+    public restartNodes_args setRestartNodesArgs(RestartNodesArgs restartNodesArgs) {
+      this.restartNodesArgs = restartNodesArgs;
+      return this;
+    }
+
+    public void unsetRestartNodesArgs() {
+      this.restartNodesArgs = null;
+    }
+
+    /** Returns true if field restartNodesArgs is set (has been assigned a value) and false otherwise */
+    public boolean isSetRestartNodesArgs() {
+      return this.restartNodesArgs != null;
+    }
+
+    public void setRestartNodesArgsIsSet(boolean value) {
+      if (!value) {
+        this.restartNodesArgs = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case RESTART_NODES_ARGS:
+        if (value == null) {
+          unsetRestartNodesArgs();
+        } else {
+          setRestartNodesArgs((RestartNodesArgs)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case RESTART_NODES_ARGS:
+        return getRestartNodesArgs();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case RESTART_NODES_ARGS:
+        return isSetRestartNodesArgs();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof restartNodes_args)
+        return this.equals((restartNodes_args)that);
+      return false;
+    }
+
+    public boolean equals(restartNodes_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_restartNodesArgs = true && this.isSetRestartNodesArgs();
+      boolean that_present_restartNodesArgs = true && that.isSetRestartNodesArgs();
+      if (this_present_restartNodesArgs || that_present_restartNodesArgs) {
+        if (!(this_present_restartNodesArgs && that_present_restartNodesArgs))
+          return false;
+        if (!this.restartNodesArgs.equals(that.restartNodesArgs))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(restartNodes_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      restartNodes_args typedOther = (restartNodes_args)other;
+
+      lastComparison = Boolean.valueOf(isSetRestartNodesArgs()).compareTo(typedOther.isSetRestartNodesArgs());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetRestartNodesArgs()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.restartNodesArgs, typedOther.restartNodesArgs);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // RESTART_NODES_ARGS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.restartNodesArgs = new RestartNodesArgs();
+              this.restartNodesArgs.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.restartNodesArgs != null) {
+        oprot.writeFieldBegin(RESTART_NODES_ARGS_FIELD_DESC);
+        this.restartNodesArgs.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("restartNodes_args(");
+      boolean first = true;
+
+      sb.append("restartNodesArgs:");
+      if (this.restartNodesArgs == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.restartNodesArgs);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class restartNodes_result implements org.apache.thrift.TBase<restartNodes_result, restartNodes_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("restartNodes_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public RestartNodesResponse success; // required
+    public SafeModeException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RestartNodesResponse.class)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(restartNodes_result.class, metaDataMap);
+    }
+
+    public restartNodes_result() {
+    }
+
+    public restartNodes_result(
+      RestartNodesResponse success,
+      SafeModeException e)
+    {
+      this();
+      this.success = success;
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public restartNodes_result(restartNodes_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new RestartNodesResponse(other.success);
+      }
+      if (other.isSetE()) {
+        this.e = new SafeModeException(other.e);
+      }
+    }
+
+    public restartNodes_result deepCopy() {
+      return new restartNodes_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.e = null;
+    }
+
+    public RestartNodesResponse getSuccess() {
+      return this.success;
+    }
+
+    public restartNodes_result setSuccess(RestartNodesResponse success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public SafeModeException getE() {
+      return this.e;
+    }
+
+    public restartNodes_result setE(SafeModeException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((RestartNodesResponse)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((SafeModeException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof restartNodes_result)
+        return this.equals((restartNodes_result)that);
+      return false;
+    }
+
+    public boolean equals(restartNodes_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(restartNodes_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      restartNodes_result typedOther = (restartNodes_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new RestartNodesResponse();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new SafeModeException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("restartNodes_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getSessions_args implements org.apache.thrift.TBase<getSessions_args, getSessions_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getSessions_args");
+
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSessions_args.class, metaDataMap);
+    }
+
+    public getSessions_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getSessions_args(getSessions_args other) {
+    }
+
+    public getSessions_args deepCopy() {
+      return new getSessions_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getSessions_args)
+        return this.equals((getSessions_args)that);
+      return false;
+    }
+
+    public boolean equals(getSessions_args that) {
+      if (that == null)
+        return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getSessions_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getSessions_args typedOther = (getSessions_args)other;
+
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
       }
-      first = false;
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getSessions_args(");
+      boolean first = true;
+
       sb.append(")");
       return sb.toString();
     }
@@ -6880,15 +11479,18 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class nodeFeedback_result implements org.apache.thrift.TBase<nodeFeedback_result, nodeFeedback_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("nodeFeedback_result");
+  public static class getSessions_result implements org.apache.thrift.TBase<getSessions_result, getSessions_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getSessions_result");
 
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
     private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    public InvalidSessionHandle e; // required
+    public List<RunningSession> success; // required
+    public SafeModeException e; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
       E((short)1, "e");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -6904,6 +11506,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
           case 1: // E
             return E;
           default:
@@ -6950,45 +11554,97 @@ public String getFieldName() {
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RunningSession.class))));
       tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(nodeFeedback_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSessions_result.class, metaDataMap);
     }
 
-    public nodeFeedback_result() {
+    public getSessions_result() {
     }
 
-    public nodeFeedback_result(
-      InvalidSessionHandle e)
+    public getSessions_result(
+      List<RunningSession> success,
+      SafeModeException e)
     {
       this();
+      this.success = success;
       this.e = e;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public nodeFeedback_result(nodeFeedback_result other) {
+    public getSessions_result(getSessions_result other) {
+      if (other.isSetSuccess()) {
+        List<RunningSession> __this__success = new ArrayList<RunningSession>();
+        for (RunningSession other_element : other.success) {
+          __this__success.add(new RunningSession(other_element));
+        }
+        this.success = __this__success;
+      }
       if (other.isSetE()) {
-        this.e = new InvalidSessionHandle(other.e);
+        this.e = new SafeModeException(other.e);
       }
     }
 
-    public nodeFeedback_result deepCopy() {
-      return new nodeFeedback_result(this);
+    public getSessions_result deepCopy() {
+      return new getSessions_result(this);
     }
 
     @Override
     public void clear() {
+      this.success = null;
       this.e = null;
     }
 
-    public InvalidSessionHandle getE() {
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public java.util.Iterator<RunningSession> getSuccessIterator() {
+      return (this.success == null) ? null : this.success.iterator();
+    }
+
+    public void addToSuccess(RunningSession elem) {
+      if (this.success == null) {
+        this.success = new ArrayList<RunningSession>();
+      }
+      this.success.add(elem);
+    }
+
+    public List<RunningSession> getSuccess() {
+      return this.success;
+    }
+
+    public getSessions_result setSuccess(List<RunningSession> success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public SafeModeException getE() {
       return this.e;
     }
 
-    public nodeFeedback_result setE(InvalidSessionHandle e) {
+    public getSessions_result setE(SafeModeException e) {
       this.e = e;
       return this;
     }
@@ -7010,11 +11666,19 @@ public void setEIsSet(boolean value) {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((List<RunningSession>)value);
+        }
+        break;
+
       case E:
         if (value == null) {
           unsetE();
         } else {
-          setE((InvalidSessionHandle)value);
+          setE((SafeModeException)value);
         }
         break;
 
@@ -7023,6 +11687,9 @@ public void setFieldValue(_Fields field, Object value) {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
       case E:
         return getE();
 
@@ -7037,6 +11704,8 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
       case E:
         return isSetE();
       }
@@ -7047,15 +11716,24 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof nodeFeedback_result)
-        return this.equals((nodeFeedback_result)that);
+      if (that instanceof getSessions_result)
+        return this.equals((getSessions_result)that);
       return false;
     }
 
-    public boolean equals(nodeFeedback_result that) {
+    public boolean equals(getSessions_result that) {
       if (that == null)
         return false;
 
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
       boolean this_present_e = true && this.isSetE();
       boolean that_present_e = true && that.isSetE();
       if (this_present_e || that_present_e) {
@@ -7073,14 +11751,24 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(nodeFeedback_result other) {
+    public int compareTo(getSessions_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      nodeFeedback_result typedOther = (nodeFeedback_result)other;
+      getSessions_result typedOther = (getSessions_result)other;
 
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
       if (lastComparison != 0) {
         return lastComparison;
@@ -7108,9 +11796,27 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
+                this.success = new ArrayList<RunningSession>(_list46.size);
+                for (int _i47 = 0; _i47 < _list46.size; ++_i47)
+                {
+                  RunningSession _elem48; // required
+                  _elem48 = new RunningSession();
+                  _elem48.read(iprot);
+                  this.success.add(_elem48);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           case 1: // E
             if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-              this.e = new InvalidSessionHandle();
+              this.e = new SafeModeException();
               this.e.read(iprot);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
@@ -7130,7 +11836,18 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetE()) {
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
+          for (RunningSession _iter49 : this.success)
+          {
+            _iter49.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
         oprot.writeFieldBegin(E_FIELD_DESC);
         this.e.write(oprot);
         oprot.writeFieldEnd();
@@ -7141,9 +11858,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("nodeFeedback_result(");
+      StringBuilder sb = new StringBuilder("getSessions_result(");
       boolean first = true;
 
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("e:");
       if (this.e == null) {
         sb.append("null");
@@ -7177,14 +11902,16 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class refreshNodes_args implements org.apache.thrift.TBase<refreshNodes_args, refreshNodes_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("refreshNodes_args");
+  public static class killSession_args implements org.apache.thrift.TBase<killSession_args, killSession_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("killSession_args");
 
+    private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
 
+    public String sessionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
+      SESSION_ID((short)1, "sessionId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -7199,6 +11926,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 1: // SESSION_ID
+            return SESSION_ID;
           default:
             return null;
         }
@@ -7237,37 +11966,88 @@ public String getFieldName() {
         return _fieldName;
       }
     }
+
+    // isset id assignments
+
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(refreshNodes_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(killSession_args.class, metaDataMap);
     }
 
-    public refreshNodes_args() {
+    public killSession_args() {
+    }
+
+    public killSession_args(
+      String sessionId)
+    {
+      this();
+      this.sessionId = sessionId;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public refreshNodes_args(refreshNodes_args other) {
+    public killSession_args(killSession_args other) {
+      if (other.isSetSessionId()) {
+        this.sessionId = other.sessionId;
+      }
     }
 
-    public refreshNodes_args deepCopy() {
-      return new refreshNodes_args(this);
+    public killSession_args deepCopy() {
+      return new killSession_args(this);
     }
 
     @Override
     public void clear() {
+      this.sessionId = null;
+    }
+
+    public String getSessionId() {
+      return this.sessionId;
+    }
+
+    public killSession_args setSessionId(String sessionId) {
+      this.sessionId = sessionId;
+      return this;
+    }
+
+    public void unsetSessionId() {
+      this.sessionId = null;
+    }
+
+    /** Returns true if field sessionId is set (has been assigned a value) and false otherwise */
+    public boolean isSetSessionId() {
+      return this.sessionId != null;
+    }
+
+    public void setSessionIdIsSet(boolean value) {
+      if (!value) {
+        this.sessionId = null;
+      }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case SESSION_ID:
+        if (value == null) {
+          unsetSessionId();
+        } else {
+          setSessionId((String)value);
+        }
+        break;
+
       }
     }
 
-    public Object getFieldValue(_Fields field) {
-      switch (field) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SESSION_ID:
+        return getSessionId();
+
       }
       throw new IllegalStateException();
     }
@@ -7279,6 +12059,8 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
+      case SESSION_ID:
+        return isSetSessionId();
       }
       throw new IllegalStateException();
     }
@@ -7287,15 +12069,24 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof refreshNodes_args)
-        return this.equals((refreshNodes_args)that);
+      if (that instanceof killSession_args)
+        return this.equals((killSession_args)that);
       return false;
     }
 
-    public boolean equals(refreshNodes_args that) {
+    public boolean equals(killSession_args that) {
       if (that == null)
         return false;
 
+      boolean this_present_sessionId = true && this.isSetSessionId();
+      boolean that_present_sessionId = true && that.isSetSessionId();
+      if (this_present_sessionId || that_present_sessionId) {
+        if (!(this_present_sessionId && that_present_sessionId))
+          return false;
+        if (!this.sessionId.equals(that.sessionId))
+          return false;
+      }
+
       return true;
     }
 
@@ -7304,14 +12095,24 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(refreshNodes_args other) {
+    public int compareTo(killSession_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      refreshNodes_args typedOther = (refreshNodes_args)other;
+      killSession_args typedOther = (killSession_args)other;
 
+      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSessionId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -7329,6 +12130,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
+          case 1: // SESSION_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.sessionId = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -7344,15 +12152,27 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
+      if (this.sessionId != null) {
+        oprot.writeFieldBegin(SESSION_ID_FIELD_DESC);
+        oprot.writeString(this.sessionId);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("refreshNodes_args(");
+      StringBuilder sb = new StringBuilder("killSession_args(");
       boolean first = true;
 
+      sb.append("sessionId:");
+      if (this.sessionId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sessionId);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -7379,14 +12199,16 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class refreshNodes_result implements org.apache.thrift.TBase<refreshNodes_result, refreshNodes_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("refreshNodes_result");
+  public static class killSession_result implements org.apache.thrift.TBase<killSession_result, killSession_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("killSession_result");
 
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
+    public SafeModeException e; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
+      E((short)1, "e");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -7401,6 +12223,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 1: // E
+            return E;
           default:
             return null;
         }
@@ -7439,37 +12263,88 @@ public String getFieldName() {
         return _fieldName;
       }
     }
+
+    // isset id assignments
+
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(refreshNodes_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(killSession_result.class, metaDataMap);
     }
 
-    public refreshNodes_result() {
+    public killSession_result() {
+    }
+
+    public killSession_result(
+      SafeModeException e)
+    {
+      this();
+      this.e = e;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public refreshNodes_result(refreshNodes_result other) {
+    public killSession_result(killSession_result other) {
+      if (other.isSetE()) {
+        this.e = new SafeModeException(other.e);
+      }
     }
 
-    public refreshNodes_result deepCopy() {
-      return new refreshNodes_result(this);
+    public killSession_result deepCopy() {
+      return new killSession_result(this);
     }
 
     @Override
     public void clear() {
+      this.e = null;
+    }
+
+    public SafeModeException getE() {
+      return this.e;
+    }
+
+    public killSession_result setE(SafeModeException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((SafeModeException)value);
+        }
+        break;
+
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case E:
+        return getE();
+
       }
       throw new IllegalStateException();
     }
@@ -7481,6 +12356,8 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
+      case E:
+        return isSetE();
       }
       throw new IllegalStateException();
     }
@@ -7489,15 +12366,24 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof refreshNodes_result)
-        return this.equals((refreshNodes_result)that);
+      if (that instanceof killSession_result)
+        return this.equals((killSession_result)that);
       return false;
     }
 
-    public boolean equals(refreshNodes_result that) {
+    public boolean equals(killSession_result that) {
       if (that == null)
         return false;
 
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
       return true;
     }
 
@@ -7506,14 +12392,24 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(refreshNodes_result other) {
+    public int compareTo(killSession_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      refreshNodes_result typedOther = (refreshNodes_result)other;
+      killSession_result typedOther = (killSession_result)other;
 
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -7531,6 +12427,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new SafeModeException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -7545,15 +12449,27 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
+      if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("refreshNodes_result(");
+      StringBuilder sb = new StringBuilder("killSession_result(");
       boolean first = true;
 
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -7580,14 +12496,16 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class getSessions_args implements org.apache.thrift.TBase<getSessions_args, getSessions_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getSessions_args");
+  public static class setSafeMode_args implements org.apache.thrift.TBase<setSafeMode_args, setSafeMode_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setSafeMode_args");
 
+    private static final org.apache.thrift.protocol.TField SAFE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("safeMode", org.apache.thrift.protocol.TType.BOOL, (short)1);
 
+    public boolean safeMode; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
+      SAFE_MODE((short)1, "safeMode");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -7602,6 +12520,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 1: // SAFE_MODE
+            return SAFE_MODE;
           default:
             return null;
         }
@@ -7640,37 +12560,91 @@ public String getFieldName() {
         return _fieldName;
       }
     }
+
+    // isset id assignments
+    private static final int __SAFEMODE_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SAFE_MODE, new org.apache.thrift.meta_data.FieldMetaData("safeMode", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSessions_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setSafeMode_args.class, metaDataMap);
     }
 
-    public getSessions_args() {
+    public setSafeMode_args() {
+    }
+
+    public setSafeMode_args(
+      boolean safeMode)
+    {
+      this();
+      this.safeMode = safeMode;
+      setSafeModeIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getSessions_args(getSessions_args other) {
+    public setSafeMode_args(setSafeMode_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.safeMode = other.safeMode;
     }
 
-    public getSessions_args deepCopy() {
-      return new getSessions_args(this);
+    public setSafeMode_args deepCopy() {
+      return new setSafeMode_args(this);
     }
 
     @Override
     public void clear() {
+      setSafeModeIsSet(false);
+      this.safeMode = false;
+    }
+
+    public boolean isSafeMode() {
+      return this.safeMode;
+    }
+
+    public setSafeMode_args setSafeMode(boolean safeMode) {
+      this.safeMode = safeMode;
+      setSafeModeIsSet(true);
+      return this;
+    }
+
+    public void unsetSafeMode() {
+      __isset_bit_vector.clear(__SAFEMODE_ISSET_ID);
+    }
+
+    /** Returns true if field safeMode is set (has been assigned a value) and false otherwise */
+    public boolean isSetSafeMode() {
+      return __isset_bit_vector.get(__SAFEMODE_ISSET_ID);
+    }
+
+    public void setSafeModeIsSet(boolean value) {
+      __isset_bit_vector.set(__SAFEMODE_ISSET_ID, value);
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case SAFE_MODE:
+        if (value == null) {
+          unsetSafeMode();
+        } else {
+          setSafeMode((Boolean)value);
+        }
+        break;
+
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case SAFE_MODE:
+        return Boolean.valueOf(isSafeMode());
+
       }
       throw new IllegalStateException();
     }
@@ -7682,6 +12656,8 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
+      case SAFE_MODE:
+        return isSetSafeMode();
       }
       throw new IllegalStateException();
     }
@@ -7690,15 +12666,24 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getSessions_args)
-        return this.equals((getSessions_args)that);
+      if (that instanceof setSafeMode_args)
+        return this.equals((setSafeMode_args)that);
       return false;
     }
 
-    public boolean equals(getSessions_args that) {
+    public boolean equals(setSafeMode_args that) {
       if (that == null)
         return false;
 
+      boolean this_present_safeMode = true;
+      boolean that_present_safeMode = true;
+      if (this_present_safeMode || that_present_safeMode) {
+        if (!(this_present_safeMode && that_present_safeMode))
+          return false;
+        if (this.safeMode != that.safeMode)
+          return false;
+      }
+
       return true;
     }
 
@@ -7707,14 +12692,24 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(getSessions_args other) {
+    public int compareTo(setSafeMode_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getSessions_args typedOther = (getSessions_args)other;
+      setSafeMode_args typedOther = (setSafeMode_args)other;
 
+      lastComparison = Boolean.valueOf(isSetSafeMode()).compareTo(typedOther.isSetSafeMode());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSafeMode()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.safeMode, typedOther.safeMode);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -7732,6 +12727,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
+          case 1: // SAFE_MODE
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.safeMode = iprot.readBool();
+              setSafeModeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -7747,15 +12750,21 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(SAFE_MODE_FIELD_DESC);
+      oprot.writeBool(this.safeMode);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getSessions_args(");
+      StringBuilder sb = new StringBuilder("setSafeMode_args(");
       boolean first = true;
 
+      sb.append("safeMode:");
+      sb.append(this.safeMode);
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -7774,6 +12783,8 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -7782,12 +12793,12 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class getSessions_result implements org.apache.thrift.TBase<getSessions_result, getSessions_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getSessions_result");
+  public static class setSafeMode_result implements org.apache.thrift.TBase<setSafeMode_result, setSafeMode_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setSafeMode_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
 
-    public List<RunningSession> success; // required
+    public boolean success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -7848,86 +12859,69 @@ public String getFieldName() {
     }
 
     // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RunningSession.class))));
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSessions_result.class, metaDataMap);
-    }
-
-    public getSessions_result() {
-    }
-
-    public getSessions_result(
-      List<RunningSession> success)
-    {
-      this();
-      this.success = success;
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setSafeMode_result.class, metaDataMap);
     }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public getSessions_result(getSessions_result other) {
-      if (other.isSetSuccess()) {
-        List<RunningSession> __this__success = new ArrayList<RunningSession>();
-        for (RunningSession other_element : other.success) {
-          __this__success.add(new RunningSession(other_element));
-        }
-        this.success = __this__success;
-      }
-    }
-
-    public getSessions_result deepCopy() {
-      return new getSessions_result(this);
+
+    public setSafeMode_result() {
     }
 
-    @Override
-    public void clear() {
-      this.success = null;
+    public setSafeMode_result(
+      boolean success)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
     }
 
-    public int getSuccessSize() {
-      return (this.success == null) ? 0 : this.success.size();
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public setSafeMode_result(setSafeMode_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
     }
 
-    public java.util.Iterator<RunningSession> getSuccessIterator() {
-      return (this.success == null) ? null : this.success.iterator();
+    public setSafeMode_result deepCopy() {
+      return new setSafeMode_result(this);
     }
 
-    public void addToSuccess(RunningSession elem) {
-      if (this.success == null) {
-        this.success = new ArrayList<RunningSession>();
-      }
-      this.success.add(elem);
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
     }
 
-    public List<RunningSession> getSuccess() {
+    public boolean isSuccess() {
       return this.success;
     }
 
-    public getSessions_result setSuccess(List<RunningSession> success) {
+    public setSafeMode_result setSuccess(boolean success) {
       this.success = success;
+      setSuccessIsSet(true);
       return this;
     }
 
     public void unsetSuccess() {
-      this.success = null;
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
     }
 
     /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return this.success != null;
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
     }
 
     public void setFieldValue(_Fields field, Object value) {
@@ -7936,7 +12930,7 @@ public void setFieldValue(_Fields field, Object value) {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<RunningSession>)value);
+          setSuccess((Boolean)value);
         }
         break;
 
@@ -7946,7 +12940,7 @@ public void setFieldValue(_Fields field, Object value) {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return getSuccess();
+        return Boolean.valueOf(isSuccess());
 
       }
       throw new IllegalStateException();
@@ -7969,21 +12963,21 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getSessions_result)
-        return this.equals((getSessions_result)that);
+      if (that instanceof setSafeMode_result)
+        return this.equals((setSafeMode_result)that);
       return false;
     }
 
-    public boolean equals(getSessions_result that) {
+    public boolean equals(setSafeMode_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
+      boolean this_present_success = true;
+      boolean that_present_success = true;
       if (this_present_success || that_present_success) {
         if (!(this_present_success && that_present_success))
           return false;
-        if (!this.success.equals(that.success))
+        if (this.success != that.success)
           return false;
       }
 
@@ -7995,13 +12989,13 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(getSessions_result other) {
+    public int compareTo(setSafeMode_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getSessions_result typedOther = (getSessions_result)other;
+      setSafeMode_result typedOther = (setSafeMode_result)other;
 
       lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
@@ -8031,19 +13025,9 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
         }
         switch (field.id) {
           case 0: // SUCCESS
-            if (field.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
-                this.success = new ArrayList<RunningSession>(_list46.size);
-                for (int _i47 = 0; _i47 < _list46.size; ++_i47)
-                {
-                  RunningSession _elem48; // required
-                  _elem48 = new RunningSession();
-                  _elem48.read(iprot);
-                  this.success.add(_elem48);
-                }
-                iprot.readListEnd();
-              }
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
@@ -8064,14 +13048,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
-          for (RunningSession _iter49 : this.success)
-          {
-            _iter49.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
+        oprot.writeBool(this.success);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -8080,15 +13057,11 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getSessions_result(");
+      StringBuilder sb = new StringBuilder("setSafeMode_result(");
       boolean first = true;
 
       sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
+      sb.append(this.success);
       first = false;
       sb.append(")");
       return sb.toString();
@@ -8116,16 +13089,14 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class killSession_args implements org.apache.thrift.TBase<killSession_args, killSession_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("killSession_args");
+  public static class persistState_args implements org.apache.thrift.TBase<persistState_args, persistState_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("persistState_args");
 
-    private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    public String sessionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      SESSION_ID((short)1, "sessionId");
+;
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -8140,8 +13111,6 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // SESSION_ID
-            return SESSION_ID;
           default:
             return null;
         }
@@ -8180,88 +13149,37 @@ public String getFieldName() {
         return _fieldName;
       }
     }
-
-    // isset id assignments
-
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(killSession_args.class, metaDataMap);
-    }
-
-    public killSession_args() {
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(persistState_args.class, metaDataMap);
     }
 
-    public killSession_args(
-      String sessionId)
-    {
-      this();
-      this.sessionId = sessionId;
+    public persistState_args() {
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public killSession_args(killSession_args other) {
-      if (other.isSetSessionId()) {
-        this.sessionId = other.sessionId;
-      }
+    public persistState_args(persistState_args other) {
     }
 
-    public killSession_args deepCopy() {
-      return new killSession_args(this);
+    public persistState_args deepCopy() {
+      return new persistState_args(this);
     }
 
     @Override
     public void clear() {
-      this.sessionId = null;
-    }
-
-    public String getSessionId() {
-      return this.sessionId;
-    }
-
-    public killSession_args setSessionId(String sessionId) {
-      this.sessionId = sessionId;
-      return this;
-    }
-
-    public void unsetSessionId() {
-      this.sessionId = null;
-    }
-
-    /** Returns true if field sessionId is set (has been assigned a value) and false otherwise */
-    public boolean isSetSessionId() {
-      return this.sessionId != null;
-    }
-
-    public void setSessionIdIsSet(boolean value) {
-      if (!value) {
-        this.sessionId = null;
-      }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SESSION_ID:
-        if (value == null) {
-          unsetSessionId();
-        } else {
-          setSessionId((String)value);
-        }
-        break;
-
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SESSION_ID:
-        return getSessionId();
-
       }
       throw new IllegalStateException();
     }
@@ -8273,8 +13191,6 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
-      case SESSION_ID:
-        return isSetSessionId();
       }
       throw new IllegalStateException();
     }
@@ -8283,24 +13199,15 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof killSession_args)
-        return this.equals((killSession_args)that);
+      if (that instanceof persistState_args)
+        return this.equals((persistState_args)that);
       return false;
     }
 
-    public boolean equals(killSession_args that) {
+    public boolean equals(persistState_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_sessionId = true && this.isSetSessionId();
-      boolean that_present_sessionId = true && that.isSetSessionId();
-      if (this_present_sessionId || that_present_sessionId) {
-        if (!(this_present_sessionId && that_present_sessionId))
-          return false;
-        if (!this.sessionId.equals(that.sessionId))
-          return false;
-      }
-
       return true;
     }
 
@@ -8309,24 +13216,14 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(killSession_args other) {
+    public int compareTo(persistState_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      killSession_args typedOther = (killSession_args)other;
+      persistState_args typedOther = (persistState_args)other;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -8344,13 +13241,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
-          case 1: // SESSION_ID
-            if (field.type == org.apache.thrift.protocol.TType.STRING) {
-              this.sessionId = iprot.readString();
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -8366,27 +13256,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.sessionId != null) {
-        oprot.writeFieldBegin(SESSION_ID_FIELD_DESC);
-        oprot.writeString(this.sessionId);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("killSession_args(");
+      StringBuilder sb = new StringBuilder("persistState_args(");
       boolean first = true;
 
-      sb.append("sessionId:");
-      if (this.sessionId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.sessionId);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -8413,14 +13291,16 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
 
   }
 
-  public static class killSession_result implements org.apache.thrift.TBase<killSession_result, killSession_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("killSession_result");
+  public static class persistState_result implements org.apache.thrift.TBase<persistState_result, persistState_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("persistState_result");
 
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
 
+    public boolean success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
+      SUCCESS((short)0, "success");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -8435,6 +13315,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
           default:
             return null;
         }
@@ -8473,37 +13355,91 @@ public String getFieldName() {
         return _fieldName;
       }
     }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(killSession_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(persistState_result.class, metaDataMap);
     }
 
-    public killSession_result() {
+    public persistState_result() {
+    }
+
+    public persistState_result(
+      boolean success)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public killSession_result(killSession_result other) {
+    public persistState_result(persistState_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
     }
 
-    public killSession_result deepCopy() {
-      return new killSession_result(this);
+    public persistState_result deepCopy() {
+      return new persistState_result(this);
     }
 
     @Override
     public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public persistState_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
       }
       throw new IllegalStateException();
     }
@@ -8515,6 +13451,8 @@ public boolean isSet(_Fields field) {
       }
 
       switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -8523,15 +13461,24 @@ public boolean isSet(_Fields field) {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof killSession_result)
-        return this.equals((killSession_result)that);
+      if (that instanceof persistState_result)
+        return this.equals((persistState_result)that);
       return false;
     }
 
-    public boolean equals(killSession_result that) {
+    public boolean equals(persistState_result that) {
       if (that == null)
         return false;
 
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
       return true;
     }
 
@@ -8540,14 +13487,24 @@ public int hashCode() {
       return 0;
     }
 
-    public int compareTo(killSession_result other) {
+    public int compareTo(persistState_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      killSession_result typedOther = (killSession_result)other;
+      persistState_result typedOther = (persistState_result)other;
 
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -8565,6 +13522,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
           break;
         }
         switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
@@ -8579,15 +13544,23 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("killSession_result(");
+      StringBuilder sb = new StringBuilder("persistState_result(");
       boolean first = true;
 
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
       sb.append(")");
       return sb.toString();
     }
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/ClusterNodeInfo.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/ClusterNodeInfo.java
index 58a06b81..e7e5b5cc 100644
--- a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/ClusterNodeInfo.java
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/ClusterNodeInfo.java
@@ -33,13 +33,13 @@ public class ClusterNodeInfo implements org.apache.thrift.TBase<ClusterNodeInfo,
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("address", org.apache.thrift.protocol.TType.STRUCT, (short)2);
   private static final org.apache.thrift.protocol.TField TOTAL_FIELD_DESC = new org.apache.thrift.protocol.TField("total", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField USED_FIELD_DESC = new org.apache.thrift.protocol.TField("used", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+  private static final org.apache.thrift.protocol.TField FREE_FIELD_DESC = new org.apache.thrift.protocol.TField("free", org.apache.thrift.protocol.TType.STRUCT, (short)4);
   private static final org.apache.thrift.protocol.TField RESOURCE_INFOS_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceInfos", org.apache.thrift.protocol.TType.MAP, (short)5);
 
   public String name; // required
   public InetAddress address; // required
   public ComputeSpecs total; // required
-  public ComputeSpecs used; // required
+  public ComputeSpecs free; // required
   public Map<ResourceType,String> resourceInfos; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -47,7 +47,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     NAME((short)1, "name"),
     ADDRESS((short)2, "address"),
     TOTAL((short)3, "total"),
-    USED((short)4, "used"),
+    FREE((short)4, "free"),
     RESOURCE_INFOS((short)5, "resourceInfos");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -69,8 +69,8 @@ public static _Fields findByThriftId(int fieldId) {
           return ADDRESS;
         case 3: // TOTAL
           return TOTAL;
-        case 4: // USED
-          return USED;
+        case 4: // FREE
+          return FREE;
         case 5: // RESOURCE_INFOS
           return RESOURCE_INFOS;
         default:
@@ -123,7 +123,7 @@ public String getFieldName() {
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, InetAddress.class)));
     tmpMap.put(_Fields.TOTAL, new org.apache.thrift.meta_data.FieldMetaData("total", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComputeSpecs.class)));
-    tmpMap.put(_Fields.USED, new org.apache.thrift.meta_data.FieldMetaData("used", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.FREE, new org.apache.thrift.meta_data.FieldMetaData("free", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComputeSpecs.class)));
     tmpMap.put(_Fields.RESOURCE_INFOS, new org.apache.thrift.meta_data.FieldMetaData("resourceInfos", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
@@ -160,8 +160,8 @@ public ClusterNodeInfo(ClusterNodeInfo other) {
     if (other.isSetTotal()) {
       this.total = new ComputeSpecs(other.total);
     }
-    if (other.isSetUsed()) {
-      this.used = new ComputeSpecs(other.used);
+    if (other.isSetFree()) {
+      this.free = new ComputeSpecs(other.free);
     }
     if (other.isSetResourceInfos()) {
       Map<ResourceType,String> __this__resourceInfos = new HashMap<ResourceType,String>();
@@ -189,7 +189,7 @@ public void clear() {
     this.name = null;
     this.address = null;
     this.total = null;
-    this.used = null;
+    this.free = null;
     this.resourceInfos = null;
   }
 
@@ -265,27 +265,27 @@ public void setTotalIsSet(boolean value) {
     }
   }
 
-  public ComputeSpecs getUsed() {
-    return this.used;
+  public ComputeSpecs getFree() {
+    return this.free;
   }
 
-  public ClusterNodeInfo setUsed(ComputeSpecs used) {
-    this.used = used;
+  public ClusterNodeInfo setFree(ComputeSpecs free) {
+    this.free = free;
     return this;
   }
 
-  public void unsetUsed() {
-    this.used = null;
+  public void unsetFree() {
+    this.free = null;
   }
 
-  /** Returns true if field used is set (has been assigned a value) and false otherwise */
-  public boolean isSetUsed() {
-    return this.used != null;
+  /** Returns true if field free is set (has been assigned a value) and false otherwise */
+  public boolean isSetFree() {
+    return this.free != null;
   }
 
-  public void setUsedIsSet(boolean value) {
+  public void setFreeIsSet(boolean value) {
     if (!value) {
-      this.used = null;
+      this.free = null;
     }
   }
 
@@ -350,11 +350,11 @@ public void setFieldValue(_Fields field, Object value) {
       }
       break;
 
-    case USED:
+    case FREE:
       if (value == null) {
-        unsetUsed();
+        unsetFree();
       } else {
-        setUsed((ComputeSpecs)value);
+        setFree((ComputeSpecs)value);
       }
       break;
 
@@ -380,8 +380,8 @@ public Object getFieldValue(_Fields field) {
     case TOTAL:
       return getTotal();
 
-    case USED:
-      return getUsed();
+    case FREE:
+      return getFree();
 
     case RESOURCE_INFOS:
       return getResourceInfos();
@@ -403,8 +403,8 @@ public boolean isSet(_Fields field) {
       return isSetAddress();
     case TOTAL:
       return isSetTotal();
-    case USED:
-      return isSetUsed();
+    case FREE:
+      return isSetFree();
     case RESOURCE_INFOS:
       return isSetResourceInfos();
     }
@@ -451,12 +451,12 @@ public boolean equals(ClusterNodeInfo that) {
         return false;
     }
 
-    boolean this_present_used = true && this.isSetUsed();
-    boolean that_present_used = true && that.isSetUsed();
-    if (this_present_used || that_present_used) {
-      if (!(this_present_used && that_present_used))
+    boolean this_present_free = true && this.isSetFree();
+    boolean that_present_free = true && that.isSetFree();
+    if (this_present_free || that_present_free) {
+      if (!(this_present_free && that_present_free))
         return false;
-      if (!this.used.equals(that.used))
+      if (!this.free.equals(that.free))
         return false;
     }
 
@@ -515,12 +515,12 @@ public int compareTo(ClusterNodeInfo other) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUsed()).compareTo(typedOther.isSetUsed());
+    lastComparison = Boolean.valueOf(isSetFree()).compareTo(typedOther.isSetFree());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetUsed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.used, typedOther.used);
+    if (isSetFree()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.free, typedOther.free);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -575,10 +575,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 4: // USED
+        case 4: // FREE
           if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-            this.used = new ComputeSpecs();
-            this.used.read(iprot);
+            this.free = new ComputeSpecs();
+            this.free.read(iprot);
           } else { 
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
@@ -632,10 +632,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
       this.total.write(oprot);
       oprot.writeFieldEnd();
     }
-    if (this.used != null) {
-      if (isSetUsed()) {
-        oprot.writeFieldBegin(USED_FIELD_DESC);
-        this.used.write(oprot);
+    if (this.free != null) {
+      if (isSetFree()) {
+        oprot.writeFieldBegin(FREE_FIELD_DESC);
+        this.free.write(oprot);
         oprot.writeFieldEnd();
       }
     }
@@ -686,13 +686,13 @@ public String toString() {
       sb.append(this.total);
     }
     first = false;
-    if (isSetUsed()) {
+    if (isSetFree()) {
       if (!first) sb.append(", ");
-      sb.append("used:");
-      if (this.used == null) {
+      sb.append("free:");
+      if (this.free == null) {
         sb.append("null");
       } else {
-        sb.append(this.used);
+        sb.append(this.free);
       }
       first = false;
     }
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/CoronaProxyJobTrackerService.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/CoronaProxyJobTrackerService.java
new file mode 100644
index 00000000..4bc24c44
--- /dev/null
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/CoronaProxyJobTrackerService.java
@@ -0,0 +1,1234 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.corona;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CoronaProxyJobTrackerService {
+
+  /**
+   * Corona ProxyJobTracker Service API.
+   */
+  public interface Iface {
+
+    public void setClusterManagerSafeModeFlag(boolean flagValue) throws org.apache.thrift.TException;
+
+    public boolean getClusterManagerSafeModeFlag() throws org.apache.thrift.TException;
+
+  }
+
+  public interface AsyncIface {
+
+    public void setClusterManagerSafeModeFlag(boolean flagValue, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.setClusterManagerSafeModeFlag_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void getClusterManagerSafeModeFlag(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getClusterManagerSafeModeFlag_call> resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+      public Factory() {}
+      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+        return new Client(prot);
+      }
+      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+        return new Client(iprot, oprot);
+      }
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol prot)
+    {
+      super(prot, prot);
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      super(iprot, oprot);
+    }
+
+    public void setClusterManagerSafeModeFlag(boolean flagValue) throws org.apache.thrift.TException
+    {
+      send_setClusterManagerSafeModeFlag(flagValue);
+      recv_setClusterManagerSafeModeFlag();
+    }
+
+    public void send_setClusterManagerSafeModeFlag(boolean flagValue) throws org.apache.thrift.TException
+    {
+      setClusterManagerSafeModeFlag_args args = new setClusterManagerSafeModeFlag_args();
+      args.setFlagValue(flagValue);
+      sendBase("setClusterManagerSafeModeFlag", args);
+    }
+
+    public void recv_setClusterManagerSafeModeFlag() throws org.apache.thrift.TException
+    {
+      setClusterManagerSafeModeFlag_result result = new setClusterManagerSafeModeFlag_result();
+      receiveBase(result, "setClusterManagerSafeModeFlag");
+      return;
+    }
+
+    public boolean getClusterManagerSafeModeFlag() throws org.apache.thrift.TException
+    {
+      send_getClusterManagerSafeModeFlag();
+      return recv_getClusterManagerSafeModeFlag();
+    }
+
+    public void send_getClusterManagerSafeModeFlag() throws org.apache.thrift.TException
+    {
+      getClusterManagerSafeModeFlag_args args = new getClusterManagerSafeModeFlag_args();
+      sendBase("getClusterManagerSafeModeFlag", args);
+    }
+
+    public boolean recv_getClusterManagerSafeModeFlag() throws org.apache.thrift.TException
+    {
+      getClusterManagerSafeModeFlag_result result = new getClusterManagerSafeModeFlag_result();
+      receiveBase(result, "getClusterManagerSafeModeFlag");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getClusterManagerSafeModeFlag failed: unknown result");
+    }
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+        this.clientManager = clientManager;
+        this.protocolFactory = protocolFactory;
+      }
+      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+        return new AsyncClient(protocolFactory, clientManager, transport);
+      }
+    }
+
+    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+      super(protocolFactory, clientManager, transport);
+    }
+
+    public void setClusterManagerSafeModeFlag(boolean flagValue, org.apache.thrift.async.AsyncMethodCallback<setClusterManagerSafeModeFlag_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      setClusterManagerSafeModeFlag_call method_call = new setClusterManagerSafeModeFlag_call(flagValue, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class setClusterManagerSafeModeFlag_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private boolean flagValue;
+      public setClusterManagerSafeModeFlag_call(boolean flagValue, org.apache.thrift.async.AsyncMethodCallback<setClusterManagerSafeModeFlag_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.flagValue = flagValue;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setClusterManagerSafeModeFlag", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        setClusterManagerSafeModeFlag_args args = new setClusterManagerSafeModeFlag_args();
+        args.setFlagValue(flagValue);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_setClusterManagerSafeModeFlag();
+      }
+    }
+
+    public void getClusterManagerSafeModeFlag(org.apache.thrift.async.AsyncMethodCallback<getClusterManagerSafeModeFlag_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getClusterManagerSafeModeFlag_call method_call = new getClusterManagerSafeModeFlag_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getClusterManagerSafeModeFlag_call extends org.apache.thrift.async.TAsyncMethodCall {
+      public getClusterManagerSafeModeFlag_call(org.apache.thrift.async.AsyncMethodCallback<getClusterManagerSafeModeFlag_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getClusterManagerSafeModeFlag", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getClusterManagerSafeModeFlag_args args = new getClusterManagerSafeModeFlag_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getClusterManagerSafeModeFlag();
+      }
+    }
+
+  }
+
+  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
+    public Processor(I iface) {
+      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+    }
+
+    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      processMap.put("setClusterManagerSafeModeFlag", new setClusterManagerSafeModeFlag());
+      processMap.put("getClusterManagerSafeModeFlag", new getClusterManagerSafeModeFlag());
+      return processMap;
+    }
+
+    private static class setClusterManagerSafeModeFlag<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setClusterManagerSafeModeFlag_args> {
+      public setClusterManagerSafeModeFlag() {
+        super("setClusterManagerSafeModeFlag");
+      }
+
+      protected setClusterManagerSafeModeFlag_args getEmptyArgsInstance() {
+        return new setClusterManagerSafeModeFlag_args();
+      }
+
+      protected setClusterManagerSafeModeFlag_result getResult(I iface, setClusterManagerSafeModeFlag_args args) throws org.apache.thrift.TException {
+        setClusterManagerSafeModeFlag_result result = new setClusterManagerSafeModeFlag_result();
+        iface.setClusterManagerSafeModeFlag(args.flagValue);
+        return result;
+      }
+    }
+
+    private static class getClusterManagerSafeModeFlag<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getClusterManagerSafeModeFlag_args> {
+      public getClusterManagerSafeModeFlag() {
+        super("getClusterManagerSafeModeFlag");
+      }
+
+      protected getClusterManagerSafeModeFlag_args getEmptyArgsInstance() {
+        return new getClusterManagerSafeModeFlag_args();
+      }
+
+      protected getClusterManagerSafeModeFlag_result getResult(I iface, getClusterManagerSafeModeFlag_args args) throws org.apache.thrift.TException {
+        getClusterManagerSafeModeFlag_result result = new getClusterManagerSafeModeFlag_result();
+        result.success = iface.getClusterManagerSafeModeFlag();
+        result.setSuccessIsSet(true);
+        return result;
+      }
+    }
+
+  }
+
+  public static class setClusterManagerSafeModeFlag_args implements org.apache.thrift.TBase<setClusterManagerSafeModeFlag_args, setClusterManagerSafeModeFlag_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setClusterManagerSafeModeFlag_args");
+
+    private static final org.apache.thrift.protocol.TField FLAG_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("flagValue", org.apache.thrift.protocol.TType.BOOL, (short)1);
+
+    public boolean flagValue; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      FLAG_VALUE((short)1, "flagValue");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // FLAG_VALUE
+            return FLAG_VALUE;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __FLAGVALUE_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.FLAG_VALUE, new org.apache.thrift.meta_data.FieldMetaData("flagValue", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setClusterManagerSafeModeFlag_args.class, metaDataMap);
+    }
+
+    public setClusterManagerSafeModeFlag_args() {
+    }
+
+    public setClusterManagerSafeModeFlag_args(
+      boolean flagValue)
+    {
+      this();
+      this.flagValue = flagValue;
+      setFlagValueIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public setClusterManagerSafeModeFlag_args(setClusterManagerSafeModeFlag_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.flagValue = other.flagValue;
+    }
+
+    public setClusterManagerSafeModeFlag_args deepCopy() {
+      return new setClusterManagerSafeModeFlag_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setFlagValueIsSet(false);
+      this.flagValue = false;
+    }
+
+    public boolean isFlagValue() {
+      return this.flagValue;
+    }
+
+    public setClusterManagerSafeModeFlag_args setFlagValue(boolean flagValue) {
+      this.flagValue = flagValue;
+      setFlagValueIsSet(true);
+      return this;
+    }
+
+    public void unsetFlagValue() {
+      __isset_bit_vector.clear(__FLAGVALUE_ISSET_ID);
+    }
+
+    /** Returns true if field flagValue is set (has been assigned a value) and false otherwise */
+    public boolean isSetFlagValue() {
+      return __isset_bit_vector.get(__FLAGVALUE_ISSET_ID);
+    }
+
+    public void setFlagValueIsSet(boolean value) {
+      __isset_bit_vector.set(__FLAGVALUE_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case FLAG_VALUE:
+        if (value == null) {
+          unsetFlagValue();
+        } else {
+          setFlagValue((Boolean)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case FLAG_VALUE:
+        return Boolean.valueOf(isFlagValue());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case FLAG_VALUE:
+        return isSetFlagValue();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof setClusterManagerSafeModeFlag_args)
+        return this.equals((setClusterManagerSafeModeFlag_args)that);
+      return false;
+    }
+
+    public boolean equals(setClusterManagerSafeModeFlag_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_flagValue = true;
+      boolean that_present_flagValue = true;
+      if (this_present_flagValue || that_present_flagValue) {
+        if (!(this_present_flagValue && that_present_flagValue))
+          return false;
+        if (this.flagValue != that.flagValue)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(setClusterManagerSafeModeFlag_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      setClusterManagerSafeModeFlag_args typedOther = (setClusterManagerSafeModeFlag_args)other;
+
+      lastComparison = Boolean.valueOf(isSetFlagValue()).compareTo(typedOther.isSetFlagValue());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetFlagValue()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.flagValue, typedOther.flagValue);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // FLAG_VALUE
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.flagValue = iprot.readBool();
+              setFlagValueIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(FLAG_VALUE_FIELD_DESC);
+      oprot.writeBool(this.flagValue);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("setClusterManagerSafeModeFlag_args(");
+      boolean first = true;
+
+      sb.append("flagValue:");
+      sb.append(this.flagValue);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class setClusterManagerSafeModeFlag_result implements org.apache.thrift.TBase<setClusterManagerSafeModeFlag_result, setClusterManagerSafeModeFlag_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setClusterManagerSafeModeFlag_result");
+
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setClusterManagerSafeModeFlag_result.class, metaDataMap);
+    }
+
+    public setClusterManagerSafeModeFlag_result() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public setClusterManagerSafeModeFlag_result(setClusterManagerSafeModeFlag_result other) {
+    }
+
+    public setClusterManagerSafeModeFlag_result deepCopy() {
+      return new setClusterManagerSafeModeFlag_result(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof setClusterManagerSafeModeFlag_result)
+        return this.equals((setClusterManagerSafeModeFlag_result)that);
+      return false;
+    }
+
+    public boolean equals(setClusterManagerSafeModeFlag_result that) {
+      if (that == null)
+        return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(setClusterManagerSafeModeFlag_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      setClusterManagerSafeModeFlag_result typedOther = (setClusterManagerSafeModeFlag_result)other;
+
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("setClusterManagerSafeModeFlag_result(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getClusterManagerSafeModeFlag_args implements org.apache.thrift.TBase<getClusterManagerSafeModeFlag_args, getClusterManagerSafeModeFlag_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getClusterManagerSafeModeFlag_args");
+
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getClusterManagerSafeModeFlag_args.class, metaDataMap);
+    }
+
+    public getClusterManagerSafeModeFlag_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getClusterManagerSafeModeFlag_args(getClusterManagerSafeModeFlag_args other) {
+    }
+
+    public getClusterManagerSafeModeFlag_args deepCopy() {
+      return new getClusterManagerSafeModeFlag_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getClusterManagerSafeModeFlag_args)
+        return this.equals((getClusterManagerSafeModeFlag_args)that);
+      return false;
+    }
+
+    public boolean equals(getClusterManagerSafeModeFlag_args that) {
+      if (that == null)
+        return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getClusterManagerSafeModeFlag_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getClusterManagerSafeModeFlag_args typedOther = (getClusterManagerSafeModeFlag_args)other;
+
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getClusterManagerSafeModeFlag_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getClusterManagerSafeModeFlag_result implements org.apache.thrift.TBase<getClusterManagerSafeModeFlag_result, getClusterManagerSafeModeFlag_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getClusterManagerSafeModeFlag_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+
+    public boolean success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getClusterManagerSafeModeFlag_result.class, metaDataMap);
+    }
+
+    public getClusterManagerSafeModeFlag_result() {
+    }
+
+    public getClusterManagerSafeModeFlag_result(
+      boolean success)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getClusterManagerSafeModeFlag_result(getClusterManagerSafeModeFlag_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+    }
+
+    public getClusterManagerSafeModeFlag_result deepCopy() {
+      return new getClusterManagerSafeModeFlag_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public getClusterManagerSafeModeFlag_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getClusterManagerSafeModeFlag_result)
+        return this.equals((getClusterManagerSafeModeFlag_result)that);
+      return false;
+    }
+
+    public boolean equals(getClusterManagerSafeModeFlag_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getClusterManagerSafeModeFlag_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getClusterManagerSafeModeFlag_result typedOther = (getClusterManagerSafeModeFlag_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getClusterManagerSafeModeFlag_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+}
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/HeartbeatArgs.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/HeartbeatArgs.java
new file mode 100644
index 00000000..e8411f09
--- /dev/null
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/HeartbeatArgs.java
@@ -0,0 +1,411 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.corona;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HeartbeatArgs implements org.apache.thrift.TBase<HeartbeatArgs, HeartbeatArgs._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HeartbeatArgs");
+
+  private static final org.apache.thrift.protocol.TField REQUEST_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("requestId", org.apache.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.thrift.protocol.TField GRANT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("grantId", org.apache.thrift.protocol.TType.I32, (short)2);
+
+  public int requestId; // required
+  public int grantId; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    REQUEST_ID((short)1, "requestId"),
+    GRANT_ID((short)2, "grantId");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // REQUEST_ID
+          return REQUEST_ID;
+        case 2: // GRANT_ID
+          return GRANT_ID;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __REQUESTID_ISSET_ID = 0;
+  private static final int __GRANTID_ISSET_ID = 1;
+  private BitSet __isset_bit_vector = new BitSet(2);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.REQUEST_ID, new org.apache.thrift.meta_data.FieldMetaData("requestId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32        , "ResourceRequestId")));
+    tmpMap.put(_Fields.GRANT_ID, new org.apache.thrift.meta_data.FieldMetaData("grantId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32        , "ResourceRequestId")));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HeartbeatArgs.class, metaDataMap);
+  }
+
+  public HeartbeatArgs() {
+  }
+
+  public HeartbeatArgs(
+    int requestId,
+    int grantId)
+  {
+    this();
+    this.requestId = requestId;
+    setRequestIdIsSet(true);
+    this.grantId = grantId;
+    setGrantIdIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public HeartbeatArgs(HeartbeatArgs other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    this.requestId = other.requestId;
+    this.grantId = other.grantId;
+  }
+
+  public HeartbeatArgs deepCopy() {
+    return new HeartbeatArgs(this);
+  }
+
+  @Override
+  public void clear() {
+    setRequestIdIsSet(false);
+    this.requestId = 0;
+    setGrantIdIsSet(false);
+    this.grantId = 0;
+  }
+
+  public int getRequestId() {
+    return this.requestId;
+  }
+
+  public HeartbeatArgs setRequestId(int requestId) {
+    this.requestId = requestId;
+    setRequestIdIsSet(true);
+    return this;
+  }
+
+  public void unsetRequestId() {
+    __isset_bit_vector.clear(__REQUESTID_ISSET_ID);
+  }
+
+  /** Returns true if field requestId is set (has been assigned a value) and false otherwise */
+  public boolean isSetRequestId() {
+    return __isset_bit_vector.get(__REQUESTID_ISSET_ID);
+  }
+
+  public void setRequestIdIsSet(boolean value) {
+    __isset_bit_vector.set(__REQUESTID_ISSET_ID, value);
+  }
+
+  public int getGrantId() {
+    return this.grantId;
+  }
+
+  public HeartbeatArgs setGrantId(int grantId) {
+    this.grantId = grantId;
+    setGrantIdIsSet(true);
+    return this;
+  }
+
+  public void unsetGrantId() {
+    __isset_bit_vector.clear(__GRANTID_ISSET_ID);
+  }
+
+  /** Returns true if field grantId is set (has been assigned a value) and false otherwise */
+  public boolean isSetGrantId() {
+    return __isset_bit_vector.get(__GRANTID_ISSET_ID);
+  }
+
+  public void setGrantIdIsSet(boolean value) {
+    __isset_bit_vector.set(__GRANTID_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case REQUEST_ID:
+      if (value == null) {
+        unsetRequestId();
+      } else {
+        setRequestId((Integer)value);
+      }
+      break;
+
+    case GRANT_ID:
+      if (value == null) {
+        unsetGrantId();
+      } else {
+        setGrantId((Integer)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case REQUEST_ID:
+      return Integer.valueOf(getRequestId());
+
+    case GRANT_ID:
+      return Integer.valueOf(getGrantId());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case REQUEST_ID:
+      return isSetRequestId();
+    case GRANT_ID:
+      return isSetGrantId();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof HeartbeatArgs)
+      return this.equals((HeartbeatArgs)that);
+    return false;
+  }
+
+  public boolean equals(HeartbeatArgs that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_requestId = true;
+    boolean that_present_requestId = true;
+    if (this_present_requestId || that_present_requestId) {
+      if (!(this_present_requestId && that_present_requestId))
+        return false;
+      if (this.requestId != that.requestId)
+        return false;
+    }
+
+    boolean this_present_grantId = true;
+    boolean that_present_grantId = true;
+    if (this_present_grantId || that_present_grantId) {
+      if (!(this_present_grantId && that_present_grantId))
+        return false;
+      if (this.grantId != that.grantId)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(HeartbeatArgs other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    HeartbeatArgs typedOther = (HeartbeatArgs)other;
+
+    lastComparison = Boolean.valueOf(isSetRequestId()).compareTo(typedOther.isSetRequestId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetRequestId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestId, typedOther.requestId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetGrantId()).compareTo(typedOther.isSetGrantId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGrantId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantId, typedOther.grantId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // REQUEST_ID
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
+            this.requestId = iprot.readI32();
+            setRequestIdIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // GRANT_ID
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
+            this.grantId = iprot.readI32();
+            setGrantIdIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    if (!isSetRequestId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestId' was not found in serialized data! Struct: " + toString());
+    }
+    if (!isSetGrantId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'grantId' was not found in serialized data! Struct: " + toString());
+    }
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldBegin(REQUEST_ID_FIELD_DESC);
+    oprot.writeI32(this.requestId);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(GRANT_ID_FIELD_DESC);
+    oprot.writeI32(this.grantId);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("HeartbeatArgs(");
+    boolean first = true;
+
+    sb.append("requestId:");
+    sb.append(this.requestId);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("grantId:");
+    sb.append(this.grantId);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // alas, we cannot check 'requestId' because it's a primitive and you chose the non-beans generator.
+    // alas, we cannot check 'grantId' because it's a primitive and you chose the non-beans generator.
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/InvalidPoolInfo.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/InvalidPoolInfo.java
new file mode 100644
index 00000000..e2133277
--- /dev/null
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/InvalidPoolInfo.java
@@ -0,0 +1,322 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.corona;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InvalidPoolInfo extends Exception implements org.apache.thrift.TBase<InvalidPoolInfo, InvalidPoolInfo._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidPoolInfo");
+
+  private static final org.apache.thrift.protocol.TField POOL_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("poolInfo", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String poolInfo; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    POOL_INFO((short)1, "poolInfo");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // POOL_INFO
+          return POOL_INFO;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.POOL_INFO, new org.apache.thrift.meta_data.FieldMetaData("poolInfo", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidPoolInfo.class, metaDataMap);
+  }
+
+  public InvalidPoolInfo() {
+  }
+
+  public InvalidPoolInfo(
+    String poolInfo)
+  {
+    this();
+    this.poolInfo = poolInfo;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public InvalidPoolInfo(InvalidPoolInfo other) {
+    if (other.isSetPoolInfo()) {
+      this.poolInfo = other.poolInfo;
+    }
+  }
+
+  public InvalidPoolInfo deepCopy() {
+    return new InvalidPoolInfo(this);
+  }
+
+  @Override
+  public void clear() {
+    this.poolInfo = null;
+  }
+
+  public String getPoolInfo() {
+    return this.poolInfo;
+  }
+
+  public InvalidPoolInfo setPoolInfo(String poolInfo) {
+    this.poolInfo = poolInfo;
+    return this;
+  }
+
+  public void unsetPoolInfo() {
+    this.poolInfo = null;
+  }
+
+  /** Returns true if field poolInfo is set (has been assigned a value) and false otherwise */
+  public boolean isSetPoolInfo() {
+    return this.poolInfo != null;
+  }
+
+  public void setPoolInfoIsSet(boolean value) {
+    if (!value) {
+      this.poolInfo = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case POOL_INFO:
+      if (value == null) {
+        unsetPoolInfo();
+      } else {
+        setPoolInfo((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case POOL_INFO:
+      return getPoolInfo();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case POOL_INFO:
+      return isSetPoolInfo();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof InvalidPoolInfo)
+      return this.equals((InvalidPoolInfo)that);
+    return false;
+  }
+
+  public boolean equals(InvalidPoolInfo that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_poolInfo = true && this.isSetPoolInfo();
+    boolean that_present_poolInfo = true && that.isSetPoolInfo();
+    if (this_present_poolInfo || that_present_poolInfo) {
+      if (!(this_present_poolInfo && that_present_poolInfo))
+        return false;
+      if (!this.poolInfo.equals(that.poolInfo))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(InvalidPoolInfo other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    InvalidPoolInfo typedOther = (InvalidPoolInfo)other;
+
+    lastComparison = Boolean.valueOf(isSetPoolInfo()).compareTo(typedOther.isSetPoolInfo());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPoolInfo()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.poolInfo, typedOther.poolInfo);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // POOL_INFO
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.poolInfo = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.poolInfo != null) {
+      oprot.writeFieldBegin(POOL_INFO_FIELD_DESC);
+      oprot.writeString(this.poolInfo);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("InvalidPoolInfo(");
+    boolean first = true;
+
+    sb.append("poolInfo:");
+    if (this.poolInfo == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.poolInfo);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    if (poolInfo == null) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'poolInfo' was not present! Struct: " + toString());
+    }
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/NodeHeartbeatResponse.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/NodeHeartbeatResponse.java
new file mode 100644
index 00000000..5eba56dd
--- /dev/null
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/NodeHeartbeatResponse.java
@@ -0,0 +1,323 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.corona;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NodeHeartbeatResponse implements org.apache.thrift.TBase<NodeHeartbeatResponse, NodeHeartbeatResponse._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeHeartbeatResponse");
+
+  private static final org.apache.thrift.protocol.TField RESTART_FLAG_FIELD_DESC = new org.apache.thrift.protocol.TField("restartFlag", org.apache.thrift.protocol.TType.BOOL, (short)1);
+
+  public boolean restartFlag; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    RESTART_FLAG((short)1, "restartFlag");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // RESTART_FLAG
+          return RESTART_FLAG;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __RESTARTFLAG_ISSET_ID = 0;
+  private BitSet __isset_bit_vector = new BitSet(1);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.RESTART_FLAG, new org.apache.thrift.meta_data.FieldMetaData("restartFlag", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NodeHeartbeatResponse.class, metaDataMap);
+  }
+
+  public NodeHeartbeatResponse() {
+  }
+
+  public NodeHeartbeatResponse(
+    boolean restartFlag)
+  {
+    this();
+    this.restartFlag = restartFlag;
+    setRestartFlagIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public NodeHeartbeatResponse(NodeHeartbeatResponse other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    this.restartFlag = other.restartFlag;
+  }
+
+  public NodeHeartbeatResponse deepCopy() {
+    return new NodeHeartbeatResponse(this);
+  }
+
+  @Override
+  public void clear() {
+    setRestartFlagIsSet(false);
+    this.restartFlag = false;
+  }
+
+  public boolean isRestartFlag() {
+    return this.restartFlag;
+  }
+
+  public NodeHeartbeatResponse setRestartFlag(boolean restartFlag) {
+    this.restartFlag = restartFlag;
+    setRestartFlagIsSet(true);
+    return this;
+  }
+
+  public void unsetRestartFlag() {
+    __isset_bit_vector.clear(__RESTARTFLAG_ISSET_ID);
+  }
+
+  /** Returns true if field restartFlag is set (has been assigned a value) and false otherwise */
+  public boolean isSetRestartFlag() {
+    return __isset_bit_vector.get(__RESTARTFLAG_ISSET_ID);
+  }
+
+  public void setRestartFlagIsSet(boolean value) {
+    __isset_bit_vector.set(__RESTARTFLAG_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case RESTART_FLAG:
+      if (value == null) {
+        unsetRestartFlag();
+      } else {
+        setRestartFlag((Boolean)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case RESTART_FLAG:
+      return Boolean.valueOf(isRestartFlag());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case RESTART_FLAG:
+      return isSetRestartFlag();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof NodeHeartbeatResponse)
+      return this.equals((NodeHeartbeatResponse)that);
+    return false;
+  }
+
+  public boolean equals(NodeHeartbeatResponse that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_restartFlag = true;
+    boolean that_present_restartFlag = true;
+    if (this_present_restartFlag || that_present_restartFlag) {
+      if (!(this_present_restartFlag && that_present_restartFlag))
+        return false;
+      if (this.restartFlag != that.restartFlag)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(NodeHeartbeatResponse other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    NodeHeartbeatResponse typedOther = (NodeHeartbeatResponse)other;
+
+    lastComparison = Boolean.valueOf(isSetRestartFlag()).compareTo(typedOther.isSetRestartFlag());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetRestartFlag()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.restartFlag, typedOther.restartFlag);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // RESTART_FLAG
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+            this.restartFlag = iprot.readBool();
+            setRestartFlagIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    if (!isSetRestartFlag()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'restartFlag' was not found in serialized data! Struct: " + toString());
+    }
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldBegin(RESTART_FLAG_FIELD_DESC);
+    oprot.writeBool(this.restartFlag);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("NodeHeartbeatResponse(");
+    boolean first = true;
+
+    sb.append("restartFlag:");
+    sb.append(this.restartFlag);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // alas, we cannot check 'restartFlag' because it's a primitive and you chose the non-beans generator.
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/RestartNodesArgs.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/RestartNodesArgs.java
new file mode 100644
index 00000000..5be3fecd
--- /dev/null
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/RestartNodesArgs.java
@@ -0,0 +1,411 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.corona;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RestartNodesArgs implements org.apache.thrift.TBase<RestartNodesArgs, RestartNodesArgs._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RestartNodesArgs");
+
+  private static final org.apache.thrift.protocol.TField FORCE_FIELD_DESC = new org.apache.thrift.protocol.TField("force", org.apache.thrift.protocol.TType.BOOL, (short)1);
+  private static final org.apache.thrift.protocol.TField BATCH_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("batchSize", org.apache.thrift.protocol.TType.I32, (short)2);
+
+  public boolean force; // required
+  public int batchSize; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    FORCE((short)1, "force"),
+    BATCH_SIZE((short)2, "batchSize");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // FORCE
+          return FORCE;
+        case 2: // BATCH_SIZE
+          return BATCH_SIZE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __FORCE_ISSET_ID = 0;
+  private static final int __BATCHSIZE_ISSET_ID = 1;
+  private BitSet __isset_bit_vector = new BitSet(2);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.FORCE, new org.apache.thrift.meta_data.FieldMetaData("force", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.BATCH_SIZE, new org.apache.thrift.meta_data.FieldMetaData("batchSize", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RestartNodesArgs.class, metaDataMap);
+  }
+
+  public RestartNodesArgs() {
+  }
+
+  public RestartNodesArgs(
+    boolean force,
+    int batchSize)
+  {
+    this();
+    this.force = force;
+    setForceIsSet(true);
+    this.batchSize = batchSize;
+    setBatchSizeIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public RestartNodesArgs(RestartNodesArgs other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    this.force = other.force;
+    this.batchSize = other.batchSize;
+  }
+
+  public RestartNodesArgs deepCopy() {
+    return new RestartNodesArgs(this);
+  }
+
+  @Override
+  public void clear() {
+    setForceIsSet(false);
+    this.force = false;
+    setBatchSizeIsSet(false);
+    this.batchSize = 0;
+  }
+
+  public boolean isForce() {
+    return this.force;
+  }
+
+  public RestartNodesArgs setForce(boolean force) {
+    this.force = force;
+    setForceIsSet(true);
+    return this;
+  }
+
+  public void unsetForce() {
+    __isset_bit_vector.clear(__FORCE_ISSET_ID);
+  }
+
+  /** Returns true if field force is set (has been assigned a value) and false otherwise */
+  public boolean isSetForce() {
+    return __isset_bit_vector.get(__FORCE_ISSET_ID);
+  }
+
+  public void setForceIsSet(boolean value) {
+    __isset_bit_vector.set(__FORCE_ISSET_ID, value);
+  }
+
+  public int getBatchSize() {
+    return this.batchSize;
+  }
+
+  public RestartNodesArgs setBatchSize(int batchSize) {
+    this.batchSize = batchSize;
+    setBatchSizeIsSet(true);
+    return this;
+  }
+
+  public void unsetBatchSize() {
+    __isset_bit_vector.clear(__BATCHSIZE_ISSET_ID);
+  }
+
+  /** Returns true if field batchSize is set (has been assigned a value) and false otherwise */
+  public boolean isSetBatchSize() {
+    return __isset_bit_vector.get(__BATCHSIZE_ISSET_ID);
+  }
+
+  public void setBatchSizeIsSet(boolean value) {
+    __isset_bit_vector.set(__BATCHSIZE_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case FORCE:
+      if (value == null) {
+        unsetForce();
+      } else {
+        setForce((Boolean)value);
+      }
+      break;
+
+    case BATCH_SIZE:
+      if (value == null) {
+        unsetBatchSize();
+      } else {
+        setBatchSize((Integer)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case FORCE:
+      return Boolean.valueOf(isForce());
+
+    case BATCH_SIZE:
+      return Integer.valueOf(getBatchSize());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case FORCE:
+      return isSetForce();
+    case BATCH_SIZE:
+      return isSetBatchSize();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof RestartNodesArgs)
+      return this.equals((RestartNodesArgs)that);
+    return false;
+  }
+
+  public boolean equals(RestartNodesArgs that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_force = true;
+    boolean that_present_force = true;
+    if (this_present_force || that_present_force) {
+      if (!(this_present_force && that_present_force))
+        return false;
+      if (this.force != that.force)
+        return false;
+    }
+
+    boolean this_present_batchSize = true;
+    boolean that_present_batchSize = true;
+    if (this_present_batchSize || that_present_batchSize) {
+      if (!(this_present_batchSize && that_present_batchSize))
+        return false;
+      if (this.batchSize != that.batchSize)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(RestartNodesArgs other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    RestartNodesArgs typedOther = (RestartNodesArgs)other;
+
+    lastComparison = Boolean.valueOf(isSetForce()).compareTo(typedOther.isSetForce());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetForce()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.force, typedOther.force);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(typedOther.isSetBatchSize());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetBatchSize()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, typedOther.batchSize);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // FORCE
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+            this.force = iprot.readBool();
+            setForceIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // BATCH_SIZE
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
+            this.batchSize = iprot.readI32();
+            setBatchSizeIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    if (!isSetForce()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'force' was not found in serialized data! Struct: " + toString());
+    }
+    if (!isSetBatchSize()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'batchSize' was not found in serialized data! Struct: " + toString());
+    }
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldBegin(FORCE_FIELD_DESC);
+    oprot.writeBool(this.force);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(BATCH_SIZE_FIELD_DESC);
+    oprot.writeI32(this.batchSize);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("RestartNodesArgs(");
+    boolean first = true;
+
+    sb.append("force:");
+    sb.append(this.force);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("batchSize:");
+    sb.append(this.batchSize);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // alas, we cannot check 'force' because it's a primitive and you chose the non-beans generator.
+    // alas, we cannot check 'batchSize' because it's a primitive and you chose the non-beans generator.
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/RestartNodesResponse.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/RestartNodesResponse.java
new file mode 100644
index 00000000..6d61c8c9
--- /dev/null
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/RestartNodesResponse.java
@@ -0,0 +1,224 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.corona;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RestartNodesResponse implements org.apache.thrift.TBase<RestartNodesResponse, RestartNodesResponse._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RestartNodesResponse");
+
+
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RestartNodesResponse.class, metaDataMap);
+  }
+
+  public RestartNodesResponse() {
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public RestartNodesResponse(RestartNodesResponse other) {
+  }
+
+  public RestartNodesResponse deepCopy() {
+    return new RestartNodesResponse(this);
+  }
+
+  @Override
+  public void clear() {
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof RestartNodesResponse)
+      return this.equals((RestartNodesResponse)that);
+    return false;
+  }
+
+  public boolean equals(RestartNodesResponse that) {
+    if (that == null)
+      return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(RestartNodesResponse other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    RestartNodesResponse typedOther = (RestartNodesResponse)other;
+
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("RestartNodesResponse(");
+    boolean first = true;
+
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/SafeModeException.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/SafeModeException.java
new file mode 100644
index 00000000..6dc6fed1
--- /dev/null
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/SafeModeException.java
@@ -0,0 +1,224 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.corona;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SafeModeException extends Exception implements org.apache.thrift.TBase<SafeModeException, SafeModeException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SafeModeException");
+
+
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SafeModeException.class, metaDataMap);
+  }
+
+  public SafeModeException() {
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public SafeModeException(SafeModeException other) {
+  }
+
+  public SafeModeException deepCopy() {
+    return new SafeModeException(this);
+  }
+
+  @Override
+  public void clear() {
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof SafeModeException)
+      return this.equals((SafeModeException)that);
+    return false;
+  }
+
+  public boolean equals(SafeModeException that) {
+    if (that == null)
+      return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(SafeModeException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    SafeModeException typedOther = (SafeModeException)other;
+
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("SafeModeException(");
+    boolean first = true;
+
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/SessionStatus.java b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/SessionStatus.java
index fb255d2e..60cfe3f2 100644
--- a/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/SessionStatus.java
+++ b/src/contrib/corona/src/gen-java/org/apache/hadoop/corona/SessionStatus.java
@@ -25,7 +25,8 @@ public enum SessionStatus implements org.apache.thrift.TEnum {
   SUCCESSFUL(3),
   KILLED(4),
   TIMED_OUT(5),
-  KILLED_ABORTED(6);
+  KILLED_ABORTED(6),
+  FAILED_JOBTRACKER(7);
 
   private final int value;
 
@@ -58,6 +59,8 @@ public static SessionStatus findByValue(int value) {
         return TIMED_OUT;
       case 6:
         return KILLED_ABORTED;
+      case 7:
+        return FAILED_JOBTRACKER;
       default:
         return null;
     }
diff --git a/src/contrib/corona/src/java/error.xml b/src/contrib/corona/src/java/error.xml
new file mode 100644
index 00000000..a7fe7ba5
--- /dev/null
+++ b/src/contrib/corona/src/java/error.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<configuration>
+  <error name="Failing high-memory">
+    <pattern>Failing high-memory.*</pattern>
+    <description>TaskTrackerMemoryManager fails the task for exceeding memory limit</description>
+  </error>
+  <error name="Killing high-memory">
+    <pattern>Killing high-memory.*</pattern>
+    <description>TaskTrackerMemoryManager kills the task for exceeding memory limit</description>
+  </error>
+  <error name="Hive Runtime Error">
+    <pattern>.*Hive Runtime Error while processing row.*</pattern>
+    <description>Error from processing a row in Hive</description>
+  </error>
+  <error name="Lost task tracker">
+    <pattern>.*Lost task tracker.*</pattern>
+    <description>TaskTracker has no heartbeat. The tasks it tracks and maps has output on it failed.</description>
+  </error>
+  <error name="Too many fetch-failures">
+    <pattern>Too many fetch-failures.*</pattern>
+    <description>A finished map failed because its map output cannot be fetched for many times.</description>
+  </error>
+  <error name="Map output lost">
+    <pattern>Map output lost.*</pattern>
+    <description>TaskTracker cannot find the map output file of a map finished on it.</description>
+  </error>
+  <error name="failed to report">
+    <pattern>.*failed to report status for.*</pattern>
+    <description>Task failed to report its status back to TaskTracker for a long time</description>
+  </error>
+  <error name="Error launching task">
+    <pattern>Error launching task.*</pattern>
+    <description>TaskTracker cannot localize and launch the task</description>
+  </error>
+  <error name="Java heap space OOM">
+    <pattern>Error: java.lang.OutOfMemoryError.*</pattern>
+    <description>Task tries to use more java heap space than configured Xmx</description>
+  </error>
+  <error name="No space left on device">
+    <pattern>.*No space left on device.*</pattern>
+    <description>TaskTracker cannot find a disk with enough space for the task</description>
+  </error>
+  <error name="No space left on device">
+    <pattern>.*No space left on device.*</pattern>
+    <description>TaskTracker cannot find a disk with enough space for the task</description>
+  </error>
+  <error name="Error: java.lang.NullPointerException">
+    <pattern>Error: java.lang.NullPointerException.*</pattern>
+  </error>
+  <error name="java.io.IOException">
+    <pattern>java.io.IOException.*</pattern>
+  </error>
+  <error name="Child Error">
+    <pattern>.*Child Error.*</pattern>
+  </error>
+</configuration>
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManager.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManager.java
index ee2ca974..1faf1e76 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManager.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManager.java
@@ -27,9 +27,11 @@
 import org.apache.hadoop.http.HttpServer;
 import org.apache.hadoop.mapred.Clock;
 import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.util.CoronaSerializer;
 import org.apache.hadoop.util.HostsFileReader;
 import org.apache.thrift.TApplicationException;
 import org.apache.thrift.TException;
+import org.codehaus.jackson.JsonGenerator;
 
 /**
  * Manager of all the resources of the cluster.
@@ -68,6 +70,8 @@ public class ClusterManager implements ClusterManagerService.Iface {
 
   /** Start time to show in UI. */
   protected long startTime;
+  /** When was the CM last restarted (either safely or otherwise) */
+  protected long lastRestartTime;
   /** Host name to show in UI. */
   protected String hostName;
 
@@ -75,6 +79,12 @@ public class ClusterManager implements ClusterManagerService.Iface {
   protected Set<ResourceType> legalTypeSet =
       EnumSet.noneOf(ResourceType.class);
 
+  /** Is the Cluster Manager in Safe Mode */
+  protected volatile boolean safeMode;
+
+  /** the thread to restart all the task trackers */
+  protected CoronaNodeRestarter nodeRestarter;
+
   /**
    * Simple constructor for testing help.
    */
@@ -84,38 +94,59 @@ public ClusterManager() { }
    * Primary constructor.
    *
    * @param conf Configuration to be used
+   * @param recoverFromDisk True if we are restarting after going down while
+   *                            in Safe Mode
+   * @throws IOException
+   */
+  public ClusterManager(Configuration conf, boolean recoverFromDisk)
+    throws IOException {
+    this(new CoronaConf(conf), recoverFromDisk);
+  }
+
+  /**
+   * Constructor for ClusterManager, when it is not specified if we are
+   * restarting after persisting the state. In this case we assume the
+   * recoverFromDisk flag to be false.
+   *
+   * @param conf Configuration to be used
    * @throws IOException
    */
   public ClusterManager(Configuration conf) throws IOException {
-    this(new CoronaConf(conf));
+    this(new CoronaConf(conf), false);
   }
 
   /**
    * Construct ClusterManager given {@link CoronaConf}
    *
    * @param conf the configuration for the ClusterManager
+   * @param recoverFromDisk true if we are restarting after going down while
+   *                        in Safe Mode
    * @throws IOException
    */
-  public ClusterManager(CoronaConf conf) throws IOException {
+  public ClusterManager(CoronaConf conf, boolean recoverFromDisk)
+    throws IOException {
     this.conf = conf;
+    HostsFileReader hostsReader =
+      new HostsFileReader(conf.getHostsFile(), conf.getExcludesFile());
     initLegalTypes();
-
     metrics = new ClusterManagerMetrics(getTypes());
 
-    sessionManager = new SessionManager(this);
+    if (recoverFromDisk) {
+      recoverClusterManagerFromDisk(hostsReader);
+    } else {
+      startTime = clock.getTime();
+      lastRestartTime = startTime;
+      nodeManager = new NodeManager(this, hostsReader);
+      nodeManager.setConf(conf);
+      sessionManager = new SessionManager(this);
+      sessionNotifier = new SessionNotifier(sessionManager, this, metrics);
+    }
     sessionManager.setConf(conf);
+    sessionNotifier.setConf(conf);
 
     sessionHistoryManager = new SessionHistoryManager();
     sessionHistoryManager.setConf(conf);
 
-    HostsFileReader hostsReader =
-        new HostsFileReader(conf.getHostsFile(), conf.getExcludesFile());
-    nodeManager = new NodeManager(this, hostsReader);
-    nodeManager.setConf(conf);
-
-    sessionNotifier = new SessionNotifier(sessionManager, this, metrics);
-    sessionNotifier.setConf(conf);
-
     scheduler = new Scheduler(nodeManager, sessionManager,
         sessionNotifier, getTypes(), metrics, conf);
     scheduler.start();
@@ -129,8 +160,60 @@ public ClusterManager(CoronaConf conf) throws IOException {
     infoServer.setAttribute("cm", this);
     infoServer.start();
 
-    startTime = clock.getTime();
     hostName = infoSocAddr.getHostName();
+
+    // We have not completely restored the nodeManager, sessionManager and the
+    // sessionNotifier
+    if (recoverFromDisk) {
+      nodeManager.restoreAfterSafeModeRestart();
+      sessionManager.restoreAfterSafeModeRestart();
+      sessionNotifier.restoreAfterSafeModeRestart();
+    }
+
+    nodeRestarter = new CoronaNodeRestarter(conf);
+    nodeRestarter.start();
+
+    setSafeMode(false);
+}
+
+  /**
+   * This method is used when the ClusterManager is restarting after going down
+   * while in Safe Mode. It starts the process of recovering the original
+   * CM state by reading back the state in JSON form.
+   * @param hostsReader The HostsReader instance
+   * @throws IOException
+   */
+  private void recoverClusterManagerFromDisk(HostsFileReader hostsReader)
+    throws IOException {
+    LOG.info("Recovering from Safe Mode");
+
+    // This will prevent the expireNodes and expireSessions threads from
+    // expiring the nodes and sessions respectively
+    safeMode = true;
+
+    CoronaSerializer coronaSerializer = new CoronaSerializer(conf);
+
+    // Expecting the START_OBJECT token for ClusterManager
+    coronaSerializer.readStartObjectToken("ClusterManager");
+
+    coronaSerializer.readField("startTime");
+    startTime = coronaSerializer.readValueAs(Long.class);
+
+    coronaSerializer.readField("nodeManager");
+    nodeManager = new NodeManager(this, hostsReader, coronaSerializer);
+    nodeManager.setConf(conf);
+
+    coronaSerializer.readField("sessionManager");
+    sessionManager = new SessionManager(this, coronaSerializer);
+
+    coronaSerializer.readField("sessionNotifier");
+    sessionNotifier = new SessionNotifier(sessionManager, this, metrics,
+                                          coronaSerializer);
+
+    // Expecting the END_OBJECT token for ClusterManager
+    coronaSerializer.readEndObjectToken("ClusterManager");
+
+    lastRestartTime = clock.getTime();
   }
 
   /**
@@ -173,30 +256,69 @@ public Collection<ResourceType> getTypes() {
     return Collections.unmodifiableCollection(legalTypeSet);
   }
 
+  /**
+   * This is a helper method which simply checks if the safe mode flag is
+   * turned on. If it is, the method which was called, cannot be executed
+   * and, a SafeModeException is thrown.
+   * @param methodName
+   * @throws SafeModeException
+   */
+  private void checkSafeMode(String methodName) throws SafeModeException {
+    if (safeMode) {
+      LOG.info(methodName + "() called while ClusterManager is in Safe Mode");
+      throw new SafeModeException();
+    }
+  }
+
+  @Override
+  public PoolInfoStrings getActualPoolInfo(PoolInfoStrings userSpecifiedPoolInfo)
+    throws TException, InvalidPoolInfo, SafeModeException {
+    checkSafeMode("getActualPoolInfo");
+    ConfigManager configManager = getScheduler().getConfigManager();
+    PoolInfo poolInfo = PoolInfo.createPoolInfo(userSpecifiedPoolInfo);
+    // Validate user specified  pool information
+    try {
+      PoolGroupManager.checkPoolInfoIfStrict(poolInfo, configManager, conf);
+    } catch (InvalidSessionHandle ex) {
+      throw new InvalidPoolInfo(ex.getHandle());
+    }
+    // Get Redirect pool info
+    PoolInfo redirectedPoolInfo = configManager.getRedirect(poolInfo);
+    PoolInfoStrings actualPoolInfo = PoolInfo.createPoolInfoStrings(redirectedPoolInfo);
+    return actualPoolInfo;
+  }
+
   @Override
-  public String getNextSessionId() {
+  public String getNextSessionId() throws SafeModeException {
+    checkSafeMode("getNextSessionId");
     return sessionManager.getNextSessionId();
   }
 
   @Override
   public SessionRegistrationData sessionStart(String handle, SessionInfo info)
-    throws TException, InvalidSessionHandle {
+    throws TException, InvalidSessionHandle, SafeModeException {
+    checkSafeMode("sessionStart");
     String sessionLogPath = sessionHistoryManager.getLogPath(handle);
     Session session = sessionManager.addSession(handle, info);
     return new SessionRegistrationData(
       session.getHandle(), new ClusterManagerInfo("", sessionLogPath),
-      PoolInfo.createPoolInfoStrings(scheduler.getPoolInfo(session)));
+      PoolInfo.createPoolInfoStrings(session.getPoolInfo()));
   }
 
   @Override
   public void sessionEnd(String handle, SessionStatus status)
-    throws TException, InvalidSessionHandle {
+    throws TException, InvalidSessionHandle, SafeModeException {
+    checkSafeMode("sessionEnd");
     try {
       InetAddress sessionAddr = sessionManager.getSession(handle).getAddress();
       LOG.info("sessionEnd called for session: " + handle +
         " on " + sessionAddr.getHost() + ":" + sessionAddr.getPort() +
         " with status: " + status);
 
+      if (status == SessionStatus.FAILED_JOBTRACKER) {
+        metrics.recordCJTFailure();
+      }
+
       Collection<ResourceGrant> canceledGrants =
           sessionManager.deleteSession(handle, status);
 
@@ -220,7 +342,8 @@ public void sessionEnd(String handle, SessionStatus status)
 
   @Override
   public void sessionUpdateInfo(String handle, SessionInfo info)
-      throws TException, InvalidSessionHandle {
+      throws TException, InvalidSessionHandle, SafeModeException {
+    checkSafeMode("sessionUpdateInfo");
     try {
       LOG.info("sessionUpdateInfo called for session: " + handle +
                " with info: " + info);
@@ -233,8 +356,24 @@ public void sessionUpdateInfo(String handle, SessionInfo info)
 
   @Override
   public void sessionHeartbeat(String handle) throws TException,
-      InvalidSessionHandle {
+      InvalidSessionHandle, SafeModeException {
+    checkSafeMode("sessionHeartbeat");
+    try {
+      sessionManager.heartbeat(handle);
+    } catch (RuntimeException e) {
+      throw new TApplicationException(e.getMessage());
+    }
+  }
+
+  @Override
+  public void sessionHeartbeatV2(String handle, HeartbeatArgs jtInfo) throws TException,
+      InvalidSessionHandle, SafeModeException {
+    checkSafeMode("sessionHeartbeatV2");
     try {
+      Session session = sessionManager.getSession(handle);
+      if (!session.checkHeartbeatInfo(jtInfo)) {
+        sessionEnd(session.getSessionId(), SessionStatus.FAILED_JOBTRACKER);
+      }
       sessionManager.heartbeat(handle);
     } catch (RuntimeException e) {
       throw new TApplicationException(e.getMessage());
@@ -278,7 +417,8 @@ protected boolean checkResourceRequestExcluded(
 
   @Override
   public void requestResource(String handle, List<ResourceRequest> requestList)
-    throws TException, InvalidSessionHandle {
+    throws TException, InvalidSessionHandle, SafeModeException {
+    checkSafeMode("requestResource");
     try {
       LOG.info ("Request " + requestList.size() +
           " resources from session: " + handle);
@@ -287,10 +427,11 @@ public void requestResource(String handle, List<ResourceRequest> requestList)
         throw new TApplicationException("Bad resource type");
       }
       if (!checkResourceRequestExcluded(requestList)) {
-        LOG.error ("Bad excluded hosts from session: " + handle);
+        LOG.error("Bad excluded hosts from session: " + handle);
         throw new TApplicationException("Requesting excluded hosts");
       }
       sessionManager.heartbeat(handle);
+      sessionManager.getSession(handle).setResourceRequest(requestList);
       List<ResourceRequestInfo> reqInfoList =
           new ArrayList<ResourceRequestInfo>(requestList.size());
       for (ResourceRequest request : requestList) {
@@ -302,7 +443,8 @@ public void requestResource(String handle, List<ResourceRequest> requestList)
             requestedNodes.add(nodeManager.resolve(host, request.type));
           }
         }
-        ResourceRequestInfo info = new ResourceRequestInfo(request, requestedNodes);
+        ResourceRequestInfo info =
+          new ResourceRequestInfo(request, requestedNodes);
         reqInfoList.add(info);
       }
       sessionManager.requestResource(handle, reqInfoList);
@@ -318,7 +460,8 @@ public void requestResource(String handle, List<ResourceRequest> requestList)
 
   @Override
   public void releaseResource(String handle, List<Integer> idList)
-    throws TException, InvalidSessionHandle {
+    throws TException, InvalidSessionHandle, SafeModeException {
+    checkSafeMode("releaseResource");
     try {
       LOG.info("Release " + idList.size() + " resources from session: " +
                handle);
@@ -343,24 +486,35 @@ public void releaseResource(String handle, List<Integer> idList)
   }
 
   @Override
-  public void nodeHeartbeat(ClusterNodeInfo node)
-    throws TException, DisallowedNode {
+  public NodeHeartbeatResponse nodeHeartbeat(ClusterNodeInfo node)
+    throws TException, DisallowedNode, SafeModeException {
+    checkSafeMode("nodeHeartbeat");
     //LOG.info("heartbeat from node: " + node.toString());
     if (nodeManager.heartbeat(node)) {
       scheduler.notifyScheduler();
     }
+    NodeHeartbeatResponse nodeHeartbeatResponse = new NodeHeartbeatResponse();
+    if (nodeRestarter != null && nodeRestarter.checkStatus(node)) {
+      nodeHeartbeatResponse.setRestartFlag(true);
+    }
+    else {
+      nodeHeartbeatResponse.setRestartFlag(false);
+    }
+    return nodeHeartbeatResponse;
   }
 
   @Override
   public void nodeFeedback(String handle, List<ResourceType> resourceTypes,
       List<NodeUsageReport> reportList)
-    throws TException, InvalidSessionHandle {
+    throws TException, InvalidSessionHandle, SafeModeException {
+    checkSafeMode("nodeFeedback");
     LOG.info("Received feedback from session " + handle);
     nodeManager.nodeFeedback(handle, resourceTypes, reportList);
   }
 
   @Override
-  public void refreshNodes() throws TException {
+  public void refreshNodes() throws TException, SafeModeException {
+    checkSafeMode("refreshNodes");
     try {
       nodeManager.refreshNodes();
     } catch (IOException e) {
@@ -369,7 +523,114 @@ public void refreshNodes() throws TException {
   }
 
   @Override
-  public List<RunningSession> getSessions() throws TException {
+  public RestartNodesResponse restartNodes( RestartNodesArgs restartNodesArgs)
+    throws TException, SafeModeException {
+    checkSafeMode("restartNode");
+    LOG.info("Got request to restart all the cluster nodes");
+    List<ClusterNode> allNodes = nodeManager.getAliveClusterNodes();
+    if (allNodes.size() > 0 && nodeRestarter != null){
+      nodeRestarter.add(allNodes, restartNodesArgs.isForce(),
+        restartNodesArgs.getBatchSize());
+    }
+    else {
+      LOG.info("There is no cluster node to restart");
+    }
+    RestartNodesResponse restartNodesResponse = new RestartNodesResponse();
+    return restartNodesResponse;
+  }
+
+
+  /**
+   * Sets the Safe Mode flag on the Cluster Manager, and on the ProxyJobTracker.
+   * If we fail to set the flag on the ProxyJobTracker, return false, which
+   * signals that setting the flag on the ProxyJobTracker failed. In that case,
+   * we should run coronaadmin with the -forceSetSafeModeOnPJT or
+   * -forceUnsetSafeModeOnPJT options.
+   *
+   * If we call this function multiple times, it wouldn't matter, because all
+   * operations (apart from resetting of the last heartbeat time) in this
+   * function, and in the setClusterManagerSafeModeFlag function in the
+   * ProxyJobTracker are idempotent.
+   *
+   * @param safeMode The value of Safe Mode flag that we want to be set.
+   * @return true, if setting the Safe Mode flag succeeded, false otherwise.
+   */
+  @Override
+  public synchronized boolean setSafeMode(boolean safeMode) {
+    /**
+     * If we are switching off the safe mode, so we need to reset the last
+     * heartbeat timestamp for each of the sessions and nodes.
+     */
+    if (safeMode == false) {
+      LOG.info("Resetting the heartbeat times for all sessions");
+      sessionManager.resetSessionsLastHeartbeatTime();
+      LOG.info("Resetting the heartbeat times for all nodes");
+      nodeManager.resetNodesLastHeartbeatTime();
+      /**
+       * If we are setting the safe mode to false, we should first set it
+       * in-memory, before we set it at the CPJT.
+       */
+      this.safeMode = false;
+    }
+    try {
+      ClusterManagerAvailabilityChecker.getPJTClient(conf).
+        setClusterManagerSafeModeFlag(safeMode);
+    } catch (IOException e) {
+      LOG.info("Exception while setting the safe mode flag in ProxyJobTracker: "
+        + e.getMessage());
+      return false;
+    } catch (TException e) {
+      LOG.info("Exception while setting the safe mode flag in ProxyJobTracker: "
+        + e.getMessage());
+      return false;
+    }
+    this.safeMode = safeMode;
+    LOG.info("Flag successfully set in ProxyJobTracker");
+    LOG.info("Safe mode is now: " + (this.safeMode ? "ON" : "OFF"));
+    return true;
+  }
+
+  /**
+   * This function saves the state of the ClusterManager to disk.
+   * @return A boolean. True if saving the state succeeded, false otherwise.
+   */
+  @Override
+  public boolean persistState() {
+    if (!safeMode) {
+      LOG.info(
+        "Cannot persist state because ClusterManager is not in Safe Mode");
+      return false;
+    }
+
+    try {
+      JsonGenerator jsonGenerator = CoronaSerializer.createJsonGenerator(conf);
+      jsonGenerator.writeStartObject();
+
+      jsonGenerator.writeFieldName("startTime");
+      jsonGenerator.writeNumber(startTime);
+
+      jsonGenerator.writeFieldName("nodeManager");
+      nodeManager.write(jsonGenerator);
+
+      jsonGenerator.writeFieldName("sessionManager");
+      sessionManager.write(jsonGenerator);
+
+      jsonGenerator.writeFieldName("sessionNotifier");
+      sessionNotifier.write(jsonGenerator);
+
+      jsonGenerator.writeEndObject();
+      jsonGenerator.close();
+    } catch (IOException e) {
+      LOG.info("Could not persist the state: ", e);
+      return false;
+    }
+    return true;
+  }
+
+  @Override
+  public List<RunningSession> getSessions()
+    throws TException, SafeModeException {
+    checkSafeMode("getSessions");
     List<RunningSession> runningSessions = new LinkedList<RunningSession>();
     Set<String> sessions = sessionManager.getSessions();
     for (String sessionId : sessions) {
@@ -400,7 +661,9 @@ public List<RunningSession> getSessions() throws TException {
   }
 
   @Override
-  public void killSession(String sessionId) throws TException {
+  public void killSession(String sessionId)
+    throws TException, SafeModeException {
+    checkSafeMode("killSession");
     try {
       LOG.info("Killing session " + sessionId);
       sessionEnd(sessionId, SessionStatus.KILLED);
@@ -417,6 +680,9 @@ public void killSession(String sessionId) throws TException {
    * @param nodeName Node to be removed
    */
   public void nodeTimeout(String nodeName) {
+    if (nodeRestarter != null) {
+      nodeRestarter.delete(nodeName);
+    }
     Set<String> sessions = nodeManager.getNodeSessions(nodeName);
     Set<ClusterNode.GrantId> grantsToRevoke = nodeManager.deleteNode(nodeName);
     if (grantsToRevoke == null) {
@@ -509,11 +775,18 @@ private void handleDeadNode(String nodeName, Set<String> sessions) {
     }
   }
 
-
   public long getStartTime() {
     return startTime;
   }
 
+  /**
+   * Returns the last time the CM was restarted either safely, or otherwise.
+   * @return Milliseconds since last restart
+   */
+  public long getLastRestartTime() {
+    return lastRestartTime;
+  }
+
   public String getHostName() {
     return hostName;
   }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerAvailabilityChecker.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerAvailabilityChecker.java
new file mode 100644
index 00000000..d6976b76
--- /dev/null
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerAvailabilityChecker.java
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.corona;
+
+import org.apache.hadoop.net.NetUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TSocket;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
+/**
+ * Has helper method(s) related to the availability of the ClusterManager
+ */
+public class ClusterManagerAvailabilityChecker {
+  static final Log LOG =
+    LogFactory.getLog(ClusterManagerAvailabilityChecker.class);
+
+  /**
+   * Used for getting a client to the CoronaProxyJobTracker
+   * @param conf
+   * @return Returns a client to the CPJT
+   * @throws IOException
+   */
+  public static CoronaProxyJobTrackerService.Client
+    getPJTClient(CoronaConf conf) throws IOException {
+    InetSocketAddress address =
+      NetUtils.createSocketAddr(conf.getProxyJobTrackerThriftAddress());
+    TFramedTransport transport = new TFramedTransport(
+      new TSocket(address.getHostName(), address.getPort()));
+    CoronaProxyJobTrackerService.Client client =
+      new CoronaProxyJobTrackerService.Client(new TBinaryProtocol(transport));
+    try {
+      transport.open();
+    } catch (TException e) {
+      LOG.info("Transport Exception: ", e);
+    }
+    return client;
+  }
+
+  /**
+   * This helper method simply polls the ProxyJobTracker if and until the
+   * clusterManagerSafeMode flag is set there.
+   * @param conf
+   * @throws IOException
+   */
+  public static void waitWhileClusterManagerInSafeMode(CoronaConf conf)
+    throws IOException {
+
+    CoronaProxyJobTrackerService.Client pjtClient = getPJTClient(conf);
+    while (true) {
+      try {
+        // If this condition holds true, then two things can happen:
+        // 1. The CM was never in Safe Mode
+        // 2. CM was in Safe Mode, just before we made this method call, and
+        //    came out of Safe Mode before the RPC call.
+        if (!pjtClient.getClusterManagerSafeModeFlag()) {
+          break;
+        }
+
+        // If the safe mode flag is indeed set
+        LOG.info("Safe mode flag is set on the ProxyJobTracker");
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException e) {
+          throw new IOException(e);
+        }
+      } catch (TException e) {
+        throw new IOException(
+          "Could not check the safe mode flag on the ProxyJobTracker", e);
+      }
+    }
+  }
+}
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerMetrics.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerMetrics.java
index 377433ce..fbeedd84 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerMetrics.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerMetrics.java
@@ -22,6 +22,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.hadoop.metrics.MetricsContext;
 import org.apache.hadoop.metrics.MetricsRecord;
@@ -29,6 +30,7 @@
 import org.apache.hadoop.metrics.Updater;
 import org.apache.hadoop.metrics.util.MetricsBase;
 import org.apache.hadoop.metrics.util.MetricsIntValue;
+import org.apache.hadoop.metrics.util.MetricsLongValue;
 import org.apache.hadoop.metrics.util.MetricsRegistry;
 import org.apache.hadoop.metrics.util.MetricsTimeVaryingInt;
 import org.apache.hadoop.metrics.util.MetricsTimeVaryingLong;
@@ -70,6 +72,9 @@ class ClusterManagerMetrics implements Updater {
   private final Map<ResourceType, MetricsIntValue> typeToFreeSlots;
   /** Scheduler run time by resource type. */
   private final Map<ResourceType, MetricsIntValue> typeToSchedulerRunTime;
+  /** The start time of the current run of the scheduler by resource type.
+   * Contains a non 0 value if the cycle is in progress and 0 otherwise */
+  private final Map<ResourceType, Long> typeToSchedulerCurrentCycleStart;
   /** Number of alive nodes. */
   private final MetricsIntValue aliveNodes;
   /** Number of dead nodes. */
@@ -85,6 +90,8 @@ class ClusterManagerMetrics implements Updater {
   private final MetricsTimeVaryingInt totalSessionCount;
   /** Number of pending calls to sessions. */
   private final MetricsIntValue pendingCallsCount;
+  /** Number of CoronaJobTracker failures. */
+  private final MetricsTimeVaryingInt numCJTFailures;
   /** Cluster manager scheduler for metrics */
   private Scheduler scheduler;
   /** Cluster manager session notifier for metrics. */
@@ -106,6 +113,8 @@ public ClusterManagerMetrics(Collection<ResourceType> types) {
     typeToTotalSlots = createTypeToCountMap(types, "total");
     typeToFreeSlots = createTypeToCountMap(types, "free");
     typeToSchedulerRunTime = createTypeToCountMap(types, "scheduler_runtime");
+    typeToSchedulerCurrentCycleStart =
+        new ConcurrentHashMap<ResourceType, Long>();
     sessionStatusToMetrics = createSessionStatusToMetricsMap();
     aliveNodes = new MetricsIntValue("alive_nodes", registry);
     deadNodes = new MetricsIntValue("dead_nodes", registry);
@@ -113,6 +122,7 @@ public ClusterManagerMetrics(Collection<ResourceType> types) {
     numRunningSessions = new MetricsIntValue("num_running_sessions", registry);
     totalSessionCount = new MetricsTimeVaryingInt("total_sessions", registry);
     pendingCallsCount = new MetricsIntValue("num_pending_calls", registry);
+    numCJTFailures = new MetricsTimeVaryingInt("num_cjt_failures", registry);
   }
 
   /**
@@ -152,9 +162,15 @@ public void setFreeSlots(ResourceType resourceType, int freeSlots) {
   }
 
   public void setSchedulerRunTime(ResourceType resourceType, int runtime) {
+    // This is called when the scheduling cycle is complete
+    setSchedulerCurrentCycleStartTime(resourceType, 0);
     typeToSchedulerRunTime.get(resourceType).set(runtime);
   }
 
+  public void setSchedulerCurrentCycleStartTime(ResourceType resourceType, long tstamp) {
+    typeToSchedulerCurrentCycleStart.put(resourceType, tstamp);
+  }
+
   /**
    * Record the request of a resource.
    * @param type The resource type.
@@ -247,6 +263,13 @@ public void setNumPendingCalls(int numPendingCalls) {
     pendingCallsCount.set(numPendingCalls);
   }
 
+  /**
+   * Records CoronaJobTracker failure.
+   */
+  public void recordCJTFailure() {
+    numCJTFailures.inc();
+  }
+
   /**
    * Set the scheduler and start the updating.  The metrics won't be reported
    * until this is called.
@@ -334,6 +357,16 @@ public void doUpdates(MetricsContext context) {
       scheduler.submitMetrics(metricsRecord);
     }
 
+    for (Map.Entry<ResourceType, Long> currStart :
+        typeToSchedulerCurrentCycleStart.entrySet()) {
+      long start = currStart.getValue();
+      if (start > 0) {
+        // This means that there's a scheduling cycle in progress.
+        int currCycleRun = (int)(System.currentTimeMillis() - start);
+        typeToSchedulerRunTime.get(currStart.getKey()).set(currCycleRun);
+      }
+    }
+
     // Get the number of pending calls.
     setNumPendingCalls(sessionNotifier.getNumPendingCalls());
 
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerServer.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerServer.java
index 073e1194..cd4bf660 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerServer.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterManagerServer.java
@@ -5,24 +5,24 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.corona.Utilities;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.StringUtils;
-import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TThreadPoolServer;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TTransportFactory;
 
 public class ClusterManagerServer extends Thread {
   public static final Log LOG = LogFactory.getLog(ClusterManagerServer.class);
 
-  static{
+  static {
     Configuration.addDefaultResource("mapred-default.xml");
     Configuration.addDefaultResource("mapred-site.xml");
     Utilities.makeProcessExitOnUncaughtException(LOG);
@@ -43,18 +43,12 @@ public ClusterManagerServer(CoronaConf conf, ClusterManager cm)
     this.conf = conf;
     String target = conf.getClusterManagerAddress();
     InetSocketAddress addr = NetUtils.createSocketAddr(target);
+    this.port = addr.getPort();
     ServerSocket serverSocket = new ServerSocket(addr.getPort());
     this.port = serverSocket.getLocalPort();
-    TServerSocket socket = new TServerSocket(serverSocket, conf.getCMSoTimeout());
-
-    TFactoryBasedThreadPoolServer.Args args =
-      new TFactoryBasedThreadPoolServer.Args(socket);
-    args.stopTimeoutVal = 0;
-    args.processor(new ClusterManagerService.Processor(cm));
-    args.transportFactory(new TFramedTransport.Factory());
-    args.protocolFactory(new TBinaryProtocol.Factory(true, true));
-    server = new TFactoryBasedThreadPoolServer(
-      args, new TFactoryBasedThreadPoolServer.DaemonThreadFactory());
+    server = TFactoryBasedThreadPoolServer.createNewServer(
+      new ClusterManagerService.Processor(cm), serverSocket,
+      conf.getCMSoTimeout());
   }
 
   public void stopRunning() {
@@ -74,10 +68,24 @@ public void run() {
   }
 
   public static void main(String[] args)
-      throws IOException, TTransportException {
+      throws IOException, TTransportException, ParseException {
     StringUtils.startupShutdownMessage(ClusterManager.class, args, LOG);
     Configuration conf = new Configuration();
-    ClusterManager cm = new ClusterManager(conf);
+    boolean recoverFromDisk = false;
+    // Check if we want to start the ClusterManager to restore the persisted
+    // state
+    Option recoverFromDiskOption =
+      new Option("recoverFromDisk",
+                  "Used to restart the CM from the state persisted on disk");
+    Options options = new Options();
+    options.addOption(recoverFromDiskOption);
+    CommandLineParser parser = new GnuParser();
+    CommandLine line = parser.parse(options, args);
+
+    if (line.hasOption("recoverFromDisk")) {
+      recoverFromDisk = true;
+    }
+    ClusterManager cm = new ClusterManager(conf, recoverFromDisk);
     try {
       ClusterManagerServer server = new ClusterManagerServer(conf, cm);
       server.start();
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterNode.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterNode.java
index b526ad20..b15d77e1 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterNode.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/ClusterNode.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.corona;
 
+import java.io.IOException;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -26,8 +27,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.net.Node;
+import org.apache.hadoop.util.CoronaSerializer;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonToken;
 
 public class ClusterNode {
   /** Class logger */
@@ -35,9 +38,11 @@ public class ClusterNode {
     LogFactory.getLog(ClusterNode.class);
   public long lastHeartbeatTime;
   public boolean deleted = false;
-  public final Node hostNode;
+  // This is no longer a final because when we restart after an upgrade, we will
+  // initialize the hostNode outside the constructor.
+  public Node hostNode;
   private ClusterNodeInfo clusterNodeInfo;
-  private volatile ComputeSpecs usedSpecs;
+  private volatile ComputeSpecs freeSpecs;
   private Map<ResourceType, Integer> resourceTypeToMaxCpu =
     new EnumMap<ResourceType, Integer>(ResourceType.class);
   private Map<ResourceType, Stats> resourceTypeToStatsMap =
@@ -46,12 +51,12 @@ public class ClusterNode {
   protected Map<GrantId, ResourceRequestInfo> grants =
     new HashMap<GrantId, ResourceRequestInfo>();
 
-  protected ComputeSpecs        granted =
+  protected ComputeSpecs granted =
     new ComputeSpecs(); // All integral fields get initialized to 0.
 
   public static class Stats {
-    private int allocatedCpu;
-    private int grantCount;
+    private volatile int allocatedCpu;
+    private volatile int grantCount;
   }
 
   /**
@@ -77,6 +82,27 @@ public GrantId(String sessionId, int requestId) {
       this.unique = sessionId + requestId;
     }
 
+    /**
+     * Constructor for GrantId, used when we are reading back the state from
+     * the disk
+     * @param coronaSerializer The CoronaSerializer instance being used to read
+     *                         the JSON from disk
+     * @throws IOException
+     */
+    public GrantId(CoronaSerializer coronaSerializer) throws IOException {
+      // Expecting the START_OBJECT token for GrantId
+      coronaSerializer.readStartObjectToken("GrantId");
+
+      coronaSerializer.readField("sessionId");
+      this.sessionId = coronaSerializer.readValueAs(String.class);
+      coronaSerializer.readField("requestId");
+      this.requestId = coronaSerializer.readValueAs(Integer.class);
+
+      // Expecting the END_OBJECT token for GrantId
+      coronaSerializer.readEndObjectToken("GrantId");
+      this.unique = this.sessionId + this.requestId;
+    }
+
     public String getSessionId() {
       return sessionId;
     }
@@ -114,26 +140,190 @@ public boolean equals(GrantId that) {
 
       return this.unique.equals(that.unique);
     }
+
+    /**
+     * Used to write the state of the GrantId instance to disk, when we are
+     * persisting the state of the NodeManager
+     * @param jsonGenerator The JsonGenerator instance being used to write JSON
+     *                      to disk
+     * @throws IOException
+     */
+    public void write(JsonGenerator jsonGenerator) throws IOException {
+      jsonGenerator.writeStartObject();
+      jsonGenerator.writeObjectField("sessionId", sessionId);
+      jsonGenerator.writeObjectField("requestId", requestId);
+      jsonGenerator.writeEndObject();
+    }
   }
 
+  public ClusterNode(
+    ClusterNodeInfo clusterNodeInfo, Node node,
+    Map<Integer, Map<ResourceType, Integer>> cpuToResourcePartitioning) {
+    clusterNodeInfo.address.host = clusterNodeInfo.address.host.intern();
+    this.clusterNodeInfo = clusterNodeInfo;
+    this.freeSpecs = clusterNodeInfo.getFree();
+    lastHeartbeatTime = ClusterManager.clock.getTime();
+    this.hostNode = node;
+    resetResourceTypeToStatsMap();
+    initResourceTypeToMaxCpuMap(cpuToResourcePartitioning);
+  }
 
   /**
-   * Based on the mapping of cpus to resources, find the appropriate resources
-   * for a given number of cpus and initialize the resource type to allocated
-   * cpu mapping.
-   *
-   * @param cpuToResourcePartitioning Mapping of cpus to resources to be used
+   * Constructor for ClusterNode, used when we are reading back the state from
+   * the disk
+   *  @param coronaSerializer The CoronaSerializer instance being used to read
+   *                          the JSON from disk
+   * @throws IOException
    */
-  private void initResourceTypeToCpu(
-      Map<Integer, Map<ResourceType, Integer>> cpuToResourcePartitioning) {
-    resourceTypeToMaxCpu =
-        getResourceTypeToCountMap((int) clusterNodeInfo.total.numCpus,
-                                  cpuToResourcePartitioning);
+  ClusterNode(CoronaSerializer coronaSerializer) throws IOException {
+    // Initialize the resourceTypeToStatsMap map
+    resetResourceTypeToStatsMap();
+
+    // Expecting the START_OBJECT token for ClusterNode
+    coronaSerializer.readStartObjectToken("ClusterNode");
+    readClusterNodeInfo(coronaSerializer);
+    coronaSerializer.readField("grants");
+    readGrants(coronaSerializer);
+
+    // Expecting the END_OBJECT token for ClusterManager
+    coronaSerializer.readEndObjectToken("ClusterNode");
+
+    // We will initialize the hostNode field later in the restoreClusterNode()
+    // method in NodeManager, which is the last stage of restoring the
+    // NodeManager state
+    hostNode = null;
+
+    // Done with reading the END_OBJECT token for ClusterNode
+  }
+
+  /**
+   * Reads the clusterNodeInfo object from the JSON stream
+   *  @param coronaSerializer The CoronaSerializer instance being used to read
+   *                          the JSON from disk
+   * @throws IOException
+   */
+  private void readClusterNodeInfo(CoronaSerializer coronaSerializer)
+    throws IOException {
+  coronaSerializer.readField("clusterNodeInfo");
+    clusterNodeInfo = new ClusterNodeInfo();
+    // Expecting the START_OBJECT token for clusterNodeInfo
+    coronaSerializer.readStartObjectToken("clusterNodeInfo");
+
+    coronaSerializer.readField("name");
+    clusterNodeInfo.name = coronaSerializer.readValueAs(String.class);
+
+    coronaSerializer.readField("address");
+    clusterNodeInfo.address = coronaSerializer.readValueAs(InetAddress.class);
+
+    coronaSerializer.readField("total");
+    clusterNodeInfo.total = coronaSerializer.readValueAs(ComputeSpecs.class);
+
+    coronaSerializer.readField("free");
+    clusterNodeInfo.free = coronaSerializer.readValueAs(ComputeSpecs.class);
+
+    coronaSerializer.readField("resourceInfos");
+    clusterNodeInfo.resourceInfos = coronaSerializer.readValueAs(Map.class);
+
+    // Expecting the END_OBJECT token for clusterNodeInfo
+    coronaSerializer.readEndObjectToken("clusterNodeInfo");
+  }
+
+  /**
+   * Reads the list of grants from the JSON stream
+   *  @param coronaSerializer The CoronaSerializer instance being used to read
+   *                          the JSON from disk
+   * @throws IOException
+   */
+  private void readGrants(CoronaSerializer coronaSerializer)
+    throws IOException {
+    // Expecting the START_OBJECT token for grants
+    coronaSerializer.readStartObjectToken("grants");
+    JsonToken current = coronaSerializer.nextToken();
+    while (current != JsonToken.END_OBJECT) {
+      // We can access the key for the grant, but it is not required
+      // Expecting the START_OBJECT token for the grant
+      coronaSerializer.readStartObjectToken("grant");
+
+      coronaSerializer.readField("grantId");
+      GrantId grantId = new GrantId(coronaSerializer);
+      coronaSerializer.readField("grant");
+      ResourceRequestInfo resourceRequestInfo =
+        new ResourceRequestInfo(coronaSerializer);
+
+      // Expecting the END_OBJECT token for the grant
+      coronaSerializer.readEndObjectToken("grant");
+
+      // This will update the grants map and the resourceTypeToStatsMap map
+      addGrant(grantId.getSessionId(), resourceRequestInfo);
+
+      current = coronaSerializer.nextToken();
+    }
+  }
+
+  /**
+   * Used to write the state of the ClusterNode instance to disk, when we are
+   * persisting the state of the NodeManager
+   * @param jsonGenerator The JsonGenerator instance being used to write JSON
+   *                      to disk
+   * @throws IOException
+   */
+  public void write(JsonGenerator jsonGenerator) throws IOException {
+    jsonGenerator.writeStartObject();
+
+    // clusterNodeInfo begins
+    jsonGenerator.writeFieldName("clusterNodeInfo");
+    jsonGenerator.writeStartObject();
+    jsonGenerator.writeStringField("name", clusterNodeInfo.name);
+    jsonGenerator.writeObjectField("address", clusterNodeInfo.address);
+    jsonGenerator.writeObjectField("total", clusterNodeInfo.total);
+    jsonGenerator.writeObjectField("free", clusterNodeInfo.free);
+    jsonGenerator.writeObjectField("resourceInfos",
+      clusterNodeInfo.resourceInfos);
+    jsonGenerator.writeEndObject();
+    // clusterNodeInfo ends
+
+    // grants begins
+    jsonGenerator.writeFieldName("grants");
+    jsonGenerator.writeStartObject();
+    for (Map.Entry<GrantId, ResourceRequestInfo> entry : grants.entrySet()) {
+      jsonGenerator.writeFieldName(entry.getKey().unique);
+      jsonGenerator.writeStartObject();
+      jsonGenerator.writeFieldName("grantId");
+      entry.getKey().write(jsonGenerator);
+      jsonGenerator.writeFieldName("grant");
+      entry.getValue().write(jsonGenerator);
+      jsonGenerator.writeEndObject();
+    }
+    jsonGenerator.writeEndObject();
+    // grants ends
+
+    jsonGenerator.writeEndObject();
+    // We skip the hostNode and lastHeartbeatTime as they need not be persisted.
+    // resourceTypeToMaxCpu and resourceTypeToStatsMap can be rebuilt using the
+    // conf and the grants respectively.
+  }
+
+  /**
+   * This method is used to reset the mapping of resource type to stats.
+   */
+  public void resetResourceTypeToStatsMap() {
     for (ResourceType type : ResourceType.values()) {
       resourceTypeToStatsMap.put(type, new Stats());
     }
   }
 
+  /**
+   * This method is used to initialize the resource type to max CPU mapping
+   * based upon the cpuToResourcePartitioning instance given
+   * @param cpuToResourcePartitioning Mapping of cpus to resources to be used
+   */
+  public void initResourceTypeToMaxCpuMap(Map<Integer, Map<ResourceType,
+                                          Integer>> cpuToResourcePartitioning) {
+    resourceTypeToMaxCpu =
+      getResourceTypeToCountMap((int) clusterNodeInfo.total.numCpus,
+        cpuToResourcePartitioning);
+  }
+
   /**
    * Get a mapping of the resource type to amount of resources for a given
    * number of cpus.
@@ -163,18 +353,6 @@ public static Map<ResourceType, Integer> getResourceTypeToCountMap(
     return ret;
   }
 
-
-  public ClusterNode(
-      ClusterNodeInfo clusterNodeInfo, Node node,
-      Map<Integer, Map<ResourceType, Integer>> cpuToResourcePartitioning) {
-    clusterNodeInfo.address.host = clusterNodeInfo.address.host.intern();
-    this.clusterNodeInfo = clusterNodeInfo;
-    this.usedSpecs = clusterNodeInfo.getUsed();
-    lastHeartbeatTime = ClusterManager.clock.getTime();
-    this.hostNode = node;
-    initResourceTypeToCpu(cpuToResourcePartitioning);
-  }
-
   public void addGrant(String sessionId, ResourceRequestInfo req) {
     if (deleted)
       throw new RuntimeException ("Node " + getName() + " has been deleted");
@@ -214,14 +392,14 @@ public boolean checkForGrant(
 
     int cpuAlloced = resourceTypeToStatsMap.get(req.type).allocatedCpu;
     Integer cpuMax = resourceTypeToMaxCpu.get(req.type);
-    boolean enoughCpu = cpuMax.intValue() >= req.specs.numCpus + cpuAlloced;
+    boolean enoughCpu = cpuMax.intValue() >= req.getSpecs().numCpus + cpuAlloced;
     boolean enoughMem = resourceLimit.hasEnoughResource(this);
     return enoughCpu && enoughMem;
   }
 
   public void heartbeat(ClusterNodeInfo newClusterNodeInfo) {
     lastHeartbeatTime = ClusterManager.clock.getTime();
-    usedSpecs = newClusterNodeInfo.getUsed();
+    freeSpecs = newClusterNodeInfo.getFree();
   }
 
   public String getName() {
@@ -236,8 +414,12 @@ public InetAddress getAddress() {
     return clusterNodeInfo.address;
   }
 
-  public ComputeSpecs getUsed() {
-    return usedSpecs;
+  public ClusterNodeInfo getClusterNodeInfo() {
+    return clusterNodeInfo;
+  }
+
+  public ComputeSpecs getFree() {
+    return freeSpecs;
   }
 
   public ComputeSpecs getTotal() {
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/ConfigManager.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/ConfigManager.java
index f443558a..5e530ce7 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/ConfigManager.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/ConfigManager.java
@@ -17,15 +17,18 @@
  */
 package org.apache.hadoop.corona;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -43,6 +46,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -96,6 +102,8 @@
 public class ConfigManager {
   /** Configuration xml tag name */
   public static final String CONFIGURATION_TAG_NAME = "configuration";
+  /** Redirect xml tag name */
+  public static final String REDIRECT_TAG_NAME = "redirect";
   /** Group xml tag name */
   public static final String GROUP_TAG_NAME = "group";
   /** Pool xml tag name */
@@ -112,6 +120,10 @@ public class ConfigManager {
   public static final String MAX_TAG_NAME_PREFIX = "max";
   /** Name xml attribute */
   public static final String NAME_ATTRIBUTE = "name";
+  /** Source xml attribute (for redirect) */
+  public static final String SOURCE_ATTRIBUTE = "source";
+  /** Destination xml attribute (for redirect) */
+  public static final String DESTINATION_ATTRIBUTE = "destination";
 
   /** Logger */
   private static final Log LOG = LogFactory.getLog(ConfigManager.class);
@@ -172,6 +184,8 @@ public class ConfigManager {
   private Map<PoolInfo, ScheduleComparator> poolInfoToComparator;
   /** The Map of the weights configuration for the pools */
   private Map<PoolInfo, Double> poolInfoToWeight;
+  /** The Map of redirections (source -> target) for PoolInfo objects */
+  private Map<PoolInfo, PoolInfo> poolInfoToRedirect;
   /** The default comparator for the schedulables within the pool */
   private ScheduleComparator defaultComparator;
   /** The ratio of the share to consider starvation */
@@ -270,16 +284,23 @@ public ConfigManager(
     }
     classLoader = cl;
 
-    generatePoolsConfigIfClassSet();
+    if (poolsConfigDocumentGenerator != null) {
+      if (generatePoolsConfigIfClassSet() == null) {
+        throw new IllegalStateException("Failed to generate the pools " +
+            "config.  Must succeed on initialization of ConfigManager.");
+      }
+    }
     try {
       findConfigFiles();
-      reloadAllConfig();
+      reloadAllConfig(true);
     } catch (IOException e) {
       LOG.error("Failed to load " + configFileName, e);
     } catch (SAXException e) {
       LOG.error("Failed to load " + configFileName, e);
     } catch (ParserConfigurationException e) {
       LOG.error("Failed to load " + configFileName, e);
+    } catch (JSONException e) {
+      LOG.error("Failed to load " + configFileName, e);
     }
   }
 
@@ -298,7 +319,42 @@ public ConfigManager() {
    * Find the configuration files as set file names or in the classpath.
    */
   private void findConfigFiles() {
+    // Find the materialized_JSON configuration file.
     if (configFileName == null) {
+      String jsonConfigFileString = conf.getConfigFile().replace(
+                                         CoronaConf.DEFAULT_CONFIG_FILE,
+                                         Configuration.MATERIALIZEDJSON);
+      File jsonConfigFile = new File(jsonConfigFileString);
+      String jsonConfigFileName = null;
+      if (jsonConfigFile.exists()) {
+        jsonConfigFileName = jsonConfigFileString;
+      } else {
+          URL u = classLoader.getResource(jsonConfigFileString);
+          jsonConfigFileName = (u != null) ? u.getPath() : null;
+      }
+      // Check that the materialized_JSON contains the resources
+      // of corona.xml
+      if (jsonConfigFileName != null) {
+        try {
+          jsonConfigFile = new File(jsonConfigFileName);
+          InputStream in = new BufferedInputStream(new FileInputStream(
+        		                                           jsonConfigFile));
+          JSONObject json = conf.instantiateJsonObject(in);
+          if (json.has(conf.xmlToThrift(CoronaConf.DEFAULT_CONFIG_FILE))) {
+            configFileName = jsonConfigFileName;
+            LOG.info("Attempt to find config file " + jsonConfigFileString +
+                     " as a file and in class loader returned " + configFileName);
+          }
+        } catch (IOException e) {
+            LOG.warn("IOException: " + "while parsing corona JSON configuration");
+        } catch (JSONException e) {
+            LOG.warn("JSONException: " + "while parsing corona JSON configuration");
+        }
+      }
+    }
+    if (configFileName == null) {
+      // Parsing the JSON configuration failed.  Look for
+      // the xml configuration.
       String configFileString = conf.getConfigFile();
       File configFile = new File(configFileString);
       if (configFile.exists()) {
@@ -441,6 +497,31 @@ public synchronized double getWeight(PoolInfo poolInfo) {
     return weight == null ? 1.0 : weight;
   }
 
+  /**
+   * Get a redirected PoolInfo (destination) from the source.  Only supports
+   * one level of redirection.
+   * @param poolInfo Pool info to check for a destination
+   * @return Destination pool info if one exists, else return the input
+   */
+  public synchronized PoolInfo getRedirect(PoolInfo poolInfo) {
+    PoolInfo destination = (poolInfoToRedirect == null) ? poolInfo :
+        poolInfoToRedirect.get(poolInfo);
+    if (destination == null) {
+      return poolInfo;
+    }
+    return destination;
+  }
+
+  /**
+   * Get a copy of the map of redirects (used for cm.jsp)
+   *
+   * @return Map of redirects otherwise null if none exists
+   */
+  public synchronized Map<PoolInfo, PoolInfo> getRedirects() {
+    return (poolInfoToRedirect == null) ? null :
+        new HashMap<PoolInfo, PoolInfo>(poolInfoToRedirect);
+  }
+
   /**
    * Get the comparator to use for scheduling sessions within a pool
    * @param poolInfo Pool info to check
@@ -516,30 +597,37 @@ public void run() {
       long lastReloadAttempt = -1L;
       long lastGenerationAttempt = -1L;
       while (running) {
-        boolean reloadAllConfig = false;
-        long now = ClusterManager.clock.getTime();
-        if ((poolsConfigDocumentGenerator != null) &&
-            (now - lastGenerationAttempt > poolsReloadPeriodMs)) {
-          lastGenerationAttempt = now;
-          generatePoolsConfigIfClassSet();
-          reloadAllConfig = true;
-        }
-        if (now - lastReloadAttempt > configReloadPeriodMs) {
-          lastReloadAttempt = now;
-          reloadAllConfig = true;
-        }
+        try {
+          boolean reloadAllConfig = false;
+          long now = ClusterManager.clock.getTime();
+          if ((poolsConfigDocumentGenerator != null) &&
+              (now - lastGenerationAttempt > poolsReloadPeriodMs)) {
+            lastGenerationAttempt = now;
+            generatePoolsConfigIfClassSet();
+            reloadAllConfig = true;
+          }
+          if (now - lastReloadAttempt > configReloadPeriodMs) {
+            lastReloadAttempt = now;
+            reloadAllConfig = true;
+          }
 
-        if (reloadAllConfig) {
-          findConfigFiles();
-          try {
-            reloadAllConfig();
-          } catch (IOException e) {
-            LOG.error("Failed to load " + configFileName, e);
-          } catch (SAXException e) {
-            LOG.error("Failed to load " + configFileName, e);
-          } catch (ParserConfigurationException e) {
-            LOG.error("Failed to load " + configFileName, e);
+          if (reloadAllConfig) {
+            findConfigFiles();
+            try {
+              reloadAllConfig(false);
+            } catch (IOException e) {
+              LOG.error("Failed to load " + configFileName, e);
+            } catch (SAXException e) {
+              LOG.error("Failed to load " + configFileName, e);
+            } catch (ParserConfigurationException e) {
+              LOG.error("Failed to load " + configFileName, e);
+            } catch (JSONException e) {
+              LOG.error("Failed to load " + configFileName, e);
+            }
           }
+        } catch (Exception e) {
+          LOG.error("Failed to reload config because of " +
+              "an unknown exception", e);
         }
         try {
           Thread.sleep(
@@ -552,20 +640,22 @@ public void run() {
   }
 
   /**
-   * If the {@link PoolsConfigDocumentGenerator} is set, generate the new
-   * pools config to a randomly named file and use a rename
-   * operation to atomically get it in place.  Synchronized due to potential
-   * conflict from a fetch pools config http request.
+   * Generate the new pools configuration using the configuration generator.
+   * The generated configuration is written to a temporary file and then
+   * atomically renamed to the specified destination file.
+   * This function may be called concurrently and it is safe to do so because
+   * of the atomic rename to the destination file.
    *
    * @return Md5 of the generated file or null if generation failed.
    */
-  public synchronized String generatePoolsConfigIfClassSet() {
+  public String generatePoolsConfigIfClassSet() {
     if (poolsConfigDocumentGenerator == null) {
       return null;
     }
     Document document = poolsConfigDocumentGenerator.generatePoolsDocument();
     if (document == null) {
-      LOG.info("generatePoolsConfig: Did not generate a valid pools xml file");
+      LOG.warn("generatePoolsConfig: Did not generate a valid pools xml file");
+      return null;
     }
 
     // Write the content into a temporary xml file and rename to the
@@ -608,15 +698,206 @@ public synchronized String generatePoolsConfigIfClassSet() {
 
     return null;
   }
+  
+  /**
+   * Helper function to reloadJsonConfig(). Parses the JSON Object
+   * corresponding to the key "TYPES".
+   * @throws JSONException
+   */
+  private void loadLocalityWaits(JSONObject json, Map<ResourceType, Long> 
+               newTypeToNodeWait, Map<ResourceType, Long> newTypeToRackWait) 
+               throws JSONException {
+    Iterator<String> keys = json.keys();
+    while (keys.hasNext()) {
+      String key = keys.next();
+      if (!json.isNull(key)) {
+        for (ResourceType type : TYPES) {
+          if (key.equals("nodeLocalityWait" + type)) {
+            long val = Long.parseLong(json.getString(key));
+            newTypeToNodeWait.put(type, val);
+          }
+          if (key.equals("rackLocalityWait" + type)) {
+            long val = Long.parseLong(json.getString(key));
+            newTypeToRackWait.put(type, val);
+          }
+        }
+      }
+    }
+  }
+  
+  /**
+   * Helper function to reloadJsonConfig().  Parses the JSON Array
+   * corresponding to the key REDIRECT_TAG_NAME.
+   * @throws JSONException
+   */
+  private void loadPoolInfoToRedirect(JSONArray json, Map<PoolInfo, PoolInfo> 
+               newPoolInfoToRedirect) throws JSONException {
+    for (int i=0; i < json.length(); i++) {
+      JSONObject jsonObj = json.getJSONObject(i);
+      PoolInfo source = PoolInfo.createPoolInfo(jsonObj.getString(
+                                                SOURCE_ATTRIBUTE));
+      PoolInfo destination = PoolInfo.createPoolInfo(jsonObj.getString(
+                                                     DESTINATION_ATTRIBUTE));
+      if (source == null || destination == null) {
+        LOG.error("Illegal redirect source " + source + " or destination " +
+            destination);
+      } else {
+          newPoolInfoToRedirect.put(source, destination);
+      }
+    }
+  }
+
+  /**
+   * Reload the general configuration and update all in-memory values. Should
+   * be invoked under synchronization.
+   * 
+   * @throws IOException
+   * @throws SAXException
+   * @throws ParserConfigurationException
+   * @throws JSONException
+   */
+  private void reloadJsonConfig() throws
+      IOException, SAXException, ParserConfigurationException, JSONException {
+    Map<ResourceType, Long> newTypeToNodeWait;
+    Map<ResourceType, Long> newTypeToRackWait;
+    ScheduleComparator newDefaultComparator = DEFAULT_COMPARATOR;
+    double newShareStarvingRatio = DEFAULT_SHARE_STARVING_RATIO;
+    long newMinPreemptPeriod = DEFAULT_MIN_PREEMPT_PERIOD;
+    int newGrantsPerIteration = DEFAULT_GRANTS_PER_ITERATION;
+    long newStarvingTimeForMinimum = DEFAULT_STARVING_TIME_FOR_MINIMUM;
+    long newStarvingTimeForShare = DEFAULT_STARVING_TIME_FOR_SHARE;
+    long newPreemptedTaskMaxRunningTime = DEFAULT_PREEMPT_TASK_MAX_RUNNING_TIME;
+    int newPreemptionRounds = DEFAULT_PREEMPTION_ROUNDS;
+    boolean newScheduleFromNodeToSession = DEFAULT_SCHEDULE_FROM_NODE_TO_SESSION;
+
+    newTypeToNodeWait = new EnumMap<ResourceType, Long>(ResourceType.class);
+    newTypeToRackWait = new EnumMap<ResourceType, Long>(ResourceType.class);
+    Map<PoolInfo, PoolInfo> newPoolInfoToRedirect =
+            new HashMap<PoolInfo, PoolInfo>();
 
+    for (ResourceType type : TYPES) {
+      newTypeToNodeWait.put(type, 0L);
+      newTypeToRackWait.put(type, 0L);
+    }
+    
+    // All the configuration files for a cluster are placed in one large	
+    // json object. This large json object has keys that map to smaller	
+    // json objects which hold the same resources as xml configuration 	
+    // files. Here, we try to parse the json object that corresponds to	
+    // corona.xml
+    File jsonConfigFile = new File(configFileName);
+    InputStream in = new BufferedInputStream(new FileInputStream(jsonConfigFile));
+    JSONObject json = conf.instantiateJsonObject(in);
+    json = json.getJSONObject(conf.xmlToThrift(CoronaConf.DEFAULT_CONFIG_FILE));
+    Iterator<String> keys = json.keys();
+    while (keys.hasNext()) {
+      String key = keys.next();
+      if (!json.isNull(key)) {
+        if (key.equals("localityWaits")) {
+          JSONObject jsonTypes = json.getJSONObject(key);
+          loadLocalityWaits(jsonTypes, newTypeToNodeWait, newTypeToRackWait);
+        }
+        if (key.equals("defaultSchedulingMode")) {
+          newDefaultComparator = ScheduleComparator.valueOf(json.getString(key));
+        }
+        if (key.equals("shareStarvingRatio")) {
+          newShareStarvingRatio = json.getDouble(key);
+          if (newShareStarvingRatio < 0 || newShareStarvingRatio > 1.0) {
+            LOG.error("Illegal shareStarvingRatio:" + newShareStarvingRatio);
+            newShareStarvingRatio = DEFAULT_SHARE_STARVING_RATIO;
+          }
+        }
+        if (key.equals("grantsPerIteration")) {
+          newGrantsPerIteration = json.getInt(key);
+          if (newMinPreemptPeriod < 0) {
+            LOG.error("Illegal grantsPerIteration: " + newGrantsPerIteration);
+            newGrantsPerIteration = DEFAULT_GRANTS_PER_ITERATION;
+          }
+        }
+        if (key.equals("minPreemptPeriod")) {
+          newMinPreemptPeriod = json.getLong(key);
+          if (newMinPreemptPeriod < 0) {
+            LOG.error("Illegal minPreemptPeriod: " + newMinPreemptPeriod);
+            newMinPreemptPeriod = DEFAULT_MIN_PREEMPT_PERIOD;
+          }
+        }
+        if (key.equals("starvingTimeForShare")) {
+          newStarvingTimeForShare = json.getLong(key);
+          if (newStarvingTimeForShare < 0) {
+            LOG.error("Illegal starvingTimeForShare:" + newStarvingTimeForShare);
+            newStarvingTimeForShare = DEFAULT_STARVING_TIME_FOR_SHARE;
+          }
+        }
+        if (key.equals("starvingTimeForMinimum")) {
+          newStarvingTimeForMinimum = json.getLong(key);
+          if (newStarvingTimeForMinimum < 0) {
+            LOG.error("Illegal starvingTimeForMinimum:" +
+                      newStarvingTimeForMinimum);
+            newStarvingTimeForMinimum = DEFAULT_STARVING_TIME_FOR_MINIMUM;
+          }
+        }
+        if (key.equals("preemptedTaskMaxRunningTime")) {
+          newPreemptedTaskMaxRunningTime = json.getLong(key);
+          if (newPreemptedTaskMaxRunningTime < 0) {
+            LOG.error("Illegal preemptedTaskMaxRunningTime:" +
+                      newPreemptedTaskMaxRunningTime);
+            newPreemptedTaskMaxRunningTime =
+              DEFAULT_PREEMPT_TASK_MAX_RUNNING_TIME;
+          }
+        }
+        if (key.equals("preemptionRounds")) {
+          newPreemptionRounds = json.getInt(key);
+          if (newPreemptionRounds < 0) {
+            LOG.error("Illegal preemptedTaskMaxRunningTime:" +
+                      newPreemptionRounds);
+            newPreemptionRounds = DEFAULT_PREEMPTION_ROUNDS;
+          }
+        }
+        if (key.equals("scheduleFromNodeToSession")) {
+          newScheduleFromNodeToSession = json.getBoolean(key);
+        }
+        if (key.equals(REDIRECT_TAG_NAME)) {
+          JSONArray jsonPoolInfoToRedirect = json.getJSONArray(key);
+          loadPoolInfoToRedirect(jsonPoolInfoToRedirect, 
+                                 newPoolInfoToRedirect);
+        }
+      }
+    }
+    synchronized (this) {
+      this.typeToNodeWait = newTypeToNodeWait;
+      this.typeToRackWait = newTypeToRackWait;
+      this.defaultComparator = newDefaultComparator;
+      this.shareStarvingRatio = newShareStarvingRatio;
+      this.minPreemptPeriod = newMinPreemptPeriod;
+      this.grantsPerIteration = newGrantsPerIteration;
+      this.starvingTimeForMinimum = newStarvingTimeForMinimum;
+      this.starvingTimeForShare = newStarvingTimeForShare;
+      this.preemptedTaskMaxRunningTime = newPreemptedTaskMaxRunningTime;
+      this.preemptionRounds = newPreemptionRounds;
+      this.scheduleFromNodeToSession = newScheduleFromNodeToSession;
+      this.poolInfoToRedirect = newPoolInfoToRedirect;
+    }
+  }
+  
   /**
-   * Reload the general configuration and update all in-memory values
+   * Reload the general configuration and update all in-memory values. Should
+   * be invoked under synchronization.
+   *
    * @throws IOException
    * @throws SAXException
    * @throws ParserConfigurationException
    */
   private void reloadConfig() throws
-      IOException, SAXException, ParserConfigurationException {
+      IOException, SAXException, ParserConfigurationException, JSONException {
+    // Loading corona configuration as JSON.
+    if (configFileName != null && configFileName.endsWith(
+                                  Configuration.MATERIALIZEDJSON)) {
+      reloadJsonConfig();
+      return;
+    }
+    // Loading corona configuration as XML.  XML configurations are
+    // deprecated.  We intend to remove all XML configurations and 
+    // transition entirely into JSON.
     Map<ResourceType, Long> newTypeToNodeWait;
     Map<ResourceType, Long> newTypeToRackWait;
     ScheduleComparator newDefaultComparator = DEFAULT_COMPARATOR;
@@ -631,6 +912,8 @@ private void reloadConfig() throws
 
     newTypeToNodeWait = new EnumMap<ResourceType, Long>(ResourceType.class);
     newTypeToRackWait = new EnumMap<ResourceType, Long>(ResourceType.class);
+    Map<PoolInfo, PoolInfo> newPoolInfoToRedirect =
+        new HashMap<PoolInfo, PoolInfo>();
 
     for (ResourceType type : TYPES) {
       newTypeToNodeWait.put(type, 0L);
@@ -714,6 +997,18 @@ private void reloadConfig() throws
       if (matched(element, "scheduleFromNodeToSession")) {
         newScheduleFromNodeToSession = Boolean.parseBoolean(getText(element));
       }
+      if (matched(element, REDIRECT_TAG_NAME)) {
+        PoolInfo source = PoolInfo.createPoolInfo(
+            element.getAttribute(SOURCE_ATTRIBUTE));
+        PoolInfo destination = PoolInfo.createPoolInfo(
+            element.getAttribute(DESTINATION_ATTRIBUTE));
+        if (source == null || destination == null) {
+          LOG.error("Illegal redirect source " + source + " or destination " +
+              destination);
+        } else {
+          newPoolInfoToRedirect.put(source, destination);
+        }
+      }
     }
     synchronized (this) {
       this.typeToNodeWait = newTypeToNodeWait;
@@ -727,6 +1022,7 @@ private void reloadConfig() throws
       this.preemptedTaskMaxRunningTime = newPreemptedTaskMaxRunningTime;
       this.preemptionRounds = newPreemptionRounds;
       this.scheduleFromNodeToSession = newScheduleFromNodeToSession;
+      this.poolInfoToRedirect = newPoolInfoToRedirect;
     }
   }
 
@@ -738,6 +1034,9 @@ private void reloadConfig() throws
    */
   private void reloadPoolsConfig()
       throws IOException, SAXException, ParserConfigurationException {
+    if (poolsConfigFileName == null) {
+      return;
+    }
     Set<String> newPoolGroupNameSet = new HashSet<String>();
     Set<PoolInfo> newPoolInfoSet = new HashSet<PoolInfo>();
     TypePoolGroupNameMap<Integer> newTypePoolNameGroupToMax =
@@ -847,10 +1146,12 @@ private void reloadPoolsConfig()
    * @throws IOException
    * @throws SAXException
    * @throws ParserConfigurationException
+   * @param init true when the config manager is being initialized.
+   *             false on reloads
    */
-  public synchronized boolean reloadAllConfig()
-      throws IOException, SAXException, ParserConfigurationException {
-    if (!isConfigChanged()) {
+  public synchronized boolean reloadAllConfig(boolean init)
+      throws IOException, SAXException, ParserConfigurationException, JSONException {
+    if (!isConfigChanged(init)) {
       return false;
     }
     reloadConfig();
@@ -863,22 +1164,38 @@ public synchronized boolean reloadAllConfig()
    * Check if the config files have changed since they were last read
    * @return true if the modification time of the file is greater
    * than that of the last successful reload, false otherwise
+   * @param init true when the config manager is being initialized.
+   *             false on reloads
    */
-  private boolean isConfigChanged() {
+  private boolean isConfigChanged(boolean init)
+      throws IOException {
+    if (init &&
+        (configFileName == null ||
+            (poolsConfigFileName == null &&
+                conf.onlyAllowConfiguredPools()))) {
+      throw new IOException("ClusterManager needs a config and a " +
+          "pools file to start");
+    }
     if (configFileName == null && poolsConfigFileName == null) {
       return false;
     }
 
-    File file = new File(configFileName);
-    boolean configChanged = (file.lastModified() == 0 ||
+    boolean configChanged = false;
+
+    if (configFileName != null) {
+      File file = new File(configFileName);
+      configChanged |= (file.lastModified() == 0 ||
         file.lastModified() > lastSuccessfulReload);
+    }
 
 
-    file = new File(poolsConfigFileName);
-    boolean poolsConfigChanged = (file.lastModified() == 0 ||
-        file.lastModified() > lastSuccessfulReload);
+    if (poolsConfigFileName != null) {
+      File file = new File(poolsConfigFileName);
+      configChanged |= (file.lastModified() == 0 ||
+          file.lastModified() > lastSuccessfulReload);
+    }
 
-    return configChanged || poolsConfigChanged;
+    return configChanged;
   }
 
   /**
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaAdmin.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaAdmin.java
index f792b2e2..b30b74da 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaAdmin.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaAdmin.java
@@ -23,7 +23,9 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.mapred.ClusterManagerSafeModeProtocol;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
@@ -51,6 +53,12 @@ private static void printUsage(String cmd) {
     } else {
       System.err.println("Usage: java CoronaAdmin");
       System.err.println("           [-refreshNodes]");
+      System.err.println("           [-setSafeMode]");
+      System.err.println("           [-unsetSafeMode]");
+      System.err.println("           [-forceSetSafeModeOnPJT]");
+      System.err.println("           [-forceUnsetSafeModeOnPJT]");
+      System.err.println("           [-restartTaskTracker]");
+      System.err.println("           [-forceRestartTaskTracker]");
       System.err.println("           [-help [cmd]]");
       System.err.println();
       ToolRunner.printGenericCommandUsage(System.err);
@@ -80,11 +88,125 @@ private int refreshNodes() throws IOException {
       client.refreshNodes();
     } catch (TException e) {
       throw new IOException(e);
+    } catch (SafeModeException e) {
+      System.err.println("ClusterManager is in Safe Mode");
     }
 
     return 0;
   }
 
+  /**
+   * Command to ask the Cluster Manager to restart all the task tracker
+   *
+   * @param forceFlag if CM shall ignore all previous restart requests
+   * @exception IOException
+   * @return Returns 0 where no exception is thrown.
+   */
+  private int restartTaskTracker(boolean forceFlag) throws IOException {
+    // Get the current configuration
+    CoronaConf conf = new CoronaConf(getConf());
+
+    InetSocketAddress address = NetUtils.createSocketAddr(conf
+        .getClusterManagerAddress());
+    TFramedTransport transport = new TFramedTransport(
+      new TSocket(address.getHostName(), address.getPort()));
+    ClusterManagerService.Client client = new ClusterManagerService.Client(
+        new TBinaryProtocol(transport));
+    int restartBatch = conf.getCoronaNodeRestartBatch();
+    try {
+      transport.open();
+      RestartNodesArgs restartNodeArgs = new RestartNodesArgs(
+        forceFlag, restartBatch);
+      client.restartNodes(restartNodeArgs);
+    } catch (TException e) {
+      throw new IOException(e);
+    } catch (SafeModeException e) {
+      System.err.println("ClusterManager is in Safe Mode");
+    }
+
+    return 0;
+  }
+
+  /**
+   * Turns on the Safe Mode if safeMode is true. Turns off the Safe Mode if
+   * safeMode is false.
+   * @param safeMode Is true if we want the Safe Mode to be on. false
+   *                 otherwise.
+   * @return 0 if successful.
+   * @throws IOException
+   */
+  private int setSafeMode(boolean safeMode) throws IOException {
+    // Get the current configuration
+    CoronaConf conf = new CoronaConf(getConf());
+
+    InetSocketAddress address = NetUtils.createSocketAddr(conf
+      .getClusterManagerAddress());
+    TFramedTransport transport = new TFramedTransport(
+      new TSocket(address.getHostName(), address.getPort()));
+    ClusterManagerService.Client client = new ClusterManagerService.Client(
+      new TBinaryProtocol(transport));
+
+    try {
+      transport.open();
+      if (client.setSafeMode(safeMode)) {
+        System.out.println("The safeMode is: " +
+                            (safeMode ? "ON" : "OFF"));
+      } else {
+        System.err.println("Could not set the safeMode flag");
+      }
+    } catch (TException e) {
+      throw new IOException(e);
+    }
+
+    return 0;
+  }
+
+  /**
+   * Persists the state of the ClusterManager
+   * @return 0 if successful.
+   * @throws IOException
+   */
+  private int persistState() throws IOException {
+    // Get the current configuration
+    CoronaConf conf = new CoronaConf(getConf());
+
+    InetSocketAddress address = NetUtils.createSocketAddr(conf
+      .getClusterManagerAddress());
+    TFramedTransport transport = new TFramedTransport(
+      new TSocket(address.getHostName(), address.getPort()));
+    ClusterManagerService.Client client = new ClusterManagerService.Client(
+      new TBinaryProtocol(transport));
+
+    try {
+      transport.open();
+      if (!client.persistState())  {
+        System.err.println("Persisting Cluster Manager state failed. ");
+      }
+    } catch (TException e) {
+      throw new IOException(e);
+    }
+
+    return 0;
+  }
+
+  /**
+   * Forcefully set the Safe Mode on the PJT
+   * @return 0 if successful
+   * @throws IOException
+   */
+  private int forceSetSafeModeOnPJT(boolean safeMode) throws IOException {
+    CoronaConf conf = new CoronaConf(getConf());
+    try {
+      ClusterManagerAvailabilityChecker.getPJTClient(conf).
+        setClusterManagerSafeModeFlag(safeMode);
+    } catch (IOException e) {
+      System.err.println("Could not set the Safe Mode flag on the PJT: " + e);
+    } catch (TException e) {
+      System.err.println("Could not set the Safe Mode flag on the PJT: " + e);
+    }
+    return 0;
+  }
+
   @Override
   public int run(String[] args) throws Exception {
     if (args.length < 1) {
@@ -101,6 +223,20 @@ public int run(String[] args) throws Exception {
         exitCode = refreshNodes();
       } else if ("-help".equals(cmd)) {
         printUsage(args[i]);
+      } else if ("-setSafeMode".equals(cmd)) {
+        exitCode = setSafeMode(true);
+      } else if ("-unsetSafeMode".equals(cmd)) {
+        exitCode = setSafeMode(false);
+      } else if ("-persistState".equals(cmd)) {
+        exitCode = persistState();
+      } else if ("-forceSetSafeModeOnPJT".equals(cmd)) {
+        exitCode = forceSetSafeModeOnPJT(true);
+      } else if ("-forceUnsetSafeModeOnPJT".equals(cmd)) {
+        exitCode = forceSetSafeModeOnPJT(false);
+      } else if ("-restartTaskTracker".equals(cmd)) {
+        exitCode = restartTaskTracker(false);
+      } else if ("-forceRestartTaskTracker".equals(cmd)) {
+        exitCode = restartTaskTracker(true);
       } else {
         exitCode = -1;
         System.err.println(cmd.substring(1) + ": Unknown command");
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaClient.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaClient.java
index 3a63b54a..affce3fd 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaClient.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaClient.java
@@ -99,7 +99,12 @@ private int killSession(String sessionId)throws IOException {
     try {
       System.out.printf("Killing %s", sessionId);
       ClusterManagerService.Client client = getCMSClient();
-      client.killSession(sessionId);
+      try {
+        client.killSession(sessionId);
+      } catch (SafeModeException e) {
+        throw new IOException(
+          "Cannot kill session yet, ClusterManager is in Safe Mode");
+      }
       System.err.printf("%s killed", sessionId);
     } catch (TException e) {
       throw new IOException(e);
@@ -107,6 +112,18 @@ private int killSession(String sessionId)throws IOException {
     return 0;
   }
 
+  public static void killSession(String sessionId, Configuration conf)
+    throws IOException {
+    try {
+      ClusterManagerService.Client client = getCMSClient(new CoronaConf(conf));
+      client.killSession(sessionId);
+    } catch (TException e) {
+      throw new IOException(e);
+    } catch (SafeModeException e) {
+      throw new IOException(e);
+    }
+  }
+
   /**
    * Gets a list of the sessions from the cluster manager
    * and outputs them on the console
@@ -116,8 +133,13 @@ private int killSession(String sessionId)throws IOException {
   private int listSessions() throws IOException {
     try {
       ClusterManagerService.Client client = getCMSClient();
-
-      List<RunningSession> sessions = client.getSessions();
+      List<RunningSession> sessions;
+      try {
+        sessions = client.getSessions();
+      } catch (SafeModeException e) {
+        throw new IOException(
+          "Cannot list sessions, ClusterManager is in Safe Mode");
+      }
       System.out.printf("%d sessions currently running:\n",
           sessions.size());
       System.out.printf("SessionID\t" +
@@ -158,10 +180,20 @@ private int listSessions() throws IOException {
    * @throws TTransportException
    */
   private ClusterManagerService.Client getCMSClient()
-      throws TTransportException {
+    throws TTransportException {
     // Get the current configuration
     CoronaConf conf = new CoronaConf(getConf());
+    return getCMSClient(conf);
+  }
 
+  /**
+   * Get the thrift client to communicate with the cluster manager
+   * @return a thrift client initialized to talk to the cluster manager
+   * @param conf The configuration.
+   * @throws TTransportException
+   */
+  private static ClusterManagerService.Client getCMSClient(CoronaConf conf)
+    throws TTransportException {
     InetSocketAddress address = NetUtils.createSocketAddr(conf
         .getClusterManagerAddress());
     TFramedTransport transport = new TFramedTransport(
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaConf.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaConf.java
index 0e66b189..80b2bf34 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaConf.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaConf.java
@@ -43,13 +43,27 @@ public class CoronaConf extends Configuration {
   public static final String HOSTS_FILE = "cm.hosts";
   /** The excludes file. */
   public static final String EXCLUDE_HOSTS_FILE = "cm.hosts.exclude";
+  /**
+   * The name of the file which will contain the CM's state when it goes for
+   * an upgrade.
+   */
+  public static final String CM_STATE_FILE = "cm.state";
   /** The RPC address of the Cluster Manager. */
   public static final String CM_ADDRESS = "cm.server.address";
+  /**
+   * This boolean property is used to fix whether compression would be used
+   * while saving the CM state or not. While debugging, it is preferable
+   * that this should be false.
+   */
+  public static final String CM_COMPRESS_STATE = "cm.compress.state";
   /** The HTTP UI address for the Cluster Manager. */
   public static final String CM_HTTP_ADDRESS = "cm.server.http.address";
   /** The RPC address of the Proxy Job Tracker. */
   public static final String PROXY_JOB_TRACKER_ADDRESS =
     "corona.proxy.job.tracker.rpcaddr";
+  /** The Thrift address of the Proxy Job Tracker. */
+  public static final String PROXY_JOB_TRACKER_THRIFT_ADDRESS =
+    "corona.proxy.job.tracker.thriftaddr";
   /** The interval after which a cluster node is timed out. */
   public static final String NODE_EXPIRY_INTERVAL = "cm.node.expiryinterval";
   /** Allow unconfigured pools? */
@@ -158,6 +172,18 @@ public class CoronaConf extends Configuration {
   public static final String POOLS_CONFIG_DOCUMENT_GENERATOR_PROPERTY =
       "cm.pools.config.document.generator";
 
+  /** number of task trackers restarted in one batch */
+  public static final String CORONA_NODE_RESTART_BATCH =
+      "corona.node.restart.batch";
+
+  /** interval for restarting task trackers batches */
+  public static final String CORONA_NODE_RESTART_INTERVAL =
+      "corona.node.restart.interval";
+
+  /** The max time CM will wait for JT heartbeat to be in sync */
+  public static final String CM_HEARTBEAT_DELAY_MAX =
+      "cm.heartbeat.delay.max";
+
   private Map<Integer, Map<ResourceType, Integer>>
     cachedCpuToResourcePartitioning = null;
 
@@ -181,6 +207,10 @@ public String getProxyJobTrackerAddress() {
     return get(PROXY_JOB_TRACKER_ADDRESS , "localhost:50035");
   }
 
+  public String getProxyJobTrackerThriftAddress() {
+    return get(PROXY_JOB_TRACKER_THRIFT_ADDRESS, "localhost:50036");
+  }
+
   public static String getClusterManagerAddress(Configuration conf) {
     return conf.get(CM_ADDRESS, "localhost:8888");
   }
@@ -405,6 +435,28 @@ public String getExcludesFile() {
     return get(EXCLUDE_HOSTS_FILE, "");
   }
 
+  /**
+   * Get the address of the file used to save the state of the ClusterManager
+   * when it goes down for an upgrade
+   *
+   * @return A String, containing the address of the file used to save the
+   *          ClusterManager state.
+   */
+  public String getCMStateFile() {
+    return get(CM_STATE_FILE, "cm.state");
+  }
+
+  /**
+   * Return the flag which indicates if we will be using compression while
+   * saving the ClusterManager state.
+   *
+   * @return A boolean, which is true if we are going to use compression while
+   *          saving the CM state.
+   */
+  public boolean getCMCompressStateFlag() {
+    return getBoolean(CM_COMPRESS_STATE, false);
+  }
+
   public int getCMNotifierThreadCount() {
     return getInt(CM_NOTIFIER_THREAD_COUNT, 17);
   }
@@ -464,4 +516,16 @@ public long getConfigReloadPeriodMs() {
   public Class<?> getPoolsConfigDocumentGeneratorClass() {
     return getClass(POOLS_CONFIG_DOCUMENT_GENERATOR_PROPERTY, null);
   }
+
+  public int  getCoronaNodeRestartBatch() {
+    return getInt(CORONA_NODE_RESTART_BATCH, 1000);
+  }
+
+  public long getCoronaNodeRestartInterval() {
+    return getLong(CORONA_NODE_RESTART_INTERVAL, 1800000L);
+  }
+
+  public long getCMHeartbeatDelayMax() {
+    return getLong(CM_HEARTBEAT_DELAY_MAX, 600000);
+  }
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaNodeRestarter.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaNodeRestarter.java
new file mode 100644
index 00000000..d9d2538a
--- /dev/null
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/CoronaNodeRestarter.java
@@ -0,0 +1,145 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.corona;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class CoronaNodeRestarter extends Thread {
+  /** Class logger */
+  public static final Log LOG = LogFactory.getLog(CoronaNodeRestarter.class);
+
+  enum RestartStatus {
+    INITIAL,
+    READY,
+    DONE,
+  }
+
+  public static class NodeRestartInfo {
+
+    ClusterNode node;
+    RestartStatus status;
+
+    NodeRestartInfo(ClusterNode node) {
+      this.node = node;
+      status = RestartStatus.INITIAL;
+    }
+  }
+
+  private final CoronaConf conf;
+  // The interval that each bacth will be set to be restarted
+  private final long restartInterval;
+  // All the nodes will be set to be restarted in batches
+  private int restartBatch;
+  private List<NodeRestartInfo> workingList;
+
+  public CoronaNodeRestarter(CoronaConf conf) {
+    this.conf = conf;
+    this.restartBatch = 1000;
+    this.restartInterval = conf.getCoronaNodeRestartInterval();
+    workingList = new ArrayList<NodeRestartInfo>();
+  }
+
+  public boolean checkStatus(ClusterNodeInfo nodeToCheck) {
+    synchronized (workingList) {
+      for (NodeRestartInfo workingNode: workingList) {
+        if (workingNode.node.getName().toString().equals(
+          nodeToCheck.getName().toString())) {
+          if (workingNode.status == RestartStatus.READY) {
+            workingNode.status = RestartStatus.DONE;
+            LOG.info("Notify " + nodeToCheck.getName().toString() +
+              " to restart");
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  public void delete(String nodeToDelete) {
+    synchronized (workingList) {
+      Iterator<NodeRestartInfo> workingIt = workingList.iterator();
+      while (workingIt.hasNext()) {
+        NodeRestartInfo tmpnode = workingIt.next();
+        if (tmpnode.node.getName().toString().equals(nodeToDelete)) {
+          LOG.info("Delete " + nodeToDelete + " from the working list");
+          workingIt.remove();
+          break;
+        }
+      }
+    }
+  }
+
+  public void add(List<ClusterNode> nodesToKill, boolean forceFlag,
+    int batchSize) {
+    synchronized (workingList) {
+      this.restartBatch = batchSize;
+      if (forceFlag) {
+        workingList.clear();
+      }
+      for (ClusterNode node: nodesToKill) {
+        workingList.add(new NodeRestartInfo(node));
+      }
+      this.interrupt();
+    }
+  }
+
+  @Override
+  public void run() {
+    while (true) {
+      synchronized (workingList) {
+        try {
+          if (workingList.size() == 0) {
+            workingList.wait();
+          }
+        } catch (InterruptedException e) {
+        }
+        int currentIndex = 0;
+        int changed = 0;
+        while (currentIndex < workingList.size() && changed < restartBatch) {
+          NodeRestartInfo workingNode = workingList.get(currentIndex);
+          if (workingNode.status == RestartStatus.INITIAL) {
+            workingNode.status = RestartStatus.READY;
+            LOG.info("set " + workingNode.node.getName().toString() +
+              " to be ready for restart");
+            changed++;
+          }
+          currentIndex++;
+        }
+        // cleanup the notified ones
+        Iterator<NodeRestartInfo> workingIt = workingList.iterator();
+        while (workingIt.hasNext()) {
+          NodeRestartInfo tmpnode = workingIt.next();
+          if (tmpnode.status == RestartStatus.DONE) {
+            workingIt.remove();
+          }
+        }
+      }
+
+      try {
+        Thread.sleep(restartInterval);
+      } catch (InterruptedException e) {
+      }
+    }
+  }
+}
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/NodeManager.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/NodeManager.java
index 7fedb5c3..47dbc1e8 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/NodeManager.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/NodeManager.java
@@ -37,7 +37,11 @@
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.net.Node;
+import org.apache.hadoop.net.TopologyCache;
+import org.apache.hadoop.util.CoronaSerializer;
 import org.apache.hadoop.util.HostsFileReader;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonToken;
 
 /**
  * Manages all the nodes known in the cluster.
@@ -116,10 +120,8 @@ public ClusterNode getRunnableNodeForAny(Set<String> excluded) {
                 if (resourceLimit.hasEnoughResource(node)) {
                   // When pass == 0, try to average out the load.
                   if (pass == 0) {
-                    synchronized (node) {
-                      if (node.getGrantCount(type) < avgLoad) {
-                        return node;
-                      }
+                    if (node.getGrantCount(type) < avgLoad) {
+                      return node;
                     }
                   } else {
                     return node;
@@ -337,6 +339,12 @@ public void deleteRunnable(ClusterNode node) {
       }
     }
 
+    /**
+     * Checks if a node is present as runnable in this index. Should be called
+     * while holding the node lock.
+     * @param clusterNode The node.
+     * @return A boolean indicating if the node is present.
+     */
     public boolean hasRunnable(ClusterNode clusterNode) {
       String host = clusterNode.getHost();
       NodeContainer nodeContainer = hostToRunnableNodes.get(host);
@@ -440,6 +448,110 @@ public NodeManager(
     this.faultManager = new FaultManager(this);
   }
 
+  /**
+   * Constructor for the NodeManager, used when reading back the state of
+   * NodeManager from disk.
+   * @param clusterManager The ClusterManager instance
+   * @param hostsReader The HostsReader instance
+   * @param coronaSerializer The CoronaSerializer instance, which will be used
+   *                         to read JSON from disk
+   * @throws IOException
+   */
+  public NodeManager(ClusterManager clusterManager,
+                     HostsFileReader hostsReader,
+                     CoronaSerializer coronaSerializer)
+    throws IOException {
+    this(clusterManager, hostsReader);
+
+    // Expecting the START_OBJECT token for nodeManager
+    coronaSerializer.readStartObjectToken("nodeManager");
+    readNameToNode(coronaSerializer);
+    readHostsToSessions(coronaSerializer);
+    readNameToApps(coronaSerializer);
+    // Expecting the END_OBJECT token for ClusterManager
+    coronaSerializer.readEndObjectToken("nodeManager");
+
+    // topologyCache need not be serialized, it will eventually be rebuilt.
+    // cpuToResourcePartitioning and resourceLimit need not be serialized,
+    // they can be read from the conf.
+  }
+
+  /**
+   * Reads the nameToNode map from the JSON stream
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  private void readNameToNode(CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readField("nameToNode");
+    // Expecting the START_OBJECT token for nameToNode
+    coronaSerializer.readStartObjectToken("nameToNode");
+    JsonToken current = coronaSerializer.nextToken();
+    while (current != JsonToken.END_OBJECT) {
+      // nodeName is the key, and the ClusterNode is the value here
+      String nodeName = coronaSerializer.getFieldName();
+      ClusterNode clusterNode = new ClusterNode(coronaSerializer);
+      if (!nameToNode.containsKey(nodeName)) {
+        nameToNode.put(nodeName, clusterNode);
+      }
+      current = coronaSerializer.nextToken();
+    }
+    // Done with reading the END_OBJECT token for nameToNode
+  }
+
+  /**
+   * Reads the hostsToSessions map from the JSON stream
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws java.io.IOException
+   */
+  private void readHostsToSessions(CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readField("hostsToSessions");
+    // Expecting the START_OBJECT token for hostsToSessions
+    coronaSerializer.readStartObjectToken("hostsToSessions");
+    JsonToken current = coronaSerializer.nextToken();
+
+    while (current != JsonToken.END_OBJECT) {
+      String host = coronaSerializer.getFieldName();
+      Set<String> sessionsSet = coronaSerializer.readValueAs(Set.class);
+      hostsToSessions.put(nameToNode.get(host), sessionsSet);
+      current = coronaSerializer.nextToken();
+    }
+  }
+
+  /**
+   * Reads the nameToApps map from the JSON stream
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  private void readNameToApps(CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readField("nameToApps");
+    // Expecting the START_OBJECT token for nameToApps
+    coronaSerializer.readStartObjectToken("nameToApps");
+    JsonToken current = coronaSerializer.nextToken();
+
+    while (current != JsonToken.END_OBJECT) {
+      String nodeName = coronaSerializer.getFieldName();
+      // Expecting the START_OBJECT token for the Apps
+      coronaSerializer.readStartObjectToken(nodeName);
+      Map<String, String> appMap = coronaSerializer.readValueAs(Map.class);
+      Map<ResourceType, String> appsOnNode =
+        new HashMap<ResourceType, String>();
+
+      for (Map.Entry<String, String> entry : appMap.entrySet()) {
+        appsOnNode.put(ResourceType.valueOf(entry.getKey()),
+          entry.getValue());
+      }
+
+      nameToApps.put(nodeName, appsOnNode);
+      current = coronaSerializer.nextToken();
+    }
+  }
+
  /**
    * See if there are any runnable nodes of a given type
    * @param type the type to look for
@@ -532,7 +644,8 @@ protected void addNode(ClusterNode node,
           typeToIndices.entrySet()) {
         ResourceType type = entry.getKey();
         if (resourceInfos.containsKey(type)) {
-          if (node.checkForGrant(Utilities.getUnitResourceRequest(type), resourceLimit)) {
+          if (node.checkForGrant(Utilities.getUnitResourceRequest(type),
+                                 resourceLimit)) {
             RunnableIndices r = entry.getValue();
             r.addRunnable(node);
           }
@@ -541,6 +654,11 @@ protected void addNode(ClusterNode node,
     }
   }
 
+  /**
+   * Update the runnable status of a node based on resources available.
+   * This checks both resources and slot availability.
+   * @param node The node
+   */
   private void updateRunnability(ClusterNode node) {
     synchronized (node) {
       for (Map.Entry<ResourceType, RunnableIndices> entry :
@@ -551,10 +669,11 @@ private void updateRunnability(ClusterNode node) {
         boolean currentlyRunnable = r.hasRunnable(node);
         boolean shouldBeRunnable = node.checkForGrant(unitReq, resourceLimit);
         if (currentlyRunnable && !shouldBeRunnable) {
-          LOG.info("Node " + node.getName() + " is no longer runnable");
+          LOG.info("Node " + node.getName() + " is no longer " +
+            type + " runnable");
           r.deleteRunnable(node);
         } else if (!currentlyRunnable && shouldBeRunnable) {
-          LOG.info("Node " + node.getName() + " is now runnable");
+          LOG.info("Node " + node.getName() + " is now " + type + " runnable");
           r.addRunnable(node);
         }
       }
@@ -578,7 +697,8 @@ protected void addAppToNode(
       for (Map.Entry<ResourceType, RunnableIndices> entry :
           typeToIndices.entrySet()) {
         if (type.equals(entry.getKey())) {
-          if (node.checkForGrant(Utilities.getUnitResourceRequest(type), resourceLimit)) {
+          if (node.checkForGrant(Utilities.getUnitResourceRequest(type),
+                                  resourceLimit)) {
             RunnableIndices r = entry.getValue();
             r.addRunnable(node);
           }
@@ -785,6 +905,58 @@ public void setConf(Configuration newConf) {
     faultManager.setConf(conf);
   }
 
+  /**
+   *  This method rebuilds members related to the NodeManager instance, which
+   *  were not directly persisted themselves.
+   *  @throws IOException
+   */
+  public void restoreAfterSafeModeRestart() throws IOException {
+    if (!clusterManager.safeMode) {
+      throw new IOException("restoreAfterSafeModeRestart() called while the " +
+        "Cluster Manager was not in Safe Mode");
+    }
+    // Restoring all the ClusterNode(s)
+    for (ClusterNode clusterNode : nameToNode.values()) {
+      restoreClusterNode(clusterNode);
+    }
+
+    // Restoring all the RequestedNodes(s)
+    for (ClusterNode clusterNode : nameToNode.values()) {
+      for (ResourceRequestInfo resourceRequestInfo :
+        clusterNode.grants.values()) {
+        // Fix the RequestedNode(s)
+        restoreResourceRequestInfo(resourceRequestInfo);
+        loadManager.incrementLoad(resourceRequestInfo.getType());
+      }
+    }
+  }
+
+  /**
+   * This method rebuilds members related to a ResourceRequestInfo instance,
+   * which were not directly persisted themselves.
+   * @param resourceRequestInfo The ResourceRequestInfo instance to be restored
+   */
+  public void restoreResourceRequestInfo(ResourceRequestInfo
+                                           resourceRequestInfo) {
+    List<RequestedNode> requestedNodes = null;
+    List<String> hosts = resourceRequestInfo.getHosts();
+    if (hosts != null && hosts.size() > 0) {
+      requestedNodes = new ArrayList<RequestedNode>(hosts.size());
+      for (String host : hosts) {
+        requestedNodes.add(resolve(host, resourceRequestInfo.getType()));
+      }
+    }
+    resourceRequestInfo.nodes = requestedNodes;
+  }
+
+  private void restoreClusterNode(ClusterNode clusterNode) {
+    clusterNode.hostNode = topologyCache.getNode(clusterNode.getHost());
+    // This will reset the lastHeartbeatTime
+    clusterNode.heartbeat(clusterNode.getClusterNodeInfo());
+    clusterNode.initResourceTypeToMaxCpuMap(cpuToResourcePartitioning);
+    updateRunnability(clusterNode);
+  }
+
   @Override
   public Configuration getConf() {
     return conf;
@@ -877,6 +1049,11 @@ public String getAppInfo(ClusterNode node, ResourceType type) {
     }
   }
 
+  /**
+   * Check if a node has enough resources.
+   * @param node The node
+   * @return A boolean indicating if it has enough resources.
+   */
   public boolean hasEnoughResource(ClusterNode node) {
     return resourceLimit.hasEnoughResource(node);
   }
@@ -892,6 +1069,11 @@ public void run() {
         try {
           Thread.sleep(nodeExpiryInterval / 2);
 
+          if (clusterManager.safeMode) {
+            // Do nothing but sleep
+            continue;
+          }
+
           long now = ClusterManager.clock.getTime();
           for (ClusterNode node : nameToNode.values()) {
             if (now - node.lastHeartbeatTime > nodeExpiryInterval) {
@@ -956,6 +1138,23 @@ public int getAllocatedCpuForType(ResourceType type) {
     return total;
   }
 
+  /**
+   * Get a list nodes with free Cpu for a resource type
+   */
+  public List<String> getFreeNodesForType(ResourceType type) {
+    ArrayList<String> freeNodes = new ArrayList<String>();
+    for (Map.Entry<String, ClusterNode> entry: nameToNode.entrySet()) {
+      ClusterNode node = entry.getValue();
+      synchronized (node) {
+        if (!node.deleted &&
+            node.getMaxCpuForType(type) > node.getAllocatedCpuForType(type)) {
+          freeNodes.add(entry.getKey() + ": " + node.getFree().toString());
+        }
+      }
+    }
+    return freeNodes;
+  }
+
   /**
    * @return The total number of configured hosts.
    */
@@ -998,6 +1197,14 @@ public List<String> getAliveNodes() {
     return new ArrayList<String>(nameToNode.keySet());
   }
 
+  /**
+   * @return The alive nodes.
+   */
+  public List<ClusterNode> getAliveClusterNodes() {
+    return new ArrayList<ClusterNode>(nameToNode.values());
+  }
+
+
   /**
    * @return The fault manager.
    */
@@ -1053,36 +1260,12 @@ public void nodeFeedback(
    */
   void blacklistNode(String nodeName, ResourceType resourceType) {
     LOG.info("Node " + nodeName + " has been blacklisted for resource " +
-        resourceType);
+      resourceType);
     clusterManager.getMetrics().setBlacklistedNodes(
         faultManager.getBlacklistedNodeCount());
     deleteAppFromNode(nodeName, resourceType);
   }
 
-  /**
-   * Checks if a host is in the included hosts list. If the included hosts lists
-   * is empty, the host is treated as included.
-   *
-   * @param host
-   *          The host
-   * @return a boolean indicating if the host is included.
-   */
-  private boolean inHostsList(String host) {
-    Set<String> hosts = hostsReader.getHostNames();
-    return hosts.isEmpty() || hosts.contains(host);
-  }
-
-  /**
-   * Checks if a host is in the excluded hosts list.
-   *
-   * @param host
-   *          The host
-   * @return a boolean indicating if the host is excluded.
-   */
-  private boolean inExcludedHostsList(String host) {
-    return hostsReader.getExcludedHosts().contains(host);
-  }
-
   /**
    * Checks if a host is allowed to communicate with the cluster manager.
    *
@@ -1091,7 +1274,7 @@ private boolean inExcludedHostsList(String host) {
    * @return a boolean indicating if the host is allowed.
    */
   private boolean canAllowNode(String host) {
-    return inHostsList(host) && !inExcludedHostsList(host);
+    return hostsReader.isAllowedHost(host);
   }
 
   /**
@@ -1120,4 +1303,57 @@ public RequestedNode resolve(String host, ResourceType type) {
   public ResourceLimit getResourceLimit() {
     return resourceLimit;
   }
+
+  /**
+   * This is required when we come out of safe mode, and we need to reset
+   * the lastHeartbeatTime for each node
+   */
+  public void resetNodesLastHeartbeatTime() {
+    long now = ClusterManager.clock.getTime();
+    for (ClusterNode node : nameToNode.values()) {
+      node.lastHeartbeatTime = now;
+    }
+  }
+
+  /**
+   * This method writes the state of the NodeManager to disk
+   * @param jsonGenerator The instance of JsonGenerator, which will be used to
+   *                      write JSON to disk
+   * @throws IOException
+   */
+  public void write(JsonGenerator jsonGenerator) throws IOException {
+    jsonGenerator.writeStartObject();
+
+    // nameToNode begins
+    jsonGenerator.writeFieldName("nameToNode");
+    jsonGenerator.writeStartObject();
+    for (Map.Entry<String, ClusterNode> entry : nameToNode.entrySet()) {
+      jsonGenerator.writeFieldName(entry.getKey());
+      entry.getValue().write(jsonGenerator);
+    }
+    jsonGenerator.writeEndObject();
+    // nameToNode ends
+
+    // hostsToSessions begins
+    // We create a new Map of type <ClusterNode.name, Set<SessionIds>>.
+    // The original hostsToSessions map has the ClusterNode as its key, and
+    // we do not need to persist the entire ClusterNode again, since we have
+    // already done that with nameToNode.
+    Map<String, Set<String>> hostsToSessionsMap =
+      new HashMap<String, Set<String>>();
+    for (Map.Entry<ClusterNode, Set<String>> entry :
+      hostsToSessions.entrySet()) {
+      hostsToSessionsMap.put(entry.getKey().getName(),
+        entry.getValue());
+    }
+    jsonGenerator.writeObjectField("hostsToSessions", hostsToSessionsMap);
+    // hostsToSessions ends
+
+    jsonGenerator.writeObjectField("nameToApps", nameToApps);
+
+    // faultManager is not required
+
+    // We can rebuild the loadManager
+    jsonGenerator.writeEndObject();
+  }
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/NodeSnapshot.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/NodeSnapshot.java
index 287340ee..29900e68 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/NodeSnapshot.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/NodeSnapshot.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.corona;
 
 import org.apache.hadoop.net.Node;
+import org.apache.hadoop.net.TopologyCache;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/PoolGroupManager.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/PoolGroupManager.java
index 5d6bd97b..15c1055c 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/PoolGroupManager.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/PoolGroupManager.java
@@ -33,7 +33,7 @@
  */
 public class PoolGroupManager {
   /** Default pool group */
-  public static final String DEFAULT_POOL_GROUP = "defaultpoolgroup";
+  public static final String DEFAULT_POOL_GROUP = "default";
   /** Default pool */
   public static final String DEFAULT_POOL = "defaultpool";
   /** Default pool info */
@@ -141,25 +141,75 @@ private Queue<PoolGroupSchedulable> createPoolGroupQueue(
    * @param session the session object to add
    */
   public void addSession(String id, Session session) {
-    PoolInfo poolInfo = getPoolInfo(session, configManager, conf);
+    PoolInfo poolInfo = getPoolInfo(session);
     LOG.info("Session " + id + " added to pool info " +
-        poolInfo + " for " + type);
+        poolInfo + " (originally " + session.getInfo().getPoolInfoStrings() +") for " + type);
     getPoolSchedulable(poolInfo).addSession(id, session);
   }
 
   /**
-   * Get the pool name for a given session, restricting to the configured
-   * pools and the default pool.
+   * If the cluster is set to configured pools only, do not allow unset pool
+   * information or pool info that doesn't match a valid pool info.  Throws
+   * an InvalidSessionHandle exception in either of the failure cases.
+   *
+   * @param poolInfo Pool info to check
+   * @param configManager Configuration to check
+   * @param conf Corona configuration to check if configured pools
+   * @throws InvalidSessionHandle
+   */
+  public static void checkPoolInfoIfStrict(PoolInfo poolInfo,
+                                           ConfigManager configManager,
+                                           CoronaConf conf)
+      throws InvalidSessionHandle {
+    if (!conf.onlyAllowConfiguredPools()) {
+      return;
+    }
+
+    // When only allowing configured pools, check the pool name to ensure
+    // it is a configured pool name.  Not setting the pool info is also
+    // invalid.  A legal name must be specified.
+
+    if (poolInfo == null) {
+      throw new InvalidSessionHandle("This cluster is operating in " +
+          "configured pools only mode.  The pool group " +
+          "and pool was not specified.  Please use the Corona parameter " +
+          CoronaConf.EXPLICIT_POOL_PROPERTY + " to set a valid poolgroup and " +
+          "pool in the format '<poolgroup>.<pool>'");
+    }
+
+    if (!configManager.isConfiguredPoolInfo(poolInfo)) {
+      throw new InvalidSessionHandle("This cluster is operating in " +
+          "configured pools only mode.  The pool group " +
+          "and pool was specified as '" + poolInfo.getPoolGroupName() +
+          "." + poolInfo.getPoolName() +
+          "' and is not part of this cluster.  " +
+          "Please use the Corona parameter " +
+          CoronaConf.EXPLICIT_POOL_PROPERTY + " to set a valid pool " +
+          "group and pool in the format <poolgroup>.<pool>");
+    }
+
+    if (!PoolInfo.isLegalPoolInfo(poolInfo)) {
+      throw new InvalidSessionHandle("This cluster is operating in " +
+          "configured pools only mode.  The pool group " +
+          "and pool was specified as '" + poolInfo.getPoolGroupName() +
+          "." + poolInfo.getPoolName() +
+          "' and has illegal characters (Something not in " +
+          PoolInfo.INVALID_REGEX + ").  Please use the Corona parameter " +
+          CoronaConf.EXPLICIT_POOL_PROPERTY + " to set a valid pool " +
+          "group and pool in the format <poolgroup>.<pool>");
+    }
+  }
+
+  /**
+   * Get the pool name for a given session, using the default pool
+   * information if the name is illegal.  Redirection should happen prior to
+   * this.
    *
    * @param session the session to get the pool name for
-   * @param configManager Config manager used to see if the pool is configured
-   * @param conf Static configuration
    * @return the pool info that the session is running in
    */
   public static PoolInfo getPoolInfo(
-      Session session,
-      ConfigManager configManager,
-      CoronaConf conf) {
+      Session session) {
     PoolInfo poolInfo = session.getPoolInfo();
 
     // If there is no explicit pool info set, take user name.
@@ -167,15 +217,6 @@ public static PoolInfo getPoolInfo(
       poolInfo = new PoolInfo(DEFAULT_POOL_GROUP, session.getUserId());
     }
 
-    // When only allowing configured pools, check the pool name to ensure
-    // it is a configured pool name.
-    if (poolInfo != null && conf.onlyAllowConfiguredPools() &&
-        !configManager.isConfiguredPoolInfo(poolInfo)) {
-      LOG.warn("getPoolInfo: Pool info " + poolInfo +
-          " is not configured for session " + session.getSessionId() +
-          ", falling back to " + DEFAULT_POOL_INFO);
-      return DEFAULT_POOL_INFO;
-    }
     if (!PoolInfo.isLegalPoolInfo(poolInfo)) {
       LOG.warn("Illegal pool info :" + poolInfo +
           " from session " + session.getSessionId());
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/PoolInfo.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/PoolInfo.java
index 55188418..175ab1f1 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/PoolInfo.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/PoolInfo.java
@@ -18,19 +18,22 @@
 
 package org.apache.hadoop.corona;
 
+import java.io.IOException;
 import java.util.regex.Pattern;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.util.CoronaSerializer;
+import org.codehaus.jackson.JsonGenerator;
 
 /**
  * Immutable object that contains the pool group name and pool name.
  */
 public class PoolInfo implements Comparable<PoolInfo> {
+  /** Invalid regex for pool group and pool names */
+  public static final String INVALID_REGEX = ".*[^0-9a-z\\-\\_].*";
   /** Class logger */
   private static final Log LOG = LogFactory.getLog(PoolInfo.class);
-  /** Invalid regex for pool group and pool names */
-  private static final String INVALID_REGEX = ".*[^0-9a-z\\-\\_].*";
   /** Compiled invalid regex used for checking pool group and pool names */
   private static final Pattern INVALID_REGEX_PATTERN =
       Pattern.compile(INVALID_REGEX);
@@ -39,6 +42,51 @@ public class PoolInfo implements Comparable<PoolInfo> {
   /** Immutable pool name */
   private final String poolName;
 
+  /**
+   * Constructor for PoolInfo, used when we are reading back the ClusterManager
+   * state from the disk
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  public PoolInfo(CoronaSerializer coronaSerializer) throws IOException {
+    // Expecting the START_OBJECT token for PoolInfo
+    coronaSerializer.readStartObjectToken("PoolInfo");
+
+    coronaSerializer.readField("poolGroupName");
+    this.poolGroupName = coronaSerializer.readValueAs(String.class);
+
+    coronaSerializer.readField("poolName");
+    this.poolName = coronaSerializer.readValueAs(String.class);
+
+    // Expecting the END_OBJECT token for PoolInfo
+    coronaSerializer.readEndObjectToken("PoolInfo");
+  }
+
+  /**
+   * Used to write the state of the PoolInfo instance to disk, when we are
+   * persisting the state of the ClusterManager
+   *
+   * @param jsonGenerator The JsonGenerator instance being used to write JSON
+   *                      to disk
+   * @throws IOException
+   */
+  public void write(JsonGenerator jsonGenerator) throws IOException {
+    jsonGenerator.writeStartObject();
+    jsonGenerator.writeStringField("poolGroupName", poolGroupName);
+    jsonGenerator.writeStringField("poolName", poolName);
+    jsonGenerator.writeEndObject();
+  }
+ 
+  /**
+   * Convert the string to PoolInfoStrings for Thrift
+   * @param poolInfoString pool info in <poolgroup>.<pool> format
+   * @return PoolInfoStrings or null if unable to parse
+   */
+  public static PoolInfoStrings createPoolInfoStrings(String poolInfoString) {
+    return createPoolInfoStrings(createPoolInfo(poolInfoString));
+  }
+
   /**
    * Convert this object to PoolInfoStrings for Thrift
    * @param poolInfo Pool info
@@ -53,6 +101,28 @@ public static PoolInfoStrings createPoolInfoStrings(PoolInfo poolInfo) {
                                poolInfo.getPoolName());
   }
 
+  /**
+   * Create PoolInfo object from a properly formatted string
+   * <poolgroup>.<pool> or return null
+   *
+   * @param poolInfoString String to parse
+   * @return Valid PoolInfo object or null if unable to parse
+   */
+  public static PoolInfo createPoolInfo(String poolInfoString) {
+    if (poolInfoString == null || poolInfoString.isEmpty()) {
+      LOG.warn("createPoolInfo: Null or empty input " + poolInfoString);
+      return null;
+    }
+
+    String[] poolInfoSplitString = poolInfoString.split("[.]");
+    if (poolInfoSplitString.length != 2) {
+      LOG.warn("createPoolInfo: Couldn't parse " + poolInfoString);
+      return null;
+    }
+
+    return new PoolInfo(poolInfoSplitString[0], poolInfoSplitString[1]);
+  }
+
   /**
    * Convert this object from PoolInfoStrings for Thrift
    * @param poolInfoStrings Thrift representation of a {@link PoolInfo}
@@ -88,7 +158,7 @@ public static String createStringFromPoolInfo(PoolInfo poolInfo) {
    *
    * Legal pool names are of nonzero length and are formed only of alphanumeric
    * characters, underscores (_), and hyphens (-).
-   * @param poolName the name of the pool to check
+   * @param poolInfo the name of the pool to check
    * @return true if the name is a valid pool name, false otherwise
    */
   public static boolean isLegalPoolInfo(PoolInfo poolInfo) {
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/ResourceLimit.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/ResourceLimit.java
index 2ff321c6..fbd091ac 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/ResourceLimit.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/ResourceLimit.java
@@ -76,15 +76,15 @@ public boolean hasEnoughResource(ClusterNode node) {
    * @return true if the node has enough memory, false otherwise
    */
   public boolean hasEnoughMemory(ClusterNode node) {
-    int used = node.getUsed().memoryMB;
     int total = node.getTotal().memoryMB;
-    int free = total - used;
+    int free = node.getFree().memoryMB;
     if (free < nodeReservedMemoryMB) {
-      LOG.info(node.getHost() + " not enough memory." +
-        " totalMB:" + total +
-        " used:" + used +
-        " free:" + free +
-        " limit:" + nodeReservedMemoryMB);
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(node.getHost() + " not enough memory." +
+          " totalMB:" + total +
+          " free:" + free +
+          " limit:" + nodeReservedMemoryMB);
+      }
       return false;
     }
     return true;
@@ -96,15 +96,15 @@ public boolean hasEnoughMemory(ClusterNode node) {
    * @return true if the node has enough space, false otherwise
    */
   private boolean hasEnoughDiskSpace(ClusterNode node) {
-    int used = node.getUsed().diskGB;
     int total = node.getTotal().diskGB;
-    int free = total - used;
+    int free = node.getFree().diskGB;
     if (free < nodeReservedDiskGB) {
-      LOG.info(node.getHost() + " not enough disk space." +
-        " totalMB:" + total +
-        " used:" + used +
-        " free:" + free +
-        " limit:" + nodeReservedDiskGB);
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(node.getHost() + " not enough disk space." +
+          " totalMB:" + total +
+          " free:" + free +
+          " limit:" + nodeReservedDiskGB);
+      }
       return false;
     }
     return true;
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/ResourceRequestInfo.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/ResourceRequestInfo.java
index cddef9b6..e162bdbf 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/ResourceRequestInfo.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/ResourceRequestInfo.java
@@ -18,6 +18,10 @@
 
 package org.apache.hadoop.corona;
 
+import org.apache.hadoop.util.CoronaSerializer;
+import org.codehaus.jackson.JsonGenerator;
+
+import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -27,7 +31,8 @@ public class ResourceRequestInfo {
   List<RequestedNode> nodes;
   Set<String> excludedHosts = new HashSet<String>();
 
-  public ResourceRequestInfo(ResourceRequest request, List<RequestedNode> nodes) {
+  public ResourceRequestInfo(ResourceRequest request,
+                             List<RequestedNode> nodes) {
     this.request = request;
     this.nodes = nodes;
     if (request.getExcludeHosts() != null) {
@@ -35,6 +40,33 @@ public ResourceRequestInfo(ResourceRequest request, List<RequestedNode> nodes) {
     }
   }
 
+  /**
+   * Constructor to reconstruct the ResourceRequestInfo object from the
+   * file which stores the state on the disk.
+   *  @param coronaSerializer The CoronaSerializer instance being used to read
+   *                         the JSON from disk
+   * @throws IOException
+   */
+  public ResourceRequestInfo(CoronaSerializer coronaSerializer)
+    throws IOException {
+    // Expecting the START_OBJECT token for ResourceRequestInfo
+    coronaSerializer.readStartObjectToken("ResourceRequestInfo");
+
+    coronaSerializer.readField("request");
+    this.request = coronaSerializer.readValueAs(ResourceRequest.class);
+
+    // Expecting the END_OBJECT token for ResourceRequestInfo
+    coronaSerializer.readEndObjectToken("ResourceRequestInfo");
+
+    // Restoring the excludedHosts
+    if (request.getExcludeHosts() != null) {
+      excludedHosts.addAll(request.getExcludeHosts());
+    }
+
+    // The list of RequestedNodes, nodes, will be restored later once the
+    // topologyCache object is created
+  }
+
   public int getId() {
     return request.id;
   }
@@ -58,4 +90,18 @@ public ComputeSpecs getSpecs() {
   public List<RequestedNode> getRequestedNodes() {
     return nodes;
   }
+
+  /**
+   * This method writes the ResourceRequestInfo instance to disk
+   * @param jsonGenerator The JsonGenerator instance being used to write the
+   *                      JSON to disk
+   * @throws IOException
+   */
+  public void write(JsonGenerator jsonGenerator) throws IOException {
+    // We neither need the list of RequestedNodes, nodes, nor excludedHosts,
+    // because we can reconstruct them from the request object
+    jsonGenerator.writeStartObject();
+    jsonGenerator.writeObjectField("request", request);
+    jsonGenerator.writeEndObject();
+  }
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/Scheduler.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/Scheduler.java
index ce217919..a62e7fed 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/Scheduler.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/Scheduler.java
@@ -232,16 +232,6 @@ public List<PoolInfo> getPoolInfos() {
     return result;
   }
 
-  /**
-   * Gets the pool info (delegating to PoolGroupManager).
-   *
-   * @param session Session to examine for the pool name
-   * @return Final pool info
-   */
-  public PoolInfo getPoolInfo(Session session) {
-     return PoolGroupManager.getPoolInfo(session, configManager, conf);
-  }
-
   /**
    * Submit the metrics.
    *
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/SchedulerForType.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/SchedulerForType.java
index 93f6646c..5009e08b 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/SchedulerForType.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/SchedulerForType.java
@@ -112,12 +112,19 @@ public SchedulerForType(
   public void run() {
     while (!shutdown) {
       try {
+        if (nodeManager.clusterManager.safeMode) {
+          // If the Cluster Manager is in Safe Mode, we will not change
+          // anything
+          Thread.sleep(1000);
+          continue;
+        }
+
         if (fullyScheduled) {
           waitForNotification();
         }
 
         long start = System.currentTimeMillis();
-
+        metrics.setSchedulerCurrentCycleStartTime(type, start);
         poolGroupManager.snapshot();
 
         boolean scheduleFromNodeToSession =
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/Session.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/Session.java
index fae14710..0c2d75b7 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/Session.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/Session.java
@@ -22,7 +22,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.net.Node;
+import org.apache.hadoop.util.CoronaSerializer;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonToken;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -68,6 +72,25 @@ public class Session {
   private final long startTime;
   /** Last time a heartbeat occurred */
   private long lastHeartbeatTime;
+  /** expected heartbeat info to sync with JT, inclduing the last resource requestId
+   *  from JT and the last grantId to JT */
+  private HeartbeatArgs expectedInfo;
+  /** the last time when heartbeat info from JT matches CM's
+   *  or is different from its own previous one
+   */ 
+  private long lastSyncTime;
+  /** If the heartbeat infos between CM and JT mismatch, this is the last heartbeat
+   *  from JT 
+   */
+  private HeartbeatArgs lastHeartbeat;
+  /** The max time for CM to wait for JT to catch up */
+  private final long maxDelay;
+  
+  /**
+   * Pool info (after possible redirection), info has the original pool info
+   * strings.
+   */
+  private final PoolInfo poolInfo;
   /**
    * Map of resource types to the resource context.
    */
@@ -82,19 +105,284 @@ public class Session {
   private Map<ResourceType, Long> typeToFirstWait =
       new EnumMap<ResourceType, Long>(ResourceType.class);
 
+  /**
+   * We do not rebuild idToPendingRequests immediately after reading from the
+   * CM state file. So we keep the list of the ids of pending requests, so as
+   * to help us rebuild it later.
+   */
+  public List<Integer> pendingRequestsList = new ArrayList<Integer>();
+
   /**
    * Constructor.
    *
    * @param id Should be a unique id
    * @param info Information about the session
    */
-  public Session(String id, SessionInfo info) {
+  public Session(long maxDelay, String id, SessionInfo info, ConfigManager configManager) {
+    this.maxDelay = maxDelay;
     this.sessionId = id;
     this.info = info;
+    PoolInfo tmpPoolInfo = PoolInfo.createPoolInfo(info.getPoolInfoStrings());
+    poolInfo = configManager.getRedirect(tmpPoolInfo);
     this.startTime = ClusterManager.clock.getTime();
     this.lastHeartbeatTime = startTime;
+    this.expectedInfo = new HeartbeatArgs();
+    this.expectedInfo.requestId = 0;
+    this.expectedInfo.grantId = 0;
+    this.lastSyncTime = System.currentTimeMillis();
+    this.lastHeartbeat = new HeartbeatArgs();
+    this.lastHeartbeat.requestId = 0;
+    this.lastHeartbeat.grantId = 0;
+  }
+
+  /**
+   * Constructor for Session, used when we are reading back the
+   * ClusterManager state from the disk
+   *
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  public Session(long maxDelay, CoronaSerializer coronaSerializer) throws IOException {
+    this.maxDelay = maxDelay;
+    // Expecting the START_OBJECT token for Session
+    coronaSerializer.readStartObjectToken("Session");
+
+    readIdToRequest(coronaSerializer);
+
+    readIdToPendingRequests(coronaSerializer);
+
+    readIdToGrant(coronaSerializer);
+
+    coronaSerializer.readField("status");
+    status = coronaSerializer.readValueAs(SessionStatus.class);
+
+    coronaSerializer.readField("sessionId");
+    this.sessionId = coronaSerializer.readValueAs(String.class);
+
+    coronaSerializer.readField("deleted");
+    deleted = coronaSerializer.readValueAs(Boolean.class);
+
+    coronaSerializer.readField("deletedTime");
+    deletedTime = coronaSerializer.readValueAs(Long.class);
+
+    coronaSerializer.readField("info");
+    this.info = coronaSerializer.readValueAs(SessionInfo.class);
+    
+    
+
+    coronaSerializer.readField("startTime");
+    this.startTime = coronaSerializer.readValueAs(Long.class);
+
+    coronaSerializer.readField("poolInfo");
+    this.poolInfo = new PoolInfo(coronaSerializer);
+
+    readTypeToFirstWait(coronaSerializer);
+    try {
+      coronaSerializer.readField("expectedInfo");
+      this.expectedInfo = coronaSerializer.readValueAs(HeartbeatArgs.class);
+    
+      coronaSerializer.readField("lastHeartbeat");
+      this.lastHeartbeat= coronaSerializer.readValueAs(HeartbeatArgs.class);
+
+      coronaSerializer.readField("lastSyncTime");
+      this.lastSyncTime = coronaSerializer.readValueAs(Long.class);
+    } catch (IOException e) {
+      this.expectedInfo= new HeartbeatArgs();
+      this.expectedInfo.requestId = 0;
+      this.expectedInfo.grantId = 0;
+      this.lastSyncTime = System.currentTimeMillis();
+      this.lastHeartbeat = new HeartbeatArgs();
+      this.lastHeartbeat.requestId = 0;
+      this.lastHeartbeat.grantId = 0;
+      return;
+    }
+
+    // Expecting the END_OBJECT token for Session
+    coronaSerializer.readEndObjectToken("Session");
+  }
+
+  /**
+   * Reads the idToRequest map from a JSON stream
+   *
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  private void readIdToRequest(CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readField("idToRequest");
+    // Expecting the START_OBJECT token for idToRequest
+    coronaSerializer.readStartObjectToken("idToRequest");
+    JsonToken current = coronaSerializer.nextToken();
+    while (current != JsonToken.END_OBJECT) {
+      Integer id = Integer.parseInt(coronaSerializer.getFieldName());
+      idToRequest.put(id, new ResourceRequestInfo(coronaSerializer));
+      current = coronaSerializer.nextToken();
+    }
+    // Done with reading the END_OBJECT token for idToRequest
+  }
+
+  /**
+   * Reads the idToPendingRequests map from a JSON stream
+   *
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  private void readIdToPendingRequests(CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readField("idToPendingRequests");
+    // Expecting the START_ARRAY token for idToPendingRequests
+    coronaSerializer.readStartArrayToken("idToPendingRequests");
+    JsonToken current = coronaSerializer.nextToken();
+    while (current != JsonToken.END_ARRAY) {
+      pendingRequestsList.add(coronaSerializer.jsonParser.getIntValue());
+      current = coronaSerializer.nextToken();
+    }
+    // Done with reading the END_ARRAY token for idToPendingRequests
+  }
+
+  /**
+   * Reads the idToGrant map from a JSON stream
+   *
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  private void readIdToGrant(CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readField("idToGrant");
+    // Expecting the START_OBJECT token for idToGrant
+    coronaSerializer.readStartObjectToken("idToGrant");
+    JsonToken current = coronaSerializer.nextToken();
+    while (current != JsonToken.END_OBJECT) {
+      Integer id = Integer.parseInt(coronaSerializer.getFieldName());
+      ResourceGrant resourceGrant =
+        coronaSerializer.readValueAs(ResourceGrant.class);
+      idToGrant.put(id, new ResourceGrant(resourceGrant));
+      current = coronaSerializer.nextToken();
+    }
+    // Done with reading the END_OBJECT token for idToGrant
+  }
+
+  /**
+   * Reads the typeToFirstWait map from the JSON stream
+   *
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  private void readTypeToFirstWait(CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readField("typeToFirstWait");
+    // Expecting the START_OBJECT token for typeToFirstWait
+    coronaSerializer.readStartObjectToken("typeToFirstWait");
+    JsonToken current = coronaSerializer.nextToken();
+    while (current != JsonToken.END_OBJECT) {
+      String resourceTypeStr = coronaSerializer.getFieldName();
+      Long wait = coronaSerializer.readValueAs(Long.class);
+      current = coronaSerializer.nextToken();
+      if (wait == -1) {
+        wait = null;
+      }
+      typeToFirstWait.put(ResourceType.valueOf(resourceTypeStr), wait);
+    }
+    // Done with reading the END_OBJECT token for typeToFirstWait
+  }
+
+  /**
+   * Used to write the state of the Session instance to disk, when we are
+   * persisting the state of the ClusterManager
+   *
+   * @param jsonGenerator The JsonGenerator instance being used to write JSON
+   *                      to disk
+   * @throws IOException
+   */
+  public void write(JsonGenerator jsonGenerator) throws IOException {
+    jsonGenerator.writeStartObject();
+
+    jsonGenerator.writeFieldName("idToRequest");
+    jsonGenerator.writeStartObject();
+    for (Integer id : idToRequest.keySet()) {
+      jsonGenerator.writeFieldName(id.toString());
+      idToRequest.get(id).write(jsonGenerator);
+    }
+    jsonGenerator.writeEndObject();
+
+    // idToPendingRequests is the same, and we only need to persist the
+    // array of pending request ids
+    jsonGenerator.writeFieldName("idToPendingRequests");
+    jsonGenerator.writeStartArray();
+    for (Integer id : idToPendingRequests.keySet()) {
+      jsonGenerator.writeNumber(id);
+    }
+    jsonGenerator.writeEndArray();
+
+    jsonGenerator.writeFieldName("idToGrant");
+    jsonGenerator.writeStartObject();
+    for (Integer id : idToGrant.keySet()) {
+      jsonGenerator.writeObjectField(id.toString(), idToGrant.get(id));
+    }
+    jsonGenerator.writeEndObject();
+
+    jsonGenerator.writeObjectField("status", status);
+
+    jsonGenerator.writeStringField("sessionId", sessionId);
+
+    jsonGenerator.writeBooleanField("deleted", deleted);
+
+    jsonGenerator.writeNumberField("deletedTime", deletedTime);
+
+    jsonGenerator.writeObjectField("info", info);
+    
+    jsonGenerator.writeNumberField("startTime", startTime);
+
+    jsonGenerator.writeFieldName("poolInfo");
+    poolInfo.write(jsonGenerator);
+
+    jsonGenerator.writeFieldName("typeToFirstWait");
+    jsonGenerator.writeStartObject();
+    for (ResourceType resourceType : typeToFirstWait.keySet()) {
+      Long wait = typeToFirstWait.get(resourceType);
+      if (wait == null) {
+        wait = new Long(-1);
+      }
+      jsonGenerator.writeNumberField(resourceType.toString(), wait);
+    }
+    jsonGenerator.writeEndObject();
+
+    jsonGenerator.writeObjectField("expectedInfo", expectedInfo);
+    
+    jsonGenerator.writeObjectField("lastHeartbeat", lastHeartbeat);
+    
+    jsonGenerator.writeNumberField("lastSyncTime", lastSyncTime);
+
+    jsonGenerator.writeEndObject();
+    // No need to serialize lastHeartbeatTime, it will be reset.
+    // typeToContext can be rebuilt
+  }
+
+  /**
+   *  This method rebuilds members related to the Session instance, which were
+   *  not directly persisted themselves.
+   */
+  public void restoreAfterSafeModeRestart() {
+    for (Integer pendingRequestId : pendingRequestsList) {
+      ResourceRequestInfo request = idToRequest.get(pendingRequestId);
+      incrementRequestCount(request.getType(), 1);
+      addPendingRequest(request);
+    }
+
+    for (Integer grantedRequestId : idToGrant.keySet()) {
+      ResourceRequestInfo request = idToRequest.get(grantedRequestId);
+      incrementRequestCount(request.getType(), 1);
+      addGrantedRequest(request);
+    }
   }
 
+
+
   public SessionStatus getStatus() {
     return status;
   }
@@ -144,12 +432,12 @@ public String getUserId() {
   }
 
   /**
-   * Get the pool info from the session info.
+   * Get the pool info from the session info.  May have been redirected.
    *
    * @return Converted pool info from Thrift PoolInfoStrings
    */
   public PoolInfo getPoolInfo() {
-    return PoolInfo.createPoolInfo(info.poolInfoStrings);
+    return poolInfo;
   }
 
   public int getPriority() {
@@ -810,7 +1098,71 @@ public long getStartTime() {
   public long getDeletedTime() {
     return deletedTime;
   }
+ 
+  public void setResourceRequest(List<ResourceRequest> requestList) {
+    int maxid = 0;
+    for (ResourceRequest request: requestList) {
+      if (maxid < request.id) {
+        maxid = request.id;
+      }
+    }
+    expectedInfo.requestId = maxid;
+  }
+  
+  public void setResourceGrant(List<ResourceGrant> grantList) {
+    int maxid = 0;
+    for (ResourceGrant grant: grantList) {
+      if (maxid < grant.id) {
+        maxid = grant.id;
+      }
+    }
+    expectedInfo.grantId = maxid;
+  }
 
+  /** Check if the heartbeatInfo between JT and CM are in sync. 
+   *  If this method returns false, it means JT and CM are out
+   *  of sync very badly, and the session will be killed.
+   */
+  public boolean checkHeartbeatInfo(HeartbeatArgs jtInfo) {
+    if (expectedInfo.requestId != jtInfo.requestId){
+      LOG.fatal("heartbeat out-of-sync:" + sessionId + 
+        " CM:" + expectedInfo.requestId + " " + expectedInfo.grantId +
+        " JT:" + jtInfo.requestId + " " + jtInfo.grantId);
+      return false;
+    }
+    if (expectedInfo.grantId == jtInfo.grantId){
+      // perfect match
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("heartbeat match:" + sessionId); 
+      }
+      lastSyncTime = System.currentTimeMillis();
+      lastHeartbeat.requestId = 0;
+      lastHeartbeat.grantId = 0;
+      return true;
+    }
+    // delay
+    if ( jtInfo.grantId != lastHeartbeat.grantId) {
+      LOG.info("heartbeat mismatch with progress:" + sessionId + 
+        " CM:" + expectedInfo.requestId + " " + expectedInfo.grantId +
+        " JT:" + jtInfo.requestId + " " + jtInfo.grantId);
+      lastSyncTime = System.currentTimeMillis();
+      lastHeartbeat.requestId = jtInfo.requestId;
+      lastHeartbeat.grantId = jtInfo.grantId;
+      return true;
+    }
+    if (System.currentTimeMillis() - lastSyncTime > maxDelay) {
+      // no progress
+      LOG.error("heartbeat out-of-sync:" + sessionId + 
+        " CM:" + expectedInfo.requestId + " " + expectedInfo.grantId +
+        " JT:" + jtInfo.requestId + " " + jtInfo.grantId);
+      return true;
+    }
+    LOG.info("heartbeat mismatch with no progress:" + sessionId + 
+      " CM:" + expectedInfo.requestId + " " + expectedInfo.grantId +
+      " JT:" + jtInfo.requestId + " " + jtInfo.grantId);
+    return true;
+  }
+  
   /**
    * Get the time to start (or waited so far) for the first resource of a type.
    * If there is no such request, this will return null.  This is thread safe.
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionDriver.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionDriver.java
index 47201cff..30e3060b 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionDriver.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionDriver.java
@@ -22,8 +22,11 @@
 import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.security.auth.login.LoginException;
 
@@ -33,8 +36,9 @@
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.UnixUserGroupInformation;
 import org.apache.hadoop.util.Daemon;
-import org.apache.hadoop.util.StringUtils;
+import org.apache.thrift.ProcessFunction;
 import org.apache.thrift.TBase;
+import org.apache.thrift.TBaseProcessor;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.server.TServer;
@@ -44,6 +48,14 @@
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportFactory;
 
+import org.apache.hadoop.corona.SessionDriverService.Iface;
+import org.apache.hadoop.corona.SessionDriverService.grantResource_args;
+import org.apache.hadoop.corona.SessionDriverService.grantResource_result;
+import org.apache.hadoop.corona.SessionDriverService.revokeResource_args;
+import org.apache.hadoop.corona.SessionDriverService.revokeResource_result;
+import org.apache.hadoop.corona.SessionDriverService.processDeadNode_args;
+import org.apache.hadoop.corona.SessionDriverService.processDeadNode_result;
+
 
 /**
  * Handles sessions from client to cluster manager.
@@ -52,11 +64,22 @@ public class SessionDriver {
 
   /** Logger */
   public static final Log LOG = LogFactory.getLog(SessionDriver.class);
+  /**
+   * Maximum size of the incoming queue. Thrift calls from the
+   * Cluster Manager will block if the queue reaches this size.
+   */
+  public static final String INCOMING_QUEUE_SIZE =
+    "corona.sessiondriver.max.incoming.queue.size";
 
+  private volatile boolean running = true;
   /** The configuration of the session */
   private final CoronaConf conf;
   /** The processor for the callback server */
   private final SessionDriverService.Iface iface;
+  /** The calls coming in from the Cluster Manager */
+  private final LinkedBlockingQueue<TBase> incoming;
+  /** Call Processor thread. */
+  private Thread incomingCallExecutor;
 
   /** The id of the underlying session */
   private String sessionId = "";
@@ -66,6 +89,8 @@ public class SessionDriver {
   private String sessionLog = "";
   /** The info of the underlying session */
   private SessionInfo sessionInfo;
+  /** heartBeat info including the last resource requestId and grantId */
+  private HeartbeatArgs heartbeatInfo;
 
   /** Callback server socket */
   private ServerSocket serverSocket;
@@ -103,6 +128,8 @@ public SessionDriver(CoronaConf conf, SessionDriverService.Iface iface)
     throws IOException {
     this.conf = conf;
     this.iface = iface;
+    incoming = new LinkedBlockingQueue<TBase>(
+      conf.getInt(INCOMING_QUEUE_SIZE, 1000));
 
     serverSocket = initializeServer(conf);
 
@@ -129,6 +156,9 @@ public SessionDriver(CoronaConf conf, SessionDriverService.Iface iface)
         PoolInfo.createPoolInfoStrings(conf.getPoolInfo()));
     this.sessionInfo.setPriority(SessionPriority.NORMAL);
     this.sessionInfo.setNoPreempt(false);
+    this.heartbeatInfo = new HeartbeatArgs();
+    this.heartbeatInfo.requestId = 0;
+    this.heartbeatInfo.grantId = 0;
 
     this.serverThread = new Daemon(new Thread() {
         @Override
@@ -138,6 +168,10 @@ public void run() {
       });
     this.serverThread.start();
 
+    incomingCallExecutor = new Daemon(new IncomingCallExecutor());
+    incomingCallExecutor.setName("Incoming Call Executor");
+    incomingCallExecutor.start();
+
     cmNotifier = new CMNotifierThread(conf, this);
     sessionId = cmNotifier.getSessionId();
   }
@@ -189,7 +223,7 @@ private ServerSocket initializeServer(CoronaConf conf) throws IOException {
 
     TFactoryBasedThreadPoolServer.Args args =
       new TFactoryBasedThreadPoolServer.Args(tServerSocket);
-    args.processor(new SessionDriverService.Processor(iface));
+    args.processor(new SessionDriverServiceProcessor(incoming));
     args.transportFactory(new TTransportFactory());
     args.protocolFactory(new TBinaryProtocol.Factory(true, true));
     args.stopTimeoutVal = 0;
@@ -211,6 +245,26 @@ public void setFailed(IOException e) {
   public PoolInfo getPoolInfo() { return poolInfo; }
 
   public String getSessionLog() { return sessionLog; }
+  
+  public void setResourceRequest(List<ResourceRequest> requestList) {
+    int maxid = 0;
+    for (ResourceRequest request: requestList) {
+      if (maxid < request.id) {
+        maxid = request.id;
+      }
+    }    
+    heartbeatInfo.requestId = maxid;
+  }
+  
+  public void setResourceGrant(List<ResourceGrant> grantList) {
+    int maxid = 0;
+    for (ResourceGrant grant: grantList) {
+      if (maxid < grant.id) {
+        maxid = grant.id;
+      }
+    }
+    heartbeatInfo.grantId = maxid;
+  }
 
   public void startSession() throws IOException {
     try {
@@ -310,9 +364,11 @@ public void setUrl(String url) throws IOException {
    */
   public void abort() {
     LOG.info("Aborting session driver");
+    running = false;
     cmNotifier.clearCalls();
     cmNotifier.doShutdown();
     server.stop();
+    incomingCallExecutor.interrupt();
   }
 
   /**
@@ -338,6 +394,7 @@ public void stop(SessionStatus status,
                    List<ResourceType> resourceTypes,
                    List<NodeUsageReport> reportList) {
     LOG.info("Stopping session driver");
+    running = false;
 
     // clear all calls from the notifier and append the feedback and session
     // end.
@@ -351,6 +408,8 @@ public void stop(SessionStatus status,
         new ClusterManagerService.sessionEnd_args(sessionId, status));
     cmNotifier.doShutdown();
     server.stop();
+
+    incomingCallExecutor.interrupt();
   }
 
   /**
@@ -360,6 +419,7 @@ public void stop(SessionStatus status,
   public void join() throws InterruptedException {
     serverThread.join();
     cmNotifier.join();
+    incomingCallExecutor.join();
   }
 
   /**
@@ -444,6 +504,10 @@ public static class CMNotifierThread extends Thread {
     private ClusterManagerService.Client client;
     /** Gets set when the SessionDriver is shutting down */
     private volatile boolean shutdown = false;
+    /** Required for doing RPC to the ProxyJobTracker */
+    private CoronaConf coronaConf;
+    /** If sessionHeartbeatV2 is sipported by CM */
+    private boolean useHeartbeatV2 = true;
 
     /**
      * Construct a CMNotifier given a Configuration, SessionInfo and for a
@@ -465,22 +529,62 @@ public CMNotifierThread(CoronaConf conf, SessionDriver sdriver)
       InetSocketAddress address = NetUtils.createSocketAddr(target);
       host = address.getHostName();
       port = address.getPort();
+      coronaConf = conf;
+
+      String tempSessionId;
+      int numCMConnectRetries = 0;
+      while (true) {
+        try {
+          transport = null;
+          LOG.info("Connecting to cluster manager at " + host + ":" + port);
+          init();
+          tempSessionId = client.getNextSessionId();
+          LOG.info("Got session ID " + tempSessionId);
+          close();
+          break;
+        } catch (TException e) {
+          if (numCMConnectRetries > retryCountMax) {
+            throw new IOException(
+              "Could not connect to Cluster Manager tried " +
+                numCMConnectRetries +
+              " times");
+          }
+          // It is possible that the ClusterManager is down after setting
+          // the Safe Mode flag. We should wait until the flag is unset.
+          ClusterManagerAvailabilityChecker.
+            waitWhileClusterManagerInSafeMode(coronaConf);
+          ++numCMConnectRetries;
+        } catch (SafeModeException f) {
+          LOG.info("Received a SafeModeException");
+          // We do not need to connect to the CM till the Safe Mode flag is
+          // set on the PJT.
+          ClusterManagerAvailabilityChecker.
+            waitWhileClusterManagerInSafeMode(conf);
+        }
 
-      try {
-        LOG.info("Connecting to cluster manager at " + host + ":" + port);
-        init();
-        sessionId = client.getNextSessionId();
-        close();
-        LOG.info("Got session ID " + sessionId);
-      } catch (TException e) {
-        throw new IOException(e);
       }
+      sessionId = tempSessionId;
     }
 
     public void startSession(SessionInfo info)
-      throws TException, InvalidSessionHandle {
-      init();
-      sreg = client.sessionStart(sessionId, info);
+      throws TException, InvalidSessionHandle, IOException {
+      while(true) {
+        init();
+        try {
+          sreg = client.sessionStart(sessionId, info);
+          break;
+        } catch (SafeModeException e) {
+          // Since we have received a SafeModeException, it is likely that
+          // the ClusterManager will now go down. So our current thrift
+          // client will no longer be useful. Hence, we need to close the
+          // current thrift client and create a new one, which will be created
+          // in the next iteration
+          close();
+          ClusterManagerAvailabilityChecker.
+            waitWhileClusterManagerInSafeMode(coronaConf);
+        }
+      }
+
       LOG.info("Started session " + sessionId);
       close();
     }
@@ -581,7 +685,20 @@ public void run() {
           // if shutdown is ordered, don't send heartbeat
           if (!shutdown && ((now - lastHeartbeatTime) > heartbeatInterval)) {
             init();
-            client.sessionHeartbeat(sreg.handle);
+            LOG.debug("Sending heartbeat for " + sreg.handle + " with (" +
+              sessionDriver.heartbeatInfo.requestId + " " +sessionDriver.heartbeatInfo.grantId +")");
+            if (useHeartbeatV2) {
+              try {
+                client.sessionHeartbeatV2(sreg.handle, sessionDriver.heartbeatInfo);
+              } catch (org.apache.thrift.TApplicationException e) {
+                LOG.info("heartbeatV2 is not suported by CM for session " + sreg.handle);
+                useHeartbeatV2 = false;
+                client.sessionHeartbeat(sreg.handle);
+              }
+            }
+            else {
+              client.sessionHeartbeat(sreg.handle);
+            }
             resetRetryState();
             lastHeartbeatTime = now;
           }
@@ -621,6 +738,18 @@ public void run() {
           // will be reopened on next try
           close();
 
+          /**
+           * If we don't know if ClusterManager was going for an upgrade,
+           * Check with the ProxyJobTracker if the ClusterManager went down
+           * after telling it.
+           */
+          try {
+            ClusterManagerAvailabilityChecker.
+              waitWhileClusterManagerInSafeMode(coronaConf);
+          } catch (IOException ie) {
+            LOG.warn("Could not check the Safe Mode flag on PJT");
+          }
+
           if (numRetries > retryCountMax) {
             LOG.error("All retries failed - closing CMNotifier");
             sessionDriver.setFailed(new IOException(e));
@@ -635,15 +764,29 @@ public void run() {
           LOG.error("InvalidSession exception - closing CMNotifier", e);
           sessionDriver.setFailed(new IOException(e));
           break;
-        }
+        } catch (SafeModeException e) {
+          LOG.info("Cluster Manager is in Safe Mode");
+          try {
+            // Since we have received a SafeModeException, it is likely that
+            // the ClusterManager will now go down. So our current thrift
+            // client will no longer be useful. Hence, we need to close the
+            // current thrift client and create a new one, which will be created
+            // in the next iteration
+            close();
+            ClusterManagerAvailabilityChecker.
+              waitWhileClusterManagerInSafeMode(coronaConf);
+          } catch (IOException ie) {
+            LOG.error(ie.getMessage());
+          }
 
+        }
       } // while (true)
       close();
     } // run()
 
 
     private void dispatchCall(TBase call)
-      throws TException, InvalidSessionHandle {
+      throws TException, InvalidSessionHandle, SafeModeException {
       if (LOG.isDebugEnabled())
         LOG.debug ("Begin dispatching call: " + call.toString());
 
@@ -652,6 +795,7 @@ private void dispatchCall(TBase call)
           (ClusterManagerService.requestResource_args)call;
 
         client.requestResource(args.handle, args.requestList);
+        sessionDriver.setResourceRequest(args.requestList);
       } else if (call instanceof ClusterManagerService.releaseResource_args) {
         ClusterManagerService.releaseResource_args args =
           (ClusterManagerService.releaseResource_args)call;
@@ -681,4 +825,187 @@ private void dispatchCall(TBase call)
 
     }
   }
+
+  /**
+   * Executes the calls received from the Cluster Manager in the same order
+   * as received.
+   */
+  private class IncomingCallExecutor extends Thread {
+    @Override
+    public void run() {
+      while (running) {
+        try {
+          TBase call = incoming.take();
+          if (call instanceof grantResource_args) {
+            grantResource_args args = (grantResource_args) call;
+            iface.grantResource(args.handle, args.granted);
+            setResourceGrant(args.granted);
+          } else if (call instanceof revokeResource_args) {
+            revokeResource_args args = (revokeResource_args) call;
+            iface.revokeResource(args.handle, args.revoked, args.force);
+          } else if (call instanceof processDeadNode_args) {
+            processDeadNode_args args = (processDeadNode_args) call;
+            iface.processDeadNode(args.handle, args.node);
+          } else {
+            throw new TException("Unhandled call " + call);
+          }
+        } catch (InterruptedException e) {
+          // Check the running flag.
+          continue;
+        } catch (TException e) {
+          throw new RuntimeException(
+            "Unexpected error while processing calls ", e);
+        }
+      }
+    }
+  }
+
+  /**
+   * A Thrift call processor that simply puts the calls in a queue. This will
+   * ensure minimum latency in executing calls from the Cluster Manager.
+   */
+  public static class SessionDriverServiceProcessor extends TBaseProcessor {
+    /**
+     * Constructor
+     * @param calls The call queue.
+     */
+    public SessionDriverServiceProcessor(LinkedBlockingQueue<TBase> calls) {
+      super(null, getProcessMap(calls));
+    }
+
+    /**
+     * Constructs the map from function name -> handler.
+     * @param calls The call queue.
+     * @return The map.
+     */
+    private static Map<String, ProcessFunction> getProcessMap(
+      LinkedBlockingQueue<TBase> calls) {
+      Map<String, ProcessFunction> processMap =
+        new HashMap<String, ProcessFunction>();
+      processMap.put("grantResource", new grantResourceHandler(calls));
+      processMap.put("revokeResource", new revokeResourceHandler(calls));
+      processMap.put("processDeadNode", new processDeadNodeHandler(calls));
+      return processMap;
+    }
+
+    /**
+     * Handles "grantResource" calls.
+     */
+    private static class grantResourceHandler
+      extends ProcessFunction<Iface, grantResource_args> {
+      /** The call queue. */
+      private final LinkedBlockingQueue<TBase> calls;
+
+      /**
+       * Constructor.
+       * @param calls the call queue.
+       */
+      public grantResourceHandler(LinkedBlockingQueue<TBase> calls) {
+        super("grantResource");
+        this.calls = calls;
+      }
+
+      /**
+       * @return empty args.
+       */
+      protected grantResource_args getEmptyArgsInstance() {
+        return new grantResource_args();
+      }
+
+      /**
+       * Call implementation. Just queue up the args.
+       * @param unused The unused interface ref.
+       * @param args The args
+       * @return Empty result
+       */
+      protected grantResource_result getResult(
+        Iface unused, grantResource_args args) throws TException {
+        try {
+          calls.put(args);
+        } catch (InterruptedException e) {
+          throw new TException(e);
+        }
+        return new grantResource_result();
+      }
+    }
+
+    /**
+     * Handles "revokeResource" calls.
+     */
+    private static class revokeResourceHandler
+      extends ProcessFunction<Iface, revokeResource_args> {
+      /** The call queue. */
+      private final LinkedBlockingQueue<TBase> calls;
+
+      /**
+       * Constructor.
+       * @param calls the call queue.
+       */
+      public revokeResourceHandler(LinkedBlockingQueue<TBase> calls) {
+        super("revokeResource");
+        this.calls = calls;
+      }
+
+      /**
+       * @return empty args.
+       */
+      protected revokeResource_args getEmptyArgsInstance() {
+        return new revokeResource_args();
+      }
+
+      /**
+       * Call implementation. Just queue up the args.
+       * @param unused The unused interface ref.
+       * @param args The args
+       * @return Empty result
+       */
+      protected revokeResource_result getResult(
+        Iface unused, revokeResource_args args) throws TException {
+        try {
+          calls.put(args);
+        } catch (InterruptedException e) {
+          throw new TException(e);
+        }
+        return new revokeResource_result();
+      }
+    }
+
+    private static class processDeadNodeHandler
+      extends ProcessFunction<Iface, processDeadNode_args> {
+      /** The call queue. */
+      private final LinkedBlockingQueue<TBase> calls;
+
+      /**
+       * Constructor.
+       * @param calls the call queue.
+       */
+      public processDeadNodeHandler(LinkedBlockingQueue<TBase> calls) {
+        super("processDeadNode");
+        this.calls = calls;
+      }
+
+      /**
+       * @return empty args.
+       */
+      protected processDeadNode_args getEmptyArgsInstance() {
+        return new processDeadNode_args();
+      }
+
+      /**
+       * Call implementation. Just queue up the args.
+       * @param unused The unused interface ref.
+       * @param args The args
+       * @return Empty result
+       */
+      protected processDeadNode_result getResult(
+        Iface unused, processDeadNode_args args) throws TException {
+        try {
+          calls.put(args);
+        } catch (InterruptedException e) {
+          throw new TException(e);
+        }
+        return new processDeadNode_result();
+      }
+    }
+  }
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionManager.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionManager.java
index d32b8f41..98472faa 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionManager.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionManager.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.corona;
 
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayDeque;
@@ -37,6 +38,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.CoronaSerializer;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonToken;
 
 /**
  * Manages a collection of sessions
@@ -60,7 +64,7 @@ public class SessionManager implements Configurable {
   private ExpireSessions expireSessions = new ExpireSessions();
   private Thread metricsUpdaterThread;
   private MetricsUpdater metricsUpdater = new MetricsUpdater();
-  private volatile boolean    shutdown = false;
+  private volatile boolean shutdown = false;
   private String startTime;
 
   // 1: primary data structure
@@ -71,6 +75,145 @@ public class SessionManager implements Configurable {
   private ConcurrentMap<String, Session> runnableSessions
     = new ConcurrentHashMap<String, Session>();
 
+  /**
+   * Constructor for SessionManager
+   *
+   * @param clusterManager The ClusterManager instance to be used
+   */
+  public SessionManager(ClusterManager clusterManager) {
+    DateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT_PATTERN);
+    this.startTime = dateFormat.format(new Date(clusterManager.getStartTime()));
+    this.clusterManager = clusterManager;
+    this.expireSessionsThread = new Thread(this.expireSessions,
+      "expireSessions");
+    this.expireSessionsThread.setDaemon(true);
+    this.expireSessionsThread.start();
+    this.metricsUpdaterThread = new Thread(this.metricsUpdater,
+      "SessionManager metrics");
+    this.metricsUpdaterThread.setDaemon(true);
+    this.metricsUpdaterThread.start();
+  }
+
+  /**
+   * Constructor for SessionManager, used when we are reading back the
+   * ClusterManager state from the disk
+   *
+   * @param clusterManager The ClusterManager instance to be used
+   * @param coronaSerializer The CoronaSerializer instance, which will be used
+   *                         to read JSON from disk
+   * @throws IOException
+   */
+  public SessionManager(ClusterManager clusterManager,
+                        CoronaSerializer coronaSerializer)
+    throws  IOException {
+    this(clusterManager);
+    // Even though the expireSessions thread would be running now, it would
+    // not expire any sessions we would be creating now, because the
+    // ClusterManager would be in Safe Mode.
+
+    // Expecting the START_OBJECT token for sessionManager
+    coronaSerializer.readStartObjectToken("sessionManager");
+
+    readSessions(coronaSerializer);
+
+    coronaSerializer.readField("sessionCounter");
+    sessionCounter = new AtomicLong(coronaSerializer.readValueAs(Long.class));
+
+    // Expecting the END_OBJECT token for sessionManager
+    coronaSerializer.readEndObjectToken("sessionManager");
+
+    // Restoring the runnableSessions map
+    for (String sessionId : sessions.keySet()) {
+      Session session = sessions.get(sessionId);
+      if (session.getPendingRequestCount() > 0) {
+        runnableSessions.put(sessionId, session);
+      }
+    }
+  }
+
+  /**
+   * Reads back the sessions map from a JSON stream
+   *
+   * @param coronaSerializer The CoronaSerializer instance to be used to
+   *                         read the JSON
+   * @throws IOException
+   */
+  private void readSessions(CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readField("sessions");
+    // Expecting the START_OBJECT token for sessions
+    coronaSerializer.readStartObjectToken("sessions");
+    JsonToken current = coronaSerializer.nextToken();
+    while (current != JsonToken.END_OBJECT) {
+      String sessionId = coronaSerializer.getFieldName();
+      Session session = new Session(clusterManager.conf.getCMHeartbeatDelayMax(),
+        coronaSerializer);
+      sessions.put(sessionId, session);
+      current = coronaSerializer.nextToken();
+    }
+    // Done with reading the END_OBJECT token for sessions
+  }
+
+  /**
+   * This method rebuilds members related to the SessionManager instance,
+   * which were not directly persisted themselves.
+   */
+  public void restoreAfterSafeModeRestart() {
+    if (!clusterManager.safeMode) {
+      return;
+    }
+
+    for (Session session : sessions.values()) {
+      for (ResourceRequestInfo resourceRequestInfo :
+        session.idToRequest.values()) {
+
+        // The helper method to restore the ResourceRequestInfo instances
+        // is placed in NodeManager because it makes use of other members
+        // of NodeManager
+        clusterManager.nodeManager.
+          restoreResourceRequestInfo(resourceRequestInfo);
+      }
+      session.restoreAfterSafeModeRestart();
+      clusterManager.getScheduler().addSession(session.getSessionId(),
+        session);
+    }
+
+    clusterManager.getMetrics().setNumRunningSessions(sessions.size());
+  }
+
+
+  /**
+   * Used to write the state of the SessionManager instance to disk, when we
+   * are persisting the state of the ClusterManager
+   * @param jsonGenerator The JsonGenerator instance being used to write JSON
+   *                      to disk
+   * @throws IOException
+   */
+  public void write(JsonGenerator jsonGenerator) throws IOException {
+    jsonGenerator.writeStartObject();
+    // retiredSessions and numRetiredSessions need not be persisted
+
+    // sessionCounter can be set to 0, when the SessionManager is instantiated
+
+    // sessions begins
+    jsonGenerator.writeFieldName("sessions");
+    jsonGenerator.writeStartObject();
+    for (String sessionId : sessions.keySet()) {
+      jsonGenerator.writeFieldName(sessionId);
+      sessions.get(sessionId).write(jsonGenerator);
+    }
+    jsonGenerator.writeEndObject();
+    // sessions ends
+
+    jsonGenerator.writeNumberField("sessionCounter",
+                                    sessionCounter.longValue());
+
+    jsonGenerator.writeEndObject();
+
+    // We can rebuild runnableSessions
+    // No need to write startTime and numRetiredSessions
+  }
+
   public Set<String> getSessions() {
     return sessions.keySet();
   }
@@ -160,20 +303,6 @@ public List<Session> getRunnableSessions() {
     return ret;
   }
 
-  public SessionManager(ClusterManager clusterManager) {
-    DateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT_PATTERN);
-    this.startTime = dateFormat.format(new Date());
-    this.clusterManager = clusterManager;
-    this.expireSessionsThread = new Thread(this.expireSessions,
-                                           "expireSessions");
-    this.expireSessionsThread.setDaemon(true);
-    this.expireSessionsThread.start();
-    this.metricsUpdaterThread = new Thread(this.metricsUpdater,
-                                          "SessionManager metrics");
-    this.metricsUpdaterThread.setDaemon(true);
-    this.metricsUpdaterThread.start();
-  }
-
   public String getNextSessionId() {
     String sessionId = startTime + "." + sessionCounter.incrementAndGet();
     return sessionId;
@@ -188,7 +317,13 @@ public Session addSession(String sessionId, SessionInfo info)
     if (sessions.containsKey(sessionId)) {
       throw new InvalidSessionHandle("Session already started " + sessionId);
     }
-    Session session = new Session(sessionId, info);
+
+    Session session = new Session(conf.getCMHeartbeatDelayMax(), sessionId, info,
+        clusterManager.getScheduler().getConfigManager());
+    PoolGroupManager.checkPoolInfoIfStrict(
+        session.getPoolInfo(),
+        clusterManager.getScheduler().getConfigManager(),
+        conf);
     sessions.put(sessionId, session);
     clusterManager.getMetrics().sessionStart();
     clusterManager.getMetrics().setNumRunningSessions(sessions.size());
@@ -217,7 +352,8 @@ public void updateInfo(String handle, SessionInfo info)
   }
 
 
-  public Collection<ResourceGrant> deleteSession(String handle, SessionStatus status)
+  public Collection<ResourceGrant> deleteSession(String handle,
+                                                 SessionStatus status)
     throws InvalidSessionHandle {
     Session session = getSession(handle);
 
@@ -399,6 +535,11 @@ public void run() {
       while (!shutdown) {
         try {
           Thread.sleep(5000);
+          // If the ClusterManager is in Safe Mode, we do not need to update
+          // the metrics
+          if (clusterManager.safeMode) {
+            continue;
+          }
           NodeManager nm = clusterManager.getNodeManager();
           ClusterManagerMetrics metrics = clusterManager.getMetrics();
           for (ResourceType resourceType: clusterManager.getTypes()) {
@@ -425,6 +566,13 @@ public void run() {
       while (!shutdown) {
         try {
           Thread.sleep(sessionExpiryInterval / 2);
+          /**
+           * If we are in safe mode, we should not expire any sessions, and
+           * reset the last seen time before we come out of safe mode.
+           */
+          if (clusterManager.safeMode) {
+            continue;
+          }
           long now = ClusterManager.clock.getTime();
           for (Session session: sessions.values()) {
             long gap = now - session.getLastHeartbeatTime();
@@ -445,6 +593,13 @@ public void run() {
                 LOG.warn(
                   "Ignoring error while expiring session " +
                   session.getHandle(), e);
+              } catch (SafeModeException e) {
+                // You could come here, if the safe mode is set while you are
+                // in the for-loop.
+                LOG.info(
+                  "Got a SafeModeException in the Expire Sessions thread");
+                // We need not loop any further.
+                break;
               }
             }
           }
@@ -469,4 +624,14 @@ public Collection<RetiredSession> getRetiredSessions() {
     return retiredSessions;
   }
 
+  /**
+   * This is required when we come out of safe mode, and we need to reset
+   * the lastHeartbeatTime for each session
+   */
+  public void resetSessionsLastHeartbeatTime() {
+    for (Session session : sessions.values()) {
+      session.heartbeat();
+    }
+  }
+
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionNotificationCtx.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionNotificationCtx.java
index aa4ec178..8fbf31b3 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionNotificationCtx.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionNotificationCtx.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.corona;
 
+import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.util.Collections;
 import java.util.List;
@@ -28,9 +29,11 @@
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 
+import org.apache.hadoop.util.CoronaSerializer;
 import org.apache.thrift.*;
 import org.apache.thrift.protocol.*;
 import org.apache.thrift.transport.*;
+import org.codehaus.jackson.JsonGenerator;
 
 /**
  * Notification state maintained on behalf of each session
@@ -73,13 +76,120 @@ public class SessionNotificationCtx implements Configurable {
   final int                     port;
   TTransport                    transport = null;
   SessionDriverService.Client   client = null;
+  final Session                 session;
 
-  public SessionNotificationCtx(String handle, String host, int port) {
+  public SessionNotificationCtx(Session session, String handle, String host, int port) {
+    this.session = session;
     this.handle = handle;
     this.host = host;
     this.port = port;
   }
 
+  /**
+   * Constructor for SessionNotificationCtx, used when we are reading back the
+   * ClusterManager state from the disk
+   *
+   * @param coronaSerializer The CoronaSerializer instance, which will be used
+   *                         to read JSON from disk
+   * @throws IOException
+   */
+  public SessionNotificationCtx(SessionManager sessionManager, CoronaSerializer coronaSerializer)
+    throws IOException {
+    coronaSerializer.readStartObjectToken("CoronaSerializer");
+
+    coronaSerializer.readField("handle");
+    this.handle = coronaSerializer.readValueAs(String.class);
+
+    try {
+      this.session = sessionManager.getSession(this.handle);
+    } catch (InvalidSessionHandle e) {
+      throw new IOException(e.getMessage());
+    }
+
+    coronaSerializer.readField("host");
+    this.host = coronaSerializer.readValueAs(String.class);
+
+    coronaSerializer.readField("port");
+    this.port = coronaSerializer.readValueAs(Integer.class);
+
+    coronaSerializer.readField("numPendingCalls");
+    int numPendingCalls = coronaSerializer.readValueAs(Integer.class);
+
+    coronaSerializer.readField("pendingCalls");
+    coronaSerializer.readStartArrayToken("pendingCalls");
+    for (int i = 0; i < numPendingCalls; i++) {
+      coronaSerializer.readStartObjectToken("pendingCall");
+
+      coronaSerializer.readField("callType");
+      String callType = coronaSerializer.readValueAs(String.class);
+
+      coronaSerializer.readField("call");
+      TBase call = null;
+      if (callType.equals(SessionDriverService.grantResource_args.
+        class.getName())) {
+        call = coronaSerializer.
+          readValueAs(SessionDriverService.grantResource_args.class);
+      } else if (callType.equals(SessionDriverService.revokeResource_args.
+        class.getName())) {
+        call = coronaSerializer.
+          readValueAs(SessionDriverService.revokeResource_args.class);
+      } else if (callType.equals(SessionDriverService.processDeadNode_args.
+        class.getName())) {
+        call = coronaSerializer.
+          readValueAs(SessionDriverService.processDeadNode_args.class);
+      } else {
+        throw new IOException("Unknown Class: " + callType);
+      }
+
+      coronaSerializer.readEndObjectToken("pendingCall");
+      pendingCalls.add(call);
+    }
+    coronaSerializer.readEndArrayToken("pendingCalls");
+
+    coronaSerializer.readEndObjectToken("CoronaSerializer");
+  }
+
+  /**
+   * Used to write the state of the SessionNotificationCtx instance to disk,
+   * when we are persisting the state of the ClusterManager
+   * @param jsonGenerator The JsonGenerator instance being used to write JSON
+   *                      to disk
+   * @throws IOException
+   */
+  public void write(JsonGenerator jsonGenerator) throws IOException {
+    jsonGenerator.writeStartObject();
+
+    jsonGenerator.writeStringField("handle", handle);
+
+    jsonGenerator.writeStringField("host", host);
+
+    jsonGenerator.writeNumberField("port", port);
+
+    jsonGenerator.writeNumberField("numPendingCalls", pendingCalls.size());
+
+    jsonGenerator.writeFieldName("pendingCalls");
+    jsonGenerator.writeStartArray();
+    for (TBase call : pendingCalls) {
+      jsonGenerator.writeStartObject();
+
+      // TBase is an abstract class. While reading back, we want to know
+      // what kind of object we actually wrote. Jackson does provide two methods
+      // to do it automatically, but one of them adds types at a lot of places
+      // where we don't need it, and hence our parsing would be required to be
+      // changed. The other required adding an annotation to the TBase class,
+      // which we can't do, since it is auto-generated by Thrift.
+      String callType = call.getClass().getName();
+      jsonGenerator.writeStringField("callType", callType);
+
+      jsonGenerator.writeObjectField("call", call);
+
+      jsonGenerator.writeEndObject();
+    }
+    jsonGenerator.writeEndArray();
+
+    jsonGenerator.writeEndObject();
+  }
+
   private void init () throws TException {
     if (transport == null) {
       TSocket socket = new TSocket(host, port);
@@ -102,15 +212,14 @@ private void dispatchCall(TBase call) throws TException {
         throw new RuntimeException ("Call handle: " + args.handle +
                                     " does not match session handle: " + handle);
 
-      //LOG.info ("Granting " + args.granted.size() + " resources to session: " + args.handle);
       client.grantResource(args.handle, args.granted);
+      session.setResourceGrant(args.granted);
     } else if (call instanceof  SessionDriverService.revokeResource_args) {
       SessionDriverService.revokeResource_args args = ( SessionDriverService.revokeResource_args)call;
       if (!args.handle.equals(handle))
         throw new RuntimeException ("Call handle: " + args.handle +
                                     " does not match session handle: " + handle);
 
-      //LOG.info ("Revoking " + args.revoked.size() + " resources to session: " + args.handle);
       client.revokeResource(args.handle, args.revoked, false);
     } else if (call instanceof SessionDriverService.processDeadNode_args) {
       SessionDriverService.processDeadNode_args args =
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionNotifier.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionNotifier.java
index b00adabc..7588bd9a 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionNotifier.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/SessionNotifier.java
@@ -18,9 +18,13 @@
 
 package org.apache.hadoop.corona;
 
+import java.io.IOException;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -28,7 +32,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.CoronaSerializer;
 import org.apache.thrift.TBase;
+import org.codehaus.jackson.JsonGenerator;
 
 /**
  * Session Notifier accepts notifications for the session drivers in a
@@ -66,6 +72,126 @@ public final static String callToHandle(TBase call) {
 
   protected int waitInterval;
 
+  /**
+   * The sessionsToCtx map that has been read from the disk. This will be
+   * cleared when the SessionNotifierThread instances are fully restored
+   */
+  Map<String, SessionNotificationCtx> sessionsToCtxFromDisk;
+  /** The deletedSessions set that has been read from the disk. This will be
+   * cleared when the SessionNotifierThread instances are fully restored
+   */
+  Set<String> deletedSessionsFromDisk;
+
+  /**
+   * Constructor for SessionNotifier
+   *
+   * @param sessionManager The SessionManager instance
+   * @param clusterManager The ClusterManager instance
+   * @param metrics The ClusterManagerMetrics instance
+   */
+  public SessionNotifier(SessionManager sessionManager,
+                         ClusterManager clusterManager,
+                         ClusterManagerMetrics metrics) {
+    this.sessionManager = sessionManager;
+    this.clusterManager = clusterManager;
+    this.metrics = metrics;
+  }
+
+  /**
+   * Constructor for SessionNotifier, used when we are reading back the
+   * ClusterManager state from the disk
+   *
+   * @param sessionManager The SessionManager instance
+   * @param clusterManager The ClusterManager instance
+   * @param metrics The ClusterManagerMetrics instance
+   * @param coronaSerializer The CoronaSerializer instance, which will be used
+   *                         to read JSON from disk
+   * @throws IOException
+   */
+  public SessionNotifier(SessionManager sessionManager,
+                         ClusterManager clusterManager,
+                         ClusterManagerMetrics metrics,
+                         CoronaSerializer coronaSerializer) throws IOException {
+    this(sessionManager, clusterManager, metrics);
+    sessionsToCtxFromDisk = new HashMap<String, SessionNotificationCtx>();
+    deletedSessionsFromDisk = new TreeSet<String>();
+    int totalSessionsToCtx, totalDeletedSessions;
+
+    coronaSerializer.readStartObjectToken("SessionNotifier");
+
+    coronaSerializer.readField("totalSessionsToCtx");
+    totalSessionsToCtx = coronaSerializer.readValueAs(Integer.class);
+
+    coronaSerializer.readField("sessionsToCtx");
+    coronaSerializer.readStartObjectToken("sessionsToCtx");
+    for (int i = 0; i < totalSessionsToCtx; i++) {
+      String handle = coronaSerializer.readValueAs(String.class);
+      SessionNotificationCtx sessionNotificationCtx =
+        new SessionNotificationCtx(sessionManager, coronaSerializer);
+      sessionsToCtxFromDisk.put(handle, sessionNotificationCtx);
+    }
+    coronaSerializer.readEndObjectToken("sessionsToCtx");
+
+    coronaSerializer.readField("totalDeletedSessions");
+    totalDeletedSessions = coronaSerializer.readValueAs(Integer.class);
+
+    coronaSerializer.readField("deletedSessions");
+    coronaSerializer.readStartArrayToken("totalDeletedSessions");
+    for (int i = 0; i < totalDeletedSessions; i++) {
+      deletedSessionsFromDisk.add(coronaSerializer.readValueAs(String.class));
+    }
+    coronaSerializer.readEndArrayToken("deletedSessions");
+
+    coronaSerializer.readEndObjectToken("SessionNotifier");
+  }
+
+  /**
+   * Used to write the state of the SessionNotifier instance to disk, when we
+   * are persisting the state of the ClusterManager
+   *
+   * @param jsonGenerator The JsonGenerator instance being used to write JSON
+   *                      to disk
+   * @throws IOException
+   */
+  public void write(JsonGenerator jsonGenerator) throws IOException {
+    jsonGenerator.writeStartObject();
+
+    int totalSessionsToCtx = 0, totalDeletedSessions = 0;
+    for (int i = 0; i < numNotifierThreads; i++) {
+      totalSessionsToCtx += notifierThreads[i].sessionsToCtx.size();
+      totalDeletedSessions += notifierThreads[i].deletedSessions.size();
+    }
+
+    jsonGenerator.writeNumberField("totalSessionsToCtx",
+                                    totalSessionsToCtx);
+
+    jsonGenerator.writeFieldName("sessionsToCtx");
+    jsonGenerator.writeStartObject();
+    for (int i = 0; i < numNotifierThreads; i++) {
+      for (ConcurrentMap.Entry<String, SessionNotificationCtx> entry :
+        notifierThreads[i].sessionsToCtx.entrySet()) {
+        jsonGenerator.writeFieldName(entry.getKey());
+        entry.getValue().write(jsonGenerator);
+      }
+    }
+    jsonGenerator.writeEndObject();
+
+    jsonGenerator.writeNumberField("totalDeletedSessions",
+                                    totalDeletedSessions);
+
+    jsonGenerator.writeFieldName("deletedSessions");
+    jsonGenerator.writeStartArray();
+    for (int i = 0; i < numNotifierThreads; i++) {
+      for (String deletedSessionHandle :
+            notifierThreads[i].deletedSessions.keySet()) {
+        jsonGenerator.writeString(deletedSessionHandle);
+      }
+    }
+    jsonGenerator.writeEndArray();
+
+    jsonGenerator.writeEndObject();
+  }
+
   public int getNumPendingCalls() {
     int numQueued = 0;
     for (SessionNotifierThread notifier: notifierThreads) {
@@ -88,7 +214,6 @@ private class SessionNotifierThread extends Thread {
     ConcurrentMap<String, Object> deletedSessions =
       new ConcurrentHashMap<String, Object> ();
 
-
     synchronized private void wakeupThread() {
       this.notify();
     }
@@ -111,7 +236,7 @@ public void addCall(TBase call) {
         synchronized (session) {
           ctx = sessionsToCtx.get(handle);
           if (ctx == null) {
-            ctx = new SessionNotificationCtx(handle,
+            ctx = new SessionNotificationCtx(session, handle,
                                              session.getAddress().host,
                                              session.getAddress().port);
             ctx.setConf(getConf());
@@ -177,6 +302,8 @@ public void run() {
               LOG.warn(
                 "Ignoring error while expiring session " +
                 ctx.getSessionHandle(), e);
+            } catch (SafeModeException e) {
+              LOG.info("Cluster Manager in Safe Mode") ;
             }
           }
         }
@@ -188,13 +315,6 @@ private SessionNotifierThread handleToNotifier(String handle) {
     return notifierThreads[Math.abs(handle.hashCode()) % numNotifierThreads];
   }
 
-  public SessionNotifier(SessionManager sessionManager,
-      ClusterManager clusterManager, ClusterManagerMetrics metrics) {
-    this.sessionManager = sessionManager;
-    this.clusterManager = clusterManager;
-    this.metrics = metrics;
-  }
-
   public void notifyGrantResource(String handle, List<ResourceGrant> granted) {
     reportGrantMetrics(granted);
     handleToNotifier(handle).addCall
@@ -238,11 +358,51 @@ public void setConf(Configuration conf) {
       notifierThreads[i] = new SessionNotifierThread();
       notifierThreads[i].setDaemon(true);
       notifierThreads[i].setName("Session Notifier Thread #" + i);
-      notifierThreads[i].start();
+
+      // If we are in Safe Mode, we haven't yet restored the SessionNotifier
+      // completely, so we won't be starting the threads now. We would do that
+      // in the restoreAfterSafeModeRestart() method.
+      if (!clusterManager.safeMode) {
+        notifierThreads[i].start();
+      }
+    }
+  }
+
+  /**
+   * This method rebuilds members related to the SessionNotifier instance,
+   * which were not directly persisted themselves.
+   */
+  public void restoreAfterSafeModeRestart() {
+    // Put the sessionsToCtxFromDisk entries into their respective
+    // SessionNotifierThreads instances
+    for (Map.Entry<String, SessionNotificationCtx> entry :
+          sessionsToCtxFromDisk.entrySet()) {
+      // The conf and the conf related properties are missing in the
+      // sessionsToCtx objects
+      entry.getValue().setConf(conf);
+      handleToNotifier(entry.getKey()).sessionsToCtx.put(entry.getKey(),
+                                                          entry.getValue());
+      sessionsToCtxFromDisk.remove(entry);
+    }
+
+    // Put the deletedSessions into the the respective SessionNotifierThreads
+    for (String deletedSessionHandle : deletedSessionsFromDisk) {
+      SessionNotifierThread notifierThread =
+        handleToNotifier(deletedSessionHandle);
+      if (notifierThread.sessionsToCtx.get(deletedSessionHandle) != null) {
+        notifierThread.deletedSessions.put(deletedSessionHandle,
+                                            notifierThread);
+      }
+      deletedSessionsFromDisk.remove(deletedSessionHandle);
     }
 
+    // We can now start the notifier threads
+    for (int i = 0; i < numNotifierThreads; i++) {
+      notifierThreads[i].start();
+    }
   }
 
+
   public Configuration getConf() {
     return conf;
   }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/TFactoryBasedThreadPoolServer.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/TFactoryBasedThreadPoolServer.java
index 4ed089bd..7c740e9a 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/TFactoryBasedThreadPoolServer.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/TFactoryBasedThreadPoolServer.java
@@ -1,6 +1,10 @@
 package org.apache.hadoop.corona;
 
+import java.io.IOException;
+import java.net.ServerSocket;
 import java.util.concurrent.ThreadFactory;
+
+import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.server.*;
 
 import org.apache.commons.logging.Log;
@@ -8,6 +12,8 @@
 import org.apache.thrift.TException;
 import org.apache.thrift.TProcessor;
 import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TServerTransport;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
@@ -29,6 +35,32 @@
  */
 public class TFactoryBasedThreadPoolServer extends TServer {
 
+  /**
+   * This is a helper method which creates a TFactoryBased..Server object using
+   * the processor, ServerSocket object and socket timeout limit. This is useful
+   * when we change the mechanism of server object creation. As a result,
+   * we don't have to change code in multiple places.
+   * @param processor
+   * @param serverSocket
+   * @param socketTimeOut
+   * @return A TFactoryBasedThreadPoolServer object
+   * @throws IOException
+   */
+  public static TFactoryBasedThreadPoolServer createNewServer(
+    TProcessor processor, ServerSocket serverSocket, int socketTimeOut)
+    throws IOException {
+    TServerSocket socket = new TServerSocket(serverSocket, socketTimeOut);
+    TFactoryBasedThreadPoolServer.Args args =
+      new TFactoryBasedThreadPoolServer.Args(socket);
+    args.stopTimeoutVal = 0;
+    args.processor(processor);
+    args.transportFactory(new TFramedTransport.Factory());
+    args.protocolFactory(new TBinaryProtocol.Factory(true, true));
+    return new TFactoryBasedThreadPoolServer(
+      args, new TFactoryBasedThreadPoolServer.DaemonThreadFactory());
+
+  }
+
   public static class DaemonThreadFactory implements ThreadFactory {
     ThreadFactory defaultFactory = Executors.defaultThreadFactory();
     public Thread newThread(Runnable r) {
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/TopologyCache.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/TopologyCache.java
index cbe0ad6c..e69de29b 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/TopologyCache.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/TopologyCache.java
@@ -1,99 +0,0 @@
-package org.apache.hadoop.corona;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.conf.Configuration;
-
-import org.apache.hadoop.net.DNSToSwitchMapping;
-import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.net.NetworkTopology;
-import org.apache.hadoop.net.Node;
-import org.apache.hadoop.net.NodeBase;
-import org.apache.hadoop.net.ScriptBasedMapping;
-
-import org.apache.hadoop.util.ReflectionUtils;
-
-public class TopologyCache extends Configured {
-
-  public static final Log LOG =
-    LogFactory.getLog(TopologyCache.class);
-
-  protected ConcurrentMap<String, Node> hostnameToNodeMap = new ConcurrentHashMap<String, Node>();
-  protected NetworkTopology clusterMap = new NetworkTopology();
-  protected DNSToSwitchMapping dnsToSwitchMapping;
-  private Set<Node> nodesAtMaxLevel =
-    Collections.newSetFromMap(new ConcurrentHashMap<Node, Boolean>());
-
-  public TopologyCache(Configuration conf) {
-    super(conf);
-
-    dnsToSwitchMapping = ReflectionUtils.newInstance
-      (conf.getClass("topology.node.switch.mapping.impl", ScriptBasedMapping.class,
-                     DNSToSwitchMapping.class), conf);
-    LOG.info("DnsToSwitchMapping class = " + dnsToSwitchMapping.getClass().getName());
-  }
-
-
-  /**
-   * Return the Node in the network topology that corresponds to the hostname
-   */
-  public Node getNode(String name) {
-    Node n = hostnameToNodeMap.get(name);
-
-    // it's ok if multiple threads try to resolve the same host at the same time
-    // the assumption is that resolve() will return a canonical node object and
-    // the put operation is therefore idempotent
-    if (n == null) {
-      n = resolveAndGetNode(name);
-      hostnameToNodeMap.put(name, n);
-      // Make an entry for the node at the max level in the cache
-      nodesAtMaxLevel.add(
-        getParentNode(n, NetworkTopology.DEFAULT_HOST_LEVEL - 1));
-    }
-
-    return n;
-  }
-
-  private Node resolveAndGetNode(String name) {
-    List <String> rNameList = dnsToSwitchMapping.resolve(Arrays.asList(new String [] {name}));
-    String networkLoc = NodeBase.normalize(rNameList.get(0));
-    Node node = null;
-
-    // we depend on clusterMap to get a canonical node object
-    // we synchronize this section to guarantee that two concurrent
-    // insertions into the clusterMap don't happen (resulting in
-    // multiple copies of the same node being created and returned)
-    synchronized (clusterMap) {
-      while ((node = clusterMap.getNode(networkLoc+"/"+name)) == null) {
-        clusterMap.add(new NodeBase(name, networkLoc));
-      }
-    }
-
-    return node;
-  }
-
-  /**
-   * Returns a collection of nodes at the max level
-   */
-  public Collection<Node> getNodesAtMaxLevel() {
-    return nodesAtMaxLevel;
-  }
-
-  public static Node getParentNode(Node node, int level) {
-    for (int i = 0; i < level; ++i) {
-      node = node.getParent();
-    }
-    return node;
-  }
-}
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/corona/Utilities.java b/src/contrib/corona/src/java/org/apache/hadoop/corona/Utilities.java
index 8034d87a..6e871ada 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/corona/Utilities.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/corona/Utilities.java
@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
+import java.util.StringTokenizer;
 
 /**
  * a collection of utility classes and functions
@@ -38,6 +39,9 @@ public class Utilities {
   /** The pattern of the application address in the appinfo string */
   public static final Pattern INET_ADDRESS_PATTERN =
     Pattern.compile("(.+):(\\d+)");
+  /** The pattern of IPAddress */
+  public static final Pattern IP_ADDRESS_PATTERN =
+    Pattern.compile("^([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)$");
   /** Cache of the ResourceRequests based on the type */
   private static Map<ResourceType, ResourceRequest> unitResourceRequestMap =
     new EnumMap<ResourceType, ResourceRequest>(ResourceType.class);
@@ -160,4 +164,46 @@ public void uncaughtException(Thread t, Throwable e) {
         }
       });
   }
+
+  public static byte[] asBytes(String addr) {
+    // Convert the TCP/IP address string to an integer value
+    int ipInt = parseNumericAddress(addr);
+    if ( ipInt == 0) {
+      return null;
+    }
+    byte[] ipByts = new byte[4];
+    ipByts[3] = (byte) (ipInt & 0xFF);
+    ipByts[2] = (byte) ((ipInt >> 8) & 0xFF);
+    ipByts[1] = (byte) ((ipInt >> 16) & 0xFF);
+    ipByts[0] = (byte) ((ipInt >> 24) & 0xFF);
+    return ipByts;
+  }
+
+  /**
+   * Check if the specified address is a valid numeric TCP/IP address and return as an integer value
+   * 
+   * @param ipaddr String
+   * @return int
+   */
+  public static int parseNumericAddress(String ipaddr) {
+    Matcher m = IP_ADDRESS_PATTERN.matcher(ipaddr);
+    int ipInt = 0;
+    if (m.find()) {
+      for (int i = 1;i < 5;i++) 
+        try {
+          int ipVal = Integer.valueOf(m.group(i)).intValue();
+          if ( ipVal < 0 || ipVal > 255) {
+            return 0;
+          }
+          //  Add to the integer address
+          ipInt = (ipInt << 8) + ipVal;
+        }
+        catch (NumberFormatException ex) {
+          return 0;
+        }
+    }
+    //  Return the integer address
+    return ipInt;
+  }
+
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/ClusterManagerSafeModeProtocol.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/ClusterManagerSafeModeProtocol.java
new file mode 100644
index 00000000..22ad64dc
--- /dev/null
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/ClusterManagerSafeModeProtocol.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.mapred;
+
+import org.apache.hadoop.ipc.VersionedProtocol;
+
+/**
+ * The protocol is used to set and get the clusterManagerSafeMode flag
+ * on the ProxyJobTracker
+ */
+public interface ClusterManagerSafeModeProtocol extends VersionedProtocol {
+  /**
+   * The versionID is used to compare if the versions are correct
+   */
+  final int versionID = 1;
+
+  /**
+   * Set the clusterManagerSafeMode flag on ProxyJobTracker
+   * @param safeMode Is the value of the clusterManagerSafeMode flag that we
+   *                 want to be set.
+   * @return 0 if the flag was set successfully.
+   */
+  int setClusterManagerSafeModeFlag(boolean safeMode);
+
+  /**
+   * Get the clusterManagerSafeMode flag from the ProxyJobTracker
+   * @return A boolean which is the value of the clusterManagerSafeMode flag.
+   */
+  boolean getClusterManagerSafeModeFlag();
+}
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobAggregator.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobAggregator.java
index 2b65c63d..4605ff17 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobAggregator.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobAggregator.java
@@ -37,4 +37,9 @@ public void reportJobStats(
     String pool,
     JobStats stats,
     Counters counters);
+
+  /**
+   * Report a job's error statistics.
+   */
+  public void reportJobErrorCounters(Counters counters);
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobInProgress.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobInProgress.java
index 34bf7926..b07184b9 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobInProgress.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobInProgress.java
@@ -42,6 +42,8 @@
 import org.apache.hadoop.corona.SessionPriority;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapred.Counters;
+import org.apache.hadoop.mapred.TaskStatus;
 import org.apache.hadoop.mapred.JobHistory.Values;
 import org.apache.hadoop.mapred.JobInProgress.Counter;
 import org.apache.hadoop.mapred.TaskStatus.Phase;
@@ -49,8 +51,10 @@
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.net.NetworkTopology;
 import org.apache.hadoop.net.Node;
+import org.apache.hadoop.net.TopologyCache;
 import org.apache.hadoop.util.StringUtils;
 
+
 public class CoronaJobInProgress extends JobInProgressTraits {
   static final Log LOG = LogFactory.getLog(CoronaJobInProgress.class);
 
@@ -144,6 +148,8 @@ public class CoronaJobInProgress extends JobInProgressTraits {
   @SuppressWarnings("deprecation")
   Counters jobCounters = new Counters();
 
+  TaskErrorCollector taskErrorCollector;
+
   // Maximum no. of fetch-failure notifications after which
   // the map task is killed
   private static final int MAX_FETCH_FAILURES_NOTIFICATIONS = 3;
@@ -229,6 +235,7 @@ public CoronaJobInProgress(
     JobID jobId, Path systemDir, JobConf defaultConf,
     CoronaJobTracker.TaskLookupTable taskLookupTable,
     TaskStateChangeListener taskStateChangeListener,
+    TopologyCache topologyCache,
     CoronaJobHistory jobHistory, String url)
     throws IOException {
     this.lockObject = lockObject;
@@ -282,12 +289,15 @@ public CoronaJobInProgress(
         NetworkTopology.DEFAULT_HOST_LEVEL);
     this.anyCacheLevel = this.maxLevel+1;
     this.localityStats = new LocalityStats(
-      jobConf, maxLevel, jobCounters, jobStats);
+      jobConf, maxLevel, jobCounters, jobStats, topologyCache);
     localityStatsThread = new Thread(localityStats);
     localityStatsThread.setName("Locality Stats");
     localityStatsThread.setDaemon(true);
     localityStatsThread.start();
 
+    this.taskErrorCollector = new TaskErrorCollector(
+      jobConf, Integer.MAX_VALUE, 1);
+
     this.slowTaskThreshold = Math.max(0.0f,
         jobConf.getFloat(CoronaJobInProgress.SPECULATIVE_SLOWTASK_THRESHOLD,1.0f));
     this.speculativeCap = jobConf.getFloat(
@@ -365,6 +375,10 @@ DataStatistics getRunningTaskStatistics(boolean isMap) {
 
   public long getJobDeadline() { return deadline; }
 
+  public int getNumMapTasks() { return numMapTasks; }
+
+  public int getNumReduceTasks() { return numReduceTasks; }
+
   @SuppressWarnings("deprecation")
   public Counters getJobCounters() { return jobCounters; }
 
@@ -484,7 +498,9 @@ public int getMaxTasksPerJob() {
   public void close() throws InterruptedException {
     localityStats.stop();
     localityStatsThread.interrupt();
-    localityStatsThread.join();
+    // The thread may be stuck in DNS lookups. This thread is a daemon,
+    // so it will not prevent process exit.
+    localityStatsThread.join(1000);
   }
 
   /**
@@ -543,11 +559,6 @@ private void initTasksFromSplitsUnprotected(JobClient.RawSplit[] splits)
                                  jobConf, this, i, 1); // numSlotsPerMap = 1
       nonRunningMaps.add(maps[i]);
       mapLocations[i] = splits[i].getLocations();
-      // Resolve the splits ahead of time to avoid delays while scheduling
-      // later on.
-      for (String local: maps[i].getSplitLocations()) {
-        localityStats.getNode(local);
-      }
     }
     LOG.info("Input size for job " + jobId + " = " + inputLength
         + ". Number of splits = " + splits.length);
@@ -1142,7 +1153,21 @@ public void updateTaskStatus(TaskInProgress tip, TaskStatus status,
       updateTaskStatusUnprotected(tip, status, ttStatus);
     }
   }
-
+  
+  private boolean isTaskKilledWithHighMemory(TaskStatus status) {
+    String diagnosticInfo = status.getDiagnosticInfo();
+    if (diagnosticInfo == null) {
+      return false;
+    }
+    String[] splitdiagnosticInfo = diagnosticInfo.split("\\s+");
+    for (String info : splitdiagnosticInfo) { 
+      if (TaskMemoryManagerThread.HIGH_MEMORY_KEYWORD.equals(info)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
   @SuppressWarnings("deprecation")
   private void updateTaskStatusUnprotected(TaskInProgress tip, TaskStatus status,
       TaskTrackerStatus ttStatus) {
@@ -1152,7 +1177,7 @@ private void updateTaskStatusUnprotected(TaskInProgress tip, TaskStatus status,
     boolean wasPending = tip.isOnlyCommitPending();
     TaskAttemptID taskid = status.getTaskID();
     boolean wasAttemptRunning = tip.isAttemptRunning(taskid);
-
+    
     // If the TIP is already completed and the task reports as SUCCEEDED then
     // mark the task as KILLED.
     // In case of task with no promotion the task tracker will mark the task
@@ -1226,6 +1251,15 @@ private void updateTaskStatusUnprotected(TaskInProgress tip, TaskStatus status,
       //For a failed task update the JT datastructures.
       else if (state == TaskStatus.State.FAILED ||
                state == TaskStatus.State.KILLED) {
+        if (isTaskKilledWithHighMemory(status)) {
+          //Increment the High Memory killed count for Reduce and Map Tasks
+          if (status.getIsMap()) {
+            jobCounters.incrCounter(Counter.TOTAL_HIGH_MEMORY_MAP_TASK_KILLED, 1);
+          }
+          else {
+            jobCounters.incrCounter(Counter.TOTAL_HIGH_MEMORY_REDUCE_TASK_KILLED, 1);
+          }
+        }
         // Get the event number for the (possibly) previously successful
         // task. If there exists one, then set that status to OBSOLETE
         int eventNumber;
@@ -1349,7 +1383,6 @@ private boolean completedTaskUnprotected(TaskInProgress tip, TaskStatus status,
     tip.completed(taskId);
 
     // Update jobhistory
-    String trackerHostname = localityStats.getNode(ttStatus.getHost());
     String taskType = getTaskType(tip);
     if (status.getIsMap()){
       jobHistory.logMapTaskStarted(status.getTaskID(), status.getStartTime(),
@@ -1357,7 +1390,7 @@ private boolean completedTaskUnprotected(TaskInProgress tip, TaskStatus status,
                                        ttStatus.getHttpPort(),
                                        taskType);
       jobHistory.logMapTaskFinished(status.getTaskID(), status.getFinishTime(),
-                                        trackerHostname, taskType,
+                                        ttStatus.getHost(), taskType,
                                         status.getStateString(),
                                         status.getCounters());
     }else{
@@ -1367,7 +1400,7 @@ private boolean completedTaskUnprotected(TaskInProgress tip, TaskStatus status,
                                           taskType);
       jobHistory.logReduceTaskFinished(status.getTaskID(), status.getShuffleFinishTime(),
                                            status.getSortFinishTime(), status.getFinishTime(),
-                                           trackerHostname,
+                                           ttStatus.getHost(),
                                            taskType,
                                            status.getStateString(),
                                            status.getCounters());
@@ -1518,6 +1551,7 @@ private void failedTaskUnprotected(TaskInProgress tip, TaskAttemptID taskid,
                           TaskStatus status, TaskTrackerStatus taskTrackerStatus,
                           boolean wasRunning, boolean wasComplete,
                           boolean wasAttemptRunning) {
+    taskErrorCollector.collect(tip, taskid, clock.getTime());
     // check if the TIP is already failed
     boolean wasFailed = tip.isFailed();
 
@@ -2190,6 +2224,10 @@ public Counters getCounters() {
     }
   }
 
+  public Counters getErrorCounters() {
+    return taskErrorCollector.getErrorCountsCounters();
+  }
+
   public Object getSchedulingInfo() {
     return null; // TODO
   }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobTracker.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobTracker.java
index c32ca0b9..5a09fdab 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobTracker.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobTracker.java
@@ -22,6 +22,8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -32,6 +34,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.corona.CoronaClient;
 import org.apache.hadoop.corona.InetAddress;
 import org.apache.hadoop.corona.CoronaConf;
 import org.apache.hadoop.corona.PoolInfo;
@@ -40,17 +43,21 @@
 import org.apache.hadoop.corona.ResourceType;
 import org.apache.hadoop.corona.SessionDriver;
 import org.apache.hadoop.corona.SessionDriverService;
+import org.apache.hadoop.corona.SessionHistoryManager;
 import org.apache.hadoop.corona.SessionPriority;
 import org.apache.hadoop.corona.SessionStatus;
 import org.apache.hadoop.corona.Utilities;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.http.HttpServer;
+import org.apache.hadoop.ipc.ProtocolProxy;
 import org.apache.hadoop.ipc.ProtocolSignature;
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.mapreduce.TaskType;
 import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.net.TopologyCache;
+import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.VersionInfo;
 
 /**
@@ -138,6 +145,23 @@ public class CoronaJobTracker extends JobTrackerTraits
   public static final String SYSTEM_DIR_KEY = "corona.system.dir";
   /** Default corona system directory. */
   public static final String DEFAULT_SYSTEM_DIR = "/tmp/hadoop/mapred/system";
+  /** Number of handlers used by the RPC server.*/
+  public static final String RPC_SERVER_HANDLER_COUNT =
+    "mapred.job.tracker.handler.count";
+  /**
+   * The number of handlers used by the RPC server in
+   * standalone mode. The standalone mode is used for large jobs, so should
+   * use more threads.
+   */
+  public static final String RPC_SERVER_HANDLER_COUNT_STANDALONE =
+     "mapred.coronajobtracker.remote.thread.standalone";
+
+  /**
+   * If a remote JT is running, stop the local RPC server after this timeout
+   * past the completion of the job.
+   */
+  public static final String RPC_SERVER_STOP_TIMEOUT =
+    "mapred.coronajobtracker.rpcserver.stop.timeout";
 
   /** Logger. */
   private static final Log LOG = LogFactory.getLog(CoronaJobTracker.class);
@@ -166,7 +190,7 @@ public class CoronaJobTracker extends JobTrackerTraits
   /** Will always be 1. */
   private AtomicInteger jobCounter = new AtomicInteger();
   /** Identifier for the current job. */
-  private final JobID jobId;
+  private JobID jobId;
   /** The job. */
   private CoronaJobInProgress job;
   /** The grants to revoke. */
@@ -199,6 +223,8 @@ public class CoronaJobTracker extends JobTrackerTraits
   private final TrackerStats trackerStats;
   /** Cache of RPC clients to task trackers. */
   private TrackerClientCache trackerClientCache;
+  /** Cache of the nodes */
+  private TopologyCache topologyCache;
   /** The resource updater. */
   private ResourceUpdater resourceUpdater = new ResourceUpdater();
   /** The resource updater thread. */
@@ -555,12 +581,20 @@ public CoronaJobTracker(
       parentHeartbeatThread.setDaemon(false);
       parentHeartbeatThread.setName("Parent Heartbeat");
       parentHeartbeatThread.start();
+      Thread parentHeartbeatMonitorThread =
+          new Thread(new ParentHeartbeatMonitor(parentHeartbeat));
+      parentHeartbeatMonitorThread.setDaemon(true);
+      parentHeartbeatMonitorThread.setName("Parent Heartbeat Monitor");
+      parentHeartbeatMonitorThread.start();
     } catch (IOException e) {
       LOG.error("Closing CJT after initial heartbeat error" , e);
       try {
         close(false);
       } catch (InterruptedException e1) {
-        throw new IOException(e1);
+      } finally {
+        // Ensures that the process will exit (some non-daemon
+        // threads might hang on unclean exit)
+        System.exit(1);
       }
     }
   }
@@ -578,12 +612,14 @@ public CoronaJobTracker(JobConf conf) throws IOException {
     this.conf = conf;
     this.trackerStats = new TrackerStats(conf);
     this.fs = FileSystem.get(conf);
+  }
 
-    createSession();
+  public static JobID jobIdFromSessionId(String sessionId) {
+    return new JobID(sessionId, 1);
+  }
 
-    // the jobtracker can run only a single job. it's jobid is fixed based
-    // on the sessionId.
-    this.jobId = new JobID(sessionId, 1);
+  public static String sessionIdFromJobID(JobID jobId) {
+    return jobId.getJtIdentifier();
   }
 
   private void failTask(TaskAttemptID taskId, String reason,
@@ -610,7 +646,7 @@ private void failTask(TaskAttemptID taskId, String reason,
     TaskStatus.Phase phase =
       tip.isMapTask() ? TaskStatus.Phase.MAP : TaskStatus.Phase.STARTING;
     CoronaJobTracker.this.job.failedTask(
-        tip, taskId, reason, phase, isFailed, trackerName, trackerStatus);
+      tip, taskId, reason, phase, isFailed, trackerName, trackerStatus);
   }
 
   public SessionDriver getSessionDriver() {
@@ -633,7 +669,8 @@ private void startFullTracker() throws IOException {
     }
     sessionDriver.startSession();
     this.resourceTracker = new ResourceTracker(lockObject);
-    this.trackerClientCache = new TrackerClientCache(conf);
+    this.topologyCache = new TopologyCache(conf);
+    this.trackerClientCache = new TrackerClientCache(conf, topologyCache);
 
     startRPCServer(this);
     startInfoServer();
@@ -657,7 +694,20 @@ private void startFullTracker() throws IOException {
 
     taskLauncher = new CoronaTaskLauncher(conf, this, expireTasks);
 
-    String sessionLogPath = sessionDriver.getSessionLog();
+    String sessionLogPath = null;
+    if (isStandalone) {
+      // If this is the remote job tracker, we need to use the session log
+      // path of the parent job tracker, since we use the job ID specified
+      // by the parent job tracker.
+      String parentSessionId = CoronaJobTracker.sessionIdFromJobID(jobId);
+      SessionHistoryManager sessionHistoryManager = new SessionHistoryManager();
+      sessionHistoryManager.setConf(conf);
+      sessionLogPath = sessionHistoryManager.getLogPath(parentSessionId);
+      LOG.info("Using session log path " + sessionLogPath + " based on jobId " +
+        jobId);
+    } else {
+      sessionLogPath = sessionDriver.getSessionLog();
+    }
     jobHistory = new CoronaJobHistory(conf, jobId, sessionLogPath);
 
     // Initialize history DONE folder
@@ -675,7 +725,8 @@ private void startRestrictedTracker(JobID jobId, JobConf jobConf)
     throws IOException {
     sessionDriver.startSession();
     this.resourceTracker = new ResourceTracker(lockObject);
-    this.trackerClientCache = new TrackerClientCache(conf);
+    this.topologyCache = new TopologyCache(conf);
+    this.trackerClientCache = new TrackerClientCache(conf, topologyCache);
     remoteJT = new RemoteJTProxy(this, jobId, jobConf);
     startRPCServer(remoteJT);
   }
@@ -684,7 +735,10 @@ private void startRPCServer(Object instance) throws IOException {
     if (interTrackerServer != null) {
       return;
     }
-    int handlerCount = conf.getInt("mapred.job.tracker.handler.count", 10);
+    int handlerCount = conf.getInt(RPC_SERVER_HANDLER_COUNT, 10);
+    if (isStandalone) {
+      handlerCount = conf.getInt(RPC_SERVER_HANDLER_COUNT_STANDALONE, 100);
+    }
 
     // Use the DNS hostname so that Task Trackers can connect to JT.
     jobTrackerAddress = NetUtils.createSocketAddr(
@@ -765,13 +819,13 @@ public TrackerStats getTrackerStats() {
     return trackerStats;
   }
 
-  public CoronaTaskTrackerProtocol getTaskTrackerClient(InetSocketAddress a)
+  public CoronaTaskTrackerProtocol getTaskTrackerClient(String host, int port)
     throws IOException {
-    return trackerClientCache.createClient(a);
+    return trackerClientCache.getClient(host, port);
   }
 
-  public void resetTaskTrackerClient(InetSocketAddress a) {
-    trackerClientCache.resetClient(a);
+  public void resetTaskTrackerClient(String host, int port) {
+    trackerClientCache.resetClient(host, port);
   }
 
   protected void closeIfComplete(boolean closeFromWebUI) throws IOException {
@@ -786,7 +840,27 @@ protected void closeIfComplete(boolean closeFromWebUI) throws IOException {
     }
   }
 
+  /**
+   * Cleanup after CoronaJobTracker operation.
+   * If remote CJT error occured use overloaded version.
+   * @param closeFromWebUI Indicates whether called from web UI.
+   * @throws IOException
+   * @throws InterruptedException
+   */
   void close(boolean closeFromWebUI) throws IOException, InterruptedException {
+    close(closeFromWebUI, false);
+  }
+
+  /**
+   * Cleanup after CoronaJobTracker operation.
+   * @param closeFromWebUI Indicates whether called from web UI.
+   * @param remoteJTFailure Indicates whether the remote CJT failed or
+   * is unreachable.
+   * @throws IOException
+   * @throws InterruptedException
+   */
+  void close(boolean closeFromWebUI, boolean remoteJTFailure)
+    throws IOException, InterruptedException {
     synchronized (closeLock) {
       if (!running) {
         return;
@@ -808,9 +882,16 @@ void close(boolean closeFromWebUI) throws IOException, InterruptedException {
       if (sessionDriver != null) {
         int jobState = 0;
         if (job == null) {
-          // The remote JT will have the real status.
-          jobState = JobStatus.SUCCEEDED;
-          sessionDriver.stop(getSessionEndStatus(jobState));
+          if (remoteJTFailure) {
+            // There will be no feedback from remote JT because it died.
+            LOG.warn("JobTracker died or is unreachable." +
+              "Reporting to ClusterManager.");
+            sessionDriver.stop(SessionStatus.FAILED_JOBTRACKER);
+          } else {
+            // The remote JT will have the real status.
+            jobState = JobStatus.SUCCEEDED;
+            sessionDriver.stop(getSessionEndStatus(jobState));
+          }
         } else {
           jobState = job.getStatus().getRunState();
           if (jobState != JobStatus.SUCCEEDED) {
@@ -861,14 +942,39 @@ void close(boolean closeFromWebUI) throws IOException, InterruptedException {
       }
       // Stop RPC server. This is done near the end of the function
       // since this could be called through a RPC heartbeat call.
-      // Stop the RPC server only if this job tracker is not operating
-      // in "remote" mode and it did not start a remote job tracker.
-      // We need the RPC server to hang around so that status
-      // calls from local JT -> remote JT and heartbeats from
-      // remote JT -> local JT continue to work after the job has completed.
-      if (!this.isStandalone && remoteJT == null &&
-        interTrackerServer != null) {
-        interTrackerServer.stop();
+      // If (standalone == true)
+      //   - dont stop the RPC server at all. When this cannot talk to the parent,
+      //     it will exit the process.
+      // if (standalone == false)
+      //   - if there is no remote JT, close right away
+      //   - if there is a remote JT, close after 1min.
+      if (interTrackerServer != null) {
+        if (!isStandalone) {
+          if (remoteJT == null) {
+            interTrackerServer.stop();
+          } else {
+            final int timeout = conf.getInt(RPC_SERVER_STOP_TIMEOUT, 0);
+            if (timeout > 0) {
+              LOG.info("Starting async thread to stop RPC server for " + jobId);
+              Thread async = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                  try {
+                    Thread.sleep(timeout);
+                    LOG.info("Stopping RPC server for " + jobId);
+                    interTrackerServer.stop();
+                    remoteJT.close();
+                  } catch (InterruptedException e) {
+                    LOG.warn(
+                    "Interrupted during wait before stopping RPC server");
+                  }
+                }
+              });
+              async.setDaemon(true);
+              async.start();
+            }
+          }
+        }
       }
 
       synchronized (lockObject) {
@@ -882,18 +988,16 @@ private void reportJobStats() {
     if (job == null) {
       return;
     }
-    Counters jobCounters = job.getJobCounters();
+    Counters jobCounters = job.getCounters();
     JobStats jobStats = job.getJobStats();
-    String pool = null;
-    if (sessionDriver != null) {
-      pool = PoolInfo.createStringFromPoolInfo(sessionDriver.getPoolInfo());
-    }
+    Counters errorCounters = job.getErrorCounters();
+    String pool = getPoolInfo();
     try {
       CoronaConf coronaConf = new CoronaConf(conf);
       InetSocketAddress aggregatorAddr = NetUtils.createSocketAddr(
         coronaConf.getProxyJobTrackerAddress());
       long timeout = 5000; // Can make configurable later.
-      CoronaJobAggregator aggregator = RPC.waitForProxy(
+      ProtocolProxy<CoronaJobAggregator> aggregator = RPC.waitForProtocolProxy(
         CoronaJobAggregator.class,
         CoronaJobAggregator.versionID,
         aggregatorAddr,
@@ -902,7 +1006,11 @@ private void reportJobStats() {
       LOG.info("Reporting job stats with jobId=" + jobId +
         ", pool=" + pool + ", jobStats=" + jobStats + ", " +
         "jobCounters=" + jobCounters);
-      aggregator.reportJobStats(jobId.toString(), pool, jobStats, jobCounters);
+      aggregator.getProxy().reportJobStats(
+        jobId.toString(), pool, jobStats, jobCounters);
+      if (aggregator.isMethodSupported("reportJobErrorCounters")) {
+        aggregator.getProxy().reportJobErrorCounters(errorCounters);
+      }
     } catch (IOException e) {
       LOG.warn("Ignoring error in reportJobStats ", e);
     }
@@ -934,6 +1042,7 @@ class ParentHeartbeat implements Runnable {
     private final InterCoronaJobTrackerProtocol parent;
     private final TaskAttemptID attemptId;
     private final String sessionId;
+    private long lastHeartbeat = 0L;
 
     public ParentHeartbeat(
       Configuration conf,
@@ -955,6 +1064,7 @@ public ParentHeartbeat(
     }
 
     public void initialHeartbeat() throws IOException {
+      lastHeartbeat = System.currentTimeMillis();
       parent.reportRemoteCoronaJobTracker(
           attemptId.toString(),
           myAddr.getHostName(),
@@ -966,11 +1076,13 @@ public void initialHeartbeat() throws IOException {
     public void run() {
       while (true) {
         try {
+          LOG.info("Performing heartbeat to parent");
           parent.reportRemoteCoronaJobTracker(
               attemptId.toString(),
               myAddr.getHostName(),
               myAddr.getPort(),
               sessionId);
+          lastHeartbeat = System.currentTimeMillis();
           LOG.info("Performed heartbeat to parent at " + parentAddr);
           Thread.sleep(1000);
         } catch (IOException e) {
@@ -989,13 +1101,41 @@ public void run() {
         }
       }
     }
+
+    long getLastHeartbeat() {
+      return lastHeartbeat;
+    }
+  }
+
+  private static class ParentHeartbeatMonitor implements Runnable {
+    ParentHeartbeat heartbeat;
+
+    private ParentHeartbeatMonitor(ParentHeartbeat heartbeat) {
+      this.heartbeat = heartbeat;
+    }
+
+    @Override
+    public void run() {
+      while (true) {
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException iex) {
+        }
+        long last = heartbeat.getLastHeartbeat();
+        if (System.currentTimeMillis() - last > 15 * 1000) {
+          ReflectionUtils.logThreadInfo(LOG,
+              "Stuck JobTracker Threads", 60 * 1000);
+        }
+      }
+    }
   }
 
 
   @Override
   public boolean processAvailableResource(ResourceGrant grant) {
     if (isBadResource(grant)) {
-      LOG.info("Resource " + grant.getId() + " is bad");
+      LOG.info("Resource " + grant.getId() + " nodename " +
+        grant.getNodeName() + " is bad");
       processBadResource(grant.getId(), true);
       // return true since this request was bad and will be returned
       // so it should no longer be available
@@ -1003,7 +1143,8 @@ public boolean processAvailableResource(ResourceGrant grant) {
     } else if (!isResourceNeeded(grant)) {
       // This resource is no longer needed, but it is not a fault
       // of the host
-      LOG.info("Resource " + grant.getId() + " is not needed");
+      LOG.info("Resource " + grant.getId() + " nodename " +
+        grant.getNodeName() + " is not needed");
       processBadResource(grant.getId(), false);
       return true;
     }
@@ -1012,16 +1153,16 @@ public boolean processAvailableResource(ResourceGrant grant) {
     String trackerName = grant.getNodeName();
     boolean isMapGrant =
         grant.getType().equals(ResourceType.MAP);
-    Task task = getSetupAndCleanupTasks(trackerName, addr.host, isMapGrant);
+    Task task = getSetupAndCleanupTasks(trackerName, grant.address.host, isMapGrant);
     if (task == null) {
       TaskInProgress tip = null;
       synchronized (lockObject) {
         tip = requestToTipMap.get(grant.getId());
       }
       if (tip.isMapTask()) {
-        task = job.obtainNewMapTaskForTip(trackerName, addr.host, tip);
+        task = job.obtainNewMapTaskForTip(trackerName, grant.address.host, tip);
       } else {
-        task = job.obtainNewReduceTaskForTip(trackerName, addr.host, tip);
+        task = job.obtainNewReduceTaskForTip(trackerName, grant.address.host, tip);
       }
     }
     if (task != null) {
@@ -1120,8 +1261,12 @@ void processDeadNodes() {
           taskLookupTable.getSuccessfulTasksForNode(deadNode);
         for (TaskAttemptID attempt : attempts) {
           TaskInProgress tip = taskLookupTable.getTIP(attempt);
-          if (tip.isMapTask()) {
-            // Only the map task needs to be rerun if there was a failure
+          // Successful reduce tasks do not need to be re-run because they write
+          // the output to HDFS. Successful job setup task does not need to be
+          // re-run. Successful map tasks dont need to be re-run in map-only jobs
+          // because they will write the output to HDFS.
+          if (tip.isMapTask() && !tip.isJobSetupTask() &&
+              job.getNumReduceTasks() != 0) {
             job.failedTask(tip, attempt, "Lost task tracker",
                 TaskStatus.Phase.MAP, false, deadNode, null);
           }
@@ -1143,8 +1288,6 @@ void processGrantsToRevoke() {
     if (job == null) {
       return;
     }
-    Map<ResourceGrant, TaskAttemptID> processed =
-        new HashMap<ResourceGrant, TaskAttemptID>();
     Set<String> nodesOfGrants = new HashSet<String>();
     synchronized (lockObject) {
       for (ResourceGrant grant : grantsToRevoke) {
@@ -1160,7 +1303,7 @@ void processGrantsToRevoke() {
           killTaskUnprotected(attemptId, false,
             "Request received to kill" +
             " task '" + attemptId + "' by cluster manager (grant revoked)");
-          processed.put(grant, attemptId);
+          LOG.info("Revoking resource " + grant.getId() + " task: " + attemptId);
           nodesOfGrants.add(grant.getNodeName());
           // Grant will get removed from the resource tracker
           // when the kill takes effect and we get a response from TT.
@@ -1169,11 +1312,7 @@ void processGrantsToRevoke() {
       for (String ttNode : nodesOfGrants) {
         queueKillActions(ttNode);
       }
-    }
-    for (Map.Entry<ResourceGrant, TaskAttemptID> entry : processed.entrySet()) {
-      LOG.info("Revoking resource " + entry.getKey().getId() +
-               " task: " + entry.getValue());
-      grantsToRevoke.remove(entry.getKey());
+      grantsToRevoke.clear();
     }
   }
 
@@ -1564,7 +1703,7 @@ CoronaJobInProgress createJob(JobID jobId, JobConf defaultConf)
 
     return new CoronaJobInProgress(
       lockObject, jobId, new Path(getSystemDir()), defaultConf,
-      taskLookupTable, this, jobHistory, getUrl());
+      taskLookupTable, this, topologyCache, jobHistory, getUrl());
   }
 
   private void registerNewRequestForTip(
@@ -1628,6 +1767,16 @@ CoronaJobInProgress getJob() {
     return job;
   }
 
+  String getPoolInfo() {
+    String pool = null;
+
+    if (sessionDriver != null) {
+      pool = PoolInfo.createStringFromPoolInfo(sessionDriver.getPoolInfo());
+    }
+
+    return pool;
+  }
+
   @Override
   public JobInProgressTraits getJobInProgress(JobID jobId) {
     checkJobId(jobId);
@@ -1692,9 +1841,50 @@ public JobID getNewJobId() throws IOException {
       throw new RuntimeException(
         "CoronaJobTracker can only run one job! (value=" + value + ")");
     }
+    createSession();
+    // the jobtracker can run only a single job. it's jobid is fixed based
+    // on the sessionId.
+    jobId = CoronaJobTracker.jobIdFromSessionId(sessionId);
     return jobId;
   }
 
+  private int parseMemoryMb(String options) {
+    for (String option : options.split("\\s+")) {
+      if (option.startsWith("-Xmx")) {
+        String memoryString = option.substring(4);
+        // If memory string is a number, then it is in bytes.
+        if (memoryString.matches(".*\\d")) {
+          return Integer.valueOf(memoryString) / 1048576;
+        } else {
+          int value = Integer.valueOf(memoryString.substring(0, memoryString.length() - 1));
+          String unit = memoryString.substring(memoryString.length() - 1).toLowerCase();
+          if (unit.equals("k")) {
+            return value / 1024;
+          } else if (unit.equals("m")) {
+            return value;
+          } else if (unit.equals("g")) {
+            return value * 1024;
+          }
+        }
+      }
+    }
+    // Couldn't find any memory option.
+    return -1;
+  }
+
+  private void checkHighMemoryJob(JobConf jobConf) throws IOException {
+    int maxMemoryMb = jobConf.getInt(JobConf.MAX_TASK_MEMORY_MB,
+        JobConf.MAX_TASK_MEMORY_MB_DEFAULT);
+    boolean isHighMemoryJob =
+        (parseMemoryMb(jobConf.get(JobConf.MAPRED_TASK_JAVA_OPTS, "")) > maxMemoryMb)
+        || (parseMemoryMb(jobConf.get(JobConf.MAPRED_MAP_TASK_JAVA_OPTS, "")) > maxMemoryMb)
+        || (parseMemoryMb(jobConf.get(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS, "")) > maxMemoryMb);
+    if (isHighMemoryJob) {
+      throw new IOException("Job memory requirements exceed limit of " +
+          maxMemoryMb + " MB per task");
+    }
+  }
+
   @Override
   public JobStatus submitJob(JobID jobId) throws IOException {
     // In stand-alone mode, the parent would have submitted the correct
@@ -1703,6 +1893,7 @@ public JobStatus submitJob(JobID jobId) throws IOException {
     // be able to get a cached configuration.
     JobConf jobConf =  isStandalone ? this.conf :
       JobClient.getAndRemoveCachedJobConf(jobId);
+    checkHighMemoryJob(jobConf);
     if (canStartLocalJT(jobConf)) {
       startFullTracker();
       CoronaJobInProgress jip = createJob(jobId, jobConf);
@@ -1740,19 +1931,24 @@ public ClusterStatus getClusterStatus(boolean detailed) throws IOException {
 
   @Override
   public void killJob(JobID jobId) throws IOException {
-    checkJobId(jobId);
-    LOG.info("Killing job " + jobId);
-    if (remoteJT == null) {
-      job.kill();
-      closeIfComplete(false);
-    } else {
-      remoteJT.killJob(jobId);
-      LOG.info("Successfully killed " + jobId + " on remote JT, closing");
-      try {
-        close(false);
-      } catch (InterruptedException e) {
-        throw new IOException(e);
+    if (jobId.equals(this.jobId)) {
+      LOG.info("Killing owned job " + jobId);
+      if (remoteJT == null) {
+        job.kill();
+        closeIfComplete(false);
+      } else {
+        remoteJT.killJob(jobId);
+        LOG.info("Successfully killed " + jobId + " on remote JT, closing");
+        try {
+          close(false);
+        } catch (InterruptedException e) {
+          throw new IOException(e);
+        }
       }
+    } else {
+      String sessionId = sessionIdFromJobID(jobId);
+      LOG.info("Killing session " + sessionId + " for non-owned job " + jobId);
+      CoronaClient.killSession(sessionId, conf);
     }
   }
 
@@ -2221,4 +2417,14 @@ public void expiredRunningTask(TaskAttemptID taskId) {
       failTask(taskId, "Timeout running task", false);
     }
   }
+
+  public void killTaskFromWebUI(TaskAttemptID taskId, boolean shouldFail) {
+    synchronized (lockObject) {
+      TaskInProgress tip = taskLookupTable.getTIP(taskId);
+      job.failedTask(
+        tip, taskId, (shouldFail ? "Failed" : "Killed") + " from Web UI",
+        tip.isMapTask() ? TaskStatus.Phase.MAP : TaskStatus.Phase.REDUCE,
+        shouldFail, tip.getTaskStatus(taskId).getTaskTracker(), null);
+    }
+  }
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobTrackerRunner.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobTrackerRunner.java
index 8156dc8c..cd9b6923 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobTrackerRunner.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaJobTrackerRunner.java
@@ -20,13 +20,18 @@ public class CoronaJobTrackerRunner extends TaskRunner {
   @SuppressWarnings("unused")
   private final CoronaSessionInfo coronaSessionInfo;
   private final File workDir;
+  private final String originalPath;
+  private final String releasePath;
   private Path localizedJobFile;
   @SuppressWarnings("deprecation")
   public CoronaJobTrackerRunner(
       TaskTracker.TaskInProgress tip, Task task, TaskTracker tracker,
-      JobConf ttConf, CoronaSessionInfo info) throws IOException {
+      JobConf ttConf, CoronaSessionInfo info, String originalPath,
+      String releasePath) throws IOException {
     super(tip, task, tracker, ttConf);
     this.coronaSessionInfo = info;
+    this.originalPath = originalPath;
+    this.releasePath = releasePath;
     LocalDirAllocator lDirAlloc = new LocalDirAllocator("mapred.local.dir");
 
     workDir = new File(lDirAlloc.getLocalPathForWrite(
@@ -70,6 +75,8 @@ private void localizeTaskConfiguration(TaskTracker tracker, JobConf ttConf,
         throw e;
       }
     }
+    // Add the values from the job conf to the configuration of this runner
+    this.conf.addResource(localizedJobFile);
   }
 
   /** Delete any temporary files from previous failed attempts. */
@@ -116,9 +123,14 @@ public void run() {
         classPath.append(sep);
       }
       // start with same classpath as parent process
-      classPath.append(System.getProperty("java.class.path"));
-      classPath.append(sep);
 
+      String systemClassPath = System.getProperty("java.class.path");
+      if (releasePath != null && !releasePath.isEmpty() &&
+        originalPath != null && !releasePath.isEmpty()) {
+        systemClassPath = systemClassPath.replaceAll(originalPath, releasePath);
+      }
+      classPath.append(systemClassPath);
+      classPath.append(sep);
       //  Build exec child jmv args.
       Vector<String> vargs = new Vector<String>(8);
       File jvm =                                  // use same jvm as parent
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaReleaseManager.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaReleaseManager.java
new file mode 100644
index 00000000..bbd34793
--- /dev/null
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaReleaseManager.java
@@ -0,0 +1,416 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.mapred;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.Iterator;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import java.text.SimpleDateFormat;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.conf.Configuration;
+
+/**
+ * Used to manage the corona releases
+ */
+public class CoronaReleaseManager extends Thread {
+  /** the release dir to copy from */
+  public static final String MAPRED_RELEASE_DIR = "mapred.release.dir";
+  /** the dir that holds all the copies of the release */
+  public static final String MAP_RELEASE_WORKING_DIR =
+    "mapred.release.working.dir";
+  /** the interval that the thread will wake up to check the releases */
+  public static final String RELEASE_DIR_CLEAN_INTERVAL =
+    "mapred.release.dir.cleanInterval";
+  /** the threshold that old releases will be removed */
+  public static final String RELEASE_DIR_CLEAN_THRESHOLD =
+    "mapred.release.dir.cleanThreshold";
+  /** the pattern that decides if a file in the release dir shall be copied */
+  public static final String RELEASE_COPY_PATTERN =
+    "mapred.release.file.pattern";
+  /** if this one is specified, only this file is used to
+   *  check if there is a new release
+   */
+  public static final String CORONA_RELEASE_FILE_CHECK =
+    "mapred.release.file.check";
+  /** Right after a release is copied, a tag file will be created to specify
+   *  that the copy is complete. When TT is restarted, if the tag file exists
+   *  for the latest release copy, no more copy is needed. When a JT gets a
+   *  release, the modification time of this tag file will be changed. So
+   *  thethread will know when to clean up.
+   */
+  public static final String RELEASE_TAG_FILE = "RELEASE_COPY_DONE";
+  private static final Log LOG = LogFactory.getLog(CoronaReleaseManager.class);
+
+  /** releaseDir is the original string for the release dir.
+   *  The directory retrieved from releasePath may not be the same as
+   *  the one specified in the classpath, for example .././
+   */
+  private String releaseDir;
+  private Path releasePath;
+  private Path workingPath;
+  private long cleanThreshold;
+  private long cleanInterval;
+  private Pattern release_pattern;
+  /** if CORONA_RELEASE_FILE_CHECK is set, only this file is used to
+   *  check if there is a new release
+   */
+  private String coronaReleaseFileCheck;
+
+  private final Configuration conf;
+  private FileSystem fs;
+  private SimpleDateFormat formatter;
+  private LinkedList<CoronaRelease> releaseList;
+  private boolean shutdownFlag = false;
+
+  class CoronaRelease {
+    Path copiedPath;
+    long releaseTimestamp;
+    LinkedList<JobID> jobids;
+    boolean latest;
+
+    CoronaRelease(Path copiedPath, long releaseTimestamp, JobID jobid) {
+      this.copiedPath = copiedPath;
+      this.releaseTimestamp = releaseTimestamp;
+      this.latest = true;
+      jobids = new LinkedList<JobID>();
+      if (jobid != null) {
+        jobids.add(jobid);
+      }
+    }
+  }
+
+  public CoronaReleaseManager(Configuration conf) throws IOException {
+    this.conf = conf;
+    fs = FileSystem.newInstanceLocal(conf);
+    releaseDir = conf.get(MAPRED_RELEASE_DIR, "");
+    coronaReleaseFileCheck = conf.get(CORONA_RELEASE_FILE_CHECK, "");
+    String workingDir = conf.get(MAP_RELEASE_WORKING_DIR, "");
+    cleanInterval = conf.getLong(RELEASE_DIR_CLEAN_INTERVAL, 300000L);
+    cleanThreshold = conf.getLong(RELEASE_DIR_CLEAN_THRESHOLD, 172800000L);
+    String patternString = conf.get(RELEASE_COPY_PATTERN, "");
+    if (patternString.isEmpty()) {
+      release_pattern = null;
+    } else {
+      release_pattern = Pattern.compile(patternString);
+    }
+    releaseList = new LinkedList<CoronaRelease>();
+    if (!releaseDir.isEmpty()) {
+      releasePath = new Path(releaseDir);
+    }
+    if (!workingDir.isEmpty()) {
+      workingPath = new Path(workingDir);
+    }
+    formatter = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+  }
+
+  @Override
+  public void run() {
+    if (releasePath == null || workingPath == null) {
+      LOG.error("The releaseDir or workingDir is empty, exiting...");
+      return;
+    }
+    while (!shutdownFlag) {
+      // check if there is a new release to copy
+      getRelease(null);
+
+      // check if old releases can be de-referenced
+      checkOldRelease();
+
+      // check if there is any old dirs to cleanup
+      try {
+        long currentTime = System.currentTimeMillis();
+        for (FileStatus dirStat: fs.listStatus(workingPath)) {
+          if (!dirStat.isDir()) {
+            continue;
+          }
+          // If the dir 's tag file is modifies/accessed 2 days ago,
+          // and if it is not in the release list
+          Path dirPath = dirStat.getPath();
+          Path tagPath = new Path(dirPath, RELEASE_TAG_FILE);
+          try {
+            if (!fs.exists(tagPath)) {
+              LOG.info("Tag " + tagPath + " is missing, removing " + dirPath);
+              removeRelease(dirPath);
+            } else {
+              FileStatus fileStat = fs.getFileStatus(tagPath);
+              if (currentTime - fileStat.getModificationTime() > cleanThreshold &&
+                  checkPath(dirPath)) {
+                // recursively delete all the files/dirs
+                LOG.info("Remove old release " + dirPath);
+                removeRelease(dirPath);
+              }
+            }
+          } catch (IOException e) {
+            LOG.error("Error in checking " + tagPath, e);
+          }
+        }
+      } catch (IOException ioe) {
+        LOG.error("IOException when clearing dir ", ioe);
+      }
+      try {
+        Thread.sleep(cleanInterval);
+      } catch (InterruptedException e) {
+      }
+    }
+  }
+
+  public void shutdown() {
+    shutdownFlag = true;
+  }
+
+  public void returnRelease(JobID jobid) {
+    synchronized (releaseList) {
+      Iterator<CoronaRelease> crIt = releaseList.iterator();
+      // A single jobid may have used multiple releases
+      while (crIt.hasNext()) {
+        CoronaRelease cr = crIt.next();
+        Iterator<JobID> jobIdIt = cr.jobids.iterator();
+        while (jobIdIt.hasNext()) {
+          JobID existingJobID = jobIdIt.next();
+          if (existingJobID.toString().equals(jobid.toString())) {
+            jobIdIt.remove();
+            LOG.info("Return release " + cr.copiedPath + " for " + jobid);
+            return;
+          }
+        }
+      }
+    }
+  }
+
+  public String getRelease(JobID jobid) {
+    if (releasePath == null || workingPath == null) {
+      LOG.error("The releaseDir or workingDir is empty");
+      return null;
+    }
+    try {
+      if (!fs.exists(releasePath)) {
+        LOG.info(releasePath + " is not existing");
+        return null;
+      }
+    } catch (IOException e) {
+      LOG.error("IOException in checking " + releasePath, e);
+      return null;
+    }
+
+    long currentTimeStamp = getLastTimeStamp();
+    synchronized (releaseList) {
+      // check if the most current one loaded
+      for (CoronaRelease cr: releaseList) {
+        if (cr.releaseTimestamp == currentTimeStamp) {
+          if (jobid != null) {
+            // update the timestamp
+            Path donePath = new Path(cr.copiedPath, RELEASE_TAG_FILE);
+            try {
+              FSDataOutputStream fos = fs.create(donePath);
+              fos.close();
+            } catch (IOException e) {
+              LOG.error("Unable to recreate " + donePath);
+              return null;
+            }
+            cr.jobids.add(jobid);
+            LOG.info("Get existing release " + cr.copiedPath +
+              " for " + jobid);
+          }
+          return cr.copiedPath.toString();
+        }
+      }
+      // copied the most current release
+      Path newWorkingPath = new Path(workingPath, 
+        formatter.format(currentTimeStamp));
+      LOG.info("Copy the latest release to " + newWorkingPath);
+      if (copyRelease(releasePath, newWorkingPath, true)) {
+        CoronaRelease cr = new CoronaRelease(newWorkingPath,
+          currentTimeStamp, jobid);
+        for (CoronaRelease tmpcr: releaseList) {
+          tmpcr.latest = false;
+        }
+        releaseList.add(cr);
+        LOG.info("Done with copying the latest release to " +
+          newWorkingPath);
+        if (jobid != null) {
+          LOG.info("copied the latest release " + newWorkingPath +
+            " for " + jobid);
+        }
+        return newWorkingPath.toString();
+      } else {
+        LOG.error("Failed to copy the latest release to " + newWorkingPath);
+        if (jobid != null) {
+          LOG.error("Unable to get any release for " + jobid);
+        }
+        return null;
+      }
+    }
+  }
+
+  private void checkOldRelease() {
+    synchronized (releaseList) {
+      // check if there is any old one to remove
+      Iterator<CoronaRelease> crIt = releaseList.iterator();
+      while (crIt.hasNext()) {
+        CoronaRelease cr = crIt.next();
+        if (cr.jobids.size() == 0 && !cr.latest) {
+          crIt.remove();
+          LOG.info("Remove " + cr.copiedPath + " from release list");
+        }
+      }
+    }
+  }
+
+  public String getOriginal() {
+    return releaseDir;
+  }
+
+  private boolean checkPath(Path inPath) {
+    synchronized (releaseList) {
+      Iterator<CoronaRelease> crIt = releaseList.iterator();
+      while (crIt.hasNext()) {
+        CoronaRelease cr = crIt.next();
+        if (cr.copiedPath.toString().equals(inPath.toUri().getPath().toString())) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  /** getLastStamp will go throught all the files and directories in the release
+   *  directory, and find the largest timestamp. This is used to check if there
+   *  is any new release. RELEASE_COPY_PATTERN and CORONA_RELEASE_FILE_CHECK can
+   *  be used to limit the files checked
+   */
+  private long getLastTimeStamp() {
+    long result = -1;
+    if (coronaReleaseFileCheck != null && !coronaReleaseFileCheck.isEmpty()) {
+      result = getLastTimeStamp(new Path(releasePath, coronaReleaseFileCheck));
+      if (result > 0) {
+        return result;
+      }
+    }
+    return getLastTimeStamp(releasePath);
+  }
+
+  /**
+   * Get the release directory's latest timestamp
+   */
+  private long getLastTimeStamp(Path pathToCheck) {
+    long lastTimeStamp = -1;
+    long tmpTimeStamp = -1;
+    try {
+      for (FileStatus fileStat: fs.listStatus(pathToCheck)) {
+        Path srcPath = fileStat.getPath();
+        if (!fileStat.isDir()) {
+          boolean checkFlag = true;
+          if (release_pattern != null) {
+            // just need to check the files that match the pattern
+            Matcher m = release_pattern.matcher(srcPath.toString());
+            if (!m.find()) {
+              checkFlag = false;
+            } 
+          }
+          if (checkFlag) {
+            tmpTimeStamp = fileStat.getModificationTime();
+          } else {
+            continue;
+          }
+        } else {
+          tmpTimeStamp = getLastTimeStamp(srcPath);
+        }
+        if (tmpTimeStamp > lastTimeStamp) {
+          lastTimeStamp = tmpTimeStamp;
+        }
+      }
+    } catch (IOException ioe) {
+      LOG.error("IOException when checking timestamp ", ioe);
+    }
+    return lastTimeStamp;
+  }
+
+  /** For every jar files from the source, create a link in the dest
+   */
+  private boolean copyRelease(Path src, Path dest, boolean isTop) {
+    try {
+
+      if (!fs.exists(dest)) {
+        if (!fs.mkdirs(dest)) {
+          LOG.error("Unable to make dir " + dest.toString());
+          return false;
+        }
+      } else {
+        if (isTop) {
+          Path donePath = new Path(dest, RELEASE_TAG_FILE);
+          if (fs.exists(donePath)) {
+            LOG.info(donePath + " exists. There is no need to copy again");
+            return true;
+          }
+        }
+      }
+      for (FileStatus fileStat: fs.listStatus(src)) {
+        Path srcPath = fileStat.getPath();
+        if (!fileStat.isDir()) {
+          boolean copyFlag = true;
+          if (release_pattern != null) {
+            Matcher m = release_pattern.matcher(srcPath.toString());
+            if (!m.find()) {
+              copyFlag = false;
+            }
+          }
+          if (copyFlag) {
+            Path destPath = new Path(dest, srcPath.getName());
+            fs.copyFromLocalFile(srcPath, destPath);
+          }
+        } else {
+          Path destPath = new Path(dest, srcPath.getName());
+          if (!copyRelease(srcPath, destPath, false)) {
+            LOG.error("Unable to create link for " + srcPath.toString() +
+              " as " + destPath.toString());
+            return false;
+          }
+        }
+      }
+      if (isTop) {
+        // create the tag file
+        Path donePath = new Path(dest, RELEASE_TAG_FILE);
+        FSDataOutputStream fos = fs.create(donePath);
+        fos.close();
+      }
+    } catch (IOException ioe) {
+      LOG.error("IOException when link dir ", ioe);
+      return false;
+    }
+    return true;
+  }
+
+  private boolean removeRelease(Path pathToRemove) {
+    try {
+      fs.delete(pathToRemove, true);
+    } catch (IOException ioe) {
+      LOG.error("IOException when remove release " +
+        pathToRemove.toString(), ioe);
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaTaskLauncher.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaTaskLauncher.java
index ca8b0dc4..edd61a32 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaTaskLauncher.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaTaskLauncher.java
@@ -24,6 +24,9 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.HashMap;
+import java.util.Random;
+import java.util.Collections;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,8 +38,8 @@
  * There are several threads used for sending the actions so that a single
  * dead task tracker does not block all actions. To preserve the order of
  * operations on a single task (like sending KillTaskAction after
- * LaunchTaskAction), the actions are queued to the same thread by doing
- * taskid % numThreads. We do not need to preserve the order of task-level
+ * LaunchTaskAction), the actions are queued to the same queue.
+ * We do not need to preserve the order of task-level
  * actions and the KillJobAction, since once we send KillJobAction, the job
  * tracker will shutdown anyway. So any actions sent after that will fail.
  */
@@ -48,6 +51,8 @@ public class CoronaTaskLauncher {
   private final ActionSender[] workers;
   /** The pool of worker threads that send actions to task trackers. */
   private final Thread[] workerThreads;
+  /** The pool of list of ActionToSend based on task tracker. */
+  private final WorkQueues allWorkQueues;
 
   /** The Corona Job Tracker. */
   private final CoronaJobTracker coronaJT;
@@ -69,6 +74,7 @@ public class CoronaTaskLauncher {
         "mapred.corona.jobtracker.numtasklauncherthreads", 4);
     workers = new ActionSender[numLauncherThreads];
     workerThreads = new Thread[numLauncherThreads];
+    allWorkQueues = new WorkQueues();
     for (int i = 0; i < numLauncherThreads; i++) {
       workers[i] = new ActionSender(i);
       workerThreads[i] = new Thread(workers[i]);
@@ -85,16 +91,15 @@ public class CoronaTaskLauncher {
    */
   @SuppressWarnings("deprecation")
   public void killJob(JobID jobId, Map<String, InetAddress> allTrackers) {
-    int workerId = 0;
     for (Map.Entry<String, InetAddress> entry : allTrackers.entrySet()) {
       String trackerName = entry.getKey();
       InetAddress addr = entry.getValue();
-      LOG.info("Sending kill job to " + trackerName + "(" + addr.host + ":" +
-          addr.port + ")");
+      String description = "KillJobAction " + jobId;
       ActionToSend action = new ActionToSend(trackerName, addr,
-          new KillJobAction(jobId));
-      workers[workerId].enqueueAction(action);
-      workerId = (workerId + 1) % workers.length;
+          new KillJobAction(jobId), description);
+      allWorkQueues.enqueueAction(action);
+      LOG.info("Queueing "  + description + " to worker " +
+        trackerName + "(" + addr.host + ":" + addr.port + ")");
     }
   }
 
@@ -107,9 +112,11 @@ public void killJob(JobID jobId, Map<String, InetAddress> allTrackers) {
   public void killTasks(
       String trackerName, InetAddress addr, List<KillTaskAction> killActions) {
     for (KillTaskAction killAction : killActions) {
-      int workerId = workerIdForTask(killAction.getTaskID());
-      workers[workerId].enqueueAction(
-          new ActionToSend(trackerName, addr, killAction));
+      String description = "KillTaskAction " + killAction.getTaskID();
+      LOG.info("Queueing " + description + " to worker " +
+        trackerName + "(" + addr.host + ":" + addr.port + ")");
+      allWorkQueues.enqueueAction(
+          new ActionToSend(trackerName, addr, killAction, description));
     }
   }
 
@@ -121,9 +128,11 @@ public void killTasks(
    */
   public void commitTask(
       String trackerName, InetAddress addr, CommitTaskAction action) {
-    int workerId = workerIdForTask(action.getTaskID());
-    workers[workerId].enqueueAction(new ActionToSend(
-        trackerName, addr, action));
+    String description = "KillTaskAction " + action.getTaskID();
+    LOG.info("Queueing " + description + " to worker " +
+      trackerName + "(" + addr.host + ":" + addr.port + ")");
+    allWorkQueues.enqueueAction(new ActionToSend(
+        trackerName, addr, action, description));
   }
 
   /**
@@ -133,8 +142,7 @@ public void commitTask(
    */
   @SuppressWarnings("deprecation")
   public boolean removeLaunchingTask(TaskAttemptID attempt) {
-    ActionSender designatedWorker = workers[workerIdForTask(attempt)];
-    return designatedWorker.removeLaunchingTask(attempt);
+    return allWorkQueues.removeLaunchingTask(attempt);
   }
 
   /**
@@ -144,15 +152,15 @@ public boolean removeLaunchingTask(TaskAttemptID attempt) {
    * @param addr The address of the tracker to send the task to.
    */
   public void launchTask(Task task, String trackerName, InetAddress addr) {
-    LOG.info("Queueing a launch task action for " + trackerName + "(" +
-        addr.host + ":" + addr.port + ")");
     CoronaSessionInfo info = new CoronaSessionInfo(
       coronaJT.getSessionId(), coronaJT.getJobTrackerAddress());
     LaunchTaskAction action = new LaunchTaskAction(task, info);
+    String description = "LaunchTaskAction " + action.getTask().getTaskID();
     ActionToSend actionToSend =
-        new ActionToSend(trackerName, addr, action);
-    int workerId = workerIdForTask(task.getTaskID());
-    workers[workerId].enqueueAction(actionToSend);
+        new ActionToSend(trackerName, addr, action, description);
+    LOG.info("Queueing " + description +  " to worker " +
+      trackerName + "(" + addr.host + ":" + addr.port + ")");
+    allWorkQueues.enqueueAction(actionToSend);
   }
 
   /**
@@ -167,8 +175,12 @@ private class ActionToSend {
     private final int port;
     /** The action to send. */
     private final TaskTrackerAction ttAction;
+    /** Description for logging. */
+    private final String description;
     /** Action creation time */
     private final long ctime = System.currentTimeMillis();
+    /** key is used in the WorkQueues */
+    private String key;
 
     /** Constructor
      * @param trackerName The name of the tracker.
@@ -176,11 +188,113 @@ private class ActionToSend {
      * @param action The action to send.
      */
     private ActionToSend(String trackerName, InetAddress addr,
-        TaskTrackerAction action) {
+        TaskTrackerAction action, String description) {
       this.trackerName = trackerName;
       this.trackerHost = addr.host;
       this.port = addr.port;
       this.ttAction = action;
+      this.description = description;
+      this.key = this.trackerHost + ":" + this.port;
+    }
+
+  }
+  
+  private class TrackerQueue {
+    boolean beingProcessed = false;
+    List<ActionToSend> actionQueue = new ArrayList<ActionToSend>();;
+  }
+  private class WorkQueues {
+    private final Map<String, TrackerQueue> trackerQueueMap = 
+      new HashMap<String, TrackerQueue>();
+    private Random randomGenerator = new Random();
+  
+    /**
+     * Remove a task pending launch.
+     * @param attempt The task attempt ID.
+     * @return A boolean indicating if a pending launch was removed.
+     */
+    @SuppressWarnings("deprecation")
+    boolean removeLaunchingTask(TaskAttemptID attempt) {
+      synchronized (trackerQueueMap) {
+        Iterator<TrackerQueue> queueIter = trackerQueueMap.values().iterator();
+        while (queueIter.hasNext()) {
+          Iterator<ActionToSend>  actIter= queueIter.next().actionQueue.iterator();
+          while ( actIter.hasNext()) {
+            ActionToSend action = (ActionToSend)actIter.next();
+            if (action.ttAction instanceof LaunchTaskAction &&
+              ((LaunchTaskAction) action.ttAction).getTask().
+                getTaskID().equals(attempt)) {
+              actIter.remove();
+              return true;
+            }
+          }
+        }
+      }
+      return false;
+    }
+
+    /**
+     * Enqueue an action to this tracker.
+     * @param a The action.
+     */
+    void enqueueAction(ActionToSend a) {
+      synchronized (trackerQueueMap) {
+        TrackerQueue existingQueue = trackerQueueMap.get(a.key);
+        if (existingQueue != null) {
+          existingQueue.actionQueue.add(a);
+        }
+        else {
+          // no existing work queue for the appInfo
+          TrackerQueue newQueue = new TrackerQueue();
+          newQueue.actionQueue.add(a);
+          trackerQueueMap.put(a.key, newQueue);
+        }
+        trackerQueueMap.notify();
+      }
+    }
+    
+    /**
+     *  get a list of AendAction to work on
+     *  @param id The threadId id
+     *  @param actions  The action list
+     */
+    void getQueue(int id, List<ActionToSend> actions) throws InterruptedException {
+      synchronized(trackerQueueMap){
+        if (trackerQueueMap.size() == 0) {
+          trackerQueueMap.wait();
+        }
+        Object[] tmpLists = trackerQueueMap.values().toArray();
+        
+        // find the starting index for the thread to check.
+        // To make sure each tackTracker gets processed, each thread starts 
+        // from the entry which maps to its threadid
+        int tmpIndex = randomGenerator.nextInt(tmpLists.length);
+        
+        int checkedQueues = 0;
+        while (checkedQueues < tmpLists.length){
+          TrackerQueue tmpQueue = (TrackerQueue)tmpLists[tmpIndex];
+          if (tmpQueue.actionQueue.size() > 0 && tmpQueue.beingProcessed == false) {
+            actions.addAll(tmpQueue.actionQueue);
+            tmpQueue.actionQueue.clear();
+            tmpQueue.beingProcessed = true;
+            return;
+          }
+          tmpIndex = (tmpIndex +1) % tmpLists.length;
+          checkedQueues ++;
+        }
+        trackerQueueMap.wait();
+      }
+      return;
+    }
+
+    void resetQueueFlag(String key) {
+      synchronized (trackerQueueMap) {
+        TrackerQueue existingQueue = trackerQueueMap.get(key);
+        if (existingQueue != null) {
+          existingQueue.beingProcessed = false;
+        }
+        trackerQueueMap.notify();
+      }
     }
   }
 
@@ -189,10 +303,9 @@ private ActionToSend(String trackerName, InetAddress addr,
    * to a single worker.
    */
   private class ActionSender implements Runnable {
-    /** The queue of actions. */
-    private final List<ActionToSend> workQueue = new LinkedList<ActionToSend>();
     /** The worker identifier. */
     private final int id;
+    private String lastKey = null;
     /** Constructor.
      * @param id The identifier of the worker.
      */
@@ -203,6 +316,7 @@ public ActionSender(int id) {
     public void run() {
       LOG.info("Starting TaskLauncher thread#" + id);
       while (true) {
+        lastKey = null;
         try {
           launchTasks();
         } catch (InterruptedException e) {
@@ -210,125 +324,98 @@ public void run() {
           if (LOG.isDebugEnabled()) {
             LOG.debug("Got InterruptedException while launching a task", e);
           }
+        } finally {
+          if (lastKey != null) {
+            allWorkQueues.resetQueueFlag(lastKey);
+          }
         }
       }
     }
 
     /**
-     * Sends a bunch of tasks at a time. This is called repeatedly.
+     * Sends a bunch of tasks at a time.
      *
      * @throws InterruptedException
      */
     private void launchTasks() throws InterruptedException {
       List<ActionToSend> actions = new ArrayList<ActionToSend>();
-      synchronized (workQueue) {
-        while (workQueue.isEmpty()) {
-          workQueue.wait();
-        }
-        actions.addAll(workQueue);
-        workQueue.clear();
+      allWorkQueues.getQueue(id, actions);
+      if (actions.size() == 0) {
+        return;
       }
 
-      for (ActionToSend actionToSend : actions) {
-        // Get the tracker address.
-        InetSocketAddress trackerRpcAddress =
-            new InetSocketAddress(actionToSend.trackerHost, actionToSend.port);
+      long actionSendStart = System.currentTimeMillis();
+      String trackerName = actions.get(0).trackerName;
+      String host = actions.get(0).trackerHost;
+      int port = actions.get(0).port;
+      lastKey = actions.get(0).key;
 
-        String trackerName = actionToSend.trackerName;
-        if (coronaJT.getTrackerStats().isFaulty(trackerName)) {
-          if (actionToSend.ttAction instanceof LaunchTaskAction) {
-            LaunchTaskAction lta = (LaunchTaskAction) actionToSend.ttAction;
-            LOG.info("Not sending LaunchTaskAction(" +
-              lta.getTask().getTaskID() + ") to " +
-              trackerRpcAddress + " since previous communication " +
-              " failed");
-          } else {
-            LOG.info("Not sending " + actionToSend.ttAction.getClass() + " to " +
-                trackerRpcAddress + " since previous communication " +
-                " failed");
-          }
+      if (coronaJT.getTrackerStats().isFaulty(trackerName)) {
+        for (ActionToSend actionToSend: actions) {
+          LOG.warn("Not sending " + actionToSend.description +  " to " +
+            actionToSend.trackerHost + ":" + actionToSend.port +
+              " since previous communication failed");
           coronaJT.processTaskLaunchError(actionToSend.ttAction);
-          continue;
         }
+        return;
+      }
 
-        // Fill in the job tracker information.
-        CoronaSessionInfo info = new CoronaSessionInfo(
-            coronaJT.getSessionId(), coronaJT.getJobTrackerAddress());
+      // Fill in the job tracker information.
+      CoronaSessionInfo info = new CoronaSessionInfo(
+        coronaJT.getSessionId(), coronaJT.getJobTrackerAddress());
+      for (ActionToSend actionToSend: actions) {
         actionToSend.ttAction.setExtensible(info);
+      }
 
-        try {
-          // Start the timer on the task just before making the connection
-          // and RPC. If there are any errors after this point, we will reuse
-          // the error handling for expired launch tasks.
+      // Get the tracker address.
+      String trackerRpcAddress = host + ":" + port;
+      long setupTime = System.currentTimeMillis();
+      long expireTaskTime = 0, getClientTime = 0, submitActionTime = 0;
+      try {
+        // Start the timer on the task just before making the connection
+        // and RPC. If there are any errors after this point, we will reuse
+        // the error handling for expired launch tasks.
+        for (ActionToSend actionToSend: actions) {
           if (actionToSend.ttAction instanceof LaunchTaskAction) {
             LaunchTaskAction lta = (LaunchTaskAction) actionToSend.ttAction;
             expireTasks.addNewTask(lta.getTask().getTaskID());
           }
-          CoronaTaskTrackerProtocol client =
-              coronaJT.getTaskTrackerClient(trackerRpcAddress);
-          client.submitActions(new TaskTrackerAction[]{actionToSend.ttAction});
-        } catch (IOException e) {
-          if (actionToSend.ttAction instanceof LaunchTaskAction) {
-            LaunchTaskAction lta = (LaunchTaskAction) actionToSend.ttAction;
-            LOG.error("Could not send LaunchTaskAction(" +
-              lta.getTask().getTaskID() + ") to " +
-              trackerRpcAddress, e);
-          } else {
-            LOG.error("Could not send " + actionToSend.ttAction.getClass() +
-                " action to " + trackerRpcAddress, e);
-          }
-          coronaJT.resetTaskTrackerClient(trackerRpcAddress);
+        }
+        TaskTrackerAction[] actArr = new TaskTrackerAction[actions.size()];
+        int index = 0;
+        for (ActionToSend actionToSend: actions) {
+          assert(actionToSend.trackerHost.equals(host) && actionToSend.port == port);
+          actArr[index] = actionToSend.ttAction;
+          index++;
+        }
+        expireTaskTime = System.currentTimeMillis();
+        CoronaTaskTrackerProtocol client = coronaJT.getTaskTrackerClient(host, port);
+        getClientTime = System.currentTimeMillis();
+        client.submitActions(actArr);
+        submitActionTime = System.currentTimeMillis();
+      } catch (IOException e) {
+        for (ActionToSend actionToSend: actions) {
+          LOG.error("Could not send " + actionToSend.description +
+              " to " + trackerRpcAddress, e);
+          coronaJT.resetTaskTrackerClient(
+            actionToSend.trackerHost, actionToSend.port);
           coronaJT.getTrackerStats().recordConnectionError(trackerName);
           coronaJT.processTaskLaunchError(actionToSend.ttAction);
         }
+      }
+      for (ActionToSend actionToSend: actions) {
         // Time To Send
         long TTS = System.currentTimeMillis() - actionToSend.ctime;
-        LOG.info("Processed action " + actionToSend.ttAction.getClass() + " for " +
-            actionToSend.trackerName + " " + TTS + " msec after its creation.");
-      }
-    }
-
-    /**
-     * Remove a task pending launch.
-     * @param attempt The task attempt ID.
-     * @return A boolean indicating if a pending launch was removed.
-     */
-    @SuppressWarnings("deprecation")
-    boolean removeLaunchingTask(TaskAttemptID attempt) {
-      synchronized (workQueue) {
-        Iterator<ActionToSend> actionIter = workQueue.iterator();
-        while (actionIter.hasNext()) {
-          ActionToSend action = actionIter.next();
-          if (action.ttAction instanceof LaunchTaskAction &&
-              ((LaunchTaskAction) action.ttAction).getTask().
-                getTaskID().equals(attempt)) {
-            actionIter.remove();
-            return true;
-          }
+        if (TTS > 500) {
+          LOG.info("Thread " + id + " processed " + actionToSend.description + " for " +
+            actionToSend.trackerName + " " + actionToSend.port + " " +
+            TTS + " msec after its creation. Times spent:" +
+            " setupTime = " + (setupTime - actionSendStart) +
+            " expireTaskTime = " + (expireTaskTime - actionSendStart) +
+            " getClientTime = " + (getClientTime - actionSendStart) +
+            " submitActionTime = " + (submitActionTime - actionSendStart));
         }
       }
-      return false;
-    }
-
-    /**
-     * Enqueue an action to this worker.
-     * @param a The action.
-     */
-    public void enqueueAction(ActionToSend a) {
-      synchronized (workQueue) {
-        workQueue.add(a);
-        workQueue.notify();
-      }
     }
   } // Worker
-
-  /**
-   * Get the worker ID for a task.
-   * @param taskId The task.
-   * @return The ID.
-   */
-  @SuppressWarnings("deprecation")
-  private int workerIdForTask(TaskAttemptID taskId) {
-    return taskId.getTaskID().getId() % workers.length;
-  }
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaTaskTracker.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaTaskTracker.java
index 797274e8..9cb641f0 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaTaskTracker.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/CoronaTaskTracker.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.util.Collection;
@@ -13,6 +14,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.corona.ClusterManagerAvailabilityChecker;
 import org.apache.hadoop.corona.ClusterManagerService;
 import org.apache.hadoop.corona.ClusterNode;
 import org.apache.hadoop.corona.ClusterNodeInfo;
@@ -23,12 +25,13 @@
 import org.apache.hadoop.corona.InetAddress;
 import org.apache.hadoop.corona.InvalidSessionHandle;
 import org.apache.hadoop.corona.ResourceType;
+import org.apache.hadoop.corona.SafeModeException;
+import org.apache.hadoop.corona.NodeHeartbeatResponse;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.ipc.ProtocolSignature;
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.RPC.Server;
 import org.apache.hadoop.mapreduce.TaskType;
-import org.apache.hadoop.net.DNS;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 import org.apache.hadoop.util.ReflectionUtils;
@@ -66,19 +69,21 @@ public class CoronaTaskTracker extends TaskTracker
   InetSocketAddress actionServerAddr = null;
   ConcurrentHashMap<String, String> blacklistedSessions =
       new ConcurrentHashMap<String, String>();
-  private final long clusterHeartbeatInterval;
-  private long lastHeartbeat = 0;
+  private final long heartbeatCMInterval;
+  private volatile long lastCMHeartbeat = 0;
   Server actionServer;
   ConcurrentHashMap<JobID, JobTrackerReporter> jobTrackerReporters;
   long jtConnectTimeoutMsec = 0;
   private int clusterManagerConnectRetries;
+  private CoronaReleaseManager crReleaseManager;
 
   /**
    * Purge old Corona Job Tracker logs.
    */
   private final Thread cjtLogCleanupThread =
     new Thread(
-      new LogCleanupThread(new File(CoronaTaskTracker.jobTrackerLogDir())),
+      new LogCleanupThread(
+        TaskLog.getLogDir(CoronaTaskTracker.jobTrackerLogDir())),
       "CJTLogCleanup");
 
   public CoronaTaskTracker(JobConf conf) throws IOException {
@@ -96,8 +101,11 @@ public CoronaTaskTracker(JobConf conf) throws IOException {
     initializeTaskActionServer();
     initializeClusterManagerCallbackServer();
     initializeCleanupThreads();
-    clusterHeartbeatInterval = conf.getLong(HEART_BEAT_INTERVAL_KEY, 3000L);
+    heartbeatCMInterval = conf.getLong(HEART_BEAT_INTERVAL_KEY, 3000L);
     jtConnectTimeoutMsec = conf.getLong(JT_CONNECT_TIMEOUT_MSEC_KEY, 60000L);
+    crReleaseManager = new CoronaReleaseManager(conf);
+    crReleaseManager.start();
+
   }
 
   private synchronized void initializeTaskActionServer() throws IOException {
@@ -222,17 +230,26 @@ public void run() {
    * Main service loop.  Will stay in this loop forever.
    */
   private void heartbeatToClusterManager() throws IOException {
-    int numCpu = resourceCalculatorPlugin.getNumProcessors();
+    CoronaConf coronaConf = new CoronaConf(fConf);
+    int numCpu = coronaConf.getInt("mapred.coronatasktracker.num.cpus",
+      resourceCalculatorPlugin.getNumProcessors());
     if (numCpu == ResourceCalculatorPlugin.UNAVAILABLE) {
       numCpu = 1;
     }
+    LOG.info("Will report " + numCpu + " CPUs");
+    int totalMemoryMB = (int) (resourceCalculatorPlugin.getPhysicalMemorySize() / 1024D / 1024);
     ComputeSpecs total = new ComputeSpecs((short)numCpu);
     total.setNetworkMBps((short)100);
-    total.setMemoryMB(
-      (int)(resourceCalculatorPlugin.getPhysicalMemorySize() / 1024D / 1024));
+    total.setMemoryMB(totalMemoryMB);
     total.setDiskGB(
        (int)(getDiskSpace(false) / 1024D / 1024 / 1024));
-    String appInfo = getLocalHostname() + ":" + actionServerAddr.getPort();
+    String appInfo = null;
+    if (getLocalHostAddress() != null) {
+      appInfo = getLocalHostAddress() + ":" + actionServerAddr.getPort();
+    }
+    else {
+      appInfo = getLocalHostname() + ":" + actionServerAddr.getPort();
+    }
     Map<ResourceType, String> resourceInfos =
         new EnumMap<ResourceType, String>(ResourceType.class);
     resourceInfos.put(ResourceType.MAP, appInfo);
@@ -242,37 +259,41 @@ private void heartbeatToClusterManager() throws IOException {
     while (running && !shuttingDown) {
       try {
         long now = System.currentTimeMillis();
-
-        long waitTime = lastHeartbeat > 0 ?
-          clusterHeartbeatInterval - (now - lastHeartbeat) : 0;
-        if (waitTime > 0) {
-          Thread.sleep(waitTime);
-        }
+        Thread.sleep(heartbeatCMInterval);
 
         float cpuUsage = resourceCalculatorPlugin.getCpuUsage();
         if (cpuUsage == ResourceCalculatorPlugin.UNAVAILABLE) {
           cpuUsage = 0;
         }
-        ComputeSpecs used = new ComputeSpecs((short)(numCpu * cpuUsage / 100D));
-        used.setNetworkMBps((short)10);
-        used.setMemoryMB(
+        ComputeSpecs free = new ComputeSpecs((short)(numCpu * cpuUsage / 100D));
+        // TODO find free network.
+        free.setNetworkMBps((short)100);
+        int availableMemoryMB =
             (int)(resourceCalculatorPlugin.
-                  getAvailablePhysicalMemorySize() / 1024D / 1024));
-        used.setDiskGB(
-            (int)(getDiskSpace(true) / 1024D / 1024 / 1024));
+                getAvailablePhysicalMemorySize() / 1024D / 1024);
+        free.setMemoryMB(availableMemoryMB);
+        long freeDiskSpace = getDiskSpace(true);
+        long freeLogDiskSpace = getLogDiskFreeSpace();
+        free.setDiskGB((int)(
+          Math.min(freeDiskSpace, freeLogDiskSpace) / 1024D / 1024 / 1024));
         // TT puts it's MR specific host:port tuple here
         ClusterNodeInfo node = new ClusterNodeInfo
           (this.getName(), clusterManagerCallbackServerAddr, total);
-        node.setUsed(used);
+        node.setFree(free);
         node.setResourceInfos(resourceInfos);
 
         LOG.debug("ClusterManager heartbeat: " + node.toString());
         if (client == null) {
           initializeClusterManagerClient();
         }
-        client.nodeHeartbeat(node);
+        NodeHeartbeatResponse nodeHeartbeatResponse =
+          client.nodeHeartbeat(node);
+        if (nodeHeartbeatResponse.restartFlag) {
+          LOG.fatal("Get CM notice to exit");
+          System.exit(0);
+        }
         clusterManagerConnectRetries = 0;
-        lastHeartbeat = System.currentTimeMillis();
+        lastCMHeartbeat = System.currentTimeMillis();
 
         markUnresponsiveTasks();
         killOverflowingTasks();
@@ -306,6 +327,17 @@ private void heartbeatToClusterManager() throws IOException {
             Thread.sleep(10000L);
           } catch (InterruptedException ie) {
           }
+          ClusterManagerAvailabilityChecker.
+            waitWhileClusterManagerInSafeMode(coronaConf);
+        }
+      } catch (SafeModeException e) {
+        LOG.info("Cluster Manager is in Safe Mode");
+        try {
+          ClusterManagerAvailabilityChecker.
+            waitWhileClusterManagerInSafeMode(coronaConf);
+        } catch (IOException ie) {
+          LOG.error("Could not wait while Cluster Manager is in Safe Mode ",
+                    ie);
         }
       }
     }
@@ -321,16 +353,21 @@ class JobTrackerReporter extends Thread {
     final RunningJob rJob;
     InterTrackerProtocol jobClient = null;
     boolean justInited = true;
-    long lastHeartbeat = -1;
+    long lastJTHeartbeat = -1;
     long previousCounterUpdate = -1;
-    long heartbeatInterval = 3000L;
+    long heartbeatJTInterval = 3000L;
     short heartbeatResponseId = -1;
     TaskTrackerStatus status = null;
+    final String name;
+    int errorCount = 0;
+    // Can make configurable later, 10 is the count used for connection errors.
+    final int maxErrorCount = 10;
     JobTrackerReporter(RunningJob rJob, InetSocketAddress jobTrackerAddr,
         String sessionHandle) {
       this.rJob = rJob;
       this.jobTrackerAddr = jobTrackerAddr;
       this.sessionHandle = sessionHandle;
+      this.name = "JobTrackerReporter(" + rJob.getJobID() + ")";
     }
     volatile boolean shuttingDown = false;
     @Override
@@ -344,38 +381,34 @@ public void run() {
             !CoronaTaskTracker.this.shuttingDown &&
             !this.shuttingDown) {
           long now = System.currentTimeMillis();
-          long waitTime = lastHeartbeat > 0 ?
-            heartbeatInterval - (now - lastHeartbeat) : 0;
-          if (waitTime > 0) {
-            // sleeps for the wait time or
-            // until there are empty slots to schedule tasks
-            synchronized (finishedCount) {
-              if (finishedCount.get() == 0) {
-                finishedCount.wait(waitTime);
-              }
-              finishedCount.set(0);
+          synchronized (finishedCount) {
+            if (finishedCount.get() == 0) {
+              finishedCount.wait(heartbeatJTInterval);
             }
+            finishedCount.set(0);
           }
           // If the reporter is just starting up, verify the buildVersion
           if(justInited) {
             String jobTrackerBV = jobClient.getBuildVersion();
             if(doCheckBuildVersion() &&
                 !VersionInfo.getBuildVersion().equals(jobTrackerBV)) {
-              String msg = "Shutting down. Incompatible buildVersion." +
+              String msg = name + " shutting down. Incompatible buildVersion." +
               "\nJobTracker's: " + jobTrackerBV +
               "\nTaskTracker's: "+ VersionInfo.getBuildVersion();
               LOG.error(msg);
               try {
                 jobClient.reportTaskTrackerError(taskTrackerName, null, msg);
               } catch(Exception e ) {
-                LOG.info("Problem reporting to jobtracker: " + e);
+                LOG.warn(name + " problem reporting to jobtracker: " + e);
               }
               shuttingDown = true;
               return;
             }
+            justInited = false;
           }
 
           Collection<TaskInProgress> tipsInSession = new LinkedList<TaskInProgress>();
+          boolean doHeartbeat = false;
           synchronized (CoronaTaskTracker.this) {
             for (TaskTracker.TaskInProgress tip : runningTasks.values()) {
               CoronaSessionInfo info = (CoronaSessionInfo)(tip.getExtensible());
@@ -384,7 +417,8 @@ public void run() {
               }
             }
             if (!tipsInSession.isEmpty() ||
-                now - lastHeartbeat > SLOW_HEARTBEAT_INTERVAL) {
+                now - lastJTHeartbeat > SLOW_HEARTBEAT_INTERVAL) {
+              doHeartbeat = true;
               // We need slow heartbeat to check if the JT is still alive
               boolean sendCounters = false;
               if (now > (previousCounterUpdate + COUNTER_UPDATE_INTERVAL)) {
@@ -392,56 +426,73 @@ public void run() {
                 previousCounterUpdate = now;
               }
               status = updateTaskTrackerStatus(
-                  sendCounters, status, tipsInSession, jobTrackerAddr);
+                  sendCounters, null, tipsInSession, jobTrackerAddr);
             }
           }
-          if (!tipsInSession.isEmpty()) {
+          if (doHeartbeat) {
             // Send heartbeat only when there is at least one running tip in
-            // this session
+            // this session, or we have reached the slow heartbeat interval.
 
-            LOG.info("JobTracker heartbeat:" + jobTrackerAddr.toString() +
-                " hearbeatId:" + heartbeatResponseId + " " + status.toString());
+            LOG.info(name + " heartbeat:" + jobTrackerAddr.toString() +
+              " hearbeatId:" + heartbeatResponseId + " " + status.toString());
 
-            HeartbeatResponse heartbeatResponse = transmitHeartBeat(
-                jobClient, heartbeatResponseId, status);
-
-            // The heartbeat got through successfully!
-            // Force a rebuild of 'status' on the next iteration
-            status = null;
-            heartbeatResponseId = heartbeatResponse.getResponseId();
-            heartbeatInterval = heartbeatResponse.getHeartbeatInterval();
+            try {
+              HeartbeatResponse heartbeatResponse = transmitHeartBeat(
+                  jobClient, heartbeatResponseId, status);
+
+              // The heartbeat got through successfully!
+              // Reset error count after a successful heartbeat.
+              errorCount = 0;
+              heartbeatResponseId = heartbeatResponse.getResponseId();
+              heartbeatJTInterval = heartbeatResponse.getHeartbeatInterval();
+              // Note the time when the heartbeat returned, use this to decide when to send the
+              // next heartbeat
+              lastJTHeartbeat = System.currentTimeMillis();
+
+              // resetting heartbeat interval from the response.
+              justStarted = false;
+            } catch (ConnectException e) {
+              // JobTracker is dead. Purge the job.
+              // Or it will timeout this task.
+              // Treat the task as killed
+              LOG.error(name + " connect error in reporting to " + jobTrackerAddr, e);
+              throw e;
+            } catch (IOException e) {
+              errorCount++;
+              if (errorCount == maxErrorCount) {
+                LOG.error(name + " too many errors " + maxErrorCount +
+                  " in reporting to " + jobTrackerAddr, e);
+                throw e;
+              } else {
+                long backoff = errorCount * heartbeatJTInterval;
+                LOG.warn(
+                  name + " error " + errorCount + " in reporting to " + jobTrackerAddr +
+                  " will wait " + backoff + " msec", e);
+                try {
+                  Thread.sleep(backoff);
+                } catch (InterruptedException ie) {
+                }
+              }
+            }
           }
-
-          // Note the time when the heartbeat returned, use this to decide when to send the
-          // next heartbeat
-          lastHeartbeat = System.currentTimeMillis();
-
-          // resetting heartbeat interval from the response.
-          justStarted = false;
-          justInited = false;
-
         }
       } catch (DiskErrorException de) {
-        String msg = "Exiting task tracker for disk error:\n" +
+        String msg = name + " exiting for disk error:\n" +
           StringUtils.stringifyException(de);
         LOG.error(msg);
         try {
           jobClient.reportTaskTrackerError(taskTrackerName,
               "DiskErrorException", msg);
         } catch (IOException exp) {
-          LOG.error("Cannot report TaskTracker failure");
+          LOG.error(name + " cannot report TaskTracker failure");
         }
       } catch (IOException e) {
-        LOG.error("Error report to JobTracker:" + jobTrackerAddr +
-            " sessionHandle:" + sessionHandle, e);
-        // JobTracker is dead. Purge the job.
-        // Or it will timeout this task.
-        // Treat the task as killed
         purgeSession(this.sessionHandle);
       } catch (InterruptedException e) {
-        LOG.info("JobTrackerReporter interrupted");
+        LOG.info(name + " interrupted");
       }
     }
+
     private void connect() throws IOException {
       try {
         jobClient = RPC.waitForProtocolProxy(
@@ -452,13 +503,12 @@ private void connect() throws IOException {
             jtConnectTimeoutMsec).getProxy();
         rJob.setJobClient(jobClient);
       } catch (IOException e) {
-        LOG.error("Failed to connect to JobTracker:" +
-            jobTrackerAddr + " sessionHandle:" + sessionHandle, e);
+        LOG.error(name + " failed to connect to " + jobTrackerAddr, e);
         throw e;
       }
     }
     public void shutdown() {
-      LOG.info("Shutting down reporter to JobTracker " + this.jobTrackerAddr);
+      LOG.info(name + " shutting down");
       // shutdown RPC connections
       RPC.stopProxy(jobClient);
       shuttingDown = true;
@@ -467,7 +517,7 @@ public void shutdown() {
 
   @Override
   public Boolean isAlive() {
-    long timeSinceHeartbeat = System.currentTimeMillis() - lastHeartbeat;
+    long timeSinceHeartbeat = System.currentTimeMillis() - lastCMHeartbeat;
     CoronaConf cConf = new CoronaConf(fConf);
     long expire = cConf.getNodeExpiryInterval();
     if (timeSinceHeartbeat > expire) {
@@ -540,8 +590,11 @@ public void startCoronaJobTracker(Task jobTask, CoronaSessionInfo info)
         + jobTask.getJobID() + " from " + info.getJobTrackerAddr());
     TaskTracker.TaskInProgress tip = new TaskInProgress(jobTask, fConf, null,
         null);
+    String releasePath = crReleaseManager.getRelease(jobTask.getJobID());
+    String originalPath = crReleaseManager.getOriginal();
     CoronaJobTrackerRunner runner =
-      new CoronaJobTrackerRunner(tip, jobTask, this, new JobConf(), info);
+      new CoronaJobTrackerRunner(tip, jobTask, this, new JobConf(), info,
+        originalPath, releasePath);
     runner.start();
   }
 
@@ -570,6 +623,9 @@ public synchronized void close() throws IOException {
     for (JobTrackerReporter reporter : jobTrackerReporters.values()) {
       reporter.shutdown();
     }
+    if (crReleaseManager != null){
+      crReleaseManager.shutdown();
+    }
   }
 
   @Override
@@ -612,6 +668,7 @@ protected RunningJob createRunningJob(JobID jobId, TaskInProgress tip)
     RunningJob rJob = new RunningJob(jobId, null, info);
     JobTrackerReporter reporter = new JobTrackerReporter(
         rJob, info.getJobTrackerAddr(), info.getSessionHandle());
+    reporter.setName("JobTrackerReporter for " + jobId);
     // Start the heartbeat to the jobtracker
     reporter.start();
     jobTrackerReporters.put(jobId, reporter);
@@ -629,6 +686,7 @@ protected synchronized void purgeJob(KillJobAction action) throws IOException {
       reporter.shutdown();
     }
     super.purgeJob(action);
+    crReleaseManager.returnRelease(jobId);
   }
 
   @Override
@@ -660,15 +718,22 @@ public static void main(String argv[]) throws Exception {
     // enable the server to track time spent waiting on locks
     ReflectionUtils.setContentionTracing
       (conf.getBoolean("tasktracker.contention.tracking", false));
+    try {
     new CoronaTaskTracker(conf).run();
+    } catch (Throwable t) {
+      LOG.fatal("Error running CoronaTaskTracker", t);
+      System.exit(-2);
+    }
   }
 
   @Override
   public void purgeSession(String handle) {
-    for (TaskTracker.RunningJob job : this.runningJobs.values()) {
-      CoronaSessionInfo info = (CoronaSessionInfo)(job.getExtensible());
-      if (info.getSessionHandle().equals(handle)) {
-        tasksToCleanup.add(new KillJobAction(job.getJobID()));
+    synchronized (runningJobs) {
+      for (TaskTracker.RunningJob job : this.runningJobs.values()) {
+        CoronaSessionInfo info = (CoronaSessionInfo)(job.getExtensible());
+        if (info.getSessionHandle().equals(handle)) {
+          tasksToCleanup.add(new KillJobAction(job.getJobID()));
+        }
       }
     }
   }
@@ -711,5 +776,4 @@ public static String jobTrackerLogDir() {
     return new File(
       System.getProperty("hadoop.log.dir"), "jtlogs").getAbsolutePath();
   }
-
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/LocalityStats.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/LocalityStats.java
index 6d8dce1d..e69de29b 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/LocalityStats.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/LocalityStats.java
@@ -1,213 +0,0 @@
-/*
- * 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.
- */
-package org.apache.hadoop.mapred;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.corona.TopologyCache;
-import org.apache.hadoop.net.Node;
-import org.apache.hadoop.mapred.JobInProgress.Counter;
-
-import java.util.ArrayList;
-
-/**
- * Record locality information. Can perform the locality computation in a
- * separate thread.
- */
-public class LocalityStats implements Runnable {
-  /** Logger. */
-  private static final Log LOG = LogFactory.getLog(CoronaJobInProgress.class);
-  /** Topology cache. */
-  private final TopologyCache topologyCache;
-  /** Max locality level. */
-  private final int maxLevel;
-  /** Job Counters. */
-  private final Counters jobCounters;
-  /** Job Statistics. */
-  private final JobStats jobStats;
-  /** List of records to be used for asynchronous operation. */
-  private final ArrayList<Record> localityRecords = new ArrayList<Record>();
-  /** In async mode, used to check if we are running. */
-  private volatile boolean running;
-
-  /**
-   * Constructor.
-   * @param jobConf Job Configuration.
-   * @param maxLevel The maximum locality level.
-   * @param counters The job counters to update.
-   * @param jobStats The job statistics to update.
-   */
-  public LocalityStats(
-    JobConf jobConf, int maxLevel, Counters counters, JobStats jobStats) {
-    topologyCache = new TopologyCache(jobConf);
-    this.maxLevel = maxLevel;
-    this.jobCounters = counters;
-    this.jobStats = jobStats;
-  }
-
-  public String getNode(String host) {
-    return topologyCache.getNode(host).toString();
-  }
-
-  /**
-   * Representation of information for asynchronous update.
-   */
-  private static class Record {
-    /** The task. */
-    private final TaskInProgress tip;
-    /** The task tracker host. */
-    private final String host;
-    /** The number of bytes processed. */
-    private final long inputBytes;
-
-    /**
-     * Constructor
-     * @param tip The task.
-     * @param host The task tracker host.
-     * @param inputBytes The number of bytes processed.
-     */
-    private Record(TaskInProgress tip, String host, long inputBytes) {
-      this.tip = tip;
-      this.host = host;
-      this.inputBytes = inputBytes;
-    }
-  }
-
-  /**
-   * In async mode, stop the thread.
-   */
-  public void stop() {
-    running = false;
-  }
-
-  /**
-   * Asynchronous update of locality.
-   * @param tip The task.
-   * @param host The task tracker host.
-   * @param inputBytes The number of bytes processed.
-   */
-  public void record(
-    TaskInProgress tip, String host, long inputBytes) {
-    synchronized (localityRecords) {
-      localityRecords.add(new Record(tip, host, inputBytes));
-      localityRecords.notify();
-    }
-  }
-
-  @Override
-  public void run() {
-    while (running) {
-      Record record = null;
-      synchronized (localityRecords) {
-        while (localityRecords.isEmpty()) {
-          try {
-            localityRecords.wait();
-          } catch (InterruptedException e) {
-            if (!running) {
-              return;
-            }
-          }
-        }
-        // Remove last element in the array.
-        record = localityRecords.remove(localityRecords.size() - 1);
-      }
-      computeStatistics(record);
-    }
-  }
-
-  /**
-   * Peform the computation statistics based on a locality record.
-   * @param record The locality information.
-   */
-  private void computeStatistics(Record record) {
-    computeStatistics(record.tip, record.host, record.inputBytes);
-  }
-
-  /**
-   * Peform the computation statistics.
-   * @param tip The task.
-   * @param host The task tracker host.
-   * @param inputBytes The number of bytes processed.
-   */
-  private void computeStatistics(
-    TaskInProgress tip, String host, long inputBytes) {
-    int level = this.maxLevel;
-    String[] splitLocations = tip.getSplitLocations();
-    if (splitLocations.length > 0) {
-      Node tracker = topologyCache.getNode(host);
-      // find the right level across split locations
-      for (String local : splitLocations) {
-        Node datanode = topologyCache.getNode(local);
-        int newLevel = this.maxLevel;
-        if (tracker != null && datanode != null) {
-          newLevel = getMatchingLevelForNodes(tracker, datanode, maxLevel);
-        }
-        if (newLevel < level) {
-          level = newLevel;
-          if (level == 0) {
-            break;
-          }
-        }
-      }
-    }
-    boolean updateTaskCountOnly = inputBytes < 0;
-    switch (level) {
-    case 0:
-      if (updateTaskCountOnly) {
-        LOG.info("Chose data-local task " + tip.getTIPId());
-        jobCounters.incrCounter(Counter.DATA_LOCAL_MAPS, 1);
-        jobStats.incNumDataLocalMaps();
-      } else {
-        jobCounters.incrCounter(Counter.LOCAL_MAP_INPUT_BYTES, inputBytes);
-        jobStats.incLocalMapInputBytes(inputBytes);
-      }
-      break;
-    case 1:
-      if (updateTaskCountOnly) {
-        LOG.info("Chose rack-local task " + tip.getTIPId());
-        jobCounters.incrCounter(Counter.RACK_LOCAL_MAPS, 1);
-        jobStats.incNumRackLocalMaps();
-      } else {
-        jobCounters.incrCounter(Counter.RACK_MAP_INPUT_BYTES, inputBytes);
-        jobStats.incRackMapInputBytes(inputBytes);
-      }
-      break;
-    default:
-      // check if there is any locality
-      if (updateTaskCountOnly && level != this.maxLevel) {
-        LOG.info("Chose cached task at level " + level + tip.getTIPId());
-        jobCounters.incrCounter(Counter.OTHER_LOCAL_MAPS, 1);
-      }
-      break;
-    }
-  }
-
-  public static int getMatchingLevelForNodes(Node n1, Node n2, int maxLevel) {
-    int count = 0;
-    do {
-      if (n1.equals(n2)) {
-        return count;
-      }
-      ++count;
-      n1 = n1.getParent();
-      n2 = n2.getParent();
-    } while (n1 != null && n2 != null);
-    return maxLevel;
-  }
-
-}
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/ProxyJobTracker.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/ProxyJobTracker.java
index 36887ee6..f18522e8 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/ProxyJobTracker.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/ProxyJobTracker.java
@@ -25,9 +25,12 @@
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
+import java.net.ServerSocket;
 import java.net.URLEncoder;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -43,7 +46,9 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.corona.CoronaConf;
 import org.apache.hadoop.corona.SessionHistoryManager;
+import org.apache.hadoop.corona.TFactoryBasedThreadPoolServer;
 import org.apache.hadoop.corona.Utilities;
+import org.apache.hadoop.corona.CoronaProxyJobTrackerService;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.http.HttpServer;
@@ -57,6 +62,7 @@
 import org.apache.hadoop.metrics.Updater;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.StringUtils;
+import org.apache.thrift.server.TServer;
 
 /**
  * This is used to proxy HTTP requests to individual Corona Job Tracker web
@@ -64,10 +70,15 @@
  * Also used for aggregating information about jobs such as job counters.
  */
 public class ProxyJobTracker implements
-  JobHistoryObserver, CoronaJobAggregator, Updater {
+  JobHistoryObserver, CoronaJobAggregator, Updater,
+  CoronaProxyJobTrackerService.Iface {
   /** Logger. */
   private static final Log LOG = LogFactory.getLog(ProxyJobTracker.class);
-
+  public static final Pattern UNUSED_JOBFILE_PATTERN = 
+    Pattern.compile("^(.+)\\/job_(\\d+)\\.(\\d+)_(\\d+)$");
+  public static final Pattern UNUSED_JOBHISTORY_PATTERN = 
+    Pattern.compile("^(.+)\\/(\\d+)\\.(\\d+)$");
+ 
   static {
     Utilities.makeProcessExitOnUncaughtException(LOG);
   }
@@ -92,16 +103,51 @@ public class ProxyJobTracker implements
   private Server rpcServer;
   /** Cache expiry. */
   private ExpireUnusedFilesInCache expireUnusedFilesInCache;
+  /** Job dir cleanup. */
+  private ExpireUnusedJobFiles expireUnusedJobFiles;
+  private ExpireUnusedJobFiles expireUnusedJobHistory;
   /** Start time of the server. */
   private long startTime;
   /** Aggregate job counters. */
   private Counters aggregateCounters = new Counters();
+  /** Aggregate error counters. */
+  private Counters aggregateErrors = new Counters();
   /** Aggregate job stats. */
   private JobStats aggregateJobStats = new JobStats();
+  /** Job Counters aggregated by pool */
+  private Map<String, Counters> poolToJobCounters =
+    new HashMap<String, Counters>();
+  /** Job Stats aggregated by pool */
+  private Map<String, JobStats> poolToJobStats =
+    new HashMap<String, JobStats>();
   /** Metrics context. */
   private MetricsContext context;
   /** Metrics record. */
   private MetricsRecord metricsRecord;
+  /** Is the Cluster Manager in Safe Mode? */
+  private volatile boolean clusterManagerSafeMode;
+  /** Metrics Record for pools */
+  private Map<String, MetricsRecord> poolToMetricsRecord =
+    new HashMap<String, MetricsRecord>();
+  /* This is the thrift server thread */
+  private TServerThread server;
+
+  /* The thrift server thread class */
+  public class TServerThread extends Thread {
+    private TServer server;
+
+    public TServerThread(TServer server) {
+      this.server = server;
+    }
+
+    public void run() {
+      try {
+        server.serve();
+      } catch (Exception e) {
+        LOG.info("Got an exception: ", e);
+      }
+    }
+  }
 
   @Override
   public void doUpdates(MetricsContext unused) {
@@ -109,25 +155,42 @@ public void doUpdates(MetricsContext unused) {
       // Update metrics with aggregate job stats and reset the aggregate.
       aggregateJobStats.incrementMetricsAndReset(metricsRecord);
 
-      // Now update metrics with the counters and reset the aggregate.
-      for (Counters.Group group : aggregateCounters) {
-        String groupName = group.getName();
-        for (Counter counter : group) {
-          String name = groupName + "_" + counter.getName();
-          name = name.replaceAll("[^a-zA-Z_]", "_").toLowerCase();
-          metricsRecord.incrMetric(name, counter.getValue());
-        }
-      }
-      // Reset the aggregate counters.
-      for (Counters.Group g : aggregateCounters) {
-        for (Counter c : g) {
-          c.setValue(0);
-        }
+      incrementMetricsAndReset(metricsRecord, aggregateCounters);
+
+      incrementMetricsAndReset(metricsRecord, aggregateErrors);
+
+      for (Map.Entry<String, MetricsRecord> entry :
+        poolToMetricsRecord.entrySet()) {
+        String pool = entry.getKey();
+
+        JobStats poolJobStats = poolToJobStats.get(pool);
+        poolJobStats.incrementMetricsAndReset(entry.getValue());
+
+        Counters poolCounters = poolToJobCounters.get(pool);
+        incrementMetricsAndReset(entry.getValue(), poolCounters);
       }
     }
     metricsRecord.update();
   }
 
+  private static void incrementMetricsAndReset(
+    MetricsRecord record, Counters counters) {
+    // Now update metrics with the counters and reset the aggregate.
+    for (Counters.Group group : counters) {
+      String groupName = group.getName();
+      for (Counter counter : group) {
+        String name = groupName + "_" + counter.getName();
+        name = name.replaceAll("[^a-zA-Z_]", "_").toLowerCase();
+        record.incrMetric(name, counter.getValue());
+      }
+    }
+    for (Counters.Group group : counters) {
+      for (Counter c : group) {
+        c.setValue(0);
+      }
+    }
+  }
+
   /**
    * Servlet to handle requests.
    */
@@ -407,8 +470,45 @@ public ProxyJobTracker(CoronaConf conf) throws IOException {
     expireUnusedFilesInCache = new ExpireUnusedFilesInCache(
       conf, getClock(), new Path(getSystemDir()), fs);
 
+    // 10 days
+    long clearJobFileThreshold = conf.getLong(
+      "mapred.job.file.expirethreshold", 864000000L);
+
+    long clearJobFileInterval = conf.getLong(
+      "mapred.job.file.checkinterval", 86400000L);
+
+    expireUnusedJobFiles = new ExpireUnusedJobFiles(
+      getClock(), fs, new Path(getSystemDir()),
+      UNUSED_JOBFILE_PATTERN, clearJobFileThreshold, clearJobFileInterval);
+
+    long clearJobHistoryThreshold = conf.getLong(
+      "mapred.job.history.expirethreshold", 864000000L);
+
+    long clearJobHistoryInterval = conf.getLong(
+      "mapred.job.history.checkinterval", 86400000L);
+
+    expireUnusedJobHistory = new ExpireUnusedJobFiles(
+      getClock(), fs, new Path(conf.getSessionsLogDir()),
+      UNUSED_JOBHISTORY_PATTERN, clearJobHistoryThreshold, clearJobHistoryInterval);
+
     sessionHistoryManager = new SessionHistoryManager();
     sessionHistoryManager.setConf(conf);
+
+    try {
+      String target = conf.getProxyJobTrackerThriftAddress();
+      InetSocketAddress addr = NetUtils.createSocketAddr(target);
+      LOG.info("Trying to start the Thrift Server at: " + target);
+      ServerSocket serverSocket = new ServerSocket(addr.getPort());
+      server = new TServerThread(
+        TFactoryBasedThreadPoolServer.createNewServer(
+          new CoronaProxyJobTrackerService.Processor(this),
+          serverSocket,
+          5000));
+      server.start();
+      LOG.info("Thrift server started on: " + target);
+    } catch (IOException e) {
+      LOG.info("Exception while starting the Thrift Server on CPJT: ", e);
+    }
   }
 
   @Override
@@ -416,20 +516,66 @@ public void reportJobStats(
     String jobId, String pool, JobStats stats, Counters counters) {
     synchronized (aggregateJobStats) {
       aggregateJobStats.accumulate(stats);
-      for (JobInProgress.Counter key : JobInProgress.Counter.values()) {
-        aggregateCounters.findCounter(key).
-          increment(counters.findCounter(key).getValue());
+      JobStats poolJobStats = poolToJobStats.get(pool);
+      if (poolJobStats == null) {
+        poolJobStats = new JobStats();
+        poolToJobStats.put(pool, poolJobStats);
+      }
+      poolJobStats.accumulate(stats);
+
+      accumulateCounters(aggregateCounters, counters);
+      Counters poolCounters = poolToJobCounters.get(pool);
+      if (poolCounters == null) {
+        poolCounters = new Counters();
+        poolToJobCounters.put(pool, poolCounters);
       }
-      for (Task.Counter key : Task.Counter.values()) {
-        aggregateCounters.findCounter(key).
-          increment(counters.findCounter(key).getValue());
+      accumulateCounters(poolCounters, counters);
+
+      if (!poolToMetricsRecord.containsKey(pool)) {
+        MetricsRecord poolRecord = context.createRecord("pool-" + pool);
+        poolToMetricsRecord.put(pool, poolRecord);
+      }
+    }
+  }
+
+  @Override
+  public void reportJobErrorCounters(Counters counters) {
+    String taskErrorGroupName = TaskErrorCollector.COUNTER_GROUP_NAME;
+    synchronized (aggregateJobStats) {
+      for (Counters.Counter counter : counters.getGroup(taskErrorGroupName)) {
+        aggregateErrors.incrCounter(
+          taskErrorGroupName, counter.getName(), counter.getCounter());
+      }
+    }
+  }
+
+  private static void accumulateCounters(
+    Counters aggregate, Counters increment) {
+    for (JobInProgress.Counter key : JobInProgress.Counter.values()) {
+      Counter counter = increment.findCounter(key);
+      if (counter != null) {
+        aggregate.findCounter(key).increment(counter.getValue());
       }
-      for (Counters.Counter counter :
-        counters.getGroup(Task.FILESYSTEM_COUNTER_GROUP)) {
-        aggregateCounters.incrCounter(
-          Task.FILESYSTEM_COUNTER_GROUP, counter.getName(), counter.getValue());
+    }
+    for (Task.Counter key : Task.Counter.values()) {
+      Counter counter = increment.findCounter(key);
+      if (counter != null) {
+        aggregate.findCounter(key).increment(counter.getValue());
       }
     }
+    for (Counters.Counter counter :
+      increment.getGroup(Task.FILESYSTEM_COUNTER_GROUP)) {
+      aggregate.incrCounter(
+        Task.FILESYSTEM_COUNTER_GROUP, counter.getName(), counter.getValue());
+    }
+  }
+
+  private static void accumulateCounters(
+    Counters.Group aggregate, Counters.Group increment) {
+    for (Counters.Counter counter : increment) {
+      aggregate.getCounterForName(
+        counter.getName()).increment(counter.getValue());
+    }
   }
 
   @Override
@@ -437,6 +583,8 @@ public long getProtocolVersion(String protocol, long clientVersion)
     throws IOException {
     if (protocol.equals(CoronaJobAggregator.class.getName())) {
       return CoronaJobAggregator.versionID;
+    } else if (protocol.equals(ClusterManagerSafeModeProtocol.class.getName())) {
+      return ClusterManagerSafeModeProtocol.versionID;
     } else {
       throw new IOException("Unknown protocol " + protocol);
     }
@@ -451,9 +599,24 @@ public ProtocolSignature getProtocolSignature(
       this, protocol, clientVersion, clientMethodsHash);
   }
 
+  // Used by the CM to tell the CPJT if it's in Safe Mode.
+  @Override
+  public void setClusterManagerSafeModeFlag(boolean safeMode) {
+    clusterManagerSafeMode = safeMode;
+    LOG.info("On ProxyJobTracker, clusterManagerSafeModeFlag: " +
+      clusterManagerSafeMode);
+  }
+
+  // Has the CM gone into Safe Mode and told the CPJT about it?
+  @Override
+  public boolean getClusterManagerSafeModeFlag() {
+    return clusterManagerSafeMode;
+  }
+
   public void join() throws InterruptedException {
     infoServer.join();
     rpcServer.join();
+    server.join();
   }
 
   public static ProxyJobTracker startProxyTracker(CoronaConf conf)
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/RemoteJTProxy.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/RemoteJTProxy.java
index 2fd0b2cf..5e8dc080 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/RemoteJTProxy.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/RemoteJTProxy.java
@@ -224,8 +224,19 @@ public boolean processAvailableResource(ResourceGrant resource) {
           return consumed;
         }
       };
-    resourceTracker.processAvailableGrants(proc, 1);
-    return grants.get(0);
+    while (true) {
+      // Try to get JT grant while periodically checking for session driver
+      // exceptions.
+      long timeout = 60 * 1000; // 1 min.
+      resourceTracker.processAvailableGrants(proc, 1, timeout);
+      IOException e = sessionDriver.getFailed();
+      if (e != null) {
+        throw e;
+      }
+      if (!grants.isEmpty()) {
+        return grants.get(0);
+      }
+    }
   }
 
   /**
@@ -243,8 +254,7 @@ private boolean startRemoteJT(
       Utilities.appInfoToAddress(grant.appInfo);
     CoronaTaskTrackerProtocol coronaTT = null;
     try {
-      coronaTT = jt.getTaskTrackerClient(
-        new InetSocketAddress(ttAddr.getHost(), ttAddr.getPort()));
+      coronaTT = jt.getTaskTrackerClient(ttAddr.getHost(), ttAddr.getPort());
     } catch (IOException e) {
       LOG.error("Error while trying to connect to TT at " + ttAddr.getHost() +
         ":" + ttAddr.getPort(), e);
@@ -491,6 +501,14 @@ public QueueAclsInfo[] getQueueAclsForCurrentUser() throws IOException {
         "getQueueAclsForCurrentUser not supported by proxy.");
   }
 
+  public void close() {
+    synchronized (this) {
+      if (client != null) {
+        RPC.stopProxy(client);
+      }
+    }
+  }
+
   /**
    * Generic caller interface.
    */
@@ -526,7 +544,7 @@ public T makeCall() throws IOException {
    */
   private void handleCallFailure() throws IOException {
     try {
-      jt.close(false);
+      jt.close(false, true);
     } catch (InterruptedException e) {
       throw new IOException(e);
     }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/ResourceTracker.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/ResourceTracker.java
index 95fcc7a7..fbab3701 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/ResourceTracker.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/ResourceTracker.java
@@ -231,9 +231,20 @@ public interface ResourceProcessor {
 
   public void processAvailableGrants(
         ResourceProcessor processor, int maxBatchSize) throws InterruptedException {
+    processAvailableGrants(processor, maxBatchSize, Long.MAX_VALUE);
+  }
+
+  public void processAvailableGrants(
+        ResourceProcessor processor,
+        int maxBatchSize,
+        long timeout) throws InterruptedException {
     synchronized(lockObject) {
       while (availableResources.isEmpty()) {
-        lockObject.wait();
+        lockObject.wait(timeout);
+        if (availableResources.isEmpty()) {
+          LOG.warn("No available resources after timeout of " + timeout);
+          return;
+        }
       }
       List<Integer> resourcesConsumed = new ArrayList<Integer>();
       List<Integer> stillAvailable = new ArrayList<Integer>();
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/mapred/TrackerClientCache.java b/src/contrib/corona/src/java/org/apache/hadoop/mapred/TrackerClientCache.java
index be1a3dad..d8a0432a 100644
--- a/src/contrib/corona/src/java/org/apache/hadoop/mapred/TrackerClientCache.java
+++ b/src/contrib/corona/src/java/org/apache/hadoop/mapred/TrackerClientCache.java
@@ -22,11 +22,18 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.net.Node;
+import org.apache.hadoop.net.TopologyCache;
+import org.apache.hadoop.corona.Utilities;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.InetAddress;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  * Cache of RPC clients to corona task trackers.
@@ -34,58 +41,82 @@
 class TrackerClientCache {
   /** Logger. */
   private static final Log LOG = LogFactory.getLog(TrackerClientCache.class);
-  /** Map of address -> rpc client. */
-  private Map<InetSocketAddress, CoronaTaskTrackerProtocol> trackerClients =
-    new HashMap<InetSocketAddress, CoronaTaskTrackerProtocol>();
+  /** Map of host:port -> rpc client. */
+  private ConcurrentMap<String, CoronaTaskTrackerProtocol> trackerClients =
+      new ConcurrentHashMap<String, CoronaTaskTrackerProtocol>();
   /** Configuration. */
   private Configuration conf;
 
+  /** The topology cache */
+  private final TopologyCache topologyCache;
+
   /**
    * Constructor.
    * @param conf Configuration.
    */
-  TrackerClientCache(Configuration conf) {
+  TrackerClientCache(Configuration conf, TopologyCache topologyCache) {
     this.conf = conf;
+    this.topologyCache = topologyCache;
   }
 
   /**
    * API to get the RPC client.
-   * @param s The address of the task tracker
+   * @param host The host
+   * @param port The port
    * @return The RPC client
    * @throws IOException
    */
-  public synchronized CoronaTaskTrackerProtocol getClient(InetSocketAddress s)
-    throws IOException {
-    CoronaTaskTrackerProtocol client = trackerClients.get(s);
-    if (client == null) {
-      client = createClient(s);
-      trackerClients.put(s, client);
+  public CoronaTaskTrackerProtocol getClient(
+      String host, int port) throws IOException {
+    String key = makeKey(host, port);
+    Node ttNode = topologyCache.getNode(host);
+    CoronaTaskTrackerProtocol client = null;
+    synchronized (ttNode) {
+      client = trackerClients.get(key);
+      if (client == null) {
+        client = createClient(host, port);
+        trackerClients.put(key, client);
+      }
     }
     return client;
   }
 
   /**
    * Remove the RPC client form the cache.
-   * @param s The address of the task tracker.
+   * @param host The host
+   * @param port The port
    */
-  public synchronized void resetClient(InetSocketAddress s) {
-    trackerClients.remove(s);
+  public void resetClient(String host, int port) {
+    trackerClients.remove(makeKey(host, port));
   }
 
   /**
    * Connect to the task tracker and get the RPC client.
-   * @param s The address.
+   * @param host The host.
+   * @param port the port.
    * @return The RPC client.
    * @throws IOException
    */
-  protected CoronaTaskTrackerProtocol createClient(InetSocketAddress s)
+  private CoronaTaskTrackerProtocol createClient(String host, int port)
     throws IOException {
-    String staticHost = null;
-    staticHost = NetUtils.getStaticResolution(s.getHostName());
+    String staticHost = NetUtils.getStaticResolution(host);
+    InetSocketAddress s = null;
+    InetAddress  inetAddress = null;
+    byte[] byteArr = null;
     if (staticHost != null) {
-      s = new InetSocketAddress(staticHost, s.getPort());
+      inetAddress = InetAddress.getByName(staticHost);
+    } else {
+      byteArr = Utilities.asBytes(host);
+      if ( byteArr == null) {
+        inetAddress = InetAddress.getByName(host);
+      }
+      else {
+        inetAddress = InetAddress.getByAddress(byteArr);
+      }
     }
-    LOG.info("Creating client to " + s.getHostName() + ":" + s.getPort());
+    s = new InetSocketAddress(inetAddress, port);
+    LOG.info("Creating client to " + 
+      (staticHost != null ? staticHost : host) + ":" + s.getPort());
     long connectTimeout =
       conf.getLong(CoronaJobTracker.TT_CONNECT_TIMEOUT_MSEC_KEY, 10000L);
     int rpcTimeout =
@@ -98,4 +129,14 @@ protected CoronaTaskTrackerProtocol createClient(InetSocketAddress s)
       connectTimeout,
       rpcTimeout);
   }
+
+  /**
+   * Creates a key from host and port
+   * @param host The host
+   * @param port The port
+   * @return String in the form host:port
+   */
+  private static String makeKey(String host, int port) {
+    return host + ":" + port;
+  }
 }
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/util/CoronaSerializer.java b/src/contrib/corona/src/java/org/apache/hadoop/util/CoronaSerializer.java
new file mode 100644
index 00000000..c510d10f
--- /dev/null
+++ b/src/contrib/corona/src/java/org/apache/hadoop/util/CoronaSerializer.java
@@ -0,0 +1,235 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.util;
+
+import org.apache.hadoop.corona.CoronaConf;
+import org.codehaus.jackson.JsonEncoding;
+import org.codehaus.jackson.JsonFactory;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonToken;
+import org.codehaus.jackson.impl.DefaultPrettyPrinter;
+import org.codehaus.jackson.map.DeserializationConfig;
+import org.codehaus.jackson.map.ObjectMapper;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+public class CoronaSerializer {
+  /**
+   * The JsonParser instance contained within a CoronaSerializer instance.
+   */
+  public JsonParser jsonParser;
+
+  /**
+   * Constructor for the CoronaSerializer class.
+   *
+   * @param conf The CoronaConf instance to be used
+   * @throws IOException
+   */
+  public CoronaSerializer(CoronaConf conf) throws IOException {
+    InputStream inputStream = new FileInputStream(conf.getCMStateFile());
+    if (conf.getCMCompressStateFlag()) {
+      inputStream = new GZIPInputStream(inputStream);
+    }
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES,
+      false);
+    JsonFactory jsonFactory = new JsonFactory();
+    jsonFactory.setCodec(mapper);
+    jsonParser = jsonFactory.createJsonParser(inputStream);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not START_OBJECT.
+   *
+   * @param parentFieldName The name of the field
+   * @throws IOException
+   */
+  public void readStartObjectToken(String parentFieldName)
+    throws IOException {
+    readToken(parentFieldName, JsonToken.START_OBJECT);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not START_ARRAY.
+   *
+   * @param parentFieldName The name of the field
+   * @throws IOException
+   */
+  public void readStartArrayToken(String parentFieldName)
+    throws IOException {
+    readToken(parentFieldName, JsonToken.START_ARRAY);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not END_OBJECT.
+   *
+   * @param parentFieldName The name of the field
+   * @throws IOException
+   */
+  public void readEndObjectToken(String parentFieldName)
+    throws IOException {
+    readToken(parentFieldName, JsonToken.END_OBJECT);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not END_ARRAY.
+   *
+   * @param parentFieldName The name of the field
+   * @throws IOException
+   */
+  public void readEndArrayToken(String parentFieldName)
+    throws IOException {
+    readToken(parentFieldName, JsonToken.END_ARRAY);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not the same as
+   * the token we expect.
+   *
+   * @param parentFieldName The name of the field
+   * @param expectedToken The expected token
+   * @throws IOException
+   */
+  public void readToken(String parentFieldName, JsonToken expectedToken)
+    throws IOException {
+    JsonToken currentToken = jsonParser.nextToken();
+    if (currentToken != expectedToken) {
+      throw new IOException("Expected a " + expectedToken.toString() +
+        " token when reading the value of the field: " +
+        parentFieldName +
+        " but found a " +
+        currentToken.toString() + " token");
+    }
+  }
+
+  /**
+   * This is a helper method which creates a JsonGenerator instance, for writing
+   * the state of the ClusterManager to the state file. The JsonGenerator
+   * instance writes to a compressed file if we have the compression flag
+   * turned on.
+   *
+   * @param conf The CoronaConf instance to be used
+   * @return The JsonGenerator instance to be used
+   * @throws IOException
+   */
+  public static JsonGenerator createJsonGenerator(CoronaConf conf)
+    throws IOException {
+    OutputStream outputStream = new FileOutputStream(conf.getCMStateFile());
+    if (conf.getCMCompressStateFlag()) {
+      outputStream = new GZIPOutputStream(outputStream);
+    }
+    ObjectMapper mapper = new ObjectMapper();
+    JsonGenerator jsonGenerator =
+      new JsonFactory().createJsonGenerator(outputStream, JsonEncoding.UTF8);
+    jsonGenerator.setCodec(mapper);
+    if (!conf.getCMCompressStateFlag()) {
+      jsonGenerator.setPrettyPrinter(new DefaultPrettyPrinter());
+    }
+    return jsonGenerator;
+  }
+
+  /**
+   * This is a helper method, which is used to throw an exception when we
+   * encounter an unexpected field name.
+   *
+   * @param fieldName Name of the field
+   * @param expectedFieldName Name of the expected field
+   * @throws IOException
+   */
+  public void foundUnknownField(String fieldName,
+                                       String expectedFieldName)
+    throws IOException {
+    throw new IOException("Found an unexpected field: " + fieldName +
+      ", instead of field: " + expectedFieldName);
+  }
+
+  /**
+   * The method reads a field from the JSON stream, and checks if the
+   * field read is the same as the expect field.
+   *
+   * @param expectedFieldName The field name which is expected next
+   * @throws IOException
+   */
+  public void readField(String expectedFieldName) throws IOException {
+    readToken(expectedFieldName, JsonToken.FIELD_NAME);
+    String fieldName = jsonParser.getCurrentName();
+    if (!fieldName.equals(expectedFieldName)) {
+      foundUnknownField(fieldName, expectedFieldName);
+    }
+  }
+
+  /**
+   * Moves the JSON parser ahead by one token
+   *
+   * @return The current JSON token
+   * @throws IOException
+   */
+  public JsonToken nextToken() throws IOException {
+    return jsonParser.nextToken();
+  }
+
+  /**
+   * If the current token is a field name, this method returns the name of
+   * the field.
+   *
+   * @return A String object containing the name of the field
+   * @throws IOException
+   */
+  public String getFieldName() throws IOException {
+    if (jsonParser.getCurrentToken() != JsonToken.FIELD_NAME) {
+      throw new IOException("Expected a field of type " + JsonToken.FIELD_NAME +
+                            ", but found a field of type " +
+                            jsonParser.getCurrentToken());
+    }
+    return jsonParser.getCurrentName();
+  }
+
+  /**
+   * The JsonParser class exposes a number of methods for reading values, which
+   * are named confusingly. They also don't move the current token ahead, which
+   * makes us use statements like jsonParser.nextToken() everywhere in the code.
+   *
+   * This wrapper method abstracts all that.
+   *
+   * @param valueType The type of the value to be read
+   * @param <T>
+   * @return
+   * @throws IOException
+   */
+  public <T> T readValueAs(Class<T> valueType)
+    throws IOException {
+    jsonParser.nextToken();
+    if (valueType == String.class) {
+      return valueType.cast(jsonParser.getText());
+    }
+    return jsonParser.readValueAs(valueType);
+  }
+}
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/util/JsonUtils.java b/src/contrib/corona/src/java/org/apache/hadoop/util/JsonUtils.java
new file mode 100644
index 00000000..c435c5e1
--- /dev/null
+++ b/src/contrib/corona/src/java/org/apache/hadoop/util/JsonUtils.java
@@ -0,0 +1,201 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.util;
+
+import org.apache.hadoop.corona.CoronaConf;
+import org.codehaus.jackson.JsonEncoding;
+import org.codehaus.jackson.JsonFactory;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonToken;
+import org.codehaus.jackson.impl.DefaultPrettyPrinter;
+import org.codehaus.jackson.map.DeserializationConfig;
+import org.codehaus.jackson.map.ObjectMapper;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+public class JsonUtils {
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not START_OBJECT.
+   *
+   * @param jsonParser The JsonParser instance to be used
+   * @param parentFieldName The name of the field
+   * @throws IOException
+   */
+  public static void readStartObjectToken(JsonParser jsonParser,
+                                          String parentFieldName)
+    throws IOException {
+    readToken(jsonParser, parentFieldName, JsonToken.START_OBJECT);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not START_ARRAY.
+   *
+   * @param jsonParser The JsonParser instance to be used
+   * @param parentFieldName The name of the field
+   * @throws IOException
+   */
+  public static void readStartArrayToken(JsonParser jsonParser,
+                                         String parentFieldName)
+    throws IOException {
+    readToken(jsonParser, parentFieldName, JsonToken.START_ARRAY);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not END_OBJECT.
+   *
+   * @param jsonParser The JsonParser instance to be used
+   * @param parentFieldName The name of the field
+   * @throws IOException
+   */
+  public static void readEndObjectToken(JsonParser jsonParser,
+                                          String parentFieldName)
+    throws IOException {
+    readToken(jsonParser, parentFieldName, JsonToken.END_OBJECT);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not END_ARRAY.
+   *
+   * @param jsonParser The JsonParser instance to be used
+   * @param parentFieldName The name of the field
+   * @throws IOException
+   */
+  public static void readEndArrayToken(JsonParser jsonParser,
+                                         String parentFieldName)
+    throws IOException {
+    readToken(jsonParser, parentFieldName, JsonToken.END_ARRAY);
+  }
+
+  /**
+   * This is a helper method that reads a JSON token using a JsonParser
+   * instance, and throws an exception if the next token is not the same as
+   * the token we expect.
+   *
+   * @param jsonParser The JsonParser instance to be used
+   * @param parentFieldName The name of the field
+   * @param expectedToken The expected token
+   * @throws IOException
+   */
+  public static void readToken(JsonParser jsonParser,
+                               String parentFieldName,
+                               JsonToken expectedToken)
+    throws IOException {
+    JsonToken currentToken = jsonParser.nextToken();
+    if (currentToken != expectedToken) {
+      throw new IOException("Expected a " + expectedToken.toString() +
+                            " token when reading the value of the field: " +
+                            parentFieldName +
+                            " but found a " +
+                            currentToken.toString() + " token");
+    }
+  }
+
+  /**
+   * This is a helper method which creates a JsonGenerator instance, for writing
+   * the state of the ClusterManager to the state file. The JsonGenerator
+   * instance writes to a compressed file if we have the compression flag
+   * turned on.
+   *
+   * @param conf The CoronaConf instance to be used
+   * @return The JsonGenerator instance to be used
+   * @throws IOException
+   */
+  public static JsonGenerator createJsonGenerator(CoronaConf conf)
+    throws IOException {
+    OutputStream outputStream = new FileOutputStream(conf.getCMStateFile());
+    if (conf.getCMCompressStateFlag()) {
+      outputStream = new GZIPOutputStream(outputStream);
+    }
+    ObjectMapper mapper = new ObjectMapper();
+    JsonGenerator jsonGenerator =
+      new JsonFactory().createJsonGenerator(outputStream, JsonEncoding.UTF8);
+    jsonGenerator.setCodec(mapper);
+    if (!conf.getCMCompressStateFlag()) {
+      jsonGenerator.setPrettyPrinter(new DefaultPrettyPrinter());
+    }
+    return jsonGenerator;
+  }
+
+  /**
+   * This is a helper method which creates a JsonParser instance, for reading
+   * back the state of the ClusterManager from the state file. The JsonParser
+   * instance reads from a compressed file if we have the compression flag
+   * turned on.
+   *
+   * @param conf The CoronaConf instance to be used
+   * @return The JsonParser instance to be used
+   * @throws IOException
+   */
+  public static JsonParser createJsonParser(CoronaConf conf)
+    throws IOException {
+    InputStream inputStream = new FileInputStream(conf.getCMStateFile());
+    if (conf.getCMCompressStateFlag()) {
+      inputStream = new GZIPInputStream(inputStream);
+    }
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES,
+      false);
+    JsonFactory jsonFactory = new JsonFactory();
+    jsonFactory.setCodec(mapper);
+    return jsonFactory.createJsonParser(inputStream);
+  }
+
+  /**
+   * This is a helper method, which is used to throw an exception when we
+   * encounter an unexpected field name.
+   *
+   * @param fieldName Name of the field
+   * @param expectedFieldName Name of the expected field
+   * @throws IOException
+   */
+  public static void foundUnknownField(String fieldName,
+                                       String expectedFieldName)
+    throws IOException {
+    throw new IOException("Found an unexpected field: " + fieldName +
+      ", instead of field: " + expectedFieldName);
+  }
+
+  /**
+   * The method reads a field from the JSON stream, and checks if the
+   * field read is the same as the expect field.
+   *
+   * @param jsonParser The JsonParser instance to be used
+   * @param expectedFieldName The field name which is expected next
+   * @throws IOException
+   */
+  public static void readField(JsonParser jsonParser,
+                               String expectedFieldName) throws IOException {
+    readToken(jsonParser, expectedFieldName, JsonToken.FIELD_NAME);
+    String fieldName = jsonParser.getCurrentName();
+    if (!fieldName.equals(expectedFieldName)) {
+      foundUnknownField(fieldName, expectedFieldName);
+    }
+  }
+}
diff --git a/src/contrib/corona/src/java/org/apache/hadoop/util/WebUtils.java b/src/contrib/corona/src/java/org/apache/hadoop/util/WebUtils.java
new file mode 100644
index 00000000..1b87f2e6
--- /dev/null
+++ b/src/contrib/corona/src/java/org/apache/hadoop/util/WebUtils.java
@@ -0,0 +1,232 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.hadoop.corona.PoolInfo;
+import org.apache.hadoop.corona.ResourceType;
+
+/**
+ * Helper static utils for the jsp pages
+ */
+public class WebUtils {
+  /**
+   * True if should be shown for this filtering.
+   * @param user User to check
+   * @param userFilterSet Set of valid users
+   * @param poolInfo Pool info to check
+   * @param poolGroupFilterSet Set of valid pool groups
+   * @param poolInfoFilterSet Set of valid pool infos
+   * @return True if should be shown.
+   */
+  public static boolean showUserPoolInfo(
+      String user,
+      Set<String> userFilterSet, PoolInfo poolInfo,
+      Set<String> poolGroupFilterSet, Set<PoolInfo> poolInfoFilterSet) {
+    boolean showUser = false;
+    if (userFilterSet.isEmpty() || userFilterSet.contains(user)) {
+      showUser = true;
+    }
+
+    return showUser &&
+        showPoolInfo(poolInfo, poolGroupFilterSet, poolInfoFilterSet);
+  }
+
+  /**
+   * True if should be shown for this filtering.
+   * @param poolInfo Pool info to check
+   * @param poolGroupFilterSet Set of valid pool groups
+   * @param poolInfoFilterSet Set of valid pool infos
+   * @return True if should be shown.
+   */
+  public static boolean showPoolInfo(
+      PoolInfo poolInfo,
+      Set<String> poolGroupFilterSet,
+      Set<PoolInfo> poolInfoFilterSet) {
+    // If there are no filters, show everything
+    if (poolGroupFilterSet.isEmpty() && poolInfoFilterSet.isEmpty()) {
+      return true;
+    }
+
+    if (poolGroupFilterSet.contains(poolInfo.getPoolGroupName())) {
+      return true;
+    } else if (poolInfoFilterSet.contains(poolInfo)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Convert resource types of a collection of String objects
+   * @param resourceTypes Collection of types to convert
+   * @return Collection of resource types
+   */
+  public static Collection<String> convertResourceTypesToStrings(
+      Collection<ResourceType> resourceTypes) {
+    List<String> retList = new ArrayList<String>(resourceTypes.size());
+    for (ResourceType resourceType : resourceTypes) {
+      retList.add(resourceType.toString());
+    }
+
+    return retList;
+  }
+
+  /**
+   * Helper class to store/retrieve the parameter filters
+   */
+  public static class JspParameterFilters {
+    /** Users allowed, null for all */
+    private final Set<String> userFilterSet = new HashSet<String>();
+    /** Pool groups allowed, null for all */
+    private final Set<String> poolGroupFilterSet = new HashSet<String>();
+    /** Pool infos  allowed, null for all */
+    private final Set<PoolInfo> poolInfoFilterSet = new HashSet<PoolInfo>();
+    /** HTML output */
+    private final StringBuilder htmlOutput = new StringBuilder();
+
+    public Set<String> getUserFilterSet() {
+      return userFilterSet;
+    }
+
+    public Set<String> getPoolGroupFilterSet() {
+      return poolGroupFilterSet;
+    }
+
+    public Set<PoolInfo> getPoolInfoFilterSet() {
+      return poolInfoFilterSet;
+    }
+
+    public StringBuilder getHtmlOutput() {
+      return htmlOutput;
+    }
+  }
+
+  /**
+   * Check the attribute names
+   * @param attributeNames Atttribute names to check
+   * @return Null if all attribute names are invalid, non-empty if the check
+   *         failed, with an appropriate error message
+   */
+  public static String validateAttributeNames(
+      Enumeration<String> attributeNames) {
+    while (attributeNames.hasMoreElements()) {
+      String attribute = attributeNames.nextElement();
+      if (!attribute.equals("users") && !attribute.equals("poolGroups") &&
+          !attribute.equals("poolInfos")) {
+        return "Illegal parameter " + attribute + ", only 'users, " +
+            "poolGroups, and 'poolInfos' parameters allowed.";
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Convert the parameters to filters and html output
+   * @param userFilter User filter parameter
+   * @param poolGroupFilter Pool group filter parameter
+   * @param poolInfoFilter Pool info filter parameter
+   * @return Filters
+   */
+  public static JspParameterFilters getJspParameterFilters(
+      String userFilter,
+      String poolGroupFilter,
+      String poolInfoFilter) {
+    JspParameterFilters filters = new JspParameterFilters();
+    if (userFilter != null && !userFilter.equals("null")) {
+      filters.getUserFilterSet().addAll(Arrays.asList(userFilter.split(",")));
+      filters.getHtmlOutput().append(("<b>users:</b> " + userFilter + "<br>"));
+    }
+    if (poolGroupFilter != null && !poolGroupFilter.equals("null")) {
+      filters.getPoolGroupFilterSet().addAll(
+          Arrays.asList(poolGroupFilter.split(",")));
+      filters.getHtmlOutput().append("<b>poolGroups:</b> " + poolGroupFilter +
+          "<br>");
+    }
+    if (poolInfoFilter != null && !poolInfoFilter.equals("null")) {
+      filters.getHtmlOutput().append(
+          "<b>poolInfos:</b> " + poolInfoFilter + "<br>");
+      for (String poolInfoString : poolInfoFilter.split(",")) {
+        String[] poolInfoStrings = poolInfoString.split("[.]");
+        if (poolInfoStrings.length == 2) {
+          filters.getPoolInfoFilterSet().add(new PoolInfo(poolInfoStrings[0],
+              poolInfoStrings[1]));
+        }
+      }
+    }
+    return filters;
+  }
+
+  /**
+   * Pool info cell html
+   */
+  public static class PoolInfoHtml {
+    private final String groupHtml;
+    private final String poolHtml;
+
+    public PoolInfoHtml(String groupHtml, String poolHtml) {
+      this.groupHtml = groupHtml;
+      this.poolHtml = poolHtml;
+    }
+
+    public String getGroupHtml() {
+      return groupHtml;
+    }
+
+    public String getPoolHtml() {
+      return poolHtml;
+    }
+  }
+
+  /**
+   * Generate the appropriate HTML for pool name (redirected info if necessary)
+   * @param redirects
+   * @param poolInfo
+   * @return Pair of group and pool html
+   */
+  public static PoolInfoHtml getPoolInfoHtml(
+      Map<PoolInfo, PoolInfo> redirects,
+      PoolInfo poolInfo) {
+    String redirectAttributes = null;
+    if (redirects != null) {
+      PoolInfo destination = redirects.get(poolInfo);
+      if (destination != null) {
+        redirectAttributes = "Redirected to " +
+            PoolInfo.createStringFromPoolInfo(destination);
+      }
+    }
+
+    String spanTag = (redirectAttributes != null) ?
+        "<span class=\"ui-state-disabled\" title=\"" + redirectAttributes +
+        "\">" : "<span>";
+    String groupHtml = spanTag + poolInfo.getPoolGroupName() + "</span>";
+    String poolHtml = spanTag +
+        (poolInfo.getPoolName() == null ? "-" : poolInfo.getPoolName())
+        + "</span>";
+
+    return new PoolInfoHtml(groupHtml, poolHtml);
+  }
+}
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/BenchmarkClusterManager.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/BenchmarkClusterManager.java
index c27255f7..012d11ad 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/BenchmarkClusterManager.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/BenchmarkClusterManager.java
@@ -61,7 +61,7 @@ public static void main(String[] args) throws Exception {
           new InetAddress(TstUtils.getNodeHost(i),
               TstUtils.getNodePort(i)),
           TstUtils.std_spec);
-      nodes[i].setUsed(TstUtils.free_spec);
+      nodes[i].setFree(TstUtils.std_spec);
       nodes[i].setResourceInfos(resourceInfos);
     }
 
@@ -126,6 +126,8 @@ public void run() {
           LOG.error("Node disallowed ", dex);
         } catch (TException e) {
           LOG.error("Node heartbeat error ", e);
+        } catch (SafeModeException e) {
+          LOG.info("Cluster Manager is in Safe Mode");
         }
       }
     }
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/MiniCoronaCluster.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/MiniCoronaCluster.java
index 1156b7e5..29633c87 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/MiniCoronaCluster.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/MiniCoronaCluster.java
@@ -21,11 +21,14 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.http.NettyMapOutputHttpServer;
 import org.apache.hadoop.mapred.CoronaJobTracker;
 import org.apache.hadoop.mapred.CoronaTaskTracker;
 import org.apache.hadoop.mapred.JobClient;
@@ -151,6 +154,11 @@ public void startTaskTracker(String host, String rack, int idx, int numDir)
     }
     if (host != null) {
       NetUtils.addStaticResolution(host, "localhost");
+      try {
+        InetAddress addr = InetAddress.getByName(host);
+        NetUtils.addStaticResolution(addr.getHostAddress(),"localhost");
+      } catch (UnknownHostException e) {
+      }
     }
     TaskTrackerRunner taskTracker;
     taskTracker = new TaskTrackerRunner(idx, numDir, host, conf);
@@ -235,6 +243,7 @@ public static class TaskTrackerRunner implements Runnable {
       }
       conf.set("mapred.task.tracker.http.address", "0.0.0.0:0");
       conf.set("mapred.task.tracker.report.address", "localhost:0");
+      conf.setInt(NettyMapOutputHttpServer.MAXIMUM_THREAD_POOL_SIZE, 10);
       File localDirBase =
         new File(conf.get("mapred.local.dir")).getAbsoluteFile();
       localDirBase.mkdirs();
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestClusterManager.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestClusterManager.java
index 52d6b760..e55e7a1d 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestClusterManager.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestClusterManager.java
@@ -15,6 +15,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapred.ResourceTracker;
 import org.apache.hadoop.net.Node;
+import org.apache.hadoop.net.TopologyCache;
 import org.apache.thrift.TException;
 
 public class TestClusterManager extends TestCase {
@@ -62,7 +63,7 @@ protected void setUp() throws IOException {
                                      new InetAddress(TstUtils.getNodeHost(i),
                                                      TstUtils.getNodePort(i)),
                                      TstUtils.std_spec);
-      nodes[i].setUsed(TstUtils.free_spec);
+      nodes[i].setFree(TstUtils.std_spec);
       nodes[i].setResourceInfos(resourceInfos);
     }
 
@@ -86,6 +87,8 @@ private void addSomeNodes(int count) throws TException {
         cm.nodeHeartbeat(nodes[i]);
       } catch (DisallowedNode e) {
         throw new TException(e);
+      } catch (SafeModeException e) {
+        LOG.info("Cluster Manager is in Safe Mode");
       }
     }
   }
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestCompletionEvents.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestCompletionEvents.java
new file mode 100644
index 00000000..ae8b38d3
--- /dev/null
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestCompletionEvents.java
@@ -0,0 +1,86 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.corona;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.examples.SleepJob;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.RunningJob;
+import org.apache.hadoop.mapred.TaskCompletionEvent;
+import org.apache.hadoop.util.ToolRunner;
+
+public class TestCompletionEvents extends TestCase {
+  private static final Log LOG =
+      LogFactory.getLog(TestMiniCoronaRunJob.class);
+  private MiniCoronaCluster corona = null;
+
+  
+  /*
+   * This unit test runs a sleep job using the Corona with some mappers and reducers
+   * and tries to find if the TaskCompletionEvent object is indeed logging all
+   * the completion events of the reducers/mappers. This unittest reproduces the
+   * bug that the task completion events are not properly logged for the Corona.
+   * As of now, this test is commented out, it should be uncommented once
+   * this bug is fixed. 
+   */
+  public void testTaskCompletionEvents() throws Exception {
+    LOG.info("Starting SleepJob to test TaskCompletionEvents");
+    corona = new MiniCoronaCluster.Builder().numTaskTrackers(1).build();
+    JobConf conf = corona.createJobConf();
+    
+    SleepJob sleepJob = new SleepJob();
+    ToolRunner.run(conf, sleepJob, new String[] { "-m", "10", "-r", "10",
+        "-mt", "5", "-rt", "5" });
+    List<TaskCompletionEvent> events = new ArrayList<TaskCompletionEvent>();
+    int index = 0;
+    int numReduces = 0;
+    int numMaps = 0;
+    RunningJob rjob = sleepJob.getRunningJob();
+    while (true) {
+      TaskCompletionEvent[] someEvents = rjob.getTaskCompletionEvents(index);
+      if (someEvents.length == 0) {
+        break;
+      }
+      for (int i = 0; i < someEvents.length; i++) {
+        if (someEvents[i].isMapTask()) {
+          numMaps++;
+        } else {
+          numReduces++;
+        }
+      }
+      index += someEvents.length;
+    }
+    Assert.assertEquals("Num maps is " + numMaps, 10, numMaps);
+    Assert.assertTrue("Num reduces is " + numReduces, numReduces >= 10);
+  }
+
+  @Override
+  protected void tearDown() {
+    if (corona != null) {
+      corona.shutdown();
+    }
+  }
+}
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestConfigManager.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestConfigManager.java
index ada617d1..133292db 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestConfigManager.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestConfigManager.java
@@ -14,6 +14,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
+import org.json.JSONException;
 
 import junit.framework.TestCase;
 
@@ -227,7 +228,31 @@ public void testPreemptParameters() throws IOException {
     assertEquals(5000L, configManager.getPreemptedTaskMaxRunningTime());
   }
 
-  public void testReload() throws IOException, SAXException, ParserConfigurationException {
+  public void testRedirect() throws IOException {
+    FileWriter out = new FileWriter(CONFIG_FILE_PATH);
+    out.write("<?xml version=\"1.0\"?>\n");
+    out.write("<configuration>\n");
+    out.write("  <redirect source=\"source.pool_source\" " +
+        "destination=\"destination.pool_destination\" />\n");
+    // Shouldn't cause an issue
+    out.write("  <redirect source=\"\" " +
+        "destination=\"should.notwork\" />\n");
+    out.write("</configuration>\n");
+    out.close();
+
+    ConfigManager configManager = new ConfigManager(TYPES, conf);
+    PoolInfo sourcePoolInfo = new PoolInfo("source", "pool_source");
+    PoolInfo destinationPoolInfo = new PoolInfo("destination",
+        "pool_destination");
+    assertEquals(destinationPoolInfo,
+        configManager.getRedirect(destinationPoolInfo));
+    assertEquals(destinationPoolInfo,
+        configManager.getRedirect(sourcePoolInfo));
+    assertEquals(null, configManager.getRedirect(null));
+  }
+
+  public void testReload() throws IOException, SAXException, 
+                                  ParserConfigurationException, JSONException {
     FileWriter out = new FileWriter(CONFIG_FILE_PATH);
     out.write("<?xml version=\"1.0\"?>\n");
     out.write("<configuration>\n");
@@ -247,7 +272,7 @@ public void testReload() throws IOException, SAXException, ParserConfigurationEx
 
     // Set the modification time so it gets reloaded
     new File(CONFIG_FILE_PATH).setLastModified(0);
-    configManager.reloadAllConfig();
+    configManager.reloadAllConfig(false);
     assertEquals(3000L, configManager.getLocalityWait(ResourceType.MAP, LocalityLevel.NODE));
   }
 
@@ -255,13 +280,21 @@ static class TestPoolsConfigDocumentGenerator implements
       PoolsConfigDocumentGenerator {
     /** Changes over time */
     private int minMap = 10;
+    /** Fail? */
+    private boolean fail = false;
+
     @Override
     public void initialize(CoronaConf conf) {
+      fail = conf.getBoolean("test.fail", false);
       // Nothing to do here.
     }
 
     @Override
     public Document generatePoolsDocument() {
+      // Fake a failure?
+      if (fail == true) {
+        return null;
+      }
       minMap += 10;
       DocumentBuilderFactory documentBuilderFactory =
           DocumentBuilderFactory.newInstance();
@@ -308,4 +341,21 @@ public void testPoolsConfigGenerator() throws InterruptedException {
     assert((changedMinMap % 10) == 0);
     assert(changedMinMap > minMap);
   }
+
+  public void testFailPoolsConfigGenerator() throws InterruptedException {
+    conf.setClass(CoronaConf.POOLS_CONFIG_DOCUMENT_GENERATOR_PROPERTY,
+        TestPoolsConfigDocumentGenerator.class,
+        PoolsConfigDocumentGenerator.class);
+    conf.setLong(CoronaConf.POOLS_RELOAD_PERIOD_MS_PROPERTY, 100);
+    conf.setLong(CoronaConf.CONFIG_RELOAD_PERIOD_MS_PROPERTY, 100);
+    conf.setBoolean("test.fail", true);
+    try {
+      ConfigManager configManager = new ConfigManager(TYPES, conf);
+      // Should have thrown an exception
+      assertEquals(true, false);
+    } catch (IllegalStateException e) {
+      // Passed!
+      System.out.println("Got expected exception " + e.getMessage());
+    }
+  }
 }
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestLoadManager.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestLoadManager.java
index 278282c5..50fee3ec 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestLoadManager.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestLoadManager.java
@@ -57,7 +57,7 @@ protected void setUp() throws IOException {
         new InetAddress(TstUtils.getNodeHost(i),
           TstUtils.getNodePort(i)),
         TstUtils.std_spec);
-      nodes[i].setUsed(TstUtils.free_spec);
+      nodes[i].setFree(TstUtils.std_spec);
       nodes[i].setResourceInfos(resourceInfos);
     }
 
@@ -105,6 +105,8 @@ private void addSomeNodes(int count) throws TException {
         cm.nodeHeartbeat(nodes[i]);
       } catch (DisallowedNode e) {
         throw new TException(e);
+      } catch (SafeModeException e) {
+        LOG.info("Cluster Manager is in Safe Mode");
       }
     }
   }
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestMiniCoronaPurge.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestMiniCoronaPurge.java
new file mode 100644
index 00000000..2168abe0
--- /dev/null
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestMiniCoronaPurge.java
@@ -0,0 +1,127 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.corona;
+
+import java.io.IOException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.examples.SleepJob;
+import org.apache.hadoop.mapred.CoronaJobTracker;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat;
+import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.fs.LocatedFileStatus;
+import org.apache.hadoop.fs.RemoteIterator;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileStatus;
+
+/**
+ * A Unit-test to test job execution of Mini Corona Map-Reduce Cluster.
+ */
+public class TestMiniCoronaPurge extends TestCase {
+  private static final Log LOG =
+      LogFactory.getLog(TestMiniCoronaPurge.class);
+  private MiniCoronaCluster corona = null;
+  private static final long THRESHOLD = 120000L;
+  private static final int SLEEPTIME = 1000;
+
+  public void testPurge() throws Exception {
+    LOG.info("Starting testPurge");
+    JobConf conf = new JobConf();
+    conf.setLong("mapred.job.file.expirethreshold", THRESHOLD);
+    conf.setLong("mapred.job.file.checkinterval",10000);
+    conf.setLong("mapred.job.history.expirethreshold", THRESHOLD);
+    conf.setLong("mapred.job.history.checkinterval",10000);
+    conf.setBoolean("mapred.job.temp.cleanup", true);
+    corona = new MiniCoronaCluster.Builder().conf(conf).numTaskTrackers(1).build();
+    final JobConf jobConf = corona.createJobConf();
+    Configuration fsConf = new Configuration(jobConf);
+    FileSystem fs = FileSystem.get(fsConf);
+    String systemDir = fsConf.get("corona.system.dir", "/tmp/hadoop/mapred/system");
+    Path tagDir;
+    // long oldtime = System.currentTimeMillis() - THRESHOLD;
+    for (int i = 0; i < 10; i++) {
+      tagDir= new Path(systemDir + "/job_00000.00000_00" + i);
+      if (!fs.exists(tagDir)) { 
+        fs.mkdirs(tagDir); 
+      }
+      // fs.setTimes(tagDir, oldtime, -1);
+    }
+  
+    // Those dirs shall not be removed
+    tagDir= new Path(systemDir + "/nojob_00000.00000_01");
+    if (!fs.exists(tagDir)) { 
+      fs.mkdirs(tagDir); 
+    }
+    // fs.setTimes(tagDir, oldtime, -1);
+
+    TstUtils.reliableSleep(SLEEPTIME);
+    long start = System.currentTimeMillis();
+    runSleepJob(conf, 1, 1);
+    long end = System.currentTimeMillis();
+   
+    LOG.info("Sleep to wait for the test files to be old enough to get cleanned");
+    TstUtils.reliableSleep(THRESHOLD);
+    
+    LOG.info("Check dirs under " + systemDir);
+    // check if the dirs have been removed 
+    boolean result;
+    for (int i = 0; i < 10; i++) {
+      tagDir= new Path(systemDir + "/job_00000.00000_00" + i);
+      result = fs.exists(tagDir);
+      assertTrue(tagDir + " is not deleted", result == false); 
+    }
+
+    // The dirs shall not be removed
+    tagDir= new Path(systemDir + "/nojob_00000.00000_01" );
+    result = fs.exists(tagDir);
+    assertTrue(tagDir + " is deleted", result == true); 
+    
+    LOG.info("Time spent for testPurge:" + (end - start));
+  }
+
+  @Override
+  protected void tearDown() {
+    if (corona != null) {
+      corona.shutdown();
+    }
+  }
+
+  private void runSleepJob(JobConf conf, int maps, int reduces)
+      throws Exception {
+    String[] args = {"-m", maps + "",
+                     "-r", reduces + "",
+                     "-mt", "1",
+                     "-rt", "1" };
+    ToolRunner.run(conf, new SleepJob(), args);
+    // This sleep is here to wait for the JobTracker to go down completely
+    TstUtils.reliableSleep(1000);
+  }
+}
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestMiniCoronaRunJob.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestMiniCoronaRunJob.java
index dd107412..69a6af10 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestMiniCoronaRunJob.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestMiniCoronaRunJob.java
@@ -259,5 +259,4 @@ public void run() {
       fail("Some of the Sleepjobs failed");
     }
   }
-
 }
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestPoolManager.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestPoolManager.java
index f3515cab..e09556e2 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestPoolManager.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestPoolManager.java
@@ -40,15 +40,15 @@ public void testUsername() {
     conf.setBoolean(CoronaConf.CONFIGURED_POOLS_ONLY, false);
     SessionInfo sessionInfo = new SessionInfo();
 
-    Session session = new Session("user", sessionInfo);
+    Session session = new Session(10000, "user", sessionInfo, configManager);
     PoolInfo poolInfo =
-        PoolGroupManager.getPoolInfo(session, configManager, conf);
+        PoolGroupManager.getPoolInfo(session);
     assert(poolInfo.getPoolGroupName().equals(
         PoolGroupManager.DEFAULT_POOL_GROUP));
     assert(poolInfo.getPoolName().equals("user"));
 
     conf.setBoolean(CoronaConf.CONFIGURED_POOLS_ONLY, true);
-    poolInfo = PoolGroupManager.getPoolInfo(session, configManager, conf);
+    poolInfo = PoolGroupManager.getPoolInfo(session);
     assert(poolInfo.getPoolGroupName().equals(
         PoolGroupManager.DEFAULT_POOL_GROUP));
     assert(poolInfo.getPoolName().equals(PoolGroupManager.DEFAULT_POOL));
@@ -81,38 +81,38 @@ public void testConfiguredPools() throws IOException {
     conf.setBoolean(CoronaConf.CONFIGURED_POOLS_ONLY, false);
     SessionInfo sessionInfo = new SessionInfo();
 
-    Session session = new Session("user", sessionInfo);
-    PoolInfo poolInfo = PoolGroupManager.getPoolInfo(session, configManager, conf);
+    Session session = new Session(10000, "user", sessionInfo, configManager);
+    PoolInfo poolInfo = PoolGroupManager.getPoolInfo(session);
     assert(poolInfo.getPoolGroupName().equals(
         PoolGroupManager.DEFAULT_POOL_GROUP));
     assert(poolInfo.getPoolName().equals("user"));
 
-    session = new Session("poolA", sessionInfo);
-    poolInfo = PoolGroupManager.getPoolInfo(session, configManager, conf);
+    session = new Session(10000, "poolA", sessionInfo, configManager);
+    poolInfo = PoolGroupManager.getPoolInfo(session);
     assert(poolInfo.getPoolGroupName().equals(
         PoolGroupManager.DEFAULT_POOL_GROUP));
     assert(poolInfo.getPoolName().equals("poolA"));
 
-    session = new Session("poolC", sessionInfo);
-    poolInfo = PoolGroupManager.getPoolInfo(session, configManager, conf);
+    session = new Session(10000, "poolC", sessionInfo, configManager);
+    poolInfo = PoolGroupManager.getPoolInfo(session);
     assert(poolInfo.getPoolGroupName().equals(
         PoolGroupManager.DEFAULT_POOL_GROUP));
     assert(poolInfo.getPoolName().equals("poolC"));
 
     conf.setBoolean(CoronaConf.CONFIGURED_POOLS_ONLY, true);
-    session = new Session("user", sessionInfo);
+    session = new Session(10000, "user", sessionInfo, configManager);
     assert(poolInfo.getPoolGroupName().equals(
         PoolGroupManager.DEFAULT_POOL_GROUP));
     assert(poolInfo.getPoolName().equals("user"));
 
-    session = new Session("poolA", sessionInfo);
-    poolInfo = PoolGroupManager.getPoolInfo(session, configManager, conf);
+    session = new Session(10000, "poolA", sessionInfo, configManager);
+    poolInfo = PoolGroupManager.getPoolInfo(session);
     assert(poolInfo.getPoolGroupName().equals(
         PoolGroupManager.DEFAULT_POOL_GROUP));
     assert(poolInfo.getPoolName().equals("poolA"));
 
-    session = new Session("poolC", sessionInfo);
-    poolInfo = PoolGroupManager.getPoolInfo(session, configManager, conf);
+    session = new Session(10000, "poolC", sessionInfo, configManager);
+    poolInfo = PoolGroupManager.getPoolInfo(session);
     assert(poolInfo.getPoolGroupName().equals(
         PoolGroupManager.DEFAULT_POOL_GROUP));
     assert(poolInfo.getPoolName().equals(PoolGroupManager.DEFAULT_POOL));
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestPreemption.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestPreemption.java
index f29ac297..4befb8d0 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestPreemption.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestPreemption.java
@@ -12,6 +12,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.net.TopologyCache;
 import org.apache.hadoop.mapred.ResourceTracker;
 import org.apache.thrift.TException;
 
@@ -60,7 +61,7 @@ protected void setUp() throws IOException {
                                      new InetAddress(TstUtils.getNodeHost(i),
                                                      TstUtils.getNodePort(i)),
                                      TstUtils.std_spec);
-      nodes[i].setUsed(TstUtils.free_spec);
+      nodes[i].setFree(TstUtils.std_spec);
       nodes[i].setResourceInfos(resourceInfos);
     }
 
@@ -243,7 +244,7 @@ public void testPreemptWithDelayedRelease() throws Throwable {
   }
 
   private void submitRequests(String handle, int maps, int reduces)
-      throws TException, InvalidSessionHandle {
+      throws TException, InvalidSessionHandle, SafeModeException {
     List<ResourceRequest> requests =
       TstUtils.createRequests(this.numNodes, maps, reduces);
     cm.requestResource(handle, requests);
@@ -270,6 +271,8 @@ private void addSomeNodes(int count) throws TException {
         cm.nodeHeartbeat(nodes[i]);
       } catch (DisallowedNode e) {
         throw new TException(e);
+      } catch (SafeModeException e) {
+        LOG.info("Cluster Manager is in Safe Mode");
       }
     }
   }
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestResourceCheck.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestResourceCheck.java
index b3958207..fccc5ce8 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestResourceCheck.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestResourceCheck.java
@@ -10,6 +10,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.net.TopologyCache;
 import org.apache.thrift.TException;
 
 public class TestResourceCheck extends TestCase {
@@ -52,7 +53,7 @@ protected void setUp(int reservedMemoryMB, int reservedDiskGB)
                                      new InetAddress(TstUtils.getNodeHost(i),
                                                      TstUtils.getNodePort(i)),
                                      TstUtils.std_spec);
-      nodes[i].setUsed(TstUtils.free_spec);
+      nodes[i].setFree(TstUtils.std_spec);
       nodes[i].setResourceInfos(resourceInfos);
     }
     sessionInfo = new SessionInfo(
@@ -135,7 +136,7 @@ public void testResourceUpdate() throws Exception {
     addSomeNodes(1);
     ClusterNodeInfo newInfo = new ClusterNodeInfo(nodes[0]);
     // Fully used.
-    newInfo.setUsed(TstUtils.std_spec);
+    newInfo.setFree(TstUtils.nothing_free_spec);
     cm.nodeHeartbeat(newInfo);
 
     String handle = TstUtils.startSession(cm, sessionInfo);
@@ -152,7 +153,7 @@ public void testResourceUpdate() throws Exception {
 
     // Node is free
     newInfo = new ClusterNodeInfo(newInfo);
-    newInfo.setUsed(TstUtils.free_spec);
+    newInfo.setFree(TstUtils.std_spec);
     cm.nodeHeartbeat(newInfo);
 
     TstUtils.reliableSleep(500);
@@ -163,7 +164,7 @@ public void testResourceUpdate() throws Exception {
   }
 
   private void submitRequests(String handle, int maps, int reduces)
-      throws TException, InvalidSessionHandle {
+      throws TException, InvalidSessionHandle, SafeModeException {
     List<ResourceRequest> requests =
       TstUtils.createRequests(this.numNodes, maps, reduces);
     cm.requestResource(handle, requests);
@@ -185,6 +186,8 @@ private void addSomeNodes(int count) throws TException {
         cm.nodeHeartbeat(nodes[i]);
       } catch (DisallowedNode e) {
         throw new TException(e);
+      } catch (SafeModeException e) {
+        LOG.info("Cluster Manager is in Safe Mode");
       }
     }
   }
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestSessionDriver.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestSessionDriver.java
index 26f37db7..6949b411 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TestSessionDriver.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TestSessionDriver.java
@@ -79,7 +79,7 @@ protected void setUp() throws Exception {
                                      new InetAddress(TstUtils.getNodeHost(i),
                                                      TstUtils.getNodePort(i)),
                                      TstUtils.std_spec);
-      nodes[i].setUsed(TstUtils.free_spec);
+      nodes[i].setFree(TstUtils.std_spec);
       nodes[i].setResourceInfos(resourceInfos);
     }
     for (int i=0; i<numNodes; i++) {
@@ -249,7 +249,7 @@ public void testCMFailurePermanent() throws Throwable {
       driver.requestResources(rlist.subList(0, 400));
 
       // these requests will timeout immediately
-      TestClusterManager.reliableSleep(100);
+      TestClusterManager.reliableSleep(500);
 
       if (driver.getFailed() == null)
         assertEquals("CM failure not detected", null);
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/corona/TstUtils.java b/src/contrib/corona/src/test/org/apache/hadoop/corona/TstUtils.java
index aff8c5f9..73b6370c 100644
--- a/src/contrib/corona/src/test/org/apache/hadoop/corona/TstUtils.java
+++ b/src/contrib/corona/src/test/org/apache/hadoop/corona/TstUtils.java
@@ -21,13 +21,14 @@ public class TstUtils {
     new HashMap<Integer, String>();
 
   public static ComputeSpecs std_spec;
+  public static ComputeSpecs nothing_free_spec;
   static {
     std_spec = new ComputeSpecs(numCpuPerNode);
     std_spec.setNetworkMBps((short)100);
     std_spec.setMemoryMB(1024);
     std_spec.setDiskGB(1024);
+    nothing_free_spec = new ComputeSpecs();
   }
-  public static ComputeSpecs free_spec = new ComputeSpecs();
   public static String std_cpu_to_resource_partitioning =
       "{\"1\":{\"MAP\":1, \"REDUCE\":1, \"JOBTRACKER\":1}}";
 
@@ -91,7 +92,7 @@ public static void reliableSleep(long ms) {
   }
 
   public static String startSession(ClusterManager cm, SessionInfo info)
-    throws IOException, TException, InvalidSessionHandle {
+    throws IOException, TException, InvalidSessionHandle, SafeModeException {
     String handle = cm.getNextSessionId();
     cm.sessionStart(handle, info);
     return handle;
diff --git a/src/contrib/corona/src/test/org/apache/hadoop/mapred/TestReleaseManager.java b/src/contrib/corona/src/test/org/apache/hadoop/mapred/TestReleaseManager.java
new file mode 100644
index 00000000..9e6991ab
--- /dev/null
+++ b/src/contrib/corona/src/test/org/apache/hadoop/mapred/TestReleaseManager.java
@@ -0,0 +1,254 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.mapred;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapred.JobID;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+
+/**
+ * A Unit-test to test release manager
+ */
+public class TestReleaseManager extends TestCase {
+  private static final Log LOG = LogFactory.getLog(TestReleaseManager.class);
+  private static final long CLEAN_INTERVAL = 10000L;
+  private static final long CLEAN_THRESHOLD = 20000L;
+  private static final String RELEASE_DIR = "/tmp/releaseDir";
+  private static final String WORKING_DIR = "/tmp/workingDir";
+  private static final String TAG_FILE_NAME = "releaseTag";
+  private static final int MAX_RETRY = 10;
+
+  private SimpleDateFormat formatter;
+  private Configuration conf;
+  private FileSystem fs;
+  private Path releasePath;
+  private Path workingPath;
+  private String tagFileName;
+  private Path releaseTagPath;
+  private long releaseTimeStamp;
+  private CoronaReleaseManager crReleaseManager;
+
+  @Override
+  protected void setUp() throws Exception {
+    formatter = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+    conf = new Configuration();
+    conf.set("mapred.release.dir", RELEASE_DIR);
+    conf.set("mapred.release.working.dir", WORKING_DIR);
+    conf.setLong("mapred.release.dir.cleanInterval", CLEAN_INTERVAL);
+    conf.setLong("mapred.release.dir.cleanThreshold", CLEAN_THRESHOLD);
+
+    fs = FileSystem.newInstanceLocal(conf);
+    releasePath = new Path(RELEASE_DIR);
+    workingPath = new Path(WORKING_DIR);
+    tagFileName = TAG_FILE_NAME;
+    releaseTagPath = new Path(releasePath, tagFileName);
+    touchTag();
+
+    crReleaseManager = new CoronaReleaseManager(conf);
+    crReleaseManager.start();
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    crReleaseManager.shutdown();
+    fs.delete(releasePath, true);
+    fs.delete(workingPath, true);
+  }
+
+  private void touchTag() throws IOException {
+    fs.create(releaseTagPath);
+    FileStatus tagStatus = fs.getFileStatus(releaseTagPath);
+    releaseTimeStamp = tagStatus.getModificationTime();
+  }
+
+  // get working release from release manager's autorun
+  private String getAutoRelease(long timestamp, JobID jobid)
+    throws IOException {
+    boolean created = false;
+    Path checkPath = new Path(workingPath, formatter.format(timestamp));
+    Path checkTagPath = new Path(checkPath, TAG_FILE_NAME);
+    for (int i = 0; i < MAX_RETRY; i++) {
+      try {
+        if (fs.exists(checkTagPath)) {
+          created = true;
+          LOG.info(checkPath + " is created successfully");
+          break;
+        }
+      } catch (IOException e) {
+      }
+      LOG.info("Waiting for the release manager");
+      try {
+        Thread.sleep(CLEAN_INTERVAL);
+      } catch (InterruptedException e) {
+      }
+    }   
+    if (!created) {
+      LOG.error(checkTagPath + " is not created");
+    }
+    assertEquals(created, true);
+
+    String resultStr = crReleaseManager.getRelease(jobid);
+    assertEquals(resultStr, checkPath.toString());
+    return resultStr;
+  }
+
+  // get working release by demand
+  private String getRelease(long timestamp, JobID jobid) throws IOException {
+    Path checkPath = new Path(workingPath, formatter.format(timestamp));
+    String resultStr = crReleaseManager.getRelease(jobid);
+    assertEquals(resultStr, checkPath.toString());
+    return resultStr;
+  }
+
+  // test the release is copied by the release manager automatically
+  public void testInitialCopy() throws IOException {
+    LOG.info("Start testInitialCopy");
+    JobID jobid = new JobID("TestJob", 1);
+    getAutoRelease(releaseTimeStamp, jobid);
+    LOG.info("Done with the testing for testInitialCopy");
+  }
+
+  // test if there is new release, release manager will copy automatically
+  public void testIncrementalCopy() throws IOException {
+    LOG.info("Start testIncrementalCopy");
+    try {
+      Thread.sleep(CLEAN_INTERVAL);
+    } catch (InterruptedException e) {
+    }
+
+    // change the release timestamp
+    touchTag();
+    JobID jobid = new JobID("TestJob", 1);
+    getAutoRelease(releaseTimeStamp, jobid);
+    LOG.info("Done with the testing for testIncrementalCopy");
+  }
+
+  // test if there is new release, release manager can copy by demand
+  public void testCopyByDemand() throws IOException {
+    LOG.info("Start testCopyByDemand");
+    touchTag();
+    JobID jobid = new JobID("TestJob", 1);
+    getRelease(releaseTimeStamp, jobid);
+    LOG.info("Done with the testing for testCopyByDemand");
+  }
+
+  // test if an old release is not used any more if will be removed
+  public void testCleanup() throws IOException {
+    LOG.info("Start testCleanup");
+    JobID jobid = new JobID("TestJob", 1);
+    String oldPath = getAutoRelease(releaseTimeStamp, jobid);
+    try {
+      Thread.sleep(CLEAN_INTERVAL);
+    } catch (InterruptedException e) {
+    }
+    touchTag();
+    JobID jobid2 = new JobID("TestJob", 2);
+    getRelease(releaseTimeStamp, jobid2);
+
+    crReleaseManager.returnRelease(jobid);
+    boolean deleted = false;
+    for (int i = 0; i < MAX_RETRY; i++) {
+      LOG.info("Waiting for the release manager");
+      try {
+        Thread.sleep(CLEAN_INTERVAL);
+      } catch (InterruptedException e) {
+      }
+      try {
+        if (!fs.exists(new Path(oldPath))) {
+          deleted = true;
+          LOG.info( oldPath + " is deleted");
+          break;
+        }
+      } catch (IOException e) {
+      }
+    }   
+    if (!deleted) {
+      LOG.error( oldPath + " is not deleted");
+    }
+    assertEquals(deleted, true);
+    LOG.info("Done with the testing for testCleanup");
+  }
+
+  // test getRelease without return, and the working copy shall stay
+  public void testNoCleanup() throws IOException {
+    LOG.info("Start testNoCleanup");
+    JobID jobid = new JobID("TestJob", 1);
+    String oldPath = getAutoRelease(releaseTimeStamp, jobid);
+    try {
+      Thread.sleep(CLEAN_INTERVAL);
+    } catch (InterruptedException e) {
+    }
+
+    touchTag();
+    JobID jobid2 = new JobID("TestJob", 2);
+    getRelease(releaseTimeStamp, jobid2);
+    
+    boolean deleted = false;
+    for (int i = 0; i < MAX_RETRY; i++) {
+      LOG.info("Waiting for the release manager");
+      try {
+        Thread.sleep(CLEAN_INTERVAL);
+      } catch (InterruptedException e) {
+      }
+      try {
+        if (!fs.exists(new Path(oldPath))) {
+          deleted = true;
+          LOG.error( oldPath + " is deleted by mistake");
+          break;
+        }
+      } catch (IOException e) {
+      }
+    }   
+    if (!deleted) {
+      LOG.info(oldPath + " is not deleted");
+    }
+    assertEquals(deleted, false);
+    LOG.info("Done with the testing for testNoCleanup");
+  }
+
+  // test when a working release is used, the tag file timestamp is changed
+  public void testNewTag() throws IOException {
+    LOG.info("Start testNewTag");
+    JobID jobid = new JobID("TestJob", 1);
+    long oldTimeStamp = releaseTimeStamp;
+    long currentTimeStamp = System.currentTimeMillis();
+    try {
+      Thread.sleep(1000);
+    } catch(InterruptedException e) {
+    }
+    String workingPath = getRelease(releaseTimeStamp, jobid);
+    String workingTag = workingPath + "/RELEASE_COPY_DONE";
+    FileStatus tagStatus = fs.getFileStatus(new Path(workingTag));
+    long newTimeStamp = tagStatus.getModificationTime();
+    LOG.info("Before getRelease, " + workingTag + " timestamp is " + oldTimeStamp);
+    LOG.info("After getRelease, the timestamp is " + newTimeStamp);
+    assertEquals(newTimeStamp > currentTimeStamp, true);
+    assertEquals(newTimeStamp > oldTimeStamp, true);
+    LOG.info("Done with the testing for testNewTag");
+  }
+}
diff --git a/src/contrib/corona/src/webapp/cm/active_json.jsp b/src/contrib/corona/src/webapp/cm/active_json.jsp
new file mode 100644
index 00000000..cd891ae1
--- /dev/null
+++ b/src/contrib/corona/src/webapp/cm/active_json.jsp
@@ -0,0 +1,77 @@
+<%@ page
+  contentType="text/html; charset=UTF-8"
+  import="javax.servlet.*"
+  import="javax.servlet.http.*"
+  import="java.io.*"
+  import="java.text.*"
+  import="java.util.*"
+  import="org.apache.hadoop.corona.*"
+  import="org.apache.hadoop.util.*"
+  import="org.apache.hadoop.util.ServletUtil"
+  import="org.apache.hadoop.util.StringUtils"
+  import="org.json.*"
+%>
+
+<%
+  WebUtils.JspParameterFilters filters = WebUtils.getJspParameterFilters(
+      request.getParameter("users"),
+      request.getParameter("poolGroups"),
+      request.getParameter("poolInfos"));
+
+  DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+  ClusterManager cm = (ClusterManager) application.getAttribute("cm");
+  NodeManager nm = cm.getNodeManager();
+  SessionManager sm = cm.getSessionManager();
+
+  JSONObject result = new JSONObject();
+  JSONArray array = new JSONArray();
+
+  Collection<ResourceType> resourceTypes = nm.getResourceTypes();
+  for (String id : sm.getSessions()) {
+    Session s;
+    try {
+      s = sm.getSession(id);
+    } catch (InvalidSessionHandle e) {
+      continue;
+    }
+
+    synchronized (s) {
+      if (s.isDeleted())
+        continue;
+
+      String url = (s.getUrl() == null || s.getUrl().length() == 0) ? id :
+          "<a href=\"" + s.getUrl() + "\">" + id + "</a>";
+      PoolInfo poolInfo = s.getPoolInfo();
+
+      if (!WebUtils.showUserPoolInfo(s.getUserId(),
+          filters.getUserFilterSet(),
+          poolInfo,
+          filters.getPoolGroupFilterSet(),
+          filters.getPoolInfoFilterSet())) {
+        continue;
+      }
+
+      JSONArray row = new JSONArray();
+      row.put(url);
+      row.put(dateFormat.format(new Date(s.getStartTime())));
+      row.put("<a href=\"jobresources.jsp?id=" + id + "\">" +
+          s.getName() + "</a>");
+      row.put(s.getUserId());
+      row.put(poolInfo.getPoolGroupName());
+      row.put(poolInfo.getPoolName());
+      row.put(SessionPriority.findByValue(s.getPriority()));
+
+      for (ResourceType resourceType : resourceTypes) {
+        row.put(s.getGrantedRequestForType(resourceType).size());
+        row.put(s.getPendingRequestForType(resourceType).size());
+        row.put(s.getRequestCountForType(resourceType));
+      }
+      array.put(row);
+    }
+  }
+
+  result.put("aaData", array);
+  response.setContentType("application/json");
+  response.setHeader("Cache-Control", "no-store");
+  out.print(result);
+%>
diff --git a/src/contrib/corona/src/webapp/cm/cm.jsp b/src/contrib/corona/src/webapp/cm/cm.jsp
index a19b8edf..78ef19c7 100644
--- a/src/contrib/corona/src/webapp/cm/cm.jsp
+++ b/src/contrib/corona/src/webapp/cm/cm.jsp
@@ -12,44 +12,6 @@
 %>
 
 <%!
-  public boolean showUserPoolInfo(String user,
-      Set<String> userFilterSet, PoolInfo poolInfo,
-      Set<String> poolGroupFilterSet, Set<PoolInfo> poolInfoFilterSet) {
-    boolean showUser = false;
-    if (userFilterSet.isEmpty() || userFilterSet.contains(user)) {
-      showUser = true;
-    }
-
-    return showUser &&
-        showPoolInfo(poolInfo, poolGroupFilterSet, poolInfoFilterSet);
-  }
-
-  public boolean showPoolInfo(PoolInfo poolInfo,
-      Set<String> poolGroupFilterSet, Set<PoolInfo> poolInfoFilterSet) {
-    // If there are no filters, show everything
-    if (poolGroupFilterSet.isEmpty() && poolInfoFilterSet.isEmpty()) {
-      return true;
-    }
-
-    if (poolGroupFilterSet.contains(poolInfo.getPoolGroupName())) {
-      return true;
-    } else if (poolInfoFilterSet.contains(poolInfo)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  public Collection<String> convertResourceTypesToStrings(
-      Collection<ResourceType> resourceTypes) {
-    List<String> retList = new ArrayList<String>(resourceTypes.size());
-    for (ResourceType resourceType : resourceTypes) {
-      retList.add(resourceType.toString());
-    }
-
-    return retList;
-  }
-
   public void generateSummaryTable(JspWriter out, NodeManager nm,
       SessionManager sm)
       throws IOException {
@@ -64,7 +26,7 @@
         { "Running", "Waiting", "TotalSlots", "FreeSlots" };
 
     sb.append(generateTableHeaderCells(
-        convertResourceTypesToStrings(resourceTypes),
+        WebUtils.convertResourceTypesToStrings(resourceTypes),
         perTypeColumns.length, 0, false));
     sb.append("<th colspan=3>Nodes</th>");
     sb.append("<th colspan=1>Session</th>");
@@ -98,7 +60,7 @@
       row.append("<td>" + running + "</td>");
       row.append("<td>" + waiting + "</td>");
       row.append("<td>" + totalslots + "</td>");
-      row.append("<td>" + freeslots + "</td>");
+      row.append("<td><a href=\"machines.jsp?type=free&resourceType=" + resourceType + "\">" + freeslots + "</a></td>");
     }
 
     row.append("<td><a href=\"machines.jsp?type=alive\">" +
@@ -137,7 +99,7 @@
     Collection<ResourceType> resourceTypes = nm.getResourceTypes();
     String[] perTypeColumns = { "Running", "Waiting", "Total" };
     sb.append(generateTableHeaderCells(
-        convertResourceTypesToStrings(resourceTypes),
+        WebUtils.convertResourceTypesToStrings(resourceTypes),
         perTypeColumns.length, 0, false));
 
     sb.append("</tr>\n");
@@ -149,47 +111,29 @@
         sb.append("<th>" + perTypeColumns[i] + "</th>");
     }
     sb.append("</tr></thead><tbody>\n");
+    out.print(sb.toString());
+    out.print("</tbody></table><br>");
+  }
 
-    for (String id : sm.getSessions()) {
-      Session s;
-      try {
-        s = sm.getSession(id);
-      } catch (InvalidSessionHandle e) {
-        continue;
-      }
-
-      synchronized (s) {
-        if (s.isDeleted())
-          continue;
-
-        String url = (s.getUrl() == null || s.getUrl().length() == 0) ? id :
-            "<a href=\"" + s.getUrl() + "\">" + id + "</a>";
-        PoolInfo poolInfo = scheduler.getPoolInfo(s);
-
-        if (!showUserPoolInfo(s.getUserId(), userFilterSet,
-            poolInfo, poolGroupFilterSet, poolInfoFilterSet)) {
-          continue;
-        }
-
-        sb.append("<tr><td>" + url + "</td><td>" +
-            dateFormat.format(new Date(s.getStartTime())) +
-            "</td><td><a href=\"jobresources.jsp?id=" + id + "\">" +
-            s.getName() + "</a></td><td>"  + s.getUserId() + "</td><td>" +
-            poolInfo.getPoolGroupName() + "</td><td>" + poolInfo.getPoolName() +
-            "</td><td>" + SessionPriority.findByValue(s.getPriority()) +
-            "</td>");
-        for (ResourceType resourceType : resourceTypes) {
-          int total = s.getRequestCountForType(resourceType);
-          int waiting = s.getPendingRequestForType(resourceType).size();
-          int running = s.getGrantedRequestForType(resourceType).size();
-          sb.append("<td>" + running + "</td><td>" + waiting + "</td><td>"
-              + total + "</td>");
-        }
-        sb.append("</tr>\n");
+  private String getPoolInfoTableData(Map<PoolInfo, PoolInfo> redirects,
+                                      PoolInfo poolInfo) {
+    StringBuffer sb = new StringBuffer();
+    String redirectAttributes = "";
+    if (redirects != null) {
+      PoolInfo destination = redirects.get(poolInfo);
+      if (destination != null) {
+        redirectAttributes = " title=\"Redirected to " +
+            PoolInfo.createStringFromPoolInfo(destination) +
+            "\" class=\"ui-state-disabled\"";
       }
     }
-    out.print(sb.toString());
-    out.print("</tbody></table><br>");
+
+    sb.append("<td" + redirectAttributes + ">" + poolInfo.getPoolGroupName() +
+        "</td>");
+    sb.append("<td" + redirectAttributes + ">" +
+        (poolInfo.getPoolName() == null ? "-" : poolInfo.getPoolName()) +
+        "</td>");
+    return sb.toString();
   }
 
   public void generatePoolTable(
@@ -205,6 +149,7 @@
     sb.append("<table id=\"poolTable\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\">\n");
 
     ConfigManager configManager = scheduler.getConfigManager();
+    Map<PoolInfo, PoolInfo> redirects = configManager.getRedirects();
 
     // Generate headers
     sb.append("<thead><tr>");
@@ -213,7 +158,7 @@
     sb.append("<th rowspan=2>Scheduling</th>");
     sb.append("<th rowspan=2>Preemptable</th>");
     sb.append(generateTableHeaderCells(
-        convertResourceTypesToStrings(types),
+        WebUtils.convertResourceTypesToStrings(types),
         metricsNames.size(), 0, false));
     sb.append("</tr>\n");
 
@@ -224,59 +169,6 @@
       }
     }
     sb.append("</tr></thead><tbody>\n");
-
-    // Initialize the total metrics
-    int totalEntries =
-      PoolInfoMetrics.MetricName.values().length * types.size();
-    List<Long> totalMetrics = new ArrayList<Long>(totalEntries);
-    for (int i = 0; i < totalEntries; ++i) {
-      totalMetrics.add(new Long(0));
-    }
-    for (PoolInfo poolInfo : scheduler.getPoolInfos()) {
-      if (!showPoolInfo(poolInfo, poolGroupFilterSet, poolInfoFilterSet)) {
-        continue;
-      }
-      sb.append("<tr>");
-      sb.append("<td>" + poolInfo.getPoolGroupName() + "</td>");
-      sb.append("<td>" + (poolInfo.getPoolName() == null ? "-" :
-          poolInfo.getPoolName()) + "</td>");
-      sb.append("<td>" + configManager.getComparator(poolInfo) + "</td>");
-      sb.append("<td>" + configManager.isPoolPreemptable(poolInfo) + "</td>");
-
-      int metricsIndex = 0;
-      for (ResourceType type : types) {
-        Map<PoolInfo, PoolInfoMetrics> poolInfoMetrics =
-            scheduler.getPoolInfoMetrics(type);
-        PoolInfoMetrics metric = poolInfoMetrics.get(poolInfo);
-        for (PoolInfoMetrics.MetricName metricsName : PoolInfoMetrics.MetricName
-            .values()) {
-          Long val = null;
-          if (metric != null) {
-            val = metric.getCounter(metricsName);
-          }
-          if (val == null) {
-            val = 0L;
-          }
-          if (metricsName == PoolInfoMetrics.MetricName.MAX &&
-              val == Integer.MAX_VALUE) {
-            sb.append("<td>-</td>");
-
-          } else {
-            sb.append("<td>" + val + "</td>");
-            totalMetrics.set(metricsIndex,
-                (totalMetrics.get(metricsIndex) + val));
-          }
-          ++metricsIndex;
-        }
-      }
-      sb.append("</tr>\n");
-    }
-    // Add totals row
-    sb.append("<tr><td>all pool groups</td><td>all pools</td>" +
-        "<td>-</td><td>-</td>");
-    for (Long metricsValue : totalMetrics) {
-      sb.append("<td>" + metricsValue + "</td>");
-    }
     sb.append("</tbody></table><br>");
     out.print(sb.toString());
   }
@@ -321,50 +213,20 @@
     // header per type
     Collection<ResourceType> resourceTypes = nm.getResourceTypes();
     sb.append(generateTableHeaderCells(
-        convertResourceTypesToStrings(resourceTypes), 1, 0, false));
+        WebUtils.convertResourceTypesToStrings(resourceTypes), 1, 0, false));
     sb.append("</tr></thead><tbody>\n");
 
-    Collection<RetiredSession> retiredSessions = sm.getRetiredSessions();
-    synchronized (retiredSessions) {
-      for (RetiredSession s : retiredSessions) {
-        PoolInfo poolInfo = s.getPoolInfo();
-        if (!showUserPoolInfo(s.getUserId(), userFilterSet,
-          poolInfo, poolGroupFilterSet, poolInfoFilterSet)) {
-          continue;
-        }
-
-        // populate row per retired session
-        sb.append("<tr>");
-
-        // fixed columns: Id/Url + Userid + Name + Status
-        String url =
-            (s.getUrl() == null || s.getUrl().length() == 0) ? s.getSessionId()
-                :
-                "<a href=\"" + s.getUrl() + "\">" + s.getSessionId() + "</a>";
-        sb.append("<td>" + url + "</td>");
-        sb.append("<td>" + dateFormat.format(new Date(s.getStartTime())) +
-                "</td>");
-        sb.append("<td>" + dateFormat.format(new Date(s.getDeletedTime())) +
-                "</td>");
-        sb.append("<td>" + s.getName() + "</td>");
-        sb.append("<td>" + s.getUserId() + "</td>");
-        sb.append("<td>" + poolInfo.getPoolGroupName() + "</td>");
-        sb.append("<td>" + (poolInfo.getPoolName() == null ? "-" :
-            poolInfo.getPoolName()) + "</td>");
-        sb.append("<td>" + s.getPriority() + "</td>");
-        sb.append("<td>" + s.getStatus() + "</td>");
-
-        // variable columns
-        for (ResourceType resourceType : resourceTypes) {
-          int total = s.getFulfilledRequestCountForType(resourceType);
-          sb.append("<td>" + total + "</td>");
-        }
-        sb.append("</tr>\n");
-      }
-    }
     out.print(sb.toString());
     out.print("</tbody></table><br>");
-  }%>
+  }
+
+  public String getDowntimeString(Date lastDowntime) {
+    Long daysElapsed = (new Date().getTime() - lastDowntime.getTime()) /
+                        (24*60*60*1000);
+    return new String(lastDowntime.toString() +
+                     " (" + daysElapsed + " days ago)");
+  }
+%>
 
 <%
   DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
@@ -400,7 +262,7 @@
 <body>
 
 <script type="text/javascript"
-  src="http://jqueryui.com/themeroller/themeswitchertool/">
+  src="/static/jqueryThemeRoller.js">
 </script>
 <div id="switcher"></div>
 
@@ -414,58 +276,33 @@
 </div>
 
 <%
-  Enumeration<String> attributeNames = request.getParameterNames();
-  while (attributeNames.hasMoreElements()) {
-    String attribute = attributeNames.nextElement();
-    if (!attribute.equals("users") && !attribute.equals("poolGroups") &&
-        !attribute.equals("poolInfos")) {
+  String validationMessage =
+    WebUtils.validateAttributeNames(request.getParameterNames());
+  if (validationMessage != null) {
 %>
 
 <script type="text/javascript">
- alert('Illegal parameter <%=attribute%>, only "users", "poolGroups", and "poolInfos" parameters are allowed');
+ alert('<%=validationMessage%>');
 </script>
 
 <%
-      break;
-    }
   }
 %>
 
 <h1><%=cmHostName%> Corona Cluster Manager </h1>
-<b>Started:</b> <%=new Date(cm.getStartTime())%><br>
+<b>Last Restarted:</b> <%=new Date(cm.getLastRestartTime())%><br>
+<b>Last Downtime:</b> <%=getDowntimeString(new Date(cm.getStartTime()))%><br>
 <b>Version:</b> <%=VersionInfo.getVersion()%>,
                 r<%=VersionInfo.getRevision()%><br>
 <b>Compiled:</b> <%=VersionInfo.getDate()%> by
                  <%=VersionInfo.getUser()%><br>
-<%
-  // Check for user set, pool info set, or pool group set filters
-  Set<String> userFilterSet = new HashSet<String>();
-  String userFilter = request.getParameter("users");
-  if (userFilter != null) {
-    userFilterSet.addAll(Arrays.asList(userFilter.split(",")));
-    out.write("<b>users:</b> " + userFilter + "<br>");
-  }
-  Set<String> poolGroupFilterSet = new HashSet<String>();
-  String poolGroupFilter = request.getParameter("poolGroups");
-  if (poolGroupFilter != null) {
-    poolGroupFilterSet.addAll(Arrays.asList(poolGroupFilter.split(",")));
-    out.write("<b>poolGroups:</b> " + poolGroupFilter + "<br>");
-  }
-  Set<PoolInfo> poolInfoFilterSet  = new HashSet<PoolInfo>();
-  String poolInfoFilter = request.getParameter("poolInfos");
-  if (poolInfoFilter != null) {
-    out.write("<b>poolInfos:</b> " + poolInfoFilter + "<br>");
-    for (String poolInfoString : poolInfoFilter.split(",")) {
-      String[] poolInfoStrings = poolInfoString.split("[.]");
-      if (poolInfoStrings.length == 2) {
-        poolInfoFilterSet.add(new PoolInfo(poolInfoStrings[0],
-                                           poolInfoStrings[1]));
-      }
-    }
-  }
-%>
 
 <%
+  WebUtils.JspParameterFilters filters = WebUtils.getJspParameterFilters(
+    request.getParameter("users"),
+    request.getParameter("poolGroups"),
+    request.getParameter("poolInfos"));
+  out.print(filters.getHtmlOutput().toString());
   Scheduler scheduler = cm.getScheduler();
   List<String> poolGroups = new ArrayList<String>();
   List<String> poolInfos = new ArrayList<String>();
@@ -509,23 +346,27 @@
 <button id="poolToggle" type="button">Show/Hide</button>
 <%
   generatePoolTable(out, cm.getScheduler(), cm.getTypes(),
-      poolGroupFilterSet, poolInfoFilterSet);
+      filters.getPoolGroupFilterSet(), filters.getPoolInfoFilterSet());
 %>
 
 <h2 id="active_sessions">Active Sessions</h2>
 <button id="activeToggle" type="button">Show/Hide</button>
 <%
   generateActiveSessionTable(out, cm.getNodeManager(),
-      cm.getSessionManager(), cm.getScheduler(), userFilterSet,
-      poolGroupFilterSet, poolInfoFilterSet, dateFormat);
+      cm.getSessionManager(), cm.getScheduler(),
+      filters.getUserFilterSet(),
+      filters.getPoolGroupFilterSet(),
+      filters.getPoolInfoFilterSet(), dateFormat);
 %>
 
 <h2 id="retired_sessions">Retired Sessions</h2>
 <button id="retiredToggle" type="button">Show/Hide</button>
 <%
   generateRetiredSessionTable(out, cm.getNodeManager(),
-      cm.getSessionManager(), userFilterSet,
-      poolGroupFilterSet, poolInfoFilterSet, dateFormat);
+      cm.getSessionManager(),
+      filters.getUserFilterSet(),
+      filters.getPoolGroupFilterSet(),
+      filters.getPoolInfoFilterSet(), dateFormat);
 %>
 
 <%
diff --git a/src/contrib/corona/src/webapp/cm/cm_old.jsp b/src/contrib/corona/src/webapp/cm/cm_old.jsp
new file mode 100644
index 00000000..b338ec99
--- /dev/null
+++ b/src/contrib/corona/src/webapp/cm/cm_old.jsp
@@ -0,0 +1,556 @@
+<%@ page
+  contentType="text/html; charset=UTF-8"
+  import="javax.servlet.*"
+  import="javax.servlet.http.*"
+  import="java.io.*"
+  import="java.text.*"
+  import="java.util.*"
+  import="org.apache.hadoop.corona.*"
+  import="org.apache.hadoop.util.*"
+  import="org.apache.hadoop.util.ServletUtil"
+  import="org.apache.hadoop.util.StringUtils"
+%>
+
+<%!
+  public boolean showUserPoolInfo(String user,
+      Set<String> userFilterSet, PoolInfo poolInfo,
+      Set<String> poolGroupFilterSet, Set<PoolInfo> poolInfoFilterSet) {
+    boolean showUser = false;
+    if (userFilterSet.isEmpty() || userFilterSet.contains(user)) {
+      showUser = true;
+    }
+
+    return showUser &&
+        showPoolInfo(poolInfo, poolGroupFilterSet, poolInfoFilterSet);
+  }
+
+  public boolean showPoolInfo(PoolInfo poolInfo,
+      Set<String> poolGroupFilterSet, Set<PoolInfo> poolInfoFilterSet) {
+    // If there are no filters, show everything
+    if (poolGroupFilterSet.isEmpty() && poolInfoFilterSet.isEmpty()) {
+      return true;
+    }
+
+    if (poolGroupFilterSet.contains(poolInfo.getPoolGroupName())) {
+      return true;
+    } else if (poolInfoFilterSet.contains(poolInfo)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  public Collection<String> convertResourceTypesToStrings(
+      Collection<ResourceType> resourceTypes) {
+    List<String> retList = new ArrayList<String>(resourceTypes.size());
+    for (ResourceType resourceType : resourceTypes) {
+      retList.add(resourceType.toString());
+    }
+
+    return retList;
+  }
+
+  public void generateSummaryTable(JspWriter out, NodeManager nm,
+      SessionManager sm)
+      throws IOException {
+    StringBuilder sb = new StringBuilder();
+    sb.append("<table id=\"summaryTable\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\">\n");
+
+    // populate header row with list of resource types
+    sb.append("<thead><tr>");
+
+    Collection<ResourceType> resourceTypes = nm.getResourceTypes();
+    String[] perTypeColumns =
+        { "Running", "Waiting", "TotalSlots", "FreeSlots" };
+
+    sb.append(generateTableHeaderCells(
+        convertResourceTypesToStrings(resourceTypes),
+        perTypeColumns.length, 0, false));
+    sb.append("<th colspan=3>Nodes</th>");
+    sb.append("<th colspan=1>Session</th>");
+    sb.append("</tr>\n");
+    out.print(sb.toString());
+
+    String typeColHeader =
+        "<th>"
+            + org.apache.commons.lang.StringUtils.join(perTypeColumns,
+                "</th><th>") + "</th>";
+    StringBuilder row = new StringBuilder("<tr>");
+    for (ResourceType resourceType : resourceTypes) {
+      row.append(typeColHeader);
+    }
+
+    // Nodes
+    row.append("<th>Alive</th>");
+    row.append("<th>Blacklisted</th>");
+    row.append("<th>Excluded</th>");
+    // Session
+    row.append("<th>Running</th></tr></thead>\n");
+    out.print(row.toString());
+
+    row = new StringBuilder("<tbody><tr>");
+
+    for (ResourceType resourceType : resourceTypes) {
+      int waiting = sm.getPendingRequestCountForType(resourceType);
+      int running = sm.getGrantCountForType(resourceType);
+      int totalslots = nm.getMaxCpuForType(resourceType);
+      int freeslots = totalslots - nm.getAllocatedCpuForType(resourceType);
+      row.append("<td>" + running + "</td>");
+      row.append("<td>" + waiting + "</td>");
+      row.append("<td>" + totalslots + "</td>");
+      row.append("<td>" + freeslots + "</td>");
+    }
+
+    row.append("<td><a href=\"machines.jsp?type=alive\">" +
+        nm.getAliveNodeCount() + "</a></td>");
+    FaultManager fm = nm.getFaultManager();
+    row.append("<td><a href=\"machines.jsp?type=blacklisted\">" +
+        fm.getBlacklistedNodeCount() + "</a></td>");
+    row.append("<td><a href=\"machines.jsp?type=excluded\">" +
+        nm.getExcludedNodeCount() + "</a></td>");
+    row.append("<td>" + sm.getRunningSessionCount() + "</td>");
+    row.append("</tr></tbody>\n");
+    row.append("</table>\n");
+
+    out.print(row.toString());
+    out.print("<br>");
+  }
+
+  public void generateActiveSessionTable(
+      JspWriter out, NodeManager nm, SessionManager sm, Scheduler scheduler,
+      Set<String> userFilterSet,
+      Set<String> poolGroupFilterSet, Set<PoolInfo> poolInfoFilterSet,
+      DateFormat dateFormat)
+      throws IOException {
+    StringBuilder sb = new StringBuilder();
+    sb.append("<table id=\"activeTable\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\">\n");
+
+    // populate header row
+    sb.append("<thead><tr>");
+
+    // fixed headers
+    String[] fixedHeaders = { "Id", "Start Time", "Name", "User", "Pool Group",
+            "Pool", "Priority" };
+    sb.append(generateTableHeaderCells(Arrays.asList(fixedHeaders), 1, 2, false));
+
+    // header per type
+    Collection<ResourceType> resourceTypes = nm.getResourceTypes();
+    String[] perTypeColumns = { "Running", "Waiting", "Total" };
+    sb.append(generateTableHeaderCells(
+        convertResourceTypesToStrings(resourceTypes),
+        perTypeColumns.length, 0, false));
+
+    sb.append("</tr>\n");
+
+    // populate sub-header row
+    sb.append("<tr>");
+    for (ResourceType resourceType : resourceTypes) {
+      for (int i = 0; i < perTypeColumns.length; i++)
+        sb.append("<th>" + perTypeColumns[i] + "</th>");
+    }
+    sb.append("</tr></thead><tbody>\n");
+
+    for (String id : sm.getSessions()) {
+      Session s;
+      try {
+        s = sm.getSession(id);
+      } catch (InvalidSessionHandle e) {
+        continue;
+      }
+
+      synchronized (s) {
+        if (s.isDeleted())
+          continue;
+
+        String url = (s.getUrl() == null || s.getUrl().length() == 0) ? id :
+            "<a href=\"" + s.getUrl() + "\">" + id + "</a>";
+        PoolInfo poolInfo = s.getPoolInfo();
+
+        if (!showUserPoolInfo(s.getUserId(), userFilterSet,
+            poolInfo, poolGroupFilterSet, poolInfoFilterSet)) {
+          continue;
+        }
+
+        sb.append("<tr><td>" + url + "</td><td>" +
+            dateFormat.format(new Date(s.getStartTime())) +
+            "</td><td><a href=\"jobresources.jsp?id=" + id + "\">" +
+            s.getName() + "</a></td><td>"  + s.getUserId() + "</td><td>" +
+            poolInfo.getPoolGroupName() + "</td><td>" + poolInfo.getPoolName() +
+            "</td><td>" + SessionPriority.findByValue(s.getPriority()) +
+            "</td>");
+        for (ResourceType resourceType : resourceTypes) {
+          int total = s.getRequestCountForType(resourceType);
+          int waiting = s.getPendingRequestForType(resourceType).size();
+          int running = s.getGrantedRequestForType(resourceType).size();
+          sb.append("<td>" + running + "</td><td>" + waiting + "</td><td>"
+              + total + "</td>");
+        }
+        sb.append("</tr>\n");
+      }
+    }
+    out.print(sb.toString());
+    out.print("</tbody></table><br>");
+  }
+
+  private String getPoolInfoTableData(Map<PoolInfo, PoolInfo> redirects,
+                                      PoolInfo poolInfo) {
+    StringBuffer sb = new StringBuffer();
+    String redirectAttributes = "";
+    if (redirects != null) {
+      PoolInfo destination = redirects.get(poolInfo);
+      if (destination != null) {
+        redirectAttributes = " title=\"Redirected to " +
+            PoolInfo.createStringFromPoolInfo(destination) +
+            "\" class=\"ui-state-disabled\"";
+      }
+    }
+
+    sb.append("<td" + redirectAttributes + ">" + poolInfo.getPoolGroupName() +
+        "</td>");
+    sb.append("<td" + redirectAttributes + ">" +
+        (poolInfo.getPoolName() == null ? "-" : poolInfo.getPoolName()) +
+        "</td>");
+    return sb.toString();
+  }
+
+  public void generatePoolTable(
+      JspWriter out, Scheduler scheduler, Collection<ResourceType> types,
+      Set<String> poolGroupFilterSet, Set<PoolInfo> poolInfoFilterSet)
+      throws IOException {
+    List<String> metricsNames = new ArrayList<String>();
+    for (PoolInfoMetrics.MetricName name :
+        PoolInfoMetrics.MetricName.values()) {
+      metricsNames.add(name.toString());
+    }
+    StringBuilder sb = new StringBuilder();
+    sb.append("<table id=\"poolTable\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\">\n");
+
+    ConfigManager configManager = scheduler.getConfigManager();
+    Map<PoolInfo, PoolInfo> redirects = configManager.getRedirects();
+
+    // Generate headers
+    sb.append("<thead><tr>");
+    sb.append("<th rowspan=2>Pool Group</th>");
+    sb.append("<th rowspan=2>Pool</th>");
+    sb.append("<th rowspan=2>Scheduling</th>");
+    sb.append("<th rowspan=2>Preemptable</th>");
+    sb.append(generateTableHeaderCells(
+        convertResourceTypesToStrings(types),
+        metricsNames.size(), 0, false));
+    sb.append("</tr>\n");
+
+    sb.append("<tr>");
+    for (int i = 0; i < types.size(); ++i) {
+      for (String name : metricsNames) {
+        sb.append("<th>" + name + "</th>");
+      }
+    }
+    sb.append("</tr></thead><tbody>\n");
+
+    // Initialize the total metrics
+    int totalEntries =
+      PoolInfoMetrics.MetricName.values().length * types.size();
+    List<Long> totalMetrics = new ArrayList<Long>(totalEntries);
+    for (int i = 0; i < totalEntries; ++i) {
+      totalMetrics.add(new Long(0));
+    }
+    for (PoolInfo poolInfo : scheduler.getPoolInfos()) {
+      if (!showPoolInfo(poolInfo, poolGroupFilterSet, poolInfoFilterSet)) {
+        continue;
+      }
+      sb.append("<tr>");
+      sb.append(getPoolInfoTableData(redirects, poolInfo));
+      sb.append("<td>" + configManager.getComparator(poolInfo) + "</td>");
+      sb.append("<td>" + configManager.isPoolPreemptable(poolInfo) + "</td>");
+
+      int metricsIndex = 0;
+      for (ResourceType type : types) {
+        Map<PoolInfo, PoolInfoMetrics> poolInfoMetrics =
+            scheduler.getPoolInfoMetrics(type);
+        PoolInfoMetrics metric = poolInfoMetrics.get(poolInfo);
+        for (PoolInfoMetrics.MetricName metricsName :
+            PoolInfoMetrics.MetricName.values()) {
+          Long val = null;
+          if (metric != null) {
+            val = metric.getCounter(metricsName);
+          }
+          if (val == null) {
+            val = 0L;
+          }
+          if (metricsName == PoolInfoMetrics.MetricName.MAX &&
+              val == Integer.MAX_VALUE) {
+            sb.append("<td>-</td>");
+
+          } else {
+            sb.append("<td>" + val + "</td>");
+            // Only add the pool infos, not pool groups metrics.
+            if (poolInfo.getPoolName() != null) {
+              totalMetrics.set(metricsIndex,
+                (totalMetrics.get(metricsIndex) + val));
+            }
+          }
+          ++metricsIndex;
+        }
+      }
+      sb.append("</tr>\n");
+    }
+    // Add totals row
+    sb.append("<tr><td>all pool groups</td><td>all pools</td>" +
+        "<td>-</td><td>-</td>");
+    for (Long metricsValue : totalMetrics) {
+      sb.append("<td>" + metricsValue + "</td>");
+    }
+    sb.append("</tbody></table><br>");
+    out.print(sb.toString());
+  }
+
+  private String generateTableHeaderCells(Collection<String> headers,
+      int colspan, int rowspan,
+      boolean useTableData) {
+    StringBuilder sb = new StringBuilder();
+    String tag = useTableData ? "td" : "th";
+    StringBuilder joinFrag = new StringBuilder("<" + tag);
+    if (colspan > 0) {
+      joinFrag.append(" colspan=" + colspan);
+    }
+    if (rowspan > 0) {
+      joinFrag.append(" rowspan=" + rowspan);
+    }
+    joinFrag.append(">");
+    sb.append(joinFrag);
+    sb.append(org.apache.commons.lang.StringUtils.join(headers, "</" + tag
+        + ">" + joinFrag));
+    sb.append("</" + tag + ">");
+    return sb.toString();
+  }
+
+  public void generateRetiredSessionTable(JspWriter out, NodeManager nm,
+      SessionManager sm, Set<String> userFilterSet,
+      Set<String> poolGroupFilterSet, Set<PoolInfo> poolInfoFilterSet,
+      DateFormat dateFormat)
+      throws IOException {
+
+    StringBuilder sb = new StringBuilder();
+    sb.append("<table id=\"retiredTable\" border=\"1\" cellpadding=\"5\" cellspacing=\"0\">\n");
+
+    // populate header row
+    sb.append("<thead><tr>");
+
+    // fixed headers
+    String[] fixedHeaders = { "Id", "Start Time", "Finished Time",
+        "Name", "User", "Pool Group", "Pool", "Priority", "Status"};
+    sb.append(generateTableHeaderCells(Arrays.asList(fixedHeaders), 1, 0, false));
+
+    // header per type
+    Collection<ResourceType> resourceTypes = nm.getResourceTypes();
+    sb.append(generateTableHeaderCells(
+        convertResourceTypesToStrings(resourceTypes), 1, 0, false));
+    sb.append("</tr></thead><tbody>\n");
+
+    Collection<RetiredSession> retiredSessions = sm.getRetiredSessions();
+    synchronized (retiredSessions) {
+      for (RetiredSession s : retiredSessions) {
+        PoolInfo poolInfo = s.getPoolInfo();
+        if (!showUserPoolInfo(s.getUserId(), userFilterSet,
+          poolInfo, poolGroupFilterSet, poolInfoFilterSet)) {
+          continue;
+        }
+
+        // populate row per retired session
+        sb.append("<tr>");
+
+        // fixed columns: Id/Url + Userid + Name + Status
+        String url =
+            (s.getUrl() == null || s.getUrl().length() == 0) ? s.getSessionId()
+                :
+                "<a href=\"" + s.getUrl() + "\">" + s.getSessionId() + "</a>";
+        sb.append("<td>" + url + "</td>");
+        sb.append("<td>" + dateFormat.format(new Date(s.getStartTime())) +
+                "</td>");
+        sb.append("<td>" + dateFormat.format(new Date(s.getDeletedTime())) +
+                "</td>");
+        sb.append("<td>" + s.getName() + "</td>");
+        sb.append("<td>" + s.getUserId() + "</td>");
+        sb.append("<td>" + poolInfo.getPoolGroupName() + "</td>");
+        sb.append("<td>" + (poolInfo.getPoolName() == null ? "-" :
+            poolInfo.getPoolName()) + "</td>");
+        sb.append("<td>" + s.getPriority() + "</td>");
+        sb.append("<td>" + s.getStatus() + "</td>");
+
+        // variable columns
+        for (ResourceType resourceType : resourceTypes) {
+          int total = s.getFulfilledRequestCountForType(resourceType);
+          sb.append("<td>" + total + "</td>");
+        }
+        sb.append("</tr>\n");
+      }
+    }
+    out.print(sb.toString());
+    out.print("</tbody></table><br>");
+  }%>
+
+<%
+  DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+  ClusterManager cm = (ClusterManager) application.getAttribute("cm");
+  NodeManager nm = cm.getNodeManager();
+  SessionManager sm = cm.getSessionManager();
+  String cmHostName = StringUtils.simpleHostname(cm.getHostName());
+%>
+
+<html>
+<head>
+<title><%=cmHostName%> Corona Cluster Manager </title>
+<link rel="stylesheet" type="text/css" href="/static/jquery/css/ui-lightness/jquery-ui-1.8.20.custom.css"/>
+<link rel="stylesheet" type="text/css" href="/static/hadoop.css">
+<link rel="stylesheet" type="text/css" href="/static/dataTables/css/jquery.dataTables.css">
+<link rel="stylesheet" type="text/css" href="/static/multiselect/jquery.multiselect.css">
+<script type="text/javascript" src="/static/jquery/js/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" src="/static/jquery/js/jquery-ui-1.8.20.custom.min.js"></script>
+<script type="text/javascript" src="/static/cm_old.js"></script>
+<script type="text/javascript" src="/static/dataTables/js/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="/static/multiselect/jquery.multiselect.min.js"></script>
+<style type="text/css">
+  body {
+    font-family: Verdana,Arial,sans-serif;
+    font-size: 1.1em;
+  }
+  .ui-button {
+    font-family: Verdana,Arial,sans-serif;
+    font-size: .91em; /* ≅ 1/1.1 */
+  }
+</style>
+</head>
+<body>
+
+<script type="text/javascript"
+  src="http://jqueryui.com/themeroller/themeswitchertool/">
+</script>
+<div id="switcher"></div>
+
+<div id="quicklinks">
+  <a href="#quicklinks" onclick="toggle('quicklinks-list'); return false;">Quick Links</a>
+  <ul id="quicklinks-list">
+    <li><a href="#pools">Pools</a></li>
+    <li><a href="#active_sessions">Active Sessions</a></li>
+    <li><a href="#retired_sessions">Retired Sessions</a></li>
+  </ul>
+</div>
+
+<%
+  Enumeration<String> attributeNames = request.getParameterNames();
+  while (attributeNames.hasMoreElements()) {
+    String attribute = attributeNames.nextElement();
+    if (!attribute.equals("users") && !attribute.equals("poolGroups") &&
+        !attribute.equals("poolInfos")) {
+%>
+
+<script type="text/javascript">
+ alert('Illegal parameter <%=attribute%>, only "users", "poolGroups", and "poolInfos" parameters are allowed');
+</script>
+
+<%
+      break;
+    }
+  }
+%>
+
+<h1><%=cmHostName%> Corona Cluster Manager </h1>
+<b>Started:</b> <%=new Date(cm.getStartTime())%><br>
+<b>Version:</b> <%=VersionInfo.getVersion()%>,
+                r<%=VersionInfo.getRevision()%><br>
+<b>Compiled:</b> <%=VersionInfo.getDate()%> by
+                 <%=VersionInfo.getUser()%><br>
+<%
+  // Check for user set, pool info set, or pool group set filters
+  Set<String> userFilterSet = new HashSet<String>();
+  String userFilter = request.getParameter("users");
+  if (userFilter != null) {
+    userFilterSet.addAll(Arrays.asList(userFilter.split(",")));
+    out.write("<b>users:</b> " + userFilter + "<br>");
+  }
+  Set<String> poolGroupFilterSet = new HashSet<String>();
+  String poolGroupFilter = request.getParameter("poolGroups");
+  if (poolGroupFilter != null) {
+    poolGroupFilterSet.addAll(Arrays.asList(poolGroupFilter.split(",")));
+    out.write("<b>poolGroups:</b> " + poolGroupFilter + "<br>");
+  }
+  Set<PoolInfo> poolInfoFilterSet  = new HashSet<PoolInfo>();
+  String poolInfoFilter = request.getParameter("poolInfos");
+  if (poolInfoFilter != null) {
+    out.write("<b>poolInfos:</b> " + poolInfoFilter + "<br>");
+    for (String poolInfoString : poolInfoFilter.split(",")) {
+      String[] poolInfoStrings = poolInfoString.split("[.]");
+      if (poolInfoStrings.length == 2) {
+        poolInfoFilterSet.add(new PoolInfo(poolInfoStrings[0],
+                                           poolInfoStrings[1]));
+      }
+    }
+  }
+%>
+
+<%
+  Scheduler scheduler = cm.getScheduler();
+  List<String> poolGroups = new ArrayList<String>();
+  List<String> poolInfos = new ArrayList<String>();
+  for (PoolInfo poolInfo : scheduler.getPoolInfos()) {
+    if (poolInfo.getPoolName() == null) {
+      poolGroups.add(poolInfo.getPoolGroupName());
+    } else {
+      poolInfos.add(PoolInfo.createStringFromPoolInfo(poolInfo));
+    }
+  }
+%>
+
+<hr>
+
+<select id="poolGroupSelect" name="poolGroupSelect" multiple="multiple">
+<%
+  for (String poolGroupString : poolGroups) {
+    out.write("<option value=\""+ poolGroupString + "\">" + poolGroupString +
+        "</option>\n");
+  }
+%>
+</select>
+
+<select id="poolInfoSelect" name="poolInfoSelect" multiple="multiple">
+<%
+  for (String poolInfoString : poolInfos) {
+    out.write("<option value=\""+ poolInfoString + "\">" + poolInfoString +
+        "</option>\n");
+  }
+%>
+</select>
+<button id="addFilter" type="button">Use selected filters</button>
+
+<h2>Cluster Summary</h2>
+
+<%
+  generateSummaryTable(out, cm.getNodeManager(), cm.getSessionManager());
+%>
+
+<h2 id="pools">Pools</h2>
+<button id="poolToggle" type="button">Show/Hide</button>
+<%
+  generatePoolTable(out, cm.getScheduler(), cm.getTypes(),
+      poolGroupFilterSet, poolInfoFilterSet);
+%>
+
+<h2 id="active_sessions">Active Sessions</h2>
+<button id="activeToggle" type="button">Show/Hide</button>
+<%
+  generateActiveSessionTable(out, cm.getNodeManager(),
+      cm.getSessionManager(), cm.getScheduler(), userFilterSet,
+      poolGroupFilterSet, poolInfoFilterSet, dateFormat);
+%>
+
+<h2 id="retired_sessions">Retired Sessions</h2>
+<button id="retiredToggle" type="button">Show/Hide</button>
+<%
+  generateRetiredSessionTable(out, cm.getNodeManager(),
+      cm.getSessionManager(), userFilterSet,
+      poolGroupFilterSet, poolInfoFilterSet, dateFormat);
+%>
+
+<%
+  out.println(ServletUtil.htmlFooter());
+%>
diff --git a/src/contrib/corona/src/webapp/cm/exec.jsp b/src/contrib/corona/src/webapp/cm/exec.jsp
index 7f21029b..4415df21 100644
--- a/src/contrib/corona/src/webapp/cm/exec.jsp
+++ b/src/contrib/corona/src/webapp/cm/exec.jsp
@@ -34,7 +34,7 @@
       response.sendError(HttpServletResponse.SC_EXPECTATION_FAILED,
           "Failed to generate a pools config");
     } else {
-      if (configManager.reloadAllConfig()) {
+      if (configManager.reloadAllConfig(false)) {
         response.addHeader("md5sum", md5String);
         out.println("response = " + md5String + "<br>");
       } else {
diff --git a/src/contrib/corona/src/webapp/cm/machines.jsp b/src/contrib/corona/src/webapp/cm/machines.jsp
index 4c976742..76bad30a 100644
--- a/src/contrib/corona/src/webapp/cm/machines.jsp
+++ b/src/contrib/corona/src/webapp/cm/machines.jsp
@@ -15,10 +15,11 @@
   NodeManager nm = cm.getNodeManager();
   String cmHostName = StringUtils.simpleHostname(cm.getHostName());
   String type = request.getParameter("type");
+  String resourceType = request.getParameter("resourceType");
 %>
 
 <%!
-  public void generateHostTable(JspWriter out, NodeManager nm, String type) 
+  public void generateHostTable(JspWriter out, NodeManager nm, String type, String resourceType)
         throws IOException {
     out.print("<center>\n");
     Collection<String> nodes = null;
@@ -41,6 +42,19 @@
       Set<String> allNodes = new TreeSet<String>(nm.getAllNodes());
       nodes = allNodes;
       out.println("<h2>All Nodes</h2>");
+    } else if ("free".equals(type)) {
+      List<String> freeNodes = new ArrayList<String>();
+      try {
+        freeNodes = nm.getFreeNodesForType(ResourceType.valueOf(resourceType));
+      } catch (IllegalArgumentException e) {
+        throw new IllegalArgumentException(
+            "Cannot correctly parse resource type " +
+            resourceType + ", must be one of " +
+            Arrays.toString(ResourceType.values()));
+      }
+      Collections.sort(freeNodes);
+      nodes = freeNodes;
+      out.println("<h2>Free " + resourceType + " Nodes</h2>");
     } else {
       return;
     }
@@ -70,8 +84,9 @@
   if ("alive".equals(type) ||
       "blacklisted".equals(type) ||
       "excluded".equals(type) ||
-      "all".equals(type)) {
-    generateHostTable(out, nm, type);
+      "all".equals(type) ||
+      "free".equals(type)) {
+    generateHostTable(out, nm, type, resourceType);
   } else {
     out.println("Unknown type " + type);
   }
diff --git a/src/contrib/corona/src/webapp/cm/pool_json.jsp b/src/contrib/corona/src/webapp/cm/pool_json.jsp
new file mode 100644
index 00000000..c777d79f
--- /dev/null
+++ b/src/contrib/corona/src/webapp/cm/pool_json.jsp
@@ -0,0 +1,99 @@
+<%@ page
+  contentType="text/html; charset=UTF-8"
+  import="javax.servlet.*"
+  import="javax.servlet.http.*"
+  import="java.io.*"
+  import="java.text.*"
+  import="java.util.*"
+  import="org.apache.hadoop.corona.*"
+  import="org.apache.hadoop.util.*"
+  import="org.apache.hadoop.util.ServletUtil"
+  import="org.apache.hadoop.util.StringUtils"
+  import="org.json.*"
+%>
+
+<%
+  WebUtils.JspParameterFilters filters = WebUtils.getJspParameterFilters(
+      request.getParameter("users"),
+      request.getParameter("poolGroups"),
+      request.getParameter("poolInfos"));
+
+  ClusterManager cm = (ClusterManager) application.getAttribute("cm");
+  NodeManager nm = cm.getNodeManager();
+
+  JSONObject result = new JSONObject();
+  JSONArray array = new JSONArray();
+
+  Collection<ResourceType> resourceTypes = nm.getResourceTypes();
+  Scheduler scheduler = cm.getScheduler();
+  ConfigManager configManager = scheduler.getConfigManager();
+  Map<PoolInfo, PoolInfo> redirects = configManager.getRedirects();
+
+  // Initialize the total metrics
+  int totalEntries =
+      PoolInfoMetrics.MetricName.values().length * resourceTypes.size();
+  List<Long> totalMetrics = new ArrayList<Long>(totalEntries);
+  for (int i = 0; i < totalEntries; ++i) {
+    totalMetrics.add(new Long(0));
+  }
+  for (PoolInfo poolInfo : scheduler.getPoolInfos()) {
+    if (!WebUtils.showPoolInfo(poolInfo, filters.getPoolGroupFilterSet(),
+        filters.getPoolInfoFilterSet())) {
+      continue;
+    }
+
+    JSONArray row = new JSONArray();
+    WebUtils.PoolInfoHtml poolInfoHtml = WebUtils.getPoolInfoHtml(redirects,
+        poolInfo);
+    row.put(poolInfoHtml.getGroupHtml());
+    row.put(poolInfoHtml.getPoolHtml());
+    row.put(configManager.getComparator(poolInfo));
+    row.put(configManager.isPoolPreemptable(poolInfo));
+
+    int metricsIndex = 0;
+    for (ResourceType type : resourceTypes) {
+      Map<PoolInfo, PoolInfoMetrics> poolInfoMetrics =
+          scheduler.getPoolInfoMetrics(type);
+      PoolInfoMetrics metric = poolInfoMetrics.get(poolInfo);
+      for (PoolInfoMetrics.MetricName metricsName :
+          PoolInfoMetrics.MetricName.values()) {
+        Long val = null;
+        if (metric != null) {
+          val = metric.getCounter(metricsName);
+        }
+        if (val == null) {
+          val = 0L;
+        }
+        if (metricsName == PoolInfoMetrics.MetricName.MAX &&
+            val == Integer.MAX_VALUE) {
+          row.put("-");
+
+        } else {
+          row.put(val);
+          // Only add the pool infos, not pool groups metrics.
+          if (poolInfo.getPoolName() != null) {
+            totalMetrics.set(metricsIndex,
+                (totalMetrics.get(metricsIndex) + val));
+          }
+        }
+        ++metricsIndex;
+      }
+    }
+    array.put(row);
+  }
+  // Add totals row
+  JSONArray row = new JSONArray();
+  row.put("all pool groups");
+  row.put("all pools");
+  row.put("-");
+  row.put("-");
+  for (Long metricsValue : totalMetrics) {
+    row.put(metricsValue);
+  }
+  array.put(row);
+
+  result.put("aaData", array);
+  response.setContentType("application/json");
+  response.setHeader("Cache-Control", "no-store");
+  out.print(result);
+%>
diff --git a/src/contrib/corona/src/webapp/cm/retired_json.jsp b/src/contrib/corona/src/webapp/cm/retired_json.jsp
new file mode 100644
index 00000000..52b64a9a
--- /dev/null
+++ b/src/contrib/corona/src/webapp/cm/retired_json.jsp
@@ -0,0 +1,73 @@
+<%@ page
+  contentType="text/html; charset=UTF-8"
+  import="javax.servlet.*"
+  import="javax.servlet.http.*"
+  import="java.io.*"
+  import="java.text.*"
+  import="java.util.*"
+  import="org.apache.hadoop.corona.*"
+  import="org.apache.hadoop.util.*"
+  import="org.apache.hadoop.util.ServletUtil"
+  import="org.apache.hadoop.util.StringUtils"
+  import="org.json.*"
+%>
+
+<%
+  WebUtils.JspParameterFilters filters = WebUtils.getJspParameterFilters(
+      request.getParameter("users"),
+      request.getParameter("poolGroups"),
+      request.getParameter("poolInfos"));
+
+  DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+  ClusterManager cm = (ClusterManager) application.getAttribute("cm");
+  NodeManager nm = cm.getNodeManager();
+  SessionManager sm = cm.getSessionManager();
+
+  JSONObject result = new JSONObject();
+  JSONArray array = new JSONArray();
+
+  Collection<ResourceType> resourceTypes = nm.getResourceTypes();
+  Collection<RetiredSession> retiredSessions = sm.getRetiredSessions();
+  synchronized (retiredSessions) {
+    for (RetiredSession s : retiredSessions) {
+      PoolInfo poolInfo = s.getPoolInfo();
+      if (!WebUtils.showUserPoolInfo(
+          s.getUserId(),
+          filters.getUserFilterSet(),
+          s.getPoolInfo(),
+          filters.getPoolGroupFilterSet(), filters.getPoolInfoFilterSet())) {
+        continue;
+      }
+
+      JSONArray row = new JSONArray();
+      // fixed columns: Id/Url + Userid + Name + Status
+      String url =
+          (s.getUrl() == null || s.getUrl().length() == 0) ? s.getSessionId()
+              :
+              "<a href=\"" + s.getUrl() + "\">" + s.getSessionId() + "</a>";
+      row.put(url);
+      row.put(dateFormat.format(new Date(s.getStartTime())));
+      row.put(dateFormat.format(new Date(s.getDeletedTime())));
+      row.put(s.getName());
+      row.put(s.getUserId());
+      row.put(poolInfo.getPoolGroupName());
+      row.put(poolInfo.getPoolName() == null ? "-" :
+          poolInfo.getPoolName());
+      row.put(s.getPriority());
+      row.put(s.getStatus());
+
+      // variable columns
+      for (ResourceType resourceType : resourceTypes) {
+        int totalTypes =
+            s.getFulfilledRequestCountForType(resourceType);
+        row.put(totalTypes);
+      }
+      array.put(row);
+    }
+  }
+
+  result.put("aaData", array);
+  response.setContentType("application/json");
+  response.setHeader("Cache-Control", "no-store");
+  out.print(result);
+%>
diff --git a/src/contrib/corona/src/webapp/jt/coronajobdetails.jsp b/src/contrib/corona/src/webapp/jt/coronajobdetails.jsp
index e1f5e77e..0fb40ef6 100644
--- a/src/contrib/corona/src/webapp/jt/coronajobdetails.jsp
+++ b/src/contrib/corona/src/webapp/jt/coronajobdetails.jsp
@@ -16,9 +16,6 @@
   CoronaJobTracker tracker = (CoronaJobTracker) application.getAttribute("job.tracker");
 %>
 <%!
-  private static final String PRIVATE_ACTIONS_KEY
-		= "webinterface.private.actions";
-
   private String tasksUrl = null;
   private String resourcesUrl = null;
   private String failUrl = null;
@@ -182,22 +179,19 @@
       jobId = job.getStatus().getJobID();
 
       String action = request.getParameter("action");
-      if(JSPUtil.conf.getBoolean(PRIVATE_ACTIONS_KEY, false) &&
-          "changeprio".equalsIgnoreCase(action)
+      if("changeprio".equalsIgnoreCase(action)
           && request.getMethod().equalsIgnoreCase("POST")) {
         tracker.setJobPriority(jobId, request.getParameter("prio"));
       }
 
-      if(JSPUtil.conf.getBoolean(PRIVATE_ACTIONS_KEY, false)) {
-          action = request.getParameter("action");
-              if(action!=null && action.equalsIgnoreCase("confirm")) {
-                printConfirm(out, jobId);
-              return;
-              }
-              else if(action != null && action.equalsIgnoreCase("kill") &&
-                  request.getMethod().equalsIgnoreCase("POST")) {
-                tracker.killJobFromWebUI(jobId);
-              }
+      action = request.getParameter("action");
+      if(action!=null && action.equalsIgnoreCase("confirm")) {
+        printConfirm(out, jobId);
+        return;
+      }
+      else if(action != null && action.equalsIgnoreCase("kill") &&
+          request.getMethod().equalsIgnoreCase("POST")) {
+        tracker.killJobFromWebUI(jobId);
       }
     }
 %>
@@ -234,6 +228,7 @@
     out.print("<b>Job Name:</b> " + profile.getJobName() + "<br>\n");
     out.print("<b>Job File:</b> <a href=\"" + getProxyUrl(confUrl, "jobid=" + jobId) + "\">"
               + profile.getJobFile() + "</a><br>\n");
+    out.print("<b>Job Pool:</b> " + tracker.getPoolInfo() + "<br>\n");
     out.print("<b>Job Setup:</b>");
     printJobLevelTaskSummary(out, jobId, "setup",
                              job.getTasks(TaskType.JOB_SETUP));
@@ -350,8 +345,7 @@
 
 <table border="0"> <tr>
 
-<% if(JSPUtil.conf.getBoolean(PRIVATE_ACTIONS_KEY, false)
-    	&& runState == JobStatus.RUNNING) {
+<% if(runState == JobStatus.RUNNING) {
       out.print("<br/><a href=\"" +
                 getProxyUrl(jobUrl, "action=confirm&jobid=" + jobId) +
                 "\"> Kill this job </a>");
diff --git a/src/contrib/corona/src/webapp/jt/coronajobfailures.jsp b/src/contrib/corona/src/webapp/jt/coronajobfailures.jsp
index 93058336..51cc1d19 100644
--- a/src/contrib/corona/src/webapp/jt/coronajobfailures.jsp
+++ b/src/contrib/corona/src/webapp/jt/coronajobfailures.jsp
@@ -41,9 +41,9 @@
           taskState == TaskStatus.State.KILLED)) || taskState == failState) {
         String taskTrackerName = statuses[i].getTaskTracker();
         TaskTrackerStatus taskTracker = tracker.getTaskTrackerStatus(taskTrackerName);
+        String taskDetailsUrl = getProxyUrl(detailsUrl, "jobid="+ jobId + "&tipid=" + tipId);
         out.print("<tr><td>" + statuses[i].getTaskID() +
-                  "</td><td><a href=\"taskdetails.jsp?jobid="+ jobId + 
-                  "&tipid=" + tipId + "\">" + tipId +
+                  "</td><td><a href=\"" + taskDetailsUrl + "\">" + tipId +
                   "</a></td>");
         if (taskTracker == null) {
           out.print("<td>" + taskTrackerName + "</td>");
diff --git a/src/contrib/corona/src/webapp/jt/coronajobresources.jsp b/src/contrib/corona/src/webapp/jt/coronajobresources.jsp
index db1faf89..444e0de7 100644
--- a/src/contrib/corona/src/webapp/jt/coronajobresources.jsp
+++ b/src/contrib/corona/src/webapp/jt/coronajobresources.jsp
@@ -7,9 +7,8 @@
   import="org.apache.hadoop.mapred.*"
   import="org.apache.hadoop.util.*"
   import="java.lang.Integer"
-  import="java.text.SimpleDateFormat"
 %>
-<%! static SimpleDateFormat dateFormat = new SimpleDateFormat("d-MMM-yyyy HH:mm:ss") ;
+<%! 
 
 	private String tasksUrl = null;
 	private String jobUrl = null;
diff --git a/src/contrib/corona/src/webapp/jt/coronajobtasks.jsp b/src/contrib/corona/src/webapp/jt/coronajobtasks.jsp
index 574b5b86..eaf58e5b 100644
--- a/src/contrib/corona/src/webapp/jt/coronajobtasks.jsp
+++ b/src/contrib/corona/src/webapp/jt/coronajobtasks.jsp
@@ -9,7 +9,7 @@
   import="java.lang.Integer"
   import="java.text.SimpleDateFormat"
 %>
-<%! static SimpleDateFormat dateFormat = new SimpleDateFormat("d-MMM-yyyy HH:mm:ss") ;
+<%! static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss") ;
 
     private String detailsUrl = null;
     private String jobUrl = null;
diff --git a/src/contrib/corona/src/webapp/jt/coronataskdetails.jsp b/src/contrib/corona/src/webapp/jt/coronataskdetails.jsp
index c828000e..be9d1c40 100644
--- a/src/contrib/corona/src/webapp/jt/coronataskdetails.jsp
+++ b/src/contrib/corona/src/webapp/jt/coronataskdetails.jsp
@@ -11,9 +11,7 @@
   import="org.apache.hadoop.util.*"
 %>
 <%!static SimpleDateFormat dateFormat = new SimpleDateFormat(
-      "d-MMM-yyyy HH:mm:ss");
-
-  private static final String PRIVATE_ACTIONS_KEY = "webinterface.private.actions";
+      "yyyy/MM/dd HH:mm:ss");
 
   private String detailsUrl = null;
   private String jobUrl = null;
@@ -63,42 +61,40 @@
     statsUrl = tracker.getProxyUrl("coronataskstats.jsp");
     hasProxy = (detailsUrl.indexOf('?') != -1);
 
-    boolean privateActions = JSPUtil.conf.getBoolean(PRIVATE_ACTIONS_KEY, false);
-    if (privateActions) {
-      String action = request.getParameter("action");
-      if (action != null) {
-        if (action.equalsIgnoreCase("confirm")) {
-          String subAction = request.getParameter("subaction");
-          if (subAction == null)
-            subAction = "fail-task";
-          printConfirm(out, jobId.toString(), tipid, taskid, subAction);
-          return;
-        }
-        else if (action.equalsIgnoreCase("kill-task") 
-            && request.getMethod().equalsIgnoreCase("POST")) {
-          tracker.killTask(taskidObj, false);
-          //redirect again so that refreshing the page will not attempt to rekill the task
-          response.sendRedirect(getProxyUrl(detailsUrl, "subaction=kill-task"
-                                            + "&tipid=" + tipid));
-        }
-        else if (action.equalsIgnoreCase("fail-task")
-            && request.getMethod().equalsIgnoreCase("POST")) {
-          tracker.killTask(taskidObj, true);
-          response.sendRedirect(getProxyUrl(detailsUrl, "subaction=fail-task"
-                                            + "&tipid=" + tipid));
-        }
-        else if (action.equalsIgnoreCase("speculative-task")
-            && request.getMethod().equalsIgnoreCase("POST")) {
-          if (tip != null) {
-            tip.setSpeculativeForced(true);
-          }
-          response.sendRedirect(getProxyUrl(detailsUrl,
-                                            "subaction=speculative-task"
-                                            + "&tipid=" + tipid
-                                            + "&here=yes"));
+    String action = request.getParameter("action");
+    if (action != null) {
+      if (action.equalsIgnoreCase("confirm")) {
+        String subAction = request.getParameter("subaction");
+        if (subAction == null)
+          subAction = "fail-task";
+        printConfirm(out, jobId.toString(), tipid, taskid, subAction);
+        return;
+      }
+      else if (action.equalsIgnoreCase("kill-task") 
+          && request.getMethod().equalsIgnoreCase("POST")) {
+        tracker.killTaskFromWebUI(taskidObj, false);
+        //redirect again so that refreshing the page will not attempt to rekill the task
+        response.sendRedirect(getProxyUrl(detailsUrl, "subaction=kill-task"
+                                          + "&tipid=" + tipid));
+      }
+      else if (action.equalsIgnoreCase("fail-task")
+          && request.getMethod().equalsIgnoreCase("POST")) {
+        tracker.killTaskFromWebUI(taskidObj, true);
+        response.sendRedirect(getProxyUrl(detailsUrl, "subaction=fail-task"
+                                          + "&tipid=" + tipid));
+      }
+      else if (action.equalsIgnoreCase("speculative-task")
+          && request.getMethod().equalsIgnoreCase("POST")) {
+        if (tip != null) {
+          tip.setSpeculativeForced(true);
         }
+        response.sendRedirect(getProxyUrl(detailsUrl,
+                                          "subaction=speculative-task"
+                                          + "&tipid=" + tipid
+                                          + "&here=yes"));
       }
     }
+
     TaskStatus[] ts = null;
     if (tip != null) { 
       ts = tip.getTaskStatuses();
@@ -256,8 +252,7 @@
           + "&tipid=" + tipid + "&taskid=" + status.getTaskID()) + "\">"
           + ((status.getCounters() != null) ? status.getCounters().size() : 0) + "</a></td>");
         out.print("<td>");
-        if (privateActions
-          && status.getRunState() == TaskStatus.State.RUNNING) {
+        if (status.getRunState() == TaskStatus.State.RUNNING) {
           out.print("<a href=\"" + getProxyUrl(detailsUrl, "action=confirm"
               + "&subaction=kill-task" + "&jobid=" + jobId + "&tipid="
               + tipid + "&taskid=" + status.getTaskID()) + "\" > Kill </a>");
@@ -272,9 +267,14 @@
           } else {
             out.print("<br>Speculative");
           }
-        }
-        else
+        } else if (status.getRunState() == TaskStatus.State.SUCCEEDED) {
+          // Allow failing succeeded tasks.
+          out.print("<a href=\"" + getProxyUrl(detailsUrl, "action=confirm"
+              + "&subaction=fail-task" + "&jobid=" + jobId + "&tipid="
+              + tipid + "&taskid=" + status.getTaskID()) + "\" > Fail </a>");
+        } else {
           out.print("<pre>&nbsp;</pre>");
+        }
         out.println("</td></tr>");
       }
   %>
diff --git a/src/contrib/corona/src/webapp/jt/index.html b/src/contrib/corona/src/webapp/jt/index.html
index 0cc16dce..07470df8 100644
--- a/src/contrib/corona/src/webapp/jt/index.html
+++ b/src/contrib/corona/src/webapp/jt/index.html
@@ -11,6 +11,7 @@ <h1>Hadoop Administration</h1>
 
 <ul>
 
+<!-- FIXME: The following link is not valid any longer -->
 <li><a href="jobtracker.jsp">JobTracker</a></li>
 
 </ul>
diff --git a/src/contrib/corona/src/webapp/proxyjt/coronaanalysejobhistory.jsp b/src/contrib/corona/src/webapp/proxyjt/coronaanalysejobhistory.jsp
index 7b7aa281..0881f466 100644
--- a/src/contrib/corona/src/webapp/proxyjt/coronaanalysejobhistory.jsp
+++ b/src/contrib/corona/src/webapp/proxyjt/coronaanalysejobhistory.jsp
@@ -11,7 +11,7 @@
 %>
 
 <%!	private static SimpleDateFormat dateFormat 
-                              = new SimpleDateFormat("d/MM HH:mm:ss") ; 
+                              = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss") ; 
 %>
 <html><body>
 <%
diff --git a/src/contrib/corona/src/webapp/proxyjt/coronajobdetailshistory.jsp b/src/contrib/corona/src/webapp/proxyjt/coronajobdetailshistory.jsp
index e5e02a18..9eff4b25 100644
--- a/src/contrib/corona/src/webapp/proxyjt/coronajobdetailshistory.jsp
+++ b/src/contrib/corona/src/webapp/proxyjt/coronajobdetailshistory.jsp
@@ -13,7 +13,7 @@
   import="org.apache.hadoop.conf.Configuration"
 %>
 
-<%! static SimpleDateFormat dateFormat = new SimpleDateFormat("d-MMM-yyyy HH:mm:ss") ; %>
+<%! static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss") ; %>
 <%
     String jobid = request.getParameter("jobid");
     String logFile = request.getParameter("logFile");
@@ -281,7 +281,7 @@
 <%
         for (String t : failedTasks) {
 %>
-          <a href="taskdetailshistory.jsp?jobid=<%=jobid%>&logFile=<%=encodedLogFileName%>&taskid=<%=t %>"><%=t %></a>,&nbsp;
+          <a href="coronataskdetailshistory.jsp?jobid=<%=jobid%>&logFile=<%=encodedLogFileName%>&taskid=<%=t %>"><%=t %></a>,&nbsp;
 <%		  
         }
 %>	
diff --git a/src/contrib/corona/src/webapp/proxyjt/coronajobhistory.jsp b/src/contrib/corona/src/webapp/proxyjt/coronajobhistory.jsp
index 8eec7961..b89cb944 100644
--- a/src/contrib/corona/src/webapp/proxyjt/coronajobhistory.jsp
+++ b/src/contrib/corona/src/webapp/proxyjt/coronajobhistory.jsp
@@ -6,7 +6,6 @@
   import="org.apache.hadoop.util.*"
   import="org.apache.hadoop.fs.*"
   import="javax.servlet.jsp.*"
-  import="java.text.SimpleDateFormat"
   import="org.apache.hadoop.mapred.*"
   import="org.apache.hadoop.mapred.JobHistory.*"
 %>
@@ -16,8 +15,6 @@
 	String trackerName = StringUtils.simpleHostname(tracker
 			.getProxyJobTrackerMachine());
 %>
-<%!private static SimpleDateFormat dateFormat = new SimpleDateFormat(
-			"d/MM HH:mm:ss");%>
 <html>
 <head>
 <script type="text/JavaScript">
diff --git a/src/contrib/corona/src/webapp/proxyjt/coronajobtaskshistory.jsp b/src/contrib/corona/src/webapp/proxyjt/coronajobtaskshistory.jsp
index 52e544fe..ec80426f 100644
--- a/src/contrib/corona/src/webapp/proxyjt/coronajobtaskshistory.jsp
+++ b/src/contrib/corona/src/webapp/proxyjt/coronajobtaskshistory.jsp
@@ -13,7 +13,7 @@
 
 <%!
   private static SimpleDateFormat dateFormat =
-                                    new SimpleDateFormat("d/MM HH:mm:ss") ;
+                                    new SimpleDateFormat("yyyy/MM/dd HH:mm:ss") ;
 %>
 
 <%
@@ -42,7 +42,8 @@
 <center>
 <table border="2" cellpadding="5" cellspacing="2" class="tablesorter">
 <thead>
-<tr><th>Task Id</th><th>Start Time</th><th>Finish Time<br/></th><th>Error</th></tr>
+<tr><th>Task Id</th><th>Task Attempts</th><th>Start Time</th>
+    <th>Finish Time<br/></th><th>Error</th></tr>
 </thead>
 <tbody>
 <%
@@ -52,7 +53,8 @@
       for (JobHistory.TaskAttempt taskAttempt : taskAttempts.values()) {
         if (taskStatus.equals(taskAttempt.get(Keys.TASK_STATUS)) ||
           taskStatus.equals("all")){
-          printTask(jobid, encodedLogFileName, taskAttempt, out);
+          printTask(jobid, encodedLogFileName, taskAttempt, taskAttempts.size(),
+                    out);
         }
       }
     }
@@ -62,11 +64,13 @@
 </table>
 <%!
   private void printTask(String jobid, String logFile,
-    JobHistory.TaskAttempt attempt, JspWriter out) throws IOException{
+      JobHistory.TaskAttempt attempt, int taskAttempts, JspWriter out)
+      throws IOException{
     out.print("<tr>");
     out.print("<td>" + "<a href=\"coronataskdetailshistory.jsp?jobid=" + jobid +
           "&logFile="+ logFile +"&taskid="+attempt.get(Keys.TASKID)+"\">" +
           attempt.get(Keys.TASKID) + "</a></td>");
+    out.print("<td>" + taskAttempts + "</td>");
     out.print("<td>" + StringUtils.getFormattedTimeWithDiff(dateFormat,
           attempt.getLong(Keys.START_TIME), 0 ) + "</td>");
     out.print("<td>" + StringUtils.getFormattedTimeWithDiff(dateFormat,
diff --git a/src/contrib/corona/src/webapp/proxyjt/coronataskdetailshistory.jsp b/src/contrib/corona/src/webapp/proxyjt/coronataskdetailshistory.jsp
index 89d49bc8..ee40d3a2 100644
--- a/src/contrib/corona/src/webapp/proxyjt/coronataskdetailshistory.jsp
+++ b/src/contrib/corona/src/webapp/proxyjt/coronataskdetailshistory.jsp
@@ -11,7 +11,7 @@
   import="org.apache.hadoop.conf.Configuration"
 %>
 
-<%!	private static SimpleDateFormat dateFormat = new SimpleDateFormat("d/MM HH:mm:ss") ; %>
+<%!	private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss") ; %>
 
 <%	
   String jobid = request.getParameter("jobid");
diff --git a/src/contrib/fairscheduler/ivy.xml b/src/contrib/fairscheduler/ivy.xml
index 7e0dd5c4..21200605 100644
--- a/src/contrib/fairscheduler/ivy.xml
+++ b/src/contrib/fairscheduler/ivy.xml
@@ -54,5 +54,9 @@
       name="jsp-2.1"
       rev="${jetty.jsp.version}"
       conf="common->master"/>
+    <dependency org="org.json"
+      name="json"
+      rev="${json.version}"
+      conf="common->default"/>
   </dependencies>
 </ivy-module>
diff --git a/src/contrib/fsshellservice/build.xml b/src/contrib/fsshellservice/build.xml
new file mode 100644
index 00000000..9fb25ee0
--- /dev/null
+++ b/src/contrib/fsshellservice/build.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!--
+   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.
+-->
+
+<!--
+Before you can run these subtargets directly, you need
+to call at top-level: ant deploy-contrib compile-core-test
+-->
+<project name="fsshellservice" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+  <import file="../build-contrib.xml"/>
+
+  <property name="src.dir" value="${basedir}/src/java"/>
+
+  <target name="check-thrift-home">
+    <echo message="Project: ${ant.project.name}"/>
+    <condition property="thrift.home.defined">
+      <or>
+        <not>
+          <isset property="thrift.home"/>
+        </not>
+        <equals arg1="${thrift.home}" arg2="$${thrift.home}" trim="true"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="thriftif" depends="check-thrift-home">
+    <echo message="${ant.project.name}"/>
+    <fail unless="thrift.home">You must set the 'thrift.home' property!</fail>
+    <echo>Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/fsshellservice.thrift</echo>
+    <exec executable="${thrift.home}/bin/thrift"  failonerror="true" dir=".">
+      <arg line=" --gen java -o ${basedir} if/fsshellservice.thrift " />
+    </exec>
+  </target>
+
+  <target name="compile" depends="init, ivy-retrieve-common" unless="skip.contrib">
+    <echo message="contrib: ${name}" />
+    <javac
+     includeantruntime="true"
+     encoding="${build.encoding}"
+     srcdir="${src.dir}:${root}/gen-java"
+     includes="**/*.java"
+     destdir="${build.classes}"
+     debug="${javac.debug}"
+     deprecation="${javac.deprecation}">
+      <classpath refid="contrib-classpath"/>
+    </javac>
+    <copy todir="${build.classes}">
+       <fileset dir="${root}/conf">
+         <include name="fsshellservice-default.xml" />
+       </fileset>
+    </copy>
+  </target>
+
+  <target name="package" depends="jar, jar-examples" unless="skip.contrib">
+   <mkdir dir="${dist.dir}/contrib/${name}"/>
+   <mkdir dir="${dist.dir}/contrib/${name}/conf"/>
+   <copy todir="${dist.dir}/contrib/${name}">
+    <fileset dir="${build.dir}">
+       <include name="hadoop-${version}-${name}.jar" />
+     </fileset>
+   </copy>
+   <copy todir="${dist.dir}/contrib/${name}/conf">
+     <fileset dir="${root}/conf">
+       <include name="fsshellservice-site.xml" />
+     </fileset>
+   </copy>
+  </target>
+
+</project>
+
diff --git a/src/contrib/fsshellservice/conf/fsshellservice-default.xml b/src/contrib/fsshellservice/conf/fsshellservice-default.xml
new file mode 100644
index 00000000..5c912284
--- /dev/null
+++ b/src/contrib/fsshellservice/conf/fsshellservice-default.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+<property>
+  <name>fssshellservice.port</name>
+  <value>62001</value>
+</property>
+
+<property>
+  <name>fsshellservice.server.clienttimeout</name>
+  <value>600000</value>
+</property>
+
+</configuration>
diff --git a/src/contrib/fsshellservice/conf/fsshellservice-site.xml b/src/contrib/fsshellservice/conf/fsshellservice-site.xml
new file mode 100644
index 00000000..d0ff3399
--- /dev/null
+++ b/src/contrib/fsshellservice/conf/fsshellservice-site.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+</configuration>
diff --git a/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/DfsFileStatus.java b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/DfsFileStatus.java
new file mode 100644
index 00000000..bca3c02a
--- /dev/null
+++ b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/DfsFileStatus.java
@@ -0,0 +1,679 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.fsshellservice;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DfsFileStatus implements org.apache.thrift.TBase<DfsFileStatus, DfsFileStatus._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DfsFileStatus");
+
+  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField LENGTH_FIELD_DESC = new org.apache.thrift.protocol.TField("length", org.apache.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.thrift.protocol.TField ISDIR_FIELD_DESC = new org.apache.thrift.protocol.TField("isdir", org.apache.thrift.protocol.TType.BOOL, (short)3);
+  private static final org.apache.thrift.protocol.TField MODIFICATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("modification_time", org.apache.thrift.protocol.TType.I64, (short)4);
+  private static final org.apache.thrift.protocol.TField ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("access_time", org.apache.thrift.protocol.TType.I64, (short)5);
+
+  public String path; // required
+  public long length; // required
+  public boolean isdir; // required
+  public long modification_time; // required
+  public long access_time; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    PATH((short)1, "path"),
+    LENGTH((short)2, "length"),
+    ISDIR((short)3, "isdir"),
+    MODIFICATION_TIME((short)4, "modification_time"),
+    ACCESS_TIME((short)5, "access_time");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // PATH
+          return PATH;
+        case 2: // LENGTH
+          return LENGTH;
+        case 3: // ISDIR
+          return ISDIR;
+        case 4: // MODIFICATION_TIME
+          return MODIFICATION_TIME;
+        case 5: // ACCESS_TIME
+          return ACCESS_TIME;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __LENGTH_ISSET_ID = 0;
+  private static final int __ISDIR_ISSET_ID = 1;
+  private static final int __MODIFICATION_TIME_ISSET_ID = 2;
+  private static final int __ACCESS_TIME_ISSET_ID = 3;
+  private BitSet __isset_bit_vector = new BitSet(4);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.LENGTH, new org.apache.thrift.meta_data.FieldMetaData("length", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.ISDIR, new org.apache.thrift.meta_data.FieldMetaData("isdir", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.MODIFICATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("modification_time", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.ACCESS_TIME, new org.apache.thrift.meta_data.FieldMetaData("access_time", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DfsFileStatus.class, metaDataMap);
+  }
+
+  public DfsFileStatus() {
+  }
+
+  public DfsFileStatus(
+    String path,
+    long length,
+    boolean isdir,
+    long modification_time,
+    long access_time)
+  {
+    this();
+    this.path = path;
+    this.length = length;
+    setLengthIsSet(true);
+    this.isdir = isdir;
+    setIsdirIsSet(true);
+    this.modification_time = modification_time;
+    setModification_timeIsSet(true);
+    this.access_time = access_time;
+    setAccess_timeIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public DfsFileStatus(DfsFileStatus other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    if (other.isSetPath()) {
+      this.path = other.path;
+    }
+    this.length = other.length;
+    this.isdir = other.isdir;
+    this.modification_time = other.modification_time;
+    this.access_time = other.access_time;
+  }
+
+  public DfsFileStatus deepCopy() {
+    return new DfsFileStatus(this);
+  }
+
+  @Override
+  public void clear() {
+    this.path = null;
+    setLengthIsSet(false);
+    this.length = 0;
+    setIsdirIsSet(false);
+    this.isdir = false;
+    setModification_timeIsSet(false);
+    this.modification_time = 0;
+    setAccess_timeIsSet(false);
+    this.access_time = 0;
+  }
+
+  public String getPath() {
+    return this.path;
+  }
+
+  public DfsFileStatus setPath(String path) {
+    this.path = path;
+    return this;
+  }
+
+  public void unsetPath() {
+    this.path = null;
+  }
+
+  /** Returns true if field path is set (has been assigned a value) and false otherwise */
+  public boolean isSetPath() {
+    return this.path != null;
+  }
+
+  public void setPathIsSet(boolean value) {
+    if (!value) {
+      this.path = null;
+    }
+  }
+
+  public long getLength() {
+    return this.length;
+  }
+
+  public DfsFileStatus setLength(long length) {
+    this.length = length;
+    setLengthIsSet(true);
+    return this;
+  }
+
+  public void unsetLength() {
+    __isset_bit_vector.clear(__LENGTH_ISSET_ID);
+  }
+
+  /** Returns true if field length is set (has been assigned a value) and false otherwise */
+  public boolean isSetLength() {
+    return __isset_bit_vector.get(__LENGTH_ISSET_ID);
+  }
+
+  public void setLengthIsSet(boolean value) {
+    __isset_bit_vector.set(__LENGTH_ISSET_ID, value);
+  }
+
+  public boolean isIsdir() {
+    return this.isdir;
+  }
+
+  public DfsFileStatus setIsdir(boolean isdir) {
+    this.isdir = isdir;
+    setIsdirIsSet(true);
+    return this;
+  }
+
+  public void unsetIsdir() {
+    __isset_bit_vector.clear(__ISDIR_ISSET_ID);
+  }
+
+  /** Returns true if field isdir is set (has been assigned a value) and false otherwise */
+  public boolean isSetIsdir() {
+    return __isset_bit_vector.get(__ISDIR_ISSET_ID);
+  }
+
+  public void setIsdirIsSet(boolean value) {
+    __isset_bit_vector.set(__ISDIR_ISSET_ID, value);
+  }
+
+  public long getModification_time() {
+    return this.modification_time;
+  }
+
+  public DfsFileStatus setModification_time(long modification_time) {
+    this.modification_time = modification_time;
+    setModification_timeIsSet(true);
+    return this;
+  }
+
+  public void unsetModification_time() {
+    __isset_bit_vector.clear(__MODIFICATION_TIME_ISSET_ID);
+  }
+
+  /** Returns true if field modification_time is set (has been assigned a value) and false otherwise */
+  public boolean isSetModification_time() {
+    return __isset_bit_vector.get(__MODIFICATION_TIME_ISSET_ID);
+  }
+
+  public void setModification_timeIsSet(boolean value) {
+    __isset_bit_vector.set(__MODIFICATION_TIME_ISSET_ID, value);
+  }
+
+  public long getAccess_time() {
+    return this.access_time;
+  }
+
+  public DfsFileStatus setAccess_time(long access_time) {
+    this.access_time = access_time;
+    setAccess_timeIsSet(true);
+    return this;
+  }
+
+  public void unsetAccess_time() {
+    __isset_bit_vector.clear(__ACCESS_TIME_ISSET_ID);
+  }
+
+  /** Returns true if field access_time is set (has been assigned a value) and false otherwise */
+  public boolean isSetAccess_time() {
+    return __isset_bit_vector.get(__ACCESS_TIME_ISSET_ID);
+  }
+
+  public void setAccess_timeIsSet(boolean value) {
+    __isset_bit_vector.set(__ACCESS_TIME_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case PATH:
+      if (value == null) {
+        unsetPath();
+      } else {
+        setPath((String)value);
+      }
+      break;
+
+    case LENGTH:
+      if (value == null) {
+        unsetLength();
+      } else {
+        setLength((Long)value);
+      }
+      break;
+
+    case ISDIR:
+      if (value == null) {
+        unsetIsdir();
+      } else {
+        setIsdir((Boolean)value);
+      }
+      break;
+
+    case MODIFICATION_TIME:
+      if (value == null) {
+        unsetModification_time();
+      } else {
+        setModification_time((Long)value);
+      }
+      break;
+
+    case ACCESS_TIME:
+      if (value == null) {
+        unsetAccess_time();
+      } else {
+        setAccess_time((Long)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case PATH:
+      return getPath();
+
+    case LENGTH:
+      return Long.valueOf(getLength());
+
+    case ISDIR:
+      return Boolean.valueOf(isIsdir());
+
+    case MODIFICATION_TIME:
+      return Long.valueOf(getModification_time());
+
+    case ACCESS_TIME:
+      return Long.valueOf(getAccess_time());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case PATH:
+      return isSetPath();
+    case LENGTH:
+      return isSetLength();
+    case ISDIR:
+      return isSetIsdir();
+    case MODIFICATION_TIME:
+      return isSetModification_time();
+    case ACCESS_TIME:
+      return isSetAccess_time();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof DfsFileStatus)
+      return this.equals((DfsFileStatus)that);
+    return false;
+  }
+
+  public boolean equals(DfsFileStatus that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_path = true && this.isSetPath();
+    boolean that_present_path = true && that.isSetPath();
+    if (this_present_path || that_present_path) {
+      if (!(this_present_path && that_present_path))
+        return false;
+      if (!this.path.equals(that.path))
+        return false;
+    }
+
+    boolean this_present_length = true;
+    boolean that_present_length = true;
+    if (this_present_length || that_present_length) {
+      if (!(this_present_length && that_present_length))
+        return false;
+      if (this.length != that.length)
+        return false;
+    }
+
+    boolean this_present_isdir = true;
+    boolean that_present_isdir = true;
+    if (this_present_isdir || that_present_isdir) {
+      if (!(this_present_isdir && that_present_isdir))
+        return false;
+      if (this.isdir != that.isdir)
+        return false;
+    }
+
+    boolean this_present_modification_time = true;
+    boolean that_present_modification_time = true;
+    if (this_present_modification_time || that_present_modification_time) {
+      if (!(this_present_modification_time && that_present_modification_time))
+        return false;
+      if (this.modification_time != that.modification_time)
+        return false;
+    }
+
+    boolean this_present_access_time = true;
+    boolean that_present_access_time = true;
+    if (this_present_access_time || that_present_access_time) {
+      if (!(this_present_access_time && that_present_access_time))
+        return false;
+      if (this.access_time != that.access_time)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(DfsFileStatus other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    DfsFileStatus typedOther = (DfsFileStatus)other;
+
+    lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPath()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLength()).compareTo(typedOther.isSetLength());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLength()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.length, typedOther.length);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetIsdir()).compareTo(typedOther.isSetIsdir());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetIsdir()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isdir, typedOther.isdir);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetModification_time()).compareTo(typedOther.isSetModification_time());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetModification_time()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.modification_time, typedOther.modification_time);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetAccess_time()).compareTo(typedOther.isSetAccess_time());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetAccess_time()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.access_time, typedOther.access_time);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // PATH
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.path = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // LENGTH
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.length = iprot.readI64();
+            setLengthIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 3: // ISDIR
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+            this.isdir = iprot.readBool();
+            setIsdirIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 4: // MODIFICATION_TIME
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.modification_time = iprot.readI64();
+            setModification_timeIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 5: // ACCESS_TIME
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.access_time = iprot.readI64();
+            setAccess_timeIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    if (!isSetLength()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'length' was not found in serialized data! Struct: " + toString());
+    }
+    if (!isSetIsdir()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'isdir' was not found in serialized data! Struct: " + toString());
+    }
+    if (!isSetModification_time()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'modification_time' was not found in serialized data! Struct: " + toString());
+    }
+    if (!isSetAccess_time()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'access_time' was not found in serialized data! Struct: " + toString());
+    }
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.path != null) {
+      oprot.writeFieldBegin(PATH_FIELD_DESC);
+      oprot.writeString(this.path);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldBegin(LENGTH_FIELD_DESC);
+    oprot.writeI64(this.length);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(ISDIR_FIELD_DESC);
+    oprot.writeBool(this.isdir);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(MODIFICATION_TIME_FIELD_DESC);
+    oprot.writeI64(this.modification_time);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(ACCESS_TIME_FIELD_DESC);
+    oprot.writeI64(this.access_time);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("DfsFileStatus(");
+    boolean first = true;
+
+    sb.append("path:");
+    if (this.path == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.path);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("length:");
+    sb.append(this.length);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("isdir:");
+    sb.append(this.isdir);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("modification_time:");
+    sb.append(this.modification_time);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("access_time:");
+    sb.append(this.access_time);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    if (path == null) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'path' was not present! Struct: " + toString());
+    }
+    // alas, we cannot check 'length' because it's a primitive and you chose the non-beans generator.
+    // alas, we cannot check 'isdir' because it's a primitive and you chose the non-beans generator.
+    // alas, we cannot check 'modification_time' because it's a primitive and you chose the non-beans generator.
+    // alas, we cannot check 'access_time' because it's a primitive and you chose the non-beans generator.
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellException.java b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellException.java
new file mode 100644
index 00000000..c123e70a
--- /dev/null
+++ b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.fsshellservice;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FsShellException extends Exception implements org.apache.thrift.TBase<FsShellException, FsShellException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FsShellException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FsShellException.class, metaDataMap);
+  }
+
+  public FsShellException() {
+  }
+
+  public FsShellException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public FsShellException(FsShellException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public FsShellException deepCopy() {
+    return new FsShellException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public FsShellException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof FsShellException)
+      return this.equals((FsShellException)that);
+    return false;
+  }
+
+  public boolean equals(FsShellException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(FsShellException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    FsShellException typedOther = (FsShellException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("FsShellException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellFileNotFoundException.java b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellFileNotFoundException.java
new file mode 100644
index 00000000..e5e797dc
--- /dev/null
+++ b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellFileNotFoundException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.fsshellservice;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FsShellFileNotFoundException extends Exception implements org.apache.thrift.TBase<FsShellFileNotFoundException, FsShellFileNotFoundException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FsShellFileNotFoundException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FsShellFileNotFoundException.class, metaDataMap);
+  }
+
+  public FsShellFileNotFoundException() {
+  }
+
+  public FsShellFileNotFoundException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public FsShellFileNotFoundException(FsShellFileNotFoundException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public FsShellFileNotFoundException deepCopy() {
+    return new FsShellFileNotFoundException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public FsShellFileNotFoundException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof FsShellFileNotFoundException)
+      return this.equals((FsShellFileNotFoundException)that);
+    return false;
+  }
+
+  public boolean equals(FsShellFileNotFoundException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(FsShellFileNotFoundException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    FsShellFileNotFoundException typedOther = (FsShellFileNotFoundException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("FsShellFileNotFoundException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellService.java b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellService.java
new file mode 100644
index 00000000..77091e1b
--- /dev/null
+++ b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsShellService.java
@@ -0,0 +1,6741 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.fsshellservice;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FsShellService {
+
+  public interface Iface {
+
+    public void copyFromLocal(String src, String dest) throws FsShellException, org.apache.thrift.TException;
+
+    public void copyToLocal(String src, String dest) throws FsShellException, org.apache.thrift.TException;
+
+    /**
+     * remove() returns true only if the existing file or directory
+     * was actually removed from the file system. remove() will return
+     * false if the file doesn't exist ...
+     * 
+     * @param path
+     * @param recursive
+     * @param skipTrash
+     */
+    public boolean remove(String path, boolean recursive, boolean skipTrash) throws FsShellException, org.apache.thrift.TException;
+
+    /**
+     * mkdirs() returns true if the operation succeeds.
+     * This method silently succeeds if the directory already exists.
+     * It will fail if a file by the given name exists. All path
+     * elements in the given directory path will be silently created.
+     * The behavior is similar to the Unix command mkdir -p.
+     * 
+     * @param f
+     */
+    public boolean mkdirs(String f) throws FsShellException, org.apache.thrift.TException;
+
+    /**
+     * rename() true if successful, or false if the old name does not
+     * exist or if the new name already belongs to the namespace.
+     * 
+     * @param src
+     * @param dest
+     */
+    public boolean rename(String src, String dest) throws FsShellException, org.apache.thrift.TException;
+
+    public List<DfsFileStatus> listStatus(String path) throws FsShellException, FsShellFileNotFoundException, org.apache.thrift.TException;
+
+    public DfsFileStatus getFileStatus(String path) throws FsShellException, FsShellFileNotFoundException, org.apache.thrift.TException;
+
+    public boolean exists(String path) throws FsShellException, org.apache.thrift.TException;
+
+  }
+
+  public interface AsyncIface {
+
+    public void copyFromLocal(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.copyFromLocal_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void copyToLocal(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.copyToLocal_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void remove(String path, boolean recursive, boolean skipTrash, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.remove_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void mkdirs(String f, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.mkdirs_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void rename(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.rename_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void listStatus(String path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.listStatus_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void getFileStatus(String path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getFileStatus_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void exists(String path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.exists_call> resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+      public Factory() {}
+      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+        return new Client(prot);
+      }
+      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+        return new Client(iprot, oprot);
+      }
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol prot)
+    {
+      super(prot, prot);
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      super(iprot, oprot);
+    }
+
+    public void copyFromLocal(String src, String dest) throws FsShellException, org.apache.thrift.TException
+    {
+      send_copyFromLocal(src, dest);
+      recv_copyFromLocal();
+    }
+
+    public void send_copyFromLocal(String src, String dest) throws org.apache.thrift.TException
+    {
+      copyFromLocal_args args = new copyFromLocal_args();
+      args.setSrc(src);
+      args.setDest(dest);
+      sendBase("copyFromLocal", args);
+    }
+
+    public void recv_copyFromLocal() throws FsShellException, org.apache.thrift.TException
+    {
+      copyFromLocal_result result = new copyFromLocal_result();
+      receiveBase(result, "copyFromLocal");
+      if (result.e != null) {
+        throw result.e;
+      }
+      return;
+    }
+
+    public void copyToLocal(String src, String dest) throws FsShellException, org.apache.thrift.TException
+    {
+      send_copyToLocal(src, dest);
+      recv_copyToLocal();
+    }
+
+    public void send_copyToLocal(String src, String dest) throws org.apache.thrift.TException
+    {
+      copyToLocal_args args = new copyToLocal_args();
+      args.setSrc(src);
+      args.setDest(dest);
+      sendBase("copyToLocal", args);
+    }
+
+    public void recv_copyToLocal() throws FsShellException, org.apache.thrift.TException
+    {
+      copyToLocal_result result = new copyToLocal_result();
+      receiveBase(result, "copyToLocal");
+      if (result.e != null) {
+        throw result.e;
+      }
+      return;
+    }
+
+    public boolean remove(String path, boolean recursive, boolean skipTrash) throws FsShellException, org.apache.thrift.TException
+    {
+      send_remove(path, recursive, skipTrash);
+      return recv_remove();
+    }
+
+    public void send_remove(String path, boolean recursive, boolean skipTrash) throws org.apache.thrift.TException
+    {
+      remove_args args = new remove_args();
+      args.setPath(path);
+      args.setRecursive(recursive);
+      args.setSkipTrash(skipTrash);
+      sendBase("remove", args);
+    }
+
+    public boolean recv_remove() throws FsShellException, org.apache.thrift.TException
+    {
+      remove_result result = new remove_result();
+      receiveBase(result, "remove");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "remove failed: unknown result");
+    }
+
+    public boolean mkdirs(String f) throws FsShellException, org.apache.thrift.TException
+    {
+      send_mkdirs(f);
+      return recv_mkdirs();
+    }
+
+    public void send_mkdirs(String f) throws org.apache.thrift.TException
+    {
+      mkdirs_args args = new mkdirs_args();
+      args.setF(f);
+      sendBase("mkdirs", args);
+    }
+
+    public boolean recv_mkdirs() throws FsShellException, org.apache.thrift.TException
+    {
+      mkdirs_result result = new mkdirs_result();
+      receiveBase(result, "mkdirs");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "mkdirs failed: unknown result");
+    }
+
+    public boolean rename(String src, String dest) throws FsShellException, org.apache.thrift.TException
+    {
+      send_rename(src, dest);
+      return recv_rename();
+    }
+
+    public void send_rename(String src, String dest) throws org.apache.thrift.TException
+    {
+      rename_args args = new rename_args();
+      args.setSrc(src);
+      args.setDest(dest);
+      sendBase("rename", args);
+    }
+
+    public boolean recv_rename() throws FsShellException, org.apache.thrift.TException
+    {
+      rename_result result = new rename_result();
+      receiveBase(result, "rename");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "rename failed: unknown result");
+    }
+
+    public List<DfsFileStatus> listStatus(String path) throws FsShellException, FsShellFileNotFoundException, org.apache.thrift.TException
+    {
+      send_listStatus(path);
+      return recv_listStatus();
+    }
+
+    public void send_listStatus(String path) throws org.apache.thrift.TException
+    {
+      listStatus_args args = new listStatus_args();
+      args.setPath(path);
+      sendBase("listStatus", args);
+    }
+
+    public List<DfsFileStatus> recv_listStatus() throws FsShellException, FsShellFileNotFoundException, org.apache.thrift.TException
+    {
+      listStatus_result result = new listStatus_result();
+      receiveBase(result, "listStatus");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      if (result.efnf != null) {
+        throw result.efnf;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listStatus failed: unknown result");
+    }
+
+    public DfsFileStatus getFileStatus(String path) throws FsShellException, FsShellFileNotFoundException, org.apache.thrift.TException
+    {
+      send_getFileStatus(path);
+      return recv_getFileStatus();
+    }
+
+    public void send_getFileStatus(String path) throws org.apache.thrift.TException
+    {
+      getFileStatus_args args = new getFileStatus_args();
+      args.setPath(path);
+      sendBase("getFileStatus", args);
+    }
+
+    public DfsFileStatus recv_getFileStatus() throws FsShellException, FsShellFileNotFoundException, org.apache.thrift.TException
+    {
+      getFileStatus_result result = new getFileStatus_result();
+      receiveBase(result, "getFileStatus");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      if (result.efnf != null) {
+        throw result.efnf;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getFileStatus failed: unknown result");
+    }
+
+    public boolean exists(String path) throws FsShellException, org.apache.thrift.TException
+    {
+      send_exists(path);
+      return recv_exists();
+    }
+
+    public void send_exists(String path) throws org.apache.thrift.TException
+    {
+      exists_args args = new exists_args();
+      args.setPath(path);
+      sendBase("exists", args);
+    }
+
+    public boolean recv_exists() throws FsShellException, org.apache.thrift.TException
+    {
+      exists_result result = new exists_result();
+      receiveBase(result, "exists");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "exists failed: unknown result");
+    }
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+        this.clientManager = clientManager;
+        this.protocolFactory = protocolFactory;
+      }
+      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+        return new AsyncClient(protocolFactory, clientManager, transport);
+      }
+    }
+
+    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+      super(protocolFactory, clientManager, transport);
+    }
+
+    public void copyFromLocal(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<copyFromLocal_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      copyFromLocal_call method_call = new copyFromLocal_call(src, dest, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class copyFromLocal_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String src;
+      private String dest;
+      public copyFromLocal_call(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<copyFromLocal_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.src = src;
+        this.dest = dest;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("copyFromLocal", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        copyFromLocal_args args = new copyFromLocal_args();
+        args.setSrc(src);
+        args.setDest(dest);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws FsShellException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_copyFromLocal();
+      }
+    }
+
+    public void copyToLocal(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<copyToLocal_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      copyToLocal_call method_call = new copyToLocal_call(src, dest, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class copyToLocal_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String src;
+      private String dest;
+      public copyToLocal_call(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<copyToLocal_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.src = src;
+        this.dest = dest;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("copyToLocal", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        copyToLocal_args args = new copyToLocal_args();
+        args.setSrc(src);
+        args.setDest(dest);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws FsShellException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_copyToLocal();
+      }
+    }
+
+    public void remove(String path, boolean recursive, boolean skipTrash, org.apache.thrift.async.AsyncMethodCallback<remove_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      remove_call method_call = new remove_call(path, recursive, skipTrash, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class remove_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String path;
+      private boolean recursive;
+      private boolean skipTrash;
+      public remove_call(String path, boolean recursive, boolean skipTrash, org.apache.thrift.async.AsyncMethodCallback<remove_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.recursive = recursive;
+        this.skipTrash = skipTrash;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        remove_args args = new remove_args();
+        args.setPath(path);
+        args.setRecursive(recursive);
+        args.setSkipTrash(skipTrash);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws FsShellException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_remove();
+      }
+    }
+
+    public void mkdirs(String f, org.apache.thrift.async.AsyncMethodCallback<mkdirs_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      mkdirs_call method_call = new mkdirs_call(f, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class mkdirs_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String f;
+      public mkdirs_call(String f, org.apache.thrift.async.AsyncMethodCallback<mkdirs_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.f = f;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mkdirs", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        mkdirs_args args = new mkdirs_args();
+        args.setF(f);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws FsShellException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_mkdirs();
+      }
+    }
+
+    public void rename(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<rename_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      rename_call method_call = new rename_call(src, dest, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class rename_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String src;
+      private String dest;
+      public rename_call(String src, String dest, org.apache.thrift.async.AsyncMethodCallback<rename_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.src = src;
+        this.dest = dest;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("rename", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        rename_args args = new rename_args();
+        args.setSrc(src);
+        args.setDest(dest);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws FsShellException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_rename();
+      }
+    }
+
+    public void listStatus(String path, org.apache.thrift.async.AsyncMethodCallback<listStatus_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      listStatus_call method_call = new listStatus_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class listStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String path;
+      public listStatus_call(String path, org.apache.thrift.async.AsyncMethodCallback<listStatus_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("listStatus", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        listStatus_args args = new listStatus_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public List<DfsFileStatus> getResult() throws FsShellException, FsShellFileNotFoundException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_listStatus();
+      }
+    }
+
+    public void getFileStatus(String path, org.apache.thrift.async.AsyncMethodCallback<getFileStatus_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getFileStatus_call method_call = new getFileStatus_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getFileStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String path;
+      public getFileStatus_call(String path, org.apache.thrift.async.AsyncMethodCallback<getFileStatus_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getFileStatus", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getFileStatus_args args = new getFileStatus_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public DfsFileStatus getResult() throws FsShellException, FsShellFileNotFoundException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getFileStatus();
+      }
+    }
+
+    public void exists(String path, org.apache.thrift.async.AsyncMethodCallback<exists_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      exists_call method_call = new exists_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class exists_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String path;
+      public exists_call(String path, org.apache.thrift.async.AsyncMethodCallback<exists_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("exists", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        exists_args args = new exists_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws FsShellException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_exists();
+      }
+    }
+
+  }
+
+  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
+    public Processor(I iface) {
+      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+    }
+
+    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      processMap.put("copyFromLocal", new copyFromLocal());
+      processMap.put("copyToLocal", new copyToLocal());
+      processMap.put("remove", new remove());
+      processMap.put("mkdirs", new mkdirs());
+      processMap.put("rename", new rename());
+      processMap.put("listStatus", new listStatus());
+      processMap.put("getFileStatus", new getFileStatus());
+      processMap.put("exists", new exists());
+      return processMap;
+    }
+
+    private static class copyFromLocal<I extends Iface> extends org.apache.thrift.ProcessFunction<I, copyFromLocal_args> {
+      public copyFromLocal() {
+        super("copyFromLocal");
+      }
+
+      protected copyFromLocal_args getEmptyArgsInstance() {
+        return new copyFromLocal_args();
+      }
+
+      protected copyFromLocal_result getResult(I iface, copyFromLocal_args args) throws org.apache.thrift.TException {
+        copyFromLocal_result result = new copyFromLocal_result();
+        try {
+          iface.copyFromLocal(args.src, args.dest);
+        } catch (FsShellException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
+    private static class copyToLocal<I extends Iface> extends org.apache.thrift.ProcessFunction<I, copyToLocal_args> {
+      public copyToLocal() {
+        super("copyToLocal");
+      }
+
+      protected copyToLocal_args getEmptyArgsInstance() {
+        return new copyToLocal_args();
+      }
+
+      protected copyToLocal_result getResult(I iface, copyToLocal_args args) throws org.apache.thrift.TException {
+        copyToLocal_result result = new copyToLocal_result();
+        try {
+          iface.copyToLocal(args.src, args.dest);
+        } catch (FsShellException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
+    private static class remove<I extends Iface> extends org.apache.thrift.ProcessFunction<I, remove_args> {
+      public remove() {
+        super("remove");
+      }
+
+      protected remove_args getEmptyArgsInstance() {
+        return new remove_args();
+      }
+
+      protected remove_result getResult(I iface, remove_args args) throws org.apache.thrift.TException {
+        remove_result result = new remove_result();
+        try {
+          result.success = iface.remove(args.path, args.recursive, args.skipTrash);
+          result.setSuccessIsSet(true);
+        } catch (FsShellException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
+    private static class mkdirs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mkdirs_args> {
+      public mkdirs() {
+        super("mkdirs");
+      }
+
+      protected mkdirs_args getEmptyArgsInstance() {
+        return new mkdirs_args();
+      }
+
+      protected mkdirs_result getResult(I iface, mkdirs_args args) throws org.apache.thrift.TException {
+        mkdirs_result result = new mkdirs_result();
+        try {
+          result.success = iface.mkdirs(args.f);
+          result.setSuccessIsSet(true);
+        } catch (FsShellException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
+    private static class rename<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rename_args> {
+      public rename() {
+        super("rename");
+      }
+
+      protected rename_args getEmptyArgsInstance() {
+        return new rename_args();
+      }
+
+      protected rename_result getResult(I iface, rename_args args) throws org.apache.thrift.TException {
+        rename_result result = new rename_result();
+        try {
+          result.success = iface.rename(args.src, args.dest);
+          result.setSuccessIsSet(true);
+        } catch (FsShellException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
+    private static class listStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, listStatus_args> {
+      public listStatus() {
+        super("listStatus");
+      }
+
+      protected listStatus_args getEmptyArgsInstance() {
+        return new listStatus_args();
+      }
+
+      protected listStatus_result getResult(I iface, listStatus_args args) throws org.apache.thrift.TException {
+        listStatus_result result = new listStatus_result();
+        try {
+          result.success = iface.listStatus(args.path);
+        } catch (FsShellException e) {
+          result.e = e;
+        } catch (FsShellFileNotFoundException efnf) {
+          result.efnf = efnf;
+        }
+        return result;
+      }
+    }
+
+    private static class getFileStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getFileStatus_args> {
+      public getFileStatus() {
+        super("getFileStatus");
+      }
+
+      protected getFileStatus_args getEmptyArgsInstance() {
+        return new getFileStatus_args();
+      }
+
+      protected getFileStatus_result getResult(I iface, getFileStatus_args args) throws org.apache.thrift.TException {
+        getFileStatus_result result = new getFileStatus_result();
+        try {
+          result.success = iface.getFileStatus(args.path);
+        } catch (FsShellException e) {
+          result.e = e;
+        } catch (FsShellFileNotFoundException efnf) {
+          result.efnf = efnf;
+        }
+        return result;
+      }
+    }
+
+    private static class exists<I extends Iface> extends org.apache.thrift.ProcessFunction<I, exists_args> {
+      public exists() {
+        super("exists");
+      }
+
+      protected exists_args getEmptyArgsInstance() {
+        return new exists_args();
+      }
+
+      protected exists_result getResult(I iface, exists_args args) throws org.apache.thrift.TException {
+        exists_result result = new exists_result();
+        try {
+          result.success = iface.exists(args.path);
+          result.setSuccessIsSet(true);
+        } catch (FsShellException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
+  }
+
+  public static class copyFromLocal_args implements org.apache.thrift.TBase<copyFromLocal_args, copyFromLocal_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("copyFromLocal_args");
+
+    private static final org.apache.thrift.protocol.TField SRC_FIELD_DESC = new org.apache.thrift.protocol.TField("src", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField DEST_FIELD_DESC = new org.apache.thrift.protocol.TField("dest", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+    public String src; // required
+    public String dest; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SRC((short)1, "src"),
+      DEST((short)2, "dest");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // SRC
+            return SRC;
+          case 2: // DEST
+            return DEST;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SRC, new org.apache.thrift.meta_data.FieldMetaData("src", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.DEST, new org.apache.thrift.meta_data.FieldMetaData("dest", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(copyFromLocal_args.class, metaDataMap);
+    }
+
+    public copyFromLocal_args() {
+    }
+
+    public copyFromLocal_args(
+      String src,
+      String dest)
+    {
+      this();
+      this.src = src;
+      this.dest = dest;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public copyFromLocal_args(copyFromLocal_args other) {
+      if (other.isSetSrc()) {
+        this.src = other.src;
+      }
+      if (other.isSetDest()) {
+        this.dest = other.dest;
+      }
+    }
+
+    public copyFromLocal_args deepCopy() {
+      return new copyFromLocal_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.src = null;
+      this.dest = null;
+    }
+
+    public String getSrc() {
+      return this.src;
+    }
+
+    public copyFromLocal_args setSrc(String src) {
+      this.src = src;
+      return this;
+    }
+
+    public void unsetSrc() {
+      this.src = null;
+    }
+
+    /** Returns true if field src is set (has been assigned a value) and false otherwise */
+    public boolean isSetSrc() {
+      return this.src != null;
+    }
+
+    public void setSrcIsSet(boolean value) {
+      if (!value) {
+        this.src = null;
+      }
+    }
+
+    public String getDest() {
+      return this.dest;
+    }
+
+    public copyFromLocal_args setDest(String dest) {
+      this.dest = dest;
+      return this;
+    }
+
+    public void unsetDest() {
+      this.dest = null;
+    }
+
+    /** Returns true if field dest is set (has been assigned a value) and false otherwise */
+    public boolean isSetDest() {
+      return this.dest != null;
+    }
+
+    public void setDestIsSet(boolean value) {
+      if (!value) {
+        this.dest = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SRC:
+        if (value == null) {
+          unsetSrc();
+        } else {
+          setSrc((String)value);
+        }
+        break;
+
+      case DEST:
+        if (value == null) {
+          unsetDest();
+        } else {
+          setDest((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SRC:
+        return getSrc();
+
+      case DEST:
+        return getDest();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SRC:
+        return isSetSrc();
+      case DEST:
+        return isSetDest();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof copyFromLocal_args)
+        return this.equals((copyFromLocal_args)that);
+      return false;
+    }
+
+    public boolean equals(copyFromLocal_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_src = true && this.isSetSrc();
+      boolean that_present_src = true && that.isSetSrc();
+      if (this_present_src || that_present_src) {
+        if (!(this_present_src && that_present_src))
+          return false;
+        if (!this.src.equals(that.src))
+          return false;
+      }
+
+      boolean this_present_dest = true && this.isSetDest();
+      boolean that_present_dest = true && that.isSetDest();
+      if (this_present_dest || that_present_dest) {
+        if (!(this_present_dest && that_present_dest))
+          return false;
+        if (!this.dest.equals(that.dest))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(copyFromLocal_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      copyFromLocal_args typedOther = (copyFromLocal_args)other;
+
+      lastComparison = Boolean.valueOf(isSetSrc()).compareTo(typedOther.isSetSrc());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSrc()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.src, typedOther.src);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDest()).compareTo(typedOther.isSetDest());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDest()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dest, typedOther.dest);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // SRC
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.src = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // DEST
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.dest = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.src != null) {
+        oprot.writeFieldBegin(SRC_FIELD_DESC);
+        oprot.writeString(this.src);
+        oprot.writeFieldEnd();
+      }
+      if (this.dest != null) {
+        oprot.writeFieldBegin(DEST_FIELD_DESC);
+        oprot.writeString(this.dest);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("copyFromLocal_args(");
+      boolean first = true;
+
+      sb.append("src:");
+      if (this.src == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.src);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("dest:");
+      if (this.dest == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.dest);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class copyFromLocal_result implements org.apache.thrift.TBase<copyFromLocal_result, copyFromLocal_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("copyFromLocal_result");
+
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public FsShellException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(copyFromLocal_result.class, metaDataMap);
+    }
+
+    public copyFromLocal_result() {
+    }
+
+    public copyFromLocal_result(
+      FsShellException e)
+    {
+      this();
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public copyFromLocal_result(copyFromLocal_result other) {
+      if (other.isSetE()) {
+        this.e = new FsShellException(other.e);
+      }
+    }
+
+    public copyFromLocal_result deepCopy() {
+      return new copyFromLocal_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.e = null;
+    }
+
+    public FsShellException getE() {
+      return this.e;
+    }
+
+    public copyFromLocal_result setE(FsShellException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((FsShellException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof copyFromLocal_result)
+        return this.equals((copyFromLocal_result)that);
+      return false;
+    }
+
+    public boolean equals(copyFromLocal_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(copyFromLocal_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      copyFromLocal_result typedOther = (copyFromLocal_result)other;
+
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new FsShellException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("copyFromLocal_result(");
+      boolean first = true;
+
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class copyToLocal_args implements org.apache.thrift.TBase<copyToLocal_args, copyToLocal_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("copyToLocal_args");
+
+    private static final org.apache.thrift.protocol.TField SRC_FIELD_DESC = new org.apache.thrift.protocol.TField("src", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField DEST_FIELD_DESC = new org.apache.thrift.protocol.TField("dest", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+    public String src; // required
+    public String dest; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SRC((short)1, "src"),
+      DEST((short)2, "dest");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // SRC
+            return SRC;
+          case 2: // DEST
+            return DEST;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SRC, new org.apache.thrift.meta_data.FieldMetaData("src", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.DEST, new org.apache.thrift.meta_data.FieldMetaData("dest", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(copyToLocal_args.class, metaDataMap);
+    }
+
+    public copyToLocal_args() {
+    }
+
+    public copyToLocal_args(
+      String src,
+      String dest)
+    {
+      this();
+      this.src = src;
+      this.dest = dest;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public copyToLocal_args(copyToLocal_args other) {
+      if (other.isSetSrc()) {
+        this.src = other.src;
+      }
+      if (other.isSetDest()) {
+        this.dest = other.dest;
+      }
+    }
+
+    public copyToLocal_args deepCopy() {
+      return new copyToLocal_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.src = null;
+      this.dest = null;
+    }
+
+    public String getSrc() {
+      return this.src;
+    }
+
+    public copyToLocal_args setSrc(String src) {
+      this.src = src;
+      return this;
+    }
+
+    public void unsetSrc() {
+      this.src = null;
+    }
+
+    /** Returns true if field src is set (has been assigned a value) and false otherwise */
+    public boolean isSetSrc() {
+      return this.src != null;
+    }
+
+    public void setSrcIsSet(boolean value) {
+      if (!value) {
+        this.src = null;
+      }
+    }
+
+    public String getDest() {
+      return this.dest;
+    }
+
+    public copyToLocal_args setDest(String dest) {
+      this.dest = dest;
+      return this;
+    }
+
+    public void unsetDest() {
+      this.dest = null;
+    }
+
+    /** Returns true if field dest is set (has been assigned a value) and false otherwise */
+    public boolean isSetDest() {
+      return this.dest != null;
+    }
+
+    public void setDestIsSet(boolean value) {
+      if (!value) {
+        this.dest = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SRC:
+        if (value == null) {
+          unsetSrc();
+        } else {
+          setSrc((String)value);
+        }
+        break;
+
+      case DEST:
+        if (value == null) {
+          unsetDest();
+        } else {
+          setDest((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SRC:
+        return getSrc();
+
+      case DEST:
+        return getDest();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SRC:
+        return isSetSrc();
+      case DEST:
+        return isSetDest();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof copyToLocal_args)
+        return this.equals((copyToLocal_args)that);
+      return false;
+    }
+
+    public boolean equals(copyToLocal_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_src = true && this.isSetSrc();
+      boolean that_present_src = true && that.isSetSrc();
+      if (this_present_src || that_present_src) {
+        if (!(this_present_src && that_present_src))
+          return false;
+        if (!this.src.equals(that.src))
+          return false;
+      }
+
+      boolean this_present_dest = true && this.isSetDest();
+      boolean that_present_dest = true && that.isSetDest();
+      if (this_present_dest || that_present_dest) {
+        if (!(this_present_dest && that_present_dest))
+          return false;
+        if (!this.dest.equals(that.dest))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(copyToLocal_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      copyToLocal_args typedOther = (copyToLocal_args)other;
+
+      lastComparison = Boolean.valueOf(isSetSrc()).compareTo(typedOther.isSetSrc());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSrc()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.src, typedOther.src);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDest()).compareTo(typedOther.isSetDest());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDest()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dest, typedOther.dest);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // SRC
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.src = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // DEST
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.dest = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.src != null) {
+        oprot.writeFieldBegin(SRC_FIELD_DESC);
+        oprot.writeString(this.src);
+        oprot.writeFieldEnd();
+      }
+      if (this.dest != null) {
+        oprot.writeFieldBegin(DEST_FIELD_DESC);
+        oprot.writeString(this.dest);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("copyToLocal_args(");
+      boolean first = true;
+
+      sb.append("src:");
+      if (this.src == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.src);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("dest:");
+      if (this.dest == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.dest);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class copyToLocal_result implements org.apache.thrift.TBase<copyToLocal_result, copyToLocal_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("copyToLocal_result");
+
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public FsShellException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(copyToLocal_result.class, metaDataMap);
+    }
+
+    public copyToLocal_result() {
+    }
+
+    public copyToLocal_result(
+      FsShellException e)
+    {
+      this();
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public copyToLocal_result(copyToLocal_result other) {
+      if (other.isSetE()) {
+        this.e = new FsShellException(other.e);
+      }
+    }
+
+    public copyToLocal_result deepCopy() {
+      return new copyToLocal_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.e = null;
+    }
+
+    public FsShellException getE() {
+      return this.e;
+    }
+
+    public copyToLocal_result setE(FsShellException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((FsShellException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof copyToLocal_result)
+        return this.equals((copyToLocal_result)that);
+      return false;
+    }
+
+    public boolean equals(copyToLocal_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(copyToLocal_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      copyToLocal_result typedOther = (copyToLocal_result)other;
+
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new FsShellException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("copyToLocal_result(");
+      boolean first = true;
+
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class remove_args implements org.apache.thrift.TBase<remove_args, remove_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("remove_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField RECURSIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("recursive", org.apache.thrift.protocol.TType.BOOL, (short)2);
+    private static final org.apache.thrift.protocol.TField SKIP_TRASH_FIELD_DESC = new org.apache.thrift.protocol.TField("skipTrash", org.apache.thrift.protocol.TType.BOOL, (short)3);
+
+    public String path; // required
+    public boolean recursive; // required
+    public boolean skipTrash; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      RECURSIVE((short)2, "recursive"),
+      SKIP_TRASH((short)3, "skipTrash");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // RECURSIVE
+            return RECURSIVE;
+          case 3: // SKIP_TRASH
+            return SKIP_TRASH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __RECURSIVE_ISSET_ID = 0;
+    private static final int __SKIPTRASH_ISSET_ID = 1;
+    private BitSet __isset_bit_vector = new BitSet(2);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.RECURSIVE, new org.apache.thrift.meta_data.FieldMetaData("recursive", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.SKIP_TRASH, new org.apache.thrift.meta_data.FieldMetaData("skipTrash", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(remove_args.class, metaDataMap);
+    }
+
+    public remove_args() {
+    }
+
+    public remove_args(
+      String path,
+      boolean recursive,
+      boolean skipTrash)
+    {
+      this();
+      this.path = path;
+      this.recursive = recursive;
+      setRecursiveIsSet(true);
+      this.skipTrash = skipTrash;
+      setSkipTrashIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public remove_args(remove_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetPath()) {
+        this.path = other.path;
+      }
+      this.recursive = other.recursive;
+      this.skipTrash = other.skipTrash;
+    }
+
+    public remove_args deepCopy() {
+      return new remove_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+      setRecursiveIsSet(false);
+      this.recursive = false;
+      setSkipTrashIsSet(false);
+      this.skipTrash = false;
+    }
+
+    public String getPath() {
+      return this.path;
+    }
+
+    public remove_args setPath(String path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public boolean isRecursive() {
+      return this.recursive;
+    }
+
+    public remove_args setRecursive(boolean recursive) {
+      this.recursive = recursive;
+      setRecursiveIsSet(true);
+      return this;
+    }
+
+    public void unsetRecursive() {
+      __isset_bit_vector.clear(__RECURSIVE_ISSET_ID);
+    }
+
+    /** Returns true if field recursive is set (has been assigned a value) and false otherwise */
+    public boolean isSetRecursive() {
+      return __isset_bit_vector.get(__RECURSIVE_ISSET_ID);
+    }
+
+    public void setRecursiveIsSet(boolean value) {
+      __isset_bit_vector.set(__RECURSIVE_ISSET_ID, value);
+    }
+
+    public boolean isSkipTrash() {
+      return this.skipTrash;
+    }
+
+    public remove_args setSkipTrash(boolean skipTrash) {
+      this.skipTrash = skipTrash;
+      setSkipTrashIsSet(true);
+      return this;
+    }
+
+    public void unsetSkipTrash() {
+      __isset_bit_vector.clear(__SKIPTRASH_ISSET_ID);
+    }
+
+    /** Returns true if field skipTrash is set (has been assigned a value) and false otherwise */
+    public boolean isSetSkipTrash() {
+      return __isset_bit_vector.get(__SKIPTRASH_ISSET_ID);
+    }
+
+    public void setSkipTrashIsSet(boolean value) {
+      __isset_bit_vector.set(__SKIPTRASH_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((String)value);
+        }
+        break;
+
+      case RECURSIVE:
+        if (value == null) {
+          unsetRecursive();
+        } else {
+          setRecursive((Boolean)value);
+        }
+        break;
+
+      case SKIP_TRASH:
+        if (value == null) {
+          unsetSkipTrash();
+        } else {
+          setSkipTrash((Boolean)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      case RECURSIVE:
+        return Boolean.valueOf(isRecursive());
+
+      case SKIP_TRASH:
+        return Boolean.valueOf(isSkipTrash());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      case RECURSIVE:
+        return isSetRecursive();
+      case SKIP_TRASH:
+        return isSetSkipTrash();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof remove_args)
+        return this.equals((remove_args)that);
+      return false;
+    }
+
+    public boolean equals(remove_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      boolean this_present_recursive = true;
+      boolean that_present_recursive = true;
+      if (this_present_recursive || that_present_recursive) {
+        if (!(this_present_recursive && that_present_recursive))
+          return false;
+        if (this.recursive != that.recursive)
+          return false;
+      }
+
+      boolean this_present_skipTrash = true;
+      boolean that_present_skipTrash = true;
+      if (this_present_skipTrash || that_present_skipTrash) {
+        if (!(this_present_skipTrash && that_present_skipTrash))
+          return false;
+        if (this.skipTrash != that.skipTrash)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(remove_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      remove_args typedOther = (remove_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetRecursive()).compareTo(typedOther.isSetRecursive());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetRecursive()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.recursive, typedOther.recursive);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetSkipTrash()).compareTo(typedOther.isSetSkipTrash());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSkipTrash()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.skipTrash, typedOther.skipTrash);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.path = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // RECURSIVE
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.recursive = iprot.readBool();
+              setRecursiveIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // SKIP_TRASH
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.skipTrash = iprot.readBool();
+              setSkipTrashIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        oprot.writeString(this.path);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(RECURSIVE_FIELD_DESC);
+      oprot.writeBool(this.recursive);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(SKIP_TRASH_FIELD_DESC);
+      oprot.writeBool(this.skipTrash);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("remove_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("recursive:");
+      sb.append(this.recursive);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("skipTrash:");
+      sb.append(this.skipTrash);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class remove_result implements org.apache.thrift.TBase<remove_result, remove_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("remove_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public FsShellException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(remove_result.class, metaDataMap);
+    }
+
+    public remove_result() {
+    }
+
+    public remove_result(
+      boolean success,
+      FsShellException e)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public remove_result(remove_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetE()) {
+        this.e = new FsShellException(other.e);
+      }
+    }
+
+    public remove_result deepCopy() {
+      return new remove_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.e = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public remove_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public FsShellException getE() {
+      return this.e;
+    }
+
+    public remove_result setE(FsShellException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((FsShellException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof remove_result)
+        return this.equals((remove_result)that);
+      return false;
+    }
+
+    public boolean equals(remove_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(remove_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      remove_result typedOther = (remove_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new FsShellException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("remove_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class mkdirs_args implements org.apache.thrift.TBase<mkdirs_args, mkdirs_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mkdirs_args");
+
+    private static final org.apache.thrift.protocol.TField F_FIELD_DESC = new org.apache.thrift.protocol.TField("f", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+    public String f; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      F((short)1, "f");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // F
+            return F;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.F, new org.apache.thrift.meta_data.FieldMetaData("f", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mkdirs_args.class, metaDataMap);
+    }
+
+    public mkdirs_args() {
+    }
+
+    public mkdirs_args(
+      String f)
+    {
+      this();
+      this.f = f;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public mkdirs_args(mkdirs_args other) {
+      if (other.isSetF()) {
+        this.f = other.f;
+      }
+    }
+
+    public mkdirs_args deepCopy() {
+      return new mkdirs_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.f = null;
+    }
+
+    public String getF() {
+      return this.f;
+    }
+
+    public mkdirs_args setF(String f) {
+      this.f = f;
+      return this;
+    }
+
+    public void unsetF() {
+      this.f = null;
+    }
+
+    /** Returns true if field f is set (has been assigned a value) and false otherwise */
+    public boolean isSetF() {
+      return this.f != null;
+    }
+
+    public void setFIsSet(boolean value) {
+      if (!value) {
+        this.f = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case F:
+        if (value == null) {
+          unsetF();
+        } else {
+          setF((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case F:
+        return getF();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case F:
+        return isSetF();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof mkdirs_args)
+        return this.equals((mkdirs_args)that);
+      return false;
+    }
+
+    public boolean equals(mkdirs_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_f = true && this.isSetF();
+      boolean that_present_f = true && that.isSetF();
+      if (this_present_f || that_present_f) {
+        if (!(this_present_f && that_present_f))
+          return false;
+        if (!this.f.equals(that.f))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(mkdirs_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      mkdirs_args typedOther = (mkdirs_args)other;
+
+      lastComparison = Boolean.valueOf(isSetF()).compareTo(typedOther.isSetF());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f, typedOther.f);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // F
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.f = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.f != null) {
+        oprot.writeFieldBegin(F_FIELD_DESC);
+        oprot.writeString(this.f);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("mkdirs_args(");
+      boolean first = true;
+
+      sb.append("f:");
+      if (this.f == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class mkdirs_result implements org.apache.thrift.TBase<mkdirs_result, mkdirs_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mkdirs_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public FsShellException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mkdirs_result.class, metaDataMap);
+    }
+
+    public mkdirs_result() {
+    }
+
+    public mkdirs_result(
+      boolean success,
+      FsShellException e)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public mkdirs_result(mkdirs_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetE()) {
+        this.e = new FsShellException(other.e);
+      }
+    }
+
+    public mkdirs_result deepCopy() {
+      return new mkdirs_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.e = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public mkdirs_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public FsShellException getE() {
+      return this.e;
+    }
+
+    public mkdirs_result setE(FsShellException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((FsShellException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof mkdirs_result)
+        return this.equals((mkdirs_result)that);
+      return false;
+    }
+
+    public boolean equals(mkdirs_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(mkdirs_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      mkdirs_result typedOther = (mkdirs_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new FsShellException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("mkdirs_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class rename_args implements org.apache.thrift.TBase<rename_args, rename_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rename_args");
+
+    private static final org.apache.thrift.protocol.TField SRC_FIELD_DESC = new org.apache.thrift.protocol.TField("src", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField DEST_FIELD_DESC = new org.apache.thrift.protocol.TField("dest", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+    public String src; // required
+    public String dest; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SRC((short)1, "src"),
+      DEST((short)2, "dest");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // SRC
+            return SRC;
+          case 2: // DEST
+            return DEST;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SRC, new org.apache.thrift.meta_data.FieldMetaData("src", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.DEST, new org.apache.thrift.meta_data.FieldMetaData("dest", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(rename_args.class, metaDataMap);
+    }
+
+    public rename_args() {
+    }
+
+    public rename_args(
+      String src,
+      String dest)
+    {
+      this();
+      this.src = src;
+      this.dest = dest;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public rename_args(rename_args other) {
+      if (other.isSetSrc()) {
+        this.src = other.src;
+      }
+      if (other.isSetDest()) {
+        this.dest = other.dest;
+      }
+    }
+
+    public rename_args deepCopy() {
+      return new rename_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.src = null;
+      this.dest = null;
+    }
+
+    public String getSrc() {
+      return this.src;
+    }
+
+    public rename_args setSrc(String src) {
+      this.src = src;
+      return this;
+    }
+
+    public void unsetSrc() {
+      this.src = null;
+    }
+
+    /** Returns true if field src is set (has been assigned a value) and false otherwise */
+    public boolean isSetSrc() {
+      return this.src != null;
+    }
+
+    public void setSrcIsSet(boolean value) {
+      if (!value) {
+        this.src = null;
+      }
+    }
+
+    public String getDest() {
+      return this.dest;
+    }
+
+    public rename_args setDest(String dest) {
+      this.dest = dest;
+      return this;
+    }
+
+    public void unsetDest() {
+      this.dest = null;
+    }
+
+    /** Returns true if field dest is set (has been assigned a value) and false otherwise */
+    public boolean isSetDest() {
+      return this.dest != null;
+    }
+
+    public void setDestIsSet(boolean value) {
+      if (!value) {
+        this.dest = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SRC:
+        if (value == null) {
+          unsetSrc();
+        } else {
+          setSrc((String)value);
+        }
+        break;
+
+      case DEST:
+        if (value == null) {
+          unsetDest();
+        } else {
+          setDest((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SRC:
+        return getSrc();
+
+      case DEST:
+        return getDest();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SRC:
+        return isSetSrc();
+      case DEST:
+        return isSetDest();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof rename_args)
+        return this.equals((rename_args)that);
+      return false;
+    }
+
+    public boolean equals(rename_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_src = true && this.isSetSrc();
+      boolean that_present_src = true && that.isSetSrc();
+      if (this_present_src || that_present_src) {
+        if (!(this_present_src && that_present_src))
+          return false;
+        if (!this.src.equals(that.src))
+          return false;
+      }
+
+      boolean this_present_dest = true && this.isSetDest();
+      boolean that_present_dest = true && that.isSetDest();
+      if (this_present_dest || that_present_dest) {
+        if (!(this_present_dest && that_present_dest))
+          return false;
+        if (!this.dest.equals(that.dest))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(rename_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      rename_args typedOther = (rename_args)other;
+
+      lastComparison = Boolean.valueOf(isSetSrc()).compareTo(typedOther.isSetSrc());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSrc()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.src, typedOther.src);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDest()).compareTo(typedOther.isSetDest());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDest()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dest, typedOther.dest);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // SRC
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.src = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // DEST
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.dest = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.src != null) {
+        oprot.writeFieldBegin(SRC_FIELD_DESC);
+        oprot.writeString(this.src);
+        oprot.writeFieldEnd();
+      }
+      if (this.dest != null) {
+        oprot.writeFieldBegin(DEST_FIELD_DESC);
+        oprot.writeString(this.dest);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("rename_args(");
+      boolean first = true;
+
+      sb.append("src:");
+      if (this.src == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.src);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("dest:");
+      if (this.dest == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.dest);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class rename_result implements org.apache.thrift.TBase<rename_result, rename_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rename_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public FsShellException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(rename_result.class, metaDataMap);
+    }
+
+    public rename_result() {
+    }
+
+    public rename_result(
+      boolean success,
+      FsShellException e)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public rename_result(rename_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetE()) {
+        this.e = new FsShellException(other.e);
+      }
+    }
+
+    public rename_result deepCopy() {
+      return new rename_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.e = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public rename_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public FsShellException getE() {
+      return this.e;
+    }
+
+    public rename_result setE(FsShellException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((FsShellException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof rename_result)
+        return this.equals((rename_result)that);
+      return false;
+    }
+
+    public boolean equals(rename_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(rename_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      rename_result typedOther = (rename_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new FsShellException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("rename_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class listStatus_args implements org.apache.thrift.TBase<listStatus_args, listStatus_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("listStatus_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+    public String path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(listStatus_args.class, metaDataMap);
+    }
+
+    public listStatus_args() {
+    }
+
+    public listStatus_args(
+      String path)
+    {
+      this();
+      this.path = path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public listStatus_args(listStatus_args other) {
+      if (other.isSetPath()) {
+        this.path = other.path;
+      }
+    }
+
+    public listStatus_args deepCopy() {
+      return new listStatus_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+    }
+
+    public String getPath() {
+      return this.path;
+    }
+
+    public listStatus_args setPath(String path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof listStatus_args)
+        return this.equals((listStatus_args)that);
+      return false;
+    }
+
+    public boolean equals(listStatus_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(listStatus_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      listStatus_args typedOther = (listStatus_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.path = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        oprot.writeString(this.path);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("listStatus_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class listStatus_result implements org.apache.thrift.TBase<listStatus_result, listStatus_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("listStatus_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField EFNF_FIELD_DESC = new org.apache.thrift.protocol.TField("efnf", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public List<DfsFileStatus> success; // required
+    public FsShellException e; // required
+    public FsShellFileNotFoundException efnf; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e"),
+      EFNF((short)2, "efnf");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          case 2: // EFNF
+            return EFNF;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DfsFileStatus.class))));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.EFNF, new org.apache.thrift.meta_data.FieldMetaData("efnf", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(listStatus_result.class, metaDataMap);
+    }
+
+    public listStatus_result() {
+    }
+
+    public listStatus_result(
+      List<DfsFileStatus> success,
+      FsShellException e,
+      FsShellFileNotFoundException efnf)
+    {
+      this();
+      this.success = success;
+      this.e = e;
+      this.efnf = efnf;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public listStatus_result(listStatus_result other) {
+      if (other.isSetSuccess()) {
+        List<DfsFileStatus> __this__success = new ArrayList<DfsFileStatus>();
+        for (DfsFileStatus other_element : other.success) {
+          __this__success.add(new DfsFileStatus(other_element));
+        }
+        this.success = __this__success;
+      }
+      if (other.isSetE()) {
+        this.e = new FsShellException(other.e);
+      }
+      if (other.isSetEfnf()) {
+        this.efnf = new FsShellFileNotFoundException(other.efnf);
+      }
+    }
+
+    public listStatus_result deepCopy() {
+      return new listStatus_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.e = null;
+      this.efnf = null;
+    }
+
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public java.util.Iterator<DfsFileStatus> getSuccessIterator() {
+      return (this.success == null) ? null : this.success.iterator();
+    }
+
+    public void addToSuccess(DfsFileStatus elem) {
+      if (this.success == null) {
+        this.success = new ArrayList<DfsFileStatus>();
+      }
+      this.success.add(elem);
+    }
+
+    public List<DfsFileStatus> getSuccess() {
+      return this.success;
+    }
+
+    public listStatus_result setSuccess(List<DfsFileStatus> success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public FsShellException getE() {
+      return this.e;
+    }
+
+    public listStatus_result setE(FsShellException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public FsShellFileNotFoundException getEfnf() {
+      return this.efnf;
+    }
+
+    public listStatus_result setEfnf(FsShellFileNotFoundException efnf) {
+      this.efnf = efnf;
+      return this;
+    }
+
+    public void unsetEfnf() {
+      this.efnf = null;
+    }
+
+    /** Returns true if field efnf is set (has been assigned a value) and false otherwise */
+    public boolean isSetEfnf() {
+      return this.efnf != null;
+    }
+
+    public void setEfnfIsSet(boolean value) {
+      if (!value) {
+        this.efnf = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((List<DfsFileStatus>)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((FsShellException)value);
+        }
+        break;
+
+      case EFNF:
+        if (value == null) {
+          unsetEfnf();
+        } else {
+          setEfnf((FsShellFileNotFoundException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case E:
+        return getE();
+
+      case EFNF:
+        return getEfnf();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      case EFNF:
+        return isSetEfnf();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof listStatus_result)
+        return this.equals((listStatus_result)that);
+      return false;
+    }
+
+    public boolean equals(listStatus_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      boolean this_present_efnf = true && this.isSetEfnf();
+      boolean that_present_efnf = true && that.isSetEfnf();
+      if (this_present_efnf || that_present_efnf) {
+        if (!(this_present_efnf && that_present_efnf))
+          return false;
+        if (!this.efnf.equals(that.efnf))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(listStatus_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      listStatus_result typedOther = (listStatus_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetEfnf()).compareTo(typedOther.isSetEfnf());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetEfnf()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.efnf, typedOther.efnf);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+                this.success = new ArrayList<DfsFileStatus>(_list0.size);
+                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+                {
+                  DfsFileStatus _elem2; // required
+                  _elem2 = new DfsFileStatus();
+                  _elem2.read(iprot);
+                  this.success.add(_elem2);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new FsShellException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // EFNF
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.efnf = new FsShellFileNotFoundException();
+              this.efnf.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
+          for (DfsFileStatus _iter3 : this.success)
+          {
+            _iter3.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetEfnf()) {
+        oprot.writeFieldBegin(EFNF_FIELD_DESC);
+        this.efnf.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("listStatus_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("efnf:");
+      if (this.efnf == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.efnf);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getFileStatus_args implements org.apache.thrift.TBase<getFileStatus_args, getFileStatus_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getFileStatus_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+    public String path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getFileStatus_args.class, metaDataMap);
+    }
+
+    public getFileStatus_args() {
+    }
+
+    public getFileStatus_args(
+      String path)
+    {
+      this();
+      this.path = path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getFileStatus_args(getFileStatus_args other) {
+      if (other.isSetPath()) {
+        this.path = other.path;
+      }
+    }
+
+    public getFileStatus_args deepCopy() {
+      return new getFileStatus_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+    }
+
+    public String getPath() {
+      return this.path;
+    }
+
+    public getFileStatus_args setPath(String path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getFileStatus_args)
+        return this.equals((getFileStatus_args)that);
+      return false;
+    }
+
+    public boolean equals(getFileStatus_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getFileStatus_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getFileStatus_args typedOther = (getFileStatus_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.path = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        oprot.writeString(this.path);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getFileStatus_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getFileStatus_result implements org.apache.thrift.TBase<getFileStatus_result, getFileStatus_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getFileStatus_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField EFNF_FIELD_DESC = new org.apache.thrift.protocol.TField("efnf", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public DfsFileStatus success; // required
+    public FsShellException e; // required
+    public FsShellFileNotFoundException efnf; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e"),
+      EFNF((short)2, "efnf");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          case 2: // EFNF
+            return EFNF;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DfsFileStatus.class)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.EFNF, new org.apache.thrift.meta_data.FieldMetaData("efnf", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getFileStatus_result.class, metaDataMap);
+    }
+
+    public getFileStatus_result() {
+    }
+
+    public getFileStatus_result(
+      DfsFileStatus success,
+      FsShellException e,
+      FsShellFileNotFoundException efnf)
+    {
+      this();
+      this.success = success;
+      this.e = e;
+      this.efnf = efnf;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getFileStatus_result(getFileStatus_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new DfsFileStatus(other.success);
+      }
+      if (other.isSetE()) {
+        this.e = new FsShellException(other.e);
+      }
+      if (other.isSetEfnf()) {
+        this.efnf = new FsShellFileNotFoundException(other.efnf);
+      }
+    }
+
+    public getFileStatus_result deepCopy() {
+      return new getFileStatus_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.e = null;
+      this.efnf = null;
+    }
+
+    public DfsFileStatus getSuccess() {
+      return this.success;
+    }
+
+    public getFileStatus_result setSuccess(DfsFileStatus success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public FsShellException getE() {
+      return this.e;
+    }
+
+    public getFileStatus_result setE(FsShellException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public FsShellFileNotFoundException getEfnf() {
+      return this.efnf;
+    }
+
+    public getFileStatus_result setEfnf(FsShellFileNotFoundException efnf) {
+      this.efnf = efnf;
+      return this;
+    }
+
+    public void unsetEfnf() {
+      this.efnf = null;
+    }
+
+    /** Returns true if field efnf is set (has been assigned a value) and false otherwise */
+    public boolean isSetEfnf() {
+      return this.efnf != null;
+    }
+
+    public void setEfnfIsSet(boolean value) {
+      if (!value) {
+        this.efnf = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((DfsFileStatus)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((FsShellException)value);
+        }
+        break;
+
+      case EFNF:
+        if (value == null) {
+          unsetEfnf();
+        } else {
+          setEfnf((FsShellFileNotFoundException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case E:
+        return getE();
+
+      case EFNF:
+        return getEfnf();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      case EFNF:
+        return isSetEfnf();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getFileStatus_result)
+        return this.equals((getFileStatus_result)that);
+      return false;
+    }
+
+    public boolean equals(getFileStatus_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      boolean this_present_efnf = true && this.isSetEfnf();
+      boolean that_present_efnf = true && that.isSetEfnf();
+      if (this_present_efnf || that_present_efnf) {
+        if (!(this_present_efnf && that_present_efnf))
+          return false;
+        if (!this.efnf.equals(that.efnf))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getFileStatus_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getFileStatus_result typedOther = (getFileStatus_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetEfnf()).compareTo(typedOther.isSetEfnf());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetEfnf()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.efnf, typedOther.efnf);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new DfsFileStatus();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new FsShellException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // EFNF
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.efnf = new FsShellFileNotFoundException();
+              this.efnf.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetEfnf()) {
+        oprot.writeFieldBegin(EFNF_FIELD_DESC);
+        this.efnf.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getFileStatus_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("efnf:");
+      if (this.efnf == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.efnf);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class exists_args implements org.apache.thrift.TBase<exists_args, exists_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exists_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+    public String path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(exists_args.class, metaDataMap);
+    }
+
+    public exists_args() {
+    }
+
+    public exists_args(
+      String path)
+    {
+      this();
+      this.path = path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public exists_args(exists_args other) {
+      if (other.isSetPath()) {
+        this.path = other.path;
+      }
+    }
+
+    public exists_args deepCopy() {
+      return new exists_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+    }
+
+    public String getPath() {
+      return this.path;
+    }
+
+    public exists_args setPath(String path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof exists_args)
+        return this.equals((exists_args)that);
+      return false;
+    }
+
+    public boolean equals(exists_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(exists_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      exists_args typedOther = (exists_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.path = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        oprot.writeString(this.path);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("exists_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class exists_result implements org.apache.thrift.TBase<exists_result, exists_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exists_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public FsShellException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(exists_result.class, metaDataMap);
+    }
+
+    public exists_result() {
+    }
+
+    public exists_result(
+      boolean success,
+      FsShellException e)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public exists_result(exists_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetE()) {
+        this.e = new FsShellException(other.e);
+      }
+    }
+
+    public exists_result deepCopy() {
+      return new exists_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.e = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public exists_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public FsShellException getE() {
+      return this.e;
+    }
+
+    public exists_result setE(FsShellException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((FsShellException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof exists_result)
+        return this.equals((exists_result)that);
+      return false;
+    }
+
+    public boolean equals(exists_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(exists_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      exists_result typedOther = (exists_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // E
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.e = new FsShellException();
+              this.e.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetE()) {
+        oprot.writeFieldBegin(E_FIELD_DESC);
+        this.e.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("exists_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+}
diff --git a/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsshellException.java b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsshellException.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsshellService.java b/src/contrib/fsshellservice/gen-java/org/apache/hadoop/hdfs/fsshellservice/FsshellService.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/contrib/fsshellservice/if/fsshellservice.thrift b/src/contrib/fsshellservice/if/fsshellservice.thrift
new file mode 100644
index 00000000..a8d659a6
--- /dev/null
+++ b/src/contrib/fsshellservice/if/fsshellservice.thrift
@@ -0,0 +1,59 @@
+#!/usr/local/bin/thrift -java
+
+namespace java org.apache.hadoop.hdfs.fsshellservice
+namespace php fsshellservice
+namespace py fsshellservice
+namespace cpp fsshellservice
+
+struct DfsFileStatus {
+  1: required string path,
+  2: required i64 length,
+  3: required bool isdir,
+  4: required i64 modification_time,
+  5: required i64 access_time,
+}
+
+exception FsShellException {
+  1: string message
+}
+
+exception FsShellFileNotFoundException {
+  1: string message
+}
+
+
+service FsShellService
+{
+  void copyFromLocal(1:string src, 2:string dest)
+      throws (1:FsShellException e),
+  void copyToLocal(1:string src, 2:string dest)
+      throws (1:FsShellException e),
+  /**
+   * remove() returns true only if the existing file or directory
+   * was actually removed from the file system. remove() will return
+   * false if the file doesn't exist ...
+   */
+  bool remove(1:string path, 2:bool recursive, 3:bool skipTrash)
+      throws (1:FsShellException e),
+  /**
+   * mkdirs() returns true if the operation succeeds.
+   * This method silently succeeds if the directory already exists.
+   * It will fail if a file by the given name exists. All path
+   * elements in the given directory path will be silently created.
+   * The behavior is similar to the Unix command mkdir -p.
+   */
+  bool mkdirs(1:string f)
+      throws (1:FsShellException e),
+  /**
+   * rename() true if successful, or false if the old name does not
+   * exist or if the new name already belongs to the namespace.
+   */
+  bool rename(1:string src, 2:string dest)
+      throws (1:FsShellException e),
+  list<DfsFileStatus> listStatus(1:string path)
+      throws (1:FsShellException e, 2:FsShellFileNotFoundException efnf),
+  DfsFileStatus getFileStatus(1:string path)
+      throws (1:FsShellException e, 2:FsShellFileNotFoundException efnf),
+  bool exists(1:string path)
+      throws (1:FsShellException e),
+}
diff --git a/src/contrib/fsshellservice/ivy.xml b/src/contrib/fsshellservice/ivy.xml
new file mode 100644
index 00000000..782647ad
--- /dev/null
+++ b/src/contrib/fsshellservice/ivy.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<ivy-module version="1.0">
+  <info organisation="org.apache.hadoop" module="${ant.project.name}">
+    <license name="Apache 2.0"/>
+    <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
+    <description>
+        Apache Hadoop contrib
+    </description>
+  </info>
+  <configurations defaultconfmapping="default">
+    <!--these match the Maven configurations-->
+    <conf name="default" extends="master,runtime"/>
+    <conf name="master" description="contains the artifact but no dependencies"/>
+    <conf name="runtime" description="runtime but not the artifact" />
+
+    <conf name="common" visibility="private" 
+      extends="runtime"
+      description="artifacts needed to compile/test the application"/>
+    <conf name="test" visibility="private" extends="runtime"/>
+  </configurations>
+
+  <publications>
+    <!--get the artifact from our module name-->
+    <artifact conf="master"/>
+  </publications>
+  <dependencies>
+    <dependency org="commons-logging"
+      name="commons-logging"
+      rev="${commons-logging.version}"
+      conf="common->default"/>
+    <dependency org="log4j"
+      name="log4j"
+      rev="${log4j.version}"
+      conf="common->master"/>
+    <dependency org="junit"
+      name="junit"
+      rev="${junit.version}"
+      conf="common->default"/>
+    </dependencies>
+  
+</ivy-module>
diff --git a/src/contrib/fsshellservice/ivy/libraries.properties b/src/contrib/fsshellservice/ivy/libraries.properties
new file mode 100644
index 00000000..0c66ce47
--- /dev/null
+++ b/src/contrib/fsshellservice/ivy/libraries.properties
@@ -0,0 +1,8 @@
+
+commons-logging.version=1.0.4
+
+log4j.version=1.2.15
+
+slf4j-api.version=1.6.1
+
+slf4j-log4j12.version=1.6.1
diff --git a/src/contrib/fsshellservice/src/java/org/apache/hadoop/hdfs/fsshellservice/FsShellServiceImpl.java b/src/contrib/fsshellservice/src/java/org/apache/hadoop/hdfs/fsshellservice/FsShellServiceImpl.java
new file mode 100644
index 00000000..dc8c0dfb
--- /dev/null
+++ b/src/contrib/fsshellservice/src/java/org/apache/hadoop/hdfs/fsshellservice/FsShellServiceImpl.java
@@ -0,0 +1,276 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.fsshellservice;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TThreadPoolServer;
+import org.apache.thrift.transport.TServerSocket;
+import org.apache.thrift.transport.TServerTransport;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.TTransportFactory;
+
+/**
+ * A running service that execute simple FSShell commands as Thrift calls
+ */
+public class FsShellServiceImpl implements FsShellService.Iface, Runnable {
+  
+  static {
+    Configuration.addDefaultResource("fsshellservice-default.xml");
+    Configuration.addDefaultResource("hdfs-default.xml");
+
+    Configuration.addDefaultResource("fsshellservice-site.xml");
+    Configuration.addDefaultResource("hdfs-site.xml"); 
+  }
+  public static final Log LOG = LogFactory.getLog(FsShellServiceImpl.class);
+
+  Configuration conf = new Configuration();
+  private int clientTimeout;
+  private TServer tserver;
+
+  private FileSystem getFileSystem(String name) throws IOException,
+      URISyntaxException {
+    return FileSystem.get(new URI(name), conf);
+  }
+  
+  @Override
+  public void copyFromLocal(String src, String dest)
+      throws FsShellException, TException {
+    LOG.info("copy from local: src: " + src + " dest: " + dest);
+    try {
+      getFileSystem(dest).copyFromLocalFile(new Path(src), new Path(dest));
+    } catch (IOException e) {
+      throw new FsShellException(e.toString());
+    } catch (URISyntaxException e) {
+      throw new FsShellException(e.toString());
+    }
+  }
+
+  @Override
+  public void copyToLocal(String src, String dest) throws FsShellException,
+      TException {
+    LOG.info("copy to local: src: " + src + " dest: " + dest);
+    try {
+      getFileSystem(src).copyToLocalFile(new Path(src), new Path(dest));
+    } catch (IOException e) {
+      throw new FsShellException(e.toString());
+    } catch (URISyntaxException e) {
+      throw new FsShellException(e.toString());
+    }
+  }
+
+  @Override
+  public boolean remove(String path, boolean recursive, boolean skipTrash)
+      throws FsShellException, TException {
+    LOG.info("remove: src: " + path + " recusive: " + recursive
+        + " skipTrash: " + skipTrash);
+    try {
+      FileSystem fs = getFileSystem(path);
+      if (!skipTrash) {
+        return getFileSystem(path).delete(new Path(path), recursive);
+      } else {
+        DistributedFileSystem dfs = DFSUtil.convertToDFS(fs);
+        if (dfs == null) {
+          throw new FsShellException(path + " is not a distributed path");
+        }
+        return dfs.getClient().delete(path, recursive);
+      }
+    } catch (IOException e) {
+      throw new FsShellException(e.toString());
+    } catch (URISyntaxException e) {
+      throw new FsShellException(e.toString());
+    }
+  }
+  
+  @Override
+  public boolean mkdirs(String f) throws FsShellException, TException {
+    LOG.info("mkdir f: " + f);
+    try {
+      return getFileSystem(f).mkdirs(new Path(f));
+    } catch (IOException e) {
+      throw new FsShellException(e.toString());
+    } catch (URISyntaxException e) {
+      throw new FsShellException(e.toString());
+    }
+  }
+
+  @Override
+  public boolean rename(String src, String dest) throws FsShellException,
+      TException {
+    LOG.info("rename: src: " + src + " dest: " + dest);
+    try {
+      return getFileSystem(src).rename(new Path(src), new Path(dest));
+    } catch (IOException e) {
+      throw new FsShellException(e.toString());
+    } catch (URISyntaxException e) {
+      throw new FsShellException(e.toString());
+    }
+  }
+
+  @Override
+  public List<DfsFileStatus> listStatus(String path) throws FsShellException,
+      FsShellFileNotFoundException, TException {
+    LOG.info("listStatus: path: " + path);
+    try {
+      FileStatus[] fsArray =  getFileSystem(path).listStatus(new Path(path));
+      if (fsArray == null) {
+        // directory doesn't exist
+        throw new FsShellFileNotFoundException("The directory doesn't exist.");
+      }
+      List<DfsFileStatus> retList = new ArrayList<DfsFileStatus>(fsArray.length);
+      for (FileStatus fs : fsArray) {
+        retList.add(new DfsFileStatus(fs.getPath().toString(), fs.getLen(), fs
+            .isDir(), fs.getModificationTime(), fs.getAccessTime()));
+      }
+      return retList;
+    } catch (IOException e) {
+      throw new FsShellException(e.toString());
+    } catch (URISyntaxException e) {
+      throw new FsShellException(e.toString());
+    }
+  }
+  
+  @Override
+  public DfsFileStatus getFileStatus(String path) throws FsShellException,
+      FsShellFileNotFoundException, TException {
+    LOG.info("getFileStatus: path: " + path);
+    try {
+      FileSystem fs = getFileSystem(path);
+      FileStatus fi = fs.getFileStatus(new Path(path));
+
+      if (fi != null) {
+        fi.makeQualified(fs);
+        return new DfsFileStatus(fi.getPath().toString(), fi.getLen(), fi.isDir(),
+            fi.getModificationTime(), fi.getAccessTime());
+      } else {
+        throw new FsShellFileNotFoundException("File does not exist: " + path);
+      }
+    } catch (FileNotFoundException fnfe) {
+      throw new FsShellFileNotFoundException(fnfe.getMessage());
+    } catch (IOException e) {
+      throw new FsShellException(e.toString());
+    } catch (URISyntaxException e) {
+      throw new FsShellException(e.toString());
+    }
+  }
+
+  @Override
+  public boolean exists(String path) throws FsShellException, TException {
+    LOG.info("exists: path: " + path);
+    try {
+      return getFileSystem(path).exists(new Path(path));
+    } catch (IOException e) {
+      throw new FsShellException(e.toString());
+    } catch (URISyntaxException e) {
+      throw new FsShellException(e.toString());
+    }
+  }
+
+  
+  private void initThriftServer(int port, int maxQueue) {
+    // Setup the Thrift server
+    LOG.info("Setting up Thrift server listening port " + port);
+    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();
+    TTransportFactory transportFactory = new TFramedTransport.Factory();
+    TServerTransport  serverTransport;
+    FsShellService.Processor<FsShellService.Iface> processor =
+        new FsShellService.Processor<FsShellService.Iface>(this);
+
+    ServerSocket serverSocket_;
+    try {
+      // Make server socket. Use loop-back address to only serve requests
+      // from local clients, in order to prevent ambiguity for commands
+      // of copyFromLocal() and copyToLocal()
+      serverSocket_ = new ServerSocket(port, maxQueue,
+          InetAddress.getAllByName(null)[0]);
+      // Prevent 2MSL delay problem on server restarts
+      serverSocket_.setReuseAddress(true);
+    } catch (IOException ioe) {
+      LOG.error("Could not create ServerSocket on local address ", ioe);
+      return;
+    }
+    serverTransport = new TServerSocket(serverSocket_, clientTimeout);
+    TThreadPoolServer.Args serverArgs =
+        new TThreadPoolServer.Args(serverTransport);
+    serverArgs.processor(processor).transportFactory(transportFactory)
+        .protocolFactory(protocolFactory);
+    tserver = new TThreadPoolServer(serverArgs);    
+  }
+  
+  @Override
+  public void run() {
+    try {
+      LOG.info("Starting Thrift server");
+      if (tserver == null) {
+        LOG.error("Error when starting the server");
+        return;
+      }
+      tserver.serve();
+    } catch (Exception e) {
+      LOG.error("Thrift server failed", e);
+    }
+  }
+
+  void init() {
+    int port = conf.getInt("fssshellservice.port", 62001);
+    int maxQueue = conf.getInt("fssshellservice.max.queue", 1024);
+    clientTimeout = conf.getInt("fsshellservice.server.clienttimeout",
+        600 * 1000);
+    initThriftServer(port, maxQueue);
+  }
+
+  FsShellServiceImpl (Configuration conf) {
+    init();
+  }
+  
+  
+  public static void main(String[] args) {
+    FsShellServiceImpl imp = new FsShellServiceImpl(new Configuration());
+    Thread t = new Thread(imp);
+    t.start();
+    while (true) {
+      try {
+        t.join();
+        break;
+      } catch (InterruptedException e) {
+        t.interrupt();
+      }
+    }
+  }
+}
diff --git a/src/contrib/fsshellservice/src/java/org/apache/hadoop/hdfs/fsshellservice/FsshellServiceImpl.java b/src/contrib/fsshellservice/src/java/org/apache/hadoop/hdfs/fsshellservice/FsshellServiceImpl.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/contrib/fsshellservice/src/test/org/apache/hadoop/hdfs/fsshellservice/FsShellServiceClient.java b/src/contrib/fsshellservice/src/test/org/apache/hadoop/hdfs/fsshellservice/FsShellServiceClient.java
new file mode 100644
index 00000000..ba11fb58
--- /dev/null
+++ b/src/contrib/fsshellservice/src/test/org/apache/hadoop/hdfs/fsshellservice/FsShellServiceClient.java
@@ -0,0 +1,98 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.fsshellservice;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+
+
+public class FsShellServiceClient {
+  FsShellService.Client client;
+  TTransport tr;
+
+  FsShellServiceClient() throws TTransportException {
+    tr = new TFramedTransport(new TSocket("localhost", 62001));
+    TProtocol proto = new TBinaryProtocol(tr);
+    client = new FsShellService.Client(proto);
+    tr.open();
+  }
+
+  void execute() throws FsShellException, FsShellFileNotFoundException,
+      TException {
+    BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+    try {
+      String line = null;
+
+      while (true) {
+        System.err.print("> ");
+        try {
+          line = br.readLine();
+        } catch (IOException ioe) {
+          System.err.println("Error when accepting inputs");
+          break;
+        }
+        if (line != null && line.toLowerCase().equals("exit")) {
+          break;
+        }
+        String[] tokens = line.split(" ");
+        String command = tokens[0].toLowerCase();
+        if (command.equals("mkdirs")) {
+          System.err.println("result: " + client.mkdirs(tokens[1]));
+        } else if (command.equals("copyfromlocal")) {
+          client.copyFromLocal(tokens[1], tokens[2]);
+          System.err.println("done");
+        } else if (command.equals("copytolocal")) {
+          client.copyToLocal(tokens[1], tokens[2]);
+          System.err.println("done");
+        } else if (command.equals("remove")) {
+          System.err.println("result: "
+              + client.remove(tokens[1], Boolean.parseBoolean(tokens[2]),
+                  Boolean.parseBoolean(tokens[3])));
+        } else if (command.equals("rename")) {
+          System.err.println("result: " + client.rename(tokens[1], tokens[2]));
+        } else if (command.equals("ls")) {
+          System.err.println("result: " + client.listStatus(tokens[1]));
+        } else if (command.equals("status")) {
+          System.err.println("result: " + client.getFileStatus(tokens[1]));
+        } else if (command.equals("exists")) {
+          System.err.println("result: " + client.exists(tokens[1]));
+        } else {
+          System.err.println("Invalid Command");
+        }
+      }
+
+    } finally {
+      tr.close();
+    }
+  }
+
+  public static void main(String[] args) throws FsShellException,
+      FsShellFileNotFoundException, TException {
+    FsShellServiceClient client = new FsShellServiceClient();
+    client.execute();
+  }
+}
diff --git a/src/contrib/fsshellservice/src/test/org/apache/hadoop/hdfs/fsshellservice/FsshellServiceClient.java b/src/contrib/fsshellservice/src/test/org/apache/hadoop/hdfs/fsshellservice/FsshellServiceClient.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/contrib/gridmix/ivy.xml b/src/contrib/gridmix/ivy.xml
index 507c4b2d..7d46702f 100644
--- a/src/contrib/gridmix/ivy.xml
+++ b/src/contrib/gridmix/ivy.xml
@@ -101,5 +101,9 @@
       name="jackson-core-asl"
       rev="${jackson.version}"
       conf="common->default"/>
+    <dependency org="org.json"
+      name="json"
+      rev="${json.version}"
+      conf="common->default"/>
   </dependencies>
 </ivy-module>
diff --git a/src/contrib/highavailability/conf/raid.xml b/src/contrib/highavailability/conf/raid.xml
index 3cf2dc66..81267a99 100644
--- a/src/contrib/highavailability/conf/raid.xml
+++ b/src/contrib/highavailability/conf/raid.xml
@@ -1,13 +1,6 @@
    <configuration>
     <srcPath prefix="hdfs://dfs1.xxx.com:8000/user/dhruba/">
       <policy name = "dhruba">
-        <property>
-          <name>srcReplication</name>
-          <value>3</value>
-          <description> pick files for RAID only if their replication factor is
-                        greater than or equal to this value.
-          </description>
-        </property>
         <property>
           <name>targetReplication</name>
           <value>2</value>
diff --git a/src/contrib/highavailability/ivy.xml b/src/contrib/highavailability/ivy.xml
index 14a77a39..afed3d27 100644
--- a/src/contrib/highavailability/ivy.xml
+++ b/src/contrib/highavailability/ivy.xml
@@ -74,5 +74,21 @@
       name="core"
       rev="${core.version}"
       conf="common->default"/>
+    <dependency org="org.json"
+      name="json"
+      rev="${json.version}"
+      conf="common->default"/>
+    <dependency org="com.google.guava"  
+      name="guava"   
+      rev="${guava.version}"  
+      conf="common->default"/>
+    <dependency org="org.mockito"
+      name="mockito-all"
+      rev="${mockito-all.version}"
+      conf="common->master"/>
+    <dependency org="org.apache.bookkeeper"
+      name="bookkeeper-server"
+      rev="${bookkeeper-server.version}"
+      conf="common->default"/>
   </dependencies>
 </ivy-module>
diff --git a/src/contrib/highavailability/ivy/libraries.properties b/src/contrib/highavailability/ivy/libraries.properties
index 35efd9d2..05d0cb01 100644
--- a/src/contrib/highavailability/ivy/libraries.properties
+++ b/src/contrib/highavailability/ivy/libraries.properties
@@ -3,3 +3,6 @@
 #These are the versions of our dependencies (in alphabetical order)
 log4j.version=1.2.15
 slf4j-api.version=1.6.1
+guava.version=r09
+mockito-all.version=1.8.2
+bookkeeper-server.version=4.1.0
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarShell.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarShell.java
index dc32399c..66a31c95 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarShell.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarShell.java
@@ -18,6 +18,8 @@
 
 package org.apache.hadoop.hdfs;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -40,6 +42,7 @@
 import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
 import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.hdfs.server.namenode.StandbyStateException;
 import org.apache.hadoop.hdfs.server.namenode.ZookeeperTxId;
 import org.apache.hadoop.io.retry.RetryPolicies;
 import org.apache.hadoop.io.retry.RetryPolicy;
@@ -179,7 +182,7 @@ private static void printUsage(String cmd) {
           + " [-{zero|one} -showAvatar] [-service serviceName]");
     } else if ("-setAvatar".equals(cmd)) {
       System.err.println("Usage: java AvatarShell"
-          + " [-{zero|one} -setAvatar {primary|standby}] [-service serviceName]");
+              + " [-{zero|one} -setAvatar {primary|standby}] [-force] [-service serviceName]");
     } else if ("-shutdownAvatar".equals(cmd)) {
       System.err.println("Usage: java AvatarShell" +
           " [-{zero|one} -shutdownAvatar] [-service serviceName]");
@@ -189,14 +192,18 @@ private static void printUsage(String cmd) {
     }  else if ("-isInitialized".equals(cmd)) {
         System.err.println("Usage: java AvatarShell" +
             " [-{zero|one} -isInitialized] [-service serviceName]");
+    } else if ("-waittxid".equals(cmd)) {
+      System.err.println("Usage: java AvatarShell"
+          + " [-waittxid] [-service serviceName]");
     } else {
       System.err.println("Usage: java AvatarShell");
       System.err.println("           [-{zero|one} -showAvatar] [-service serviceName]");
-      System.err.println("           [-{zero|one} -setAvatar {primary|standby}] [-service serviceName]");
+      System.err.println("           [-{zero|one} -setAvatar {primary|standby}] [-force] [-service serviceName]");
       System.err.println("           [-{zero|one} -shutdownAvatar] [-service serviceName]");
-      System.err.println("           [-{zero|one} -leaveSafeMode] [-service serviceName]");
+      System.err.println("           [-{zero|one} -safemode get|leave] [-service serviceName]");
       System.err.println("           [-failover] [-service serviceName]");
       System.err.println("           [-{zero|one} -isInitialized] [-service serviceName]");
+      System.err.println("           [-waittxid] [-service serviceName]");
       System.err.println();
       ToolRunner.printGenericCommandUsage(System.err);
     }
@@ -208,6 +215,10 @@ private boolean isPrimary(Configuration conf, String zkRegistration) {
     return actualName.equals(zkRegistration);
   }
 
+  protected long getMaxWaitTimeForWaitTxid() {
+    return 1000 * 60 * 10; // 10 minutes.
+  }
+
   /**
    * Waits till the last txid node appears in Zookeeper, such that it matches
    * the ssid node.
@@ -216,7 +227,7 @@ private void waitForLastTxIdNode(AvatarZooKeeperClient zk, Configuration conf)
       throws Exception {
     // Gather session id and transaction id data.
     String address = AvatarNode.getClusterAddress(conf);
-    long maxWaitTime = 1000 * 60 * 10; // 10 minutes.
+    long maxWaitTime = this.getMaxWaitTimeForWaitTxid();
     long start = System.currentTimeMillis();
     while (true) {
       if (System.currentTimeMillis() - start > maxWaitTime) {
@@ -337,6 +348,30 @@ public int run(String argv[]) throws Exception {
     
     int exitCode = 0;
     
+    if ("-waittxid".equals(argv[0])) {
+      AvatarZooKeeperClient zk = new AvatarZooKeeperClient(conf, null);
+      try {
+        String serviceName = null;
+        if (argv.length == 3 && "-service".equals(argv[1])) {
+          serviceName = argv[2];
+        }
+        if (!processServiceName(serviceName)) {
+          return -1;
+        }
+        waitForLastTxIdNode(zk, originalConf);
+      } catch (Exception e) {
+        exitCode = -1;
+        System.err.println(argv[0].substring(1) + ": "
+            + e.getLocalizedMessage());
+      } finally {
+        zk.shutdown();
+      }
+      if (exitCode == 0) {
+        LOG.info("Primary shutdown was successful!");
+      }
+      return exitCode;
+    }
+
     if ("-failover".equals(argv[0])) {
       try {
         String serviceName = null;
@@ -352,6 +387,11 @@ public int run(String argv[]) throws Exception {
         System.err.println(argv[0].substring(1) + ": "
             + e.getLocalizedMessage());
       }
+      if (exitCode == 0) {
+        LOG.info("Failover was successful!");
+      } else {
+        LOG.error("Failover failed!");
+      }
       return exitCode;
     }
     
@@ -361,12 +401,25 @@ public int run(String argv[]) throws Exception {
 
     // Get the role
     String role = null;
+    boolean forceSetAvatar = false;
     if ("-setAvatar".equals(cmd)) {
       if (argv.length < 3) {
         printUsage(cmd);
         return -1;
       }
       role = argv[i++];
+      if (i != argv.length && "-force".equals(argv[i])) {
+        forceSetAvatar = true;
+        i++;
+      }
+    }
+    String safeModeAction = null;
+    if ("-safemode".equals(cmd)) {
+      if (argv.length < 3) {
+        printUsage(cmd);
+        return -1;
+      }
+      safeModeAction = argv[i++];
     }
 
     String serviceName = null;
@@ -394,13 +447,13 @@ public int run(String argv[]) throws Exception {
       if ("-showAvatar".equals(cmd)) {
         exitCode = showAvatar();
       } else if ("-setAvatar".equals(cmd)) {
-        exitCode = setAvatar(role);
+        exitCode = setAvatar(role, forceSetAvatar);
       } else if ("-isInitialized".equals(cmd)) {
         exitCode = isInitialized();
       } else if ("-shutdownAvatar".equals(cmd)) {
         shutdownAvatar();
-      } else if ("-leaveSafeMode".equals(cmd)) {
-        leaveSafeMode();
+      } else if ("-safemode".equals(cmd)) {
+        processSafeMode(safeModeAction);
       } else {
         exitCode = -1;
         System.err.println(cmd.substring(1) + ": Unknown command");
@@ -434,6 +487,9 @@ public int run(String argv[]) throws Exception {
       System.err.println(cmd.substring(1) + ": " + re.getLocalizedMessage());
     } finally {
     }
+    if (exitCode == 0) {
+      LOG.info(cmd.substring(1) + " was successful!");
+    }
     return exitCode;
   }
 
@@ -452,13 +508,41 @@ private int showAvatar()
   
   private int isInitialized()
       throws IOException {
-    return avatarnode.isInitialized() ? 0 : -1;
+    int exitCode = avatarnode.isInitialized() ? 0 : -1;
+    if (exitCode == 0) {
+      LOG.info("Standby has been successfully initialized");
+    } else {
+      LOG.error("Standby has not been initialized yet");
+    }
+    return exitCode;
+  }
+
+  public static void handleRemoteException(RemoteException re) throws IOException {
+    IOException ie = re.unwrapRemoteException();
+    if (!(ie instanceof StandbyStateException)) {
+      throw re;
+    }
+    BufferedReader in = new BufferedReader(new InputStreamReader(
+          System.in));
+    String input = null;
+    do {
+      System.out.println("The Standby's state is incorrect : " + ie
+          + "\n. You can still force a failover after some manual "
+          + "verification. This is an EXTEREMELY DANGEROUS operation if "
+          + "you don't know what you are doing. Do you wish to "
+          + "continue with forcing the failover ? (Y/N)");
+      input = in.readLine();
+    } while (input == null || (!input.equalsIgnoreCase("Y") && !input
+          .equalsIgnoreCase("N")));
+    if (input.equalsIgnoreCase("N")) {
+      throw re;
+    }
   }
 
   /**
    * Sets the avatar to the specified value
    */
-  public int setAvatar(String role)
+  public int setAvatar(String role, boolean noverification)
       throws IOException {
     Avatar dest;
     if (Avatar.ACTIVE.toString().equalsIgnoreCase(role)) {
@@ -473,7 +557,12 @@ public int setAvatar(String role)
     if (current == dest) {
       System.out.println("This instance is already in " + current + " avatar.");
     } else {
-      avatarnode.setAvatar(dest);
+      try {
+        avatarnode.quiesceForFailover(noverification);
+      } catch (RemoteException re) {
+        handleRemoteException(re);
+      }
+      avatarnode.performFailover();
       updateZooKeeper();
     }
     return 0;
@@ -484,8 +573,15 @@ public void shutdownAvatar() throws IOException {
     avatarnode.shutdownAvatar();
   }
   
-  public void leaveSafeMode() throws IOException {
-    avatarnode.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
+  public void processSafeMode(String safeModeAction) throws IOException {
+    if (safeModeAction.equals("leave")) {
+      avatarnode.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
+    } else if (safeModeAction.equals("get")) {
+      boolean safemode = avatarnode.setSafeMode(SafeModeAction.SAFEMODE_GET);
+      System.out.println("Safe mode is " + (safemode ? "ON" : "OFF"));
+    } else {
+      throw new IOException("Invalid safemode action : " + safeModeAction);
+    }
   }
 
   public void clearZooKeeper() throws IOException {
@@ -500,7 +596,6 @@ public void clearZooKeeper() throws IOException {
     AvatarZooKeeperClient zk = new AvatarZooKeeperClient(conf, null);
 
     // Clear NameNode address in ZK
-    System.out.println("Clear Client Address");
     LOG.info("Clear Client Address information in ZooKeeper");
     InetSocketAddress defaultAddr;
     String[] aliases;
@@ -518,7 +613,6 @@ public void clearZooKeeper() throws IOException {
         zk.clearPrimary(alias);
       }
     }
-    System.out.println("Clear Service Address");
     LOG.info("Clear Service Address information in ZooKeeper");
     // Clear service address in ZK
 
@@ -534,7 +628,6 @@ public void clearZooKeeper() throws IOException {
         zk.clearPrimary(alias);
       }
     }
-    System.out.println("Clear Http Address");
     LOG.info("Clear Http Address information in ZooKeeper");
     // Clear http address in ZK
     // Stolen from NameNode so we have the same code in both places
@@ -583,7 +676,6 @@ public void updateZooKeeper() throws IOException {
     AvatarZooKeeperClient zk = new AvatarZooKeeperClient(conf, null);
 
     // Update NameNode address in ZK
-    System.out.println("Update Client Address");
     LOG.info("Update Client Address information in ZooKeeper");
     InetSocketAddress defaultAddr;
     String[] aliases;
@@ -601,7 +693,6 @@ public void updateZooKeeper() throws IOException {
         zk.registerPrimary(alias, primaryAddress);
       }
     }
-    System.out.println("Update Service Address");
     LOG.info("Update Service Address information in ZooKeeper");
     // Update service address in ZK
     addr = NameNode.getDNProtocolAddress(conf);
@@ -620,7 +711,6 @@ public void updateZooKeeper() throws IOException {
         zk.registerPrimary(alias, primaryServiceAddress);
       }
     }
-    System.out.println("Update Http Address");
     LOG.info("Update Http Address information in ZooKeeper");
     // Update http address in ZK
     // Stolen from NameNode so we have the same code in both places
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarZKShell.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarZKShell.java
index 32b5d557..6f8fb847 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarZKShell.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarZKShell.java
@@ -371,7 +371,6 @@ public void clearZooKeeper() throws IOException {
     String defaultName = defaultAddr.getHostName() + ":"
         + defaultAddr.getPort();
 
-    System.out.println("Clear Client Address: " + defaultName);
     LOG.info("Clear Client Address information in ZooKeeper: " + defaultName);
 
     zk.clearPrimary(defaultName);
@@ -382,7 +381,6 @@ public void clearZooKeeper() throws IOException {
         zk.clearPrimary(alias);
       }
     }
-    System.out.println("Clear Service Address");
     LOG.info("Clear Service Address information in ZooKeeper");
     // Clear service address in ZK
 
@@ -398,7 +396,6 @@ public void clearZooKeeper() throws IOException {
         zk.clearPrimary(alias);
       }
     }
-    System.out.println("Clear Http Address");
     LOG.info("Clear Http Address information in ZooKeeper");
     // Clear http address in ZK
     // Stolen from NameNode so we have the same code in both places
@@ -454,20 +451,19 @@ public void updateZooKeeper(boolean force, boolean overwrite)
     AvatarZooKeeperClient zk = new AvatarZooKeeperClient(conf, null);
 
     // Update NameNode address in ZK
-    System.out.println("Update Client Address");
     LOG.info("Update Client Address information in ZooKeeper");
     InetSocketAddress defaultAddr;
     String[] aliases;
 
     InetSocketAddress addr = NameNode.getClientProtocolAddress(conf);
     if (addr == null) {
-      System.out.println( FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY +
+      System.err.println( FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY +
           " for primary service is not defined");
       return;
     }
     defaultAddr = NameNode.getClientProtocolAddress(originalConf);
     if (defaultAddr == null) {
-      System.out.println( FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY +
+      System.err.println( FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY +
           " for default service is not defined");
       return;
     }
@@ -482,7 +478,6 @@ public void updateZooKeeper(boolean force, boolean overwrite)
         zk.registerPrimary(alias, primaryAddress, overwrite);
       }
     }
-    System.out.println("Update Service Address");
     LOG.info("Update Service Address information in ZooKeeper");
     // Update service address in ZK
     addr = NameNode.getDNProtocolAddress(conf);
@@ -501,7 +496,6 @@ public void updateZooKeeper(boolean force, boolean overwrite)
         zk.registerPrimary(alias, primaryServiceAddress, overwrite);
       }
     }
-    System.out.println("Update Http Address");
     LOG.info("Update Http Address information in ZooKeeper");
     // Update http address in ZK
     // Stolen from NameNode so we have the same code in both places
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarZooKeeperClient.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarZooKeeperClient.java
index 74bb5e1b..a971caeb 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarZooKeeperClient.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/AvatarZooKeeperClient.java
@@ -6,12 +6,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
 import org.apache.hadoop.hdfs.server.namenode.ZookeeperTxId;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.util.SerializableUtils;
 import org.apache.hadoop.fs.FileAlreadyExistsException;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.zookeeper.AsyncCallback;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
@@ -23,6 +27,9 @@
 import org.apache.zookeeper.data.Stat;
 
 public class AvatarZooKeeperClient {
+  
+  private static Log LOG = LogFactory.getLog(AvatarZooKeeperClient.class.getName());
+  
   private String connection;
   private int timeout;
   private int connectTimeout;
@@ -41,6 +48,7 @@ public class AvatarZooKeeperClient {
   // Making it large enough to be sure that the cluster is down
   // these retries go one after another so they do not take long
   public static final int ZK_CONNECTION_RETRIES = 10;
+  private static final int ZK_INIT_RETRIES = 5;
   public static final int ZK_CONNECT_TIMEOUT_DEFAULT = 10000; // 10 seconds
   
   public AvatarZooKeeperClient(Configuration conf, Watcher watcher) {
@@ -57,7 +65,7 @@ public AvatarZooKeeperClient(Configuration conf, Watcher watcher) {
       watch = false;
     }
     this.failoverCheckPeriod = conf.getInt("fs.avatar.failover.checkperiod",
-        DistributedAvatarFileSystem.FAILOVER_CHECK_PERIOD);
+        FailoverClientHandler.FAILOVER_CHECK_PERIOD);
   }
 
   private static class ProxyWatcher implements Watcher {
@@ -153,12 +161,11 @@ private void zkCreateRecursively(String zNode, byte[] data,
         if (i == parts.length - 1) {
           payLoad = data;
         }
-        Stat stat;
         boolean created = false;
         while (!created) {
           // While loop to keep trying through the ConnectionLoss exceptions
           try {
-            if ((stat = zk.exists(path, false)) != null) {
+            if ((zk.exists(path, false)) != null) {
               // -1 indicates that we should update zNode regardless of its
               // version
               // since we are not utilizing versions in zNode - this is the best
@@ -168,7 +175,7 @@ private void zkCreateRecursively(String zNode, byte[] data,
               zk.setData(path, payLoad, -1);
             } else {
               zk.create(path, payLoad, acls, CreateMode.PERSISTENT);
-            }
+            }            
             created = true;
           } catch (KeeperException ex) {
             ex.printStackTrace();
@@ -210,8 +217,20 @@ public synchronized void primeConnection() throws IOException,
 
   private void initZK() throws IOException, InterruptedException {
     synchronized (watcher) {
-      if (zk == null || zk.getState() == ZooKeeper.States.CLOSED) {
-        zk = new ZooKeeper(connection, timeout, watcher);
+      for (int i = 0; i < ZK_INIT_RETRIES; i++) {
+        try {
+          if (zk == null || zk.getState() == ZooKeeper.States.CLOSED) {
+            zk = new ZooKeeper(connection, timeout, watcher);
+          }
+          break;
+        } catch (IOException ie) {
+          if (i == ZK_INIT_RETRIES - 1) {
+            throw ie;
+          }
+          FileSystem.LOG.info("Connection to zookeeper could not be"
+              + "established retrying....", ie);
+          Thread.sleep(3000);
+        }
       }
       if (zk.getState() != ZooKeeper.States.CONNECTED) {
         watcher.wait(this.connectTimeout);
@@ -243,7 +262,8 @@ private void stopZK() throws InterruptedException {
    * @throws KeeperException
    * @throws InterruptedException
    */
-  private synchronized byte[] getNodeData(String node, Stat stat, boolean retry)
+  private synchronized byte[] getNodeData(String node, Stat stat,
+      boolean retry, boolean sync)
       throws IOException, KeeperException, InterruptedException {
     int failures = 0;
     
@@ -251,6 +271,10 @@ private synchronized byte[] getNodeData(String node, Stat stat, boolean retry)
     while (data == null) {
       initZK();
       try {
+        if (sync) {
+          SyncUtil su = new SyncUtil();
+          su.sync(zk, node);
+        }
         data = zk.getData(node, watch, stat);
         if (data == null && retry) {
           // Failover is in progress
@@ -275,6 +299,7 @@ private synchronized byte[] getNodeData(String node, Stat stat, boolean retry)
         }
         throw kex;
       } finally {
+        stopZK();
       }
     }
     return data;
@@ -293,7 +318,7 @@ public Long getPrimarySsId(String address) throws IOException,
       KeeperException, InterruptedException, ClassNotFoundException {
     Stat stat = new Stat();
     String node = getSsIdNode(address);
-    byte[] data = getNodeData(node, stat, false);
+    byte[] data = getNodeData(node, stat, false, true);
     if (data == null) {
       return null;
     }
@@ -313,7 +338,7 @@ public ZookeeperTxId getPrimaryLastTxId(String address) throws IOException,
       KeeperException, InterruptedException, ClassNotFoundException {
     Stat stat = new Stat();
     String node = getLastTxIdNode(address);
-    byte[] data = getNodeData(node, stat, false);
+    byte[] data = getNodeData(node, stat, false, true);
     if (data == null) {
       return null;
     }
@@ -323,7 +348,7 @@ public ZookeeperTxId getPrimaryLastTxId(String address) throws IOException,
   public String getPrimaryAvatarAddress(String address, Stat stat, boolean retry)
     throws IOException, KeeperException, InterruptedException {
     String node = getRegistrationNode(address);
-    byte[] data = getNodeData(node, stat, retry);
+    byte[] data = getNodeData(node, stat, retry, false);
     if (data == null) {
       return null;
     }
@@ -332,6 +357,7 @@ public String getPrimaryAvatarAddress(String address, Stat stat, boolean retry)
 
   public String getPrimaryAvatarAddress(URI address, Stat stat, boolean retry) 
     throws IOException, KeeperException, InterruptedException {
+    InjectionHandler.processEvent(InjectionEvent.AVATARZK_GET_PRIMARY_ADDRESS);
     return getPrimaryAvatarAddress(address.getAuthority(), stat, retry);
   }
 
@@ -372,6 +398,8 @@ private synchronized Stat getNodeStats(String node) throws IOException,
 
   public long getPrimaryRegistrationTime(URI address) throws IOException,
       KeeperException, InterruptedException {
+    InjectionHandler
+        .processEvent(InjectionEvent.AVATARZK_GET_REGISTRATION_TIME);
     String node = getRegistrationNode(address.getAuthority());
     return getNodeStats(node).getMtime();
   }
@@ -415,4 +443,30 @@ private String getLastTxIdNode(String clusterAddress) {
   public synchronized void shutdown() throws InterruptedException {
     stopZK();
   }
+  
+  /**
+   * Helper class for syncing data to ZK.
+   */
+  static class SyncUtil implements AsyncCallback.VoidCallback {
+    private static final int MAX_SYNC_WAIT_TIME = 5 * 1000; // 5 sec
+    volatile int rc = -1;
+
+    @Override
+    public synchronized void processResult(int rc, String path, Object ctx) {
+      this.rc = rc;
+      this.notify();
+    }
+
+    synchronized boolean sync(ZooKeeper zk, String path)
+        throws InterruptedException {
+      zk.sync(path, this, null);
+      this.wait(MAX_SYNC_WAIT_TIME);
+      if (rc != KeeperException.Code.OK.intValue()) {
+        LOG.info("Cannot sync ZK for path: " + path + " return code: " + rc);
+        return false;
+      }
+      LOG.info("Synced ZK for path: " + path);
+      return true;
+    }
+  }
 }
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/CachingAvatarZooKeeperClient.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/CachingAvatarZooKeeperClient.java
index df62e738..8ac615e6 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/CachingAvatarZooKeeperClient.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/CachingAvatarZooKeeperClient.java
@@ -10,10 +10,10 @@
 import java.net.URI;
 import java.nio.channels.FileLock;
 import java.nio.channels.OverlappingFileLockException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.LinkedList;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.Watcher;
@@ -22,9 +22,110 @@
 public class CachingAvatarZooKeeperClient extends AvatarZooKeeperClient {
   private String cacheDir = null;
   private boolean useCache = false;
+  private static final Log LOG = LogFactory.getLog(CachingAvatarZooKeeperClient.class);
 
-  private Map<String, Long> lastCacheMod = Collections
-      .synchronizedMap(new HashMap<String, Long>());
+  // This needs to be thread local so that each thread maintains its own copy of
+  // last file read time for a cache file. In this way multiple threads using
+  // the same client would still go to zookeeper only once. We use a linked list
+  // since the number of elements in this data structure won't be large and
+  // hence we don't pay a huge lookup penalty and at the same time save memory.
+  private ThreadLocal<LinkedList<CacheEntry>> lastCacheMod =
+    new ThreadLocal<LinkedList<CacheEntry>>() {
+    @Override
+    protected LinkedList<CacheEntry> initialValue() {
+      return new LinkedList<CacheEntry>();
+    }
+  };
+
+  private static class CacheEntry {
+    public final String key;
+    public long readTime;
+
+    public CacheEntry(String key, long readTime) {
+      this.key = key;
+      this.readTime = readTime;
+    }
+  }
+
+  private CacheEntry findEntry(String key) {
+    for (CacheEntry entry : lastCacheMod.get()) {
+      if (entry.key.equals(key)) {
+        return entry;
+      }
+    }
+    return null;
+  }
+
+  private Long getReadTime(String key) {
+    CacheEntry entry = findEntry(key);
+    return (entry != null) ? entry.readTime : null;
+  }
+
+  private void updateReadTime(String key, long readTime) {
+    CacheEntry entry = findEntry(key);
+    if (entry != null) {
+      entry.readTime = readTime;
+    } else {
+      entry = new CacheEntry(key, readTime);
+      lastCacheMod.get().add(entry);
+    }
+  }
+
+  public abstract class ZooKeeperCall {
+
+    private final String dataFileSuffix;
+    private final String lockFileSuffix;
+    protected final URI address;
+
+    private ZooKeeperCall(String dataFileSuffix, String lockFileSuffix,
+        URI address) {
+      this.dataFileSuffix = dataFileSuffix;
+      this.lockFileSuffix = lockFileSuffix;
+      this.address = address;
+    }
+
+    public File getDataFile(String cacheDir) {
+      return new File(cacheDir, address.getAuthority() + dataFileSuffix);
+    }
+
+    public File getLockFile(String cacheDir) {
+      return new File(cacheDir, ".avatar_zk_cache_lock" + lockFileSuffix);
+    }
+
+    public abstract String invoke() throws IOException, InterruptedException,
+        KeeperException;
+  }
+
+  public class GetAddr extends ZooKeeperCall {
+    private final boolean retry;
+    private final Stat stat;
+
+    public GetAddr(URI address, Stat stat, boolean retry) {
+      super("", "", address);
+      this.stat = stat;
+      this.retry = retry;
+    }
+
+    public String invoke() throws IOException, InterruptedException,
+        KeeperException {
+      return CachingAvatarZooKeeperClient.super.getPrimaryAvatarAddress(
+          address, stat,
+          retry);
+    }
+  }
+
+  public class GetStat extends ZooKeeperCall {
+    public GetStat(URI address) {
+      super("_stat", "_stat", address);
+    }
+
+    public String invoke() throws IOException, InterruptedException,
+        KeeperException {
+      return ""
+          + CachingAvatarZooKeeperClient.super
+              .getPrimaryRegistrationTime(address);
+    }
+  }
 
   public CachingAvatarZooKeeperClient(Configuration conf, Watcher watcher) {
     super(conf, watcher);
@@ -32,27 +133,71 @@ public CachingAvatarZooKeeperClient(Configuration conf, Watcher watcher) {
     this.useCache = conf.getBoolean("fs.ha.zookeeper.cache", false);
   }
 
-  private String getFromCache(URI address, Stat stat, boolean retry)
-      throws IOException, InterruptedException {
-    FileLock lock = tryLock(true);
+  private String retrieveAndPopulateCache(File cache, ZooKeeperCall call)
+      throws IOException, KeeperException, InterruptedException {
+    String val = call.invoke();
+    FileWriter writer = new FileWriter(cache);
+    writer.write(val);
+    writer.close();
+    setRWPermissions(cache);
+    updateReadTime(cache.getName(), cache.lastModified());
+    return val;
+  }
+
+  private String getFromCache(ZooKeeperCall call) throws IOException,
+          InterruptedException, KeeperException {
+    FileWithLock fileWithLock = tryLock(call);
     String result = null;
+    BufferedReader reader = null;
     try {
-      File cache = new File(cacheDir, address.getAuthority());
+      File cache = call.getDataFile(cacheDir);
       if (!cache.exists()) {
-        return null;
+        return retrieveAndPopulateCache(cache, call);
       }
-      lastCacheMod.put(address.getAuthority(), cache.lastModified());
-      BufferedReader reader = new BufferedReader(new FileReader(cache));
+      updateReadTime(cache.getName(), cache.lastModified());
+      reader = new BufferedReader(new FileReader(cache));
       result = reader.readLine();
     } finally {
-      lock.release();
+      if (reader != null) {
+        reader.close();
+      }
+      if (fileWithLock != null) {
+        if (fileWithLock.lock != null) {
+          fileWithLock.lock.release();
+        }
+        if (fileWithLock.file != null) {
+          fileWithLock.file.close();
+        }
+      }
     }
     return result;
   }
 
-  private FileLock tryLock(boolean retry) throws IOException,
-      InterruptedException {
-    File lockFile = new File(cacheDir, ".avatar_zk_cache_lock");
+  /**
+   * Makes sure the given file has r/w permissions for everyone. We need this
+   * since the cache files might be accessed by different users on the
+   * same machine.
+   */
+  private void setRWPermissions(File f) {
+    if (!f.setReadable(true, false) || !f.setWritable(true, false)) {
+      LOG.info("Could not set permissions for file : "
+          + f + " probably because user : " + System.getProperty("user.name")
+          + " is not the owner");
+    }
+  }
+
+  class FileWithLock {
+    public final FileLock lock;
+    public final RandomAccessFile file;
+    public FileWithLock(FileLock lock, RandomAccessFile file) {
+      this.lock = lock;
+      this.file = file;
+    }
+  }
+
+  private FileWithLock tryLock(ZooKeeperCall call)
+      throws IOException, InterruptedException {
+    File lockFile = call.getLockFile(cacheDir);
     RandomAccessFile file = null;
 
     for (int i = 0; i < 10; i++) {
@@ -62,9 +207,6 @@ private FileLock tryLock(boolean retry) throws IOException,
       } catch (FileNotFoundException fnfe) {
         // We experience this exception for unknown reason, we retry
         // a few times.
-        if (!retry) {
-          return null;
-        }
         if (!new File(cacheDir).exists()) {
           new File(cacheDir).mkdir();
         }
@@ -75,6 +217,7 @@ private FileLock tryLock(boolean retry) throws IOException,
         }
       }
     }
+    setRWPermissions(lockFile);
 
     FileLock lock = null;
     do {
@@ -85,54 +228,63 @@ private FileLock tryLock(boolean retry) throws IOException,
         lock = null;
         Thread.sleep(1000);
       }
-    } while (lock == null && retry);
-    return lock;
+    } while (lock == null);
+    return new FileWithLock(lock, file);
   }
 
-  private String populateCache(URI address, Stat stat, boolean retry)
+  private String populateCache(ZooKeeperCall call)
       throws IOException, InterruptedException, KeeperException {
-    FileLock lock = tryLock(true);
+    FileWithLock fileWithLock = tryLock(call);
     String val = null;
     try {
-      File cache = new File(cacheDir, address.getAuthority());
+      File cache = call.getDataFile(cacheDir);
       long fileModTime = cache.lastModified();
-      Long lastFileReadTime = lastCacheMod.get(address.getAuthority());
-      if (lastFileReadTime == null || lastFileReadTime >= fileModTime) {
+      Long lastFileReadTime = getReadTime(cache.getName());
+      if (lastFileReadTime != null && lastFileReadTime >= fileModTime) {
         // Cache has not been updated and we need to populate it
-        val = super.getPrimaryAvatarAddress(address, stat, retry);
-        FileWriter writer = new FileWriter(cache);
-        writer.write(val);
-        writer.close();
-        lastCacheMod.put(address.getAuthority(), cache.lastModified());
+        val = retrieveAndPopulateCache(cache, call);
       }
     } finally {
-      if (lock != null) {
-        lock.release();
+      if (fileWithLock != null) {
+        if (fileWithLock.lock != null) {
+          fileWithLock.lock.release();
+        }
+        if (fileWithLock.file != null) {
+          fileWithLock.file.close();
+        }
       }
     }
     if (val == null) {
-      val = getFromCache(address, stat, retry);
+      val = getFromCache(call);
     }
     return val;
   }
 
+  @Override
+  public long getPrimaryRegistrationTime(URI address) throws IOException,
+      KeeperException, InterruptedException {
+    if (!useCache) {
+      return super.getPrimaryRegistrationTime(address);
+    }
+    ZooKeeperCall call = new GetStat(address);
+    return Long.parseLong(populateCache(call));
+  }
+
   public String getPrimaryAvatarAddress(URI address, Stat stat, boolean retry,
       boolean firstAttempt) throws IOException, KeeperException,
-      InterruptedException {
-    String result = null;
+         InterruptedException {
     if (!useCache) {
       return super.getPrimaryAvatarAddress(address, stat, retry);
     }
-    if (firstAttempt) {
-      result = getFromCache(address, stat, retry);
-    }
-    if (result == null) {
-      result = populateCache(address, stat, retry);
-    }
-    return result;
+    ZooKeeperCall call = new GetAddr(address, stat, retry);
+    return populateCache(call);
   }
 
   public boolean isCacheEnabled() {
     return useCache;
   }
+
+  String getCacheDir() {
+    return this.cacheDir;
+  }
 }
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/DistributedAvatarFileSystem.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/DistributedAvatarFileSystem.java
index ec56eb16..e0b69832 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/DistributedAvatarFileSystem.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/DistributedAvatarFileSystem.java
@@ -1,81 +1,37 @@
 package org.apache.hadoop.hdfs;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.FileNotFoundException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.OpenFileInfo;
-import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RemoteIterator;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
-import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.ClientProtocol;
 import org.apache.hadoop.hdfs.protocol.CorruptFileBlocks;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
-import org.apache.hadoop.hdfs.protocol.DirectoryListing;
-import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
-import org.apache.hadoop.hdfs.protocol.LocatedBlock;
-import org.apache.hadoop.hdfs.protocol.LocatedBlockWithMetaInfo;
-import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
-import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
-import org.apache.hadoop.hdfs.protocol.LocatedBlockWithFileName;
-import org.apache.hadoop.hdfs.protocol.LocatedDirectoryListing;
-import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlock;
-import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlocks;
-import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
-import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
-import org.apache.hadoop.hdfs.protocol.FSConstants.UpgradeAction;
-import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
-import org.apache.hadoop.ipc.ProtocolSignature;
-import org.apache.hadoop.ipc.RPC.VersionIncompatible;
-import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.ipc.VersionedProtocol;
 import org.apache.hadoop.util.StringUtils;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.data.Stat;
 
-public class DistributedAvatarFileSystem extends DistributedFileSystem {
+public class DistributedAvatarFileSystem extends DistributedFileSystem
+    implements FailoverClient {
 
   static {
     Configuration.addDefaultResource("avatar-default.xml");
     Configuration.addDefaultResource("avatar-site.xml");
   }
   
-  CachingAvatarZooKeeperClient zk;
-  /*
-   * ReadLock is acquired by the clients performing operations WriteLock is
-   * acquired when we need to failover and modify the proxy. Read and write
-   * because of read and write access to the namenode object.
-   */
-  ReentrantReadWriteLock fsLock = new ReentrantReadWriteLock(true);
   /**
    *  The canonical URI representing the cluster we are connecting to
    *  dfs1.data.xxx.com:9000 for example
    */
   URI logicalName;
-  /**
-   * The full address of the node in ZooKeeper
-   */
-  long lastPrimaryUpdate = 0;
-
   Configuration conf;
-  // Wrapper for NameNodeProtocol that handles failover
-  FailoverClientProtocol failoverClient;
-  // Should DAFS retry write operations on failures or not
-  boolean alwaysRetryWrites;
-  // Indicates whether subscription model is used for ZK communication 
-  boolean watchZK;
-  boolean cacheZKData = false;
   // number of milliseconds to wait between successive attempts
   // to initialize standbyFS
   long standbyFSInitInterval;
@@ -108,15 +64,9 @@ public class DistributedAvatarFileSystem extends DistributedFileSystem {
   // URI of primary and standby avatar
   URI primaryURI;
   URI standbyURI;
-  private int failoverCheckPeriod;
 
-  // Will try for two minutes checking with ZK every 15 seconds
-  // to see if the failover has happened in pull case
-  // and just wait for two minutes in watch case
-  public static final int FAILOVER_CHECK_PERIOD = 15000;
-  public static final int FAILOVER_RETRIES = 8;
-  // Tolerate up to 5 retries connecting to the NameNode
-  private static final int FAILURE_RETRY = 5;
+  FailoverClientProtocol failoverClient;
+  FailoverClientHandler failoverHandler;
 
   /**
    * HA FileSystem initialization
@@ -128,26 +78,10 @@ public URI getUri() {
   }
 
   public void initialize(URI name, Configuration conf) throws IOException {
-    /*
-     * If true clients holds a watch on the znode and acts on events If false -
-     * failover is pull based. Client will call zookeeper exists()
-     */
-    watchZK = conf.getBoolean("fs.ha.zookeeper.watch", false);
-    /*
-     * If false - on Mutable call to the namenode we fail If true we try to make
-     * the call go through by resolving conflicts
-     */
-    alwaysRetryWrites = conf.getBoolean("fs.ha.retrywrites", false);
     // The actual name of the filesystem e.g. dfs.data.xxx.com:9000
     this.logicalName = name;
     this.conf = conf;
-    // Create AvatarZooKeeperClient
-    Watcher watcher = null;
-    if (watchZK) {
-      watcher = new ZooKeeperFSWatcher();
-    }
-    zk = new CachingAvatarZooKeeperClient(conf, watcher);
-    cacheZKData = zk.isCacheEnabled();
+    failoverHandler = new FailoverClientHandler(conf, logicalName, this);
     // default interval between standbyFS initialization attempts is 10 mins
     standbyFSInitInterval = conf.getLong("fs.avatar.standbyfs.initinterval",
                                          10 * 60 * 1000);
@@ -161,8 +95,6 @@ public void initialize(URI name, Configuration conf) throws IOException {
       conf.getInt("fs.avatar.standbyfs.checkrequests", 5000);
 
     initUnderlyingFileSystem(false);
-    failoverCheckPeriod = conf.getInt("fs.avatar.failover.checkperiod",
-        FAILOVER_CHECK_PERIOD);
   }
 
   private URI addrToURI(String addrString) throws URISyntaxException {
@@ -213,15 +145,21 @@ private void initStandbyFS() {
     }
   }
 
+  @Override
+  public boolean tryFailover() throws IOException {
+    return initUnderlyingFileSystem(true);
+  }
+
   private boolean initUnderlyingFileSystem(boolean failover) throws IOException {
     try {
       boolean firstAttempt = true;
 
       while (true) {
         Stat stat = new Stat();
-        String primaryAddr = zk.getPrimaryAvatarAddress(logicalName, stat,
+        String primaryAddr = failoverHandler.getPrimaryAvatarAddress(
+            logicalName,
+            stat,
             true, firstAttempt);
-        lastPrimaryUpdate = stat.getMtime();
         primaryURI = addrToURI(primaryAddr);
 
         URI uri0 = addrToURI(conf.get("fs.default.name0", ""));
@@ -262,15 +200,16 @@ private boolean initUnderlyingFileSystem(boolean failover) throws IOException {
             failoverFS = new DistributedFileSystem();
             failoverFS.initialize(primaryURI, conf);
 
-            failoverClient.newNameNode(failoverFS.dfs.namenode);
+            newNamenode(failoverFS.dfs.namenode);
 
           } else {
             super.initialize(primaryURI, conf);
-            failoverClient = new FailoverClientProtocol(this.dfs.namenode);
+            failoverClient = new FailoverClientProtocol(this.dfs.namenode,
+                failoverHandler);
             this.dfs.namenode = failoverClient;
           }
         } catch (IOException ex) {
-          if (firstAttempt && cacheZKData) {
+          if (firstAttempt && failoverHandler.isZKCacheEnabled()) {
             firstAttempt = false;
             continue;
           } else {
@@ -297,1073 +236,24 @@ private boolean initUnderlyingFileSystem(boolean failover) throws IOException {
     return true;
   }
 
-  private class FailoverClientProtocol implements ClientProtocol {
-
-    ClientProtocol namenode;
-
-    public FailoverClientProtocol(ClientProtocol namenode) {
-      this.namenode = namenode;
-    }
-
-    public synchronized void nameNodeDown() {
-      namenode = null;
-    }
-
-    public synchronized void newNameNode(ClientProtocol namenode) {
-      this.namenode = namenode;
-    }
-
-    public synchronized boolean isDown() {
-      return this.namenode == null;
-    }
-
-    @Override
-    public int getDataTransferProtocolVersion() throws IOException {
-      return (new ImmutableFSCaller<Integer>() {
-        @Override
-        Integer call() throws IOException {
-          return namenode.getDataTransferProtocolVersion();
-        }    
-      }).callFS();
-    }
-
-    @Override
-    public void abandonBlock(final Block b, final String src,
-        final String holder) throws IOException {
-      (new MutableFSCaller<Boolean>() {
-
-        @Override
-        Boolean call(int retry) throws IOException {
-          namenode.abandonBlock(b, src, holder);
-          return true;
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public void abandonFile(final String src,
-        final String holder) throws IOException {
-      (new MutableFSCaller<Boolean>() {
-
-        @Override
-        Boolean call(int retry) throws IOException {
-          namenode.abandonFile(src, holder);
-          return true;
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public LocatedDirectoryListing getLocatedPartialListing(final String src,
-        final byte[] startAfter) throws IOException {
-      return (new ImmutableFSCaller<LocatedDirectoryListing>() {
-
-        @Override
-        LocatedDirectoryListing call() throws IOException {
-          return namenode.getLocatedPartialListing(src, startAfter);
-        }
-
-      }).callFS();
-    }
-
-    public LocatedBlock addBlock(final String src, final String clientName,
-        final DatanodeInfo[] excludedNodes, final DatanodeInfo[] favoredNodes)
-        throws IOException {
-      return (new MutableFSCaller<LocatedBlock>() {
-        @Override
-        LocatedBlock call(int retries) throws IOException {
-          if (retries > 0) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                .getLen());
-              if (blocks.locatedBlockCount() > 0 ) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlock(src, clientName, excludedNodes,
-            favoredNodes);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlock addBlock(final String src, final String clientName,
-        final DatanodeInfo[] excludedNodes) throws IOException {
-      return (new MutableFSCaller<LocatedBlock>() {
-        @Override
-        LocatedBlock call(int retries) throws IOException {
-          if (retries > 0) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                  .getLen());
-              // If atleast one block exists.
-              if (blocks.locatedBlockCount() > 0) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlock(src, clientName, excludedNodes);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public VersionedLocatedBlock addBlockAndFetchVersion(
-        final String src, final String clientName,
-        final DatanodeInfo[] excludedNodes) throws IOException {
-      return (new MutableFSCaller<VersionedLocatedBlock>() {
-        @Override
-        VersionedLocatedBlock call(int retries) throws IOException {
-          if (retries > 0) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                  .getLen());
-              // If atleast one block exists.
-              if (blocks.locatedBlockCount() > 0) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlockAndFetchVersion(src, clientName, excludedNodes);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(
-        final String src, final String clientName,
-        final DatanodeInfo[] excludedNodes) throws IOException {
-      return (new MutableFSCaller<LocatedBlockWithMetaInfo>() {
-        @Override
-        LocatedBlockWithMetaInfo call(int retries) throws IOException {
-          if (retries > 0) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                  .getLen());
-              if (blocks.locatedBlockCount() > 0 ) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlockAndFetchMetaInfo(src, clientName,
-              excludedNodes);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(
-        final String src, final String clientName,
-        final DatanodeInfo[] excludedNodes,
-        final long startPos) throws IOException {
-      return (new MutableFSCaller<LocatedBlockWithMetaInfo>() {
-        @Override
-        LocatedBlockWithMetaInfo call(int retries) throws IOException {
-          if (retries > 0) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                  .getLen());
-              if (blocks.locatedBlockCount() > 0 ) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlockAndFetchMetaInfo(src, clientName,
-              excludedNodes, startPos);
-        }
-
-      }).callFS();
-    }
-    
-    @Override
-    public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(final String src,
-        final String clientName, final DatanodeInfo[] excludedNodes,
-        final DatanodeInfo[] favoredNodes)
-        throws IOException {
-      return (new MutableFSCaller<LocatedBlockWithMetaInfo>() {
-        @Override
-        LocatedBlockWithMetaInfo call(int retries) throws IOException {
-          if (retries > 0) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                  .getLen());
-              if (blocks.locatedBlockCount() > 0 ) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlockAndFetchMetaInfo(src, clientName,
-              excludedNodes, favoredNodes);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(final String src,
-        final String clientName, final DatanodeInfo[] excludedNodes,
-	final DatanodeInfo[] favoredNodes, final long startPos)
-        throws IOException {
-      return (new MutableFSCaller<LocatedBlockWithMetaInfo>() {
-        @Override
-        LocatedBlockWithMetaInfo call(int retries) throws IOException {
-          if (retries > 0) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                  .getLen());
-              if (blocks.locatedBlockCount() > 0 ) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlockAndFetchMetaInfo(src, clientName,
-              excludedNodes, favoredNodes, startPos);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(final String src,
-        final String clientName, final DatanodeInfo[] excludedNodes,
-       	final DatanodeInfo[] favoredNodes, final long startPos,
-        final Block lastBlock)
-        throws IOException {
-      return (new MutableFSCaller<LocatedBlockWithMetaInfo>() {
-        @Override
-        LocatedBlockWithMetaInfo call(int retries) throws IOException {
-          if (retries > 0 && lastBlock == null) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                  .getLen());
-              if (blocks.locatedBlockCount() > 0 ) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlockAndFetchMetaInfo(src, clientName,
-       	      excludedNodes, favoredNodes, startPos, lastBlock);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlock addBlock(final String src, final String clientName)
-        throws IOException {
-      return (new MutableFSCaller<LocatedBlock>() {
-        @Override
-        LocatedBlock call(int retries) throws IOException {
-          if (retries > 0) {
-            FileStatus info = namenode.getFileInfo(src);
-            if (info != null) {
-              LocatedBlocks blocks = namenode.getBlockLocations(src, 0, info
-                  .getLen());
-              // If atleast one block exists.
-              if (blocks.locatedBlockCount() > 0) {
-                LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
-                if (last.getBlockSize() == 0) {
-                  // This one has not been written to
-                  namenode.abandonBlock(last.getBlock(), src, clientName);
-                }
-              }
-            }
-          }
-          return namenode.addBlock(src, clientName);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlock append(final String src, final String clientName)
-        throws IOException {
-      return (new MutableFSCaller<LocatedBlock>() {
-        @Override
-        LocatedBlock call(int retries) throws IOException {
-          if (retries > 0) {
-            namenode.complete(src, clientName);
-          }
-          return namenode.append(src, clientName);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlockWithMetaInfo appendAndFetchMetaInfo(final String src,
-        final String clientName) throws IOException {
-      return (new MutableFSCaller<LocatedBlockWithMetaInfo>() {
-        @Override
-        LocatedBlockWithMetaInfo call(int retries) throws IOException {
-          if (retries > 0) {
-            namenode.complete(src, clientName);
-          }
-          return namenode.appendAndFetchMetaInfo(src, clientName);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean complete(final String src, final String clientName)
-        throws IOException {
-      // Treating this as Immutable even though it changes metadata
-      // but the complete called on the file should result in completed file
-      return (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          if (r > 0) {
-            try {
-              return namenode.complete(src, clientName);
-            } catch (IOException ex) {
-              if (namenode.getFileInfo(src) != null) {
-                // This might mean that we closed that file
-                // which is why namenode can no longer find it
-                // in the list of UnderConstruction
-                if (ex.getMessage()
-                    .contains("Could not complete write to file")) {
-                  // We guess that we closed this file before because of the
-                  // nature of exception
-                  return true;
-                }
-              }
-              throw ex;
-            }
-          }
-          return namenode.complete(src, clientName);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean complete(final String src, final String clientName,
-       	final long fileLen)
-        throws IOException {
-      // Treating this as Immutable even though it changes metadata
-      // but the complete called on the file should result in completed file
-      return (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          if (r > 0) {
-            try {
-              return namenode.complete(src, clientName, fileLen);
-            } catch (IOException ex) {
-              if (namenode.getFileInfo(src) != null) {
-                // This might mean that we closed that file
-                // which is why namenode can no longer find it
-                // in the list of UnderConstruction
-                if (ex.getMessage()
-                    .contains("Could not complete write to file")) {
-                  // We guess that we closed this file before because of the
-                  // nature of exception
-                  return true;
-                }
-              }
-              throw ex;
-            }
-          }
-          return namenode.complete(src, clientName, fileLen);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean complete(final String src, final String clientName,
-       	final long fileLen, final Block lastBlock)
-        throws IOException {
-      // Treating this as Immutable even though it changes metadata
-      // but the complete called on the file should result in completed file
-      return (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          if (r > 0 && lastBlock == null) {
-            try {
-              return namenode.complete(src, clientName, fileLen, lastBlock);
-            } catch (IOException ex) {
-              if (namenode.getFileInfo(src) != null) {
-                // This might mean that we closed that file
-                // which is why namenode can no longer find it
-                // in the list of UnderConstruction
-                if (ex.getMessage()
-                    .contains("Could not complete write to file")) {
-                  // We guess that we closed this file before because of the
-                  // nature of exception
-                  return true;
-                }
-              }
-              throw ex;
-            }
-          }
-          return namenode.complete(src, clientName, fileLen, lastBlock);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void create(final String src, final FsPermission masked,
-        final String clientName, final boolean overwrite,
-        final short replication, final long blockSize) throws IOException {
-     (new MutableFSCaller<Boolean>() {
-       @Override
-       Boolean call(int retries) throws IOException {
-         namenode.create(src, masked, clientName, overwrite,
-            replication, blockSize);
-         return true;
-       }
-     }).callFS();
-   }
-
-    @Override
-    public void create(final String src, final FsPermission masked,
-        final String clientName, final boolean overwrite,
-        final boolean createParent,
-        final short replication, final long blockSize) throws IOException {
-      (new MutableFSCaller<Boolean>() {
-        @Override
-        Boolean call(int retries) throws IOException {
-          if (retries > 0) {
-            // This I am not sure about, because of lease holder I can tell if
-            // it
-            // was me or not with a high level of certainty
-            FileStatus stat = namenode.getFileInfo(src);
-            if (stat != null && !overwrite) {
-              /*
-               * Since the file exists already we need to perform a number of
-               * checks to see if it was created by us before the failover
-               */
-
-              if (stat.getBlockSize() == blockSize
-                  && stat.getReplication() == replication && stat.getLen() == 0
-                  && stat.getPermission().equals(masked)) {
-                // The file has not been written to and it looks exactly like
-                // the file we were trying to create. Last check:
-                // call create again and then parse the exception.
-                // Two cases:
-                // it was the same client who created the old file
-                // or it was created by someone else - fail
-                try {
-                  namenode.create(src, masked, clientName, overwrite,
-                      createParent, replication, blockSize);
-                } catch (AlreadyBeingCreatedException aex) {
-                  if (aex.getMessage().contains(
-                      "current leaseholder is trying to recreate file")) {
-                    namenode.delete(src, false);
-                  } else {
-                    throw aex;
-                  }
-                }
-              }
-            }
-          }
-          namenode.create(src, masked, clientName, overwrite, createParent, replication,
-              blockSize);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean delete(final String src, final boolean recursive)
-        throws IOException {
-      return (new MutableFSCaller<Boolean>() {
-        @Override
-        Boolean call(int retries) throws IOException {
-          if (retries > 0) {
-            namenode.delete(src, recursive);
-            return true;
-          }
-          return namenode.delete(src, recursive);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public boolean delete(final String src) throws IOException {
-      return (new MutableFSCaller<Boolean>() {
-        @Override
-        Boolean call(int retries) throws IOException {
-          if (retries > 0) {
-            namenode.delete(src);
-            return true;
-          }
-          return namenode.delete(src);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public UpgradeStatusReport distributedUpgradeProgress(
-        final UpgradeAction action) throws IOException {
-      return (new MutableFSCaller<UpgradeStatusReport>() {
-        UpgradeStatusReport call(int r) throws IOException {
-          return namenode.distributedUpgradeProgress(action);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void finalizeUpgrade() throws IOException {
-      (new MutableFSCaller<Boolean>() {
-        Boolean call(int retry) throws IOException {
-          namenode.finalizeUpgrade();
-          return true;
-        }
-      }).callFS();
-
-    }
-
-    @Override
-    public void fsync(final String src, final String client) throws IOException {
-      // TODO Is it Mutable or Immutable
-      (new ImmutableFSCaller<Boolean>() {
-
-        @Override
-        Boolean call() throws IOException {
-          namenode.fsync(src, client);
-          return true;
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlocks getBlockLocations(final String src, final long offset,
-        final long length) throws IOException {
-      // TODO Make it cache values as per Dhruba's suggestion
-      return (new ImmutableFSCaller<LocatedBlocks>() {
-        LocatedBlocks call() throws IOException {
-          return namenode.getBlockLocations(src, offset, length);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public VersionedLocatedBlocks open(final String src, final long offset,
-        final long length) throws IOException {
-      // TODO Make it cache values as per Dhruba's suggestion
-      return (new ImmutableFSCaller<VersionedLocatedBlocks>() {
-        VersionedLocatedBlocks call() throws IOException {
-          return namenode.open(src, offset, length);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public LocatedBlocksWithMetaInfo openAndFetchMetaInfo(final String src, final long offset,
-        final long length) throws IOException {
-      // TODO Make it cache values as per Dhruba's suggestion
-      return (new ImmutableFSCaller<LocatedBlocksWithMetaInfo>() {
-        LocatedBlocksWithMetaInfo call() throws IOException {
-          return namenode.openAndFetchMetaInfo(src, offset, length);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public ContentSummary getContentSummary(final String src) throws IOException {
-      return (new ImmutableFSCaller<ContentSummary>() {
-        ContentSummary call() throws IOException {
-          return namenode.getContentSummary(src);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public String getClusterName() throws IOException {
-      return (new ImmutableFSCaller<String>() {
-        String call() throws IOException {
-          return namenode.getClusterName();
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void recount() throws IOException {
-      (new ImmutableFSCaller<Boolean>() {
-        Boolean call() throws IOException {
-          namenode.recount();
-          return true;
-        }
-      }).callFS();
-    }
-    
-    @Deprecated @Override
-    public FileStatus[] getCorruptFiles() throws AccessControlException,
-        IOException {
-      return (new ImmutableFSCaller<FileStatus[]>() {
-        FileStatus[] call() throws IOException {
-          return namenode.getCorruptFiles();
-        }
-      }).callFS();
-    }
-
-    @Override
-    public CorruptFileBlocks
-      listCorruptFileBlocks(final String path, final String cookie)
-      throws IOException {
-      return (new ImmutableFSCaller<CorruptFileBlocks> () {
-                CorruptFileBlocks call() 
-                  throws IOException {
-                  return namenode.listCorruptFileBlocks(path, cookie);
-                }
-              }).callFS();
-    }
-
-    @Override
-    public DatanodeInfo[] getDatanodeReport(final DatanodeReportType type)
-        throws IOException {
-      return (new ImmutableFSCaller<DatanodeInfo[]>() {
-        DatanodeInfo[] call() throws IOException {
-          return namenode.getDatanodeReport(type);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public FileStatus getFileInfo(final String src) throws IOException {
-      return (new ImmutableFSCaller<FileStatus>() {
-        FileStatus call() throws IOException {
-          return namenode.getFileInfo(src);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public HdfsFileStatus getHdfsFileInfo(final String src) throws IOException {
-      return (new ImmutableFSCaller<HdfsFileStatus>() {
-        HdfsFileStatus call() throws IOException {
-          return namenode.getHdfsFileInfo(src);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public HdfsFileStatus[] getHdfsListing(final String src) throws IOException {
-      return (new ImmutableFSCaller<HdfsFileStatus[]>() {
-        HdfsFileStatus[] call() throws IOException {
-          return namenode.getHdfsListing(src);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public FileStatus[] getListing(final String src) throws IOException {
-      return (new ImmutableFSCaller<FileStatus[]>() {
-        FileStatus[] call() throws IOException {
-          return namenode.getListing(src);
-        }
-      }).callFS();
-    }
-
-    public DirectoryListing getPartialListing(final String src,
-        final byte[] startAfter) throws IOException {
-      return (new ImmutableFSCaller<DirectoryListing>() {
-        DirectoryListing call() throws IOException {
-          return namenode.getPartialListing(src, startAfter);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public long getPreferredBlockSize(final String filename) throws IOException {
-      return (new ImmutableFSCaller<Long>() {
-        Long call() throws IOException {
-          return namenode.getPreferredBlockSize(filename);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public long[] getStats() throws IOException {
-      return (new ImmutableFSCaller<long[]>() {
-        long[] call() throws IOException {
-          return namenode.getStats();
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void metaSave(final String filename) throws IOException {
-      (new ImmutableFSCaller<Boolean>() {
-        Boolean call() throws IOException {
-          namenode.metaSave(filename);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public OpenFileInfo[] iterativeGetOpenFiles(
-      final String path, final int millis, final String start) throws IOException {
-      return (new ImmutableFSCaller<OpenFileInfo[]>() {
-        OpenFileInfo[] call() throws IOException {
-          return namenode.iterativeGetOpenFiles(path, millis, start);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean mkdirs(final String src, final FsPermission masked)
-        throws IOException {
-      return (new ImmutableFSCaller<Boolean>() {
-        Boolean call() throws IOException {
-          return namenode.mkdirs(src, masked);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void refreshNodes() throws IOException {
-      (new ImmutableFSCaller<Boolean>() {
-        Boolean call() throws IOException {
-          namenode.refreshNodes();
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean hardLink(final String src, final String dst) throws IOException {
-      return (new MutableFSCaller<Boolean>() {
-
-        @Override
-        Boolean call(int retries) throws IOException {
-          return namenode.hardLink(src, dst);
-        }
-      }).callFS();
-    }
-    
-    @Override
-    public boolean rename(final String src, final String dst) throws IOException {
-      return (new MutableFSCaller<Boolean>() {
-
-        @Override
-        Boolean call(int retries) throws IOException {
-          if (retries > 0) {
-            /*
-             * Because of the organization of the code in the NameNode if the
-             * source is still there then the rename did not happen
-             * 
-             * If it doesn't exist then if the rename happened, the dst exists
-             * otherwise rename did not happen because there was an error return
-             * false
-             * 
-             * This is of course a subject to races between clients but with
-             * certain assumptions about a system we can make the call succeed
-             * on failover
-             */
-            if (namenode.getFileInfo(src) != null)
-              return namenode.rename(src, dst);
-            return namenode.getFileInfo(dst) != null;
-          }
-          return namenode.rename(src, dst);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public void renewLease(final String clientName) throws IOException {
-      // Treating this as immutable
-      (new ImmutableFSCaller<Boolean>() {
-        Boolean call() throws IOException {
-          namenode.renewLease(clientName);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void reportBadBlocks(final LocatedBlock[] blocks) throws IOException {
-      // TODO this might be a good place to send it to both namenodes
-      (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          namenode.reportBadBlocks(blocks);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void saveNamespace() throws IOException {
-      (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          namenode.saveNamespace();
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void saveNamespace(final boolean force, final boolean uncompressed) throws IOException {
-      (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          namenode.saveNamespace(force, uncompressed);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void setOwner(final String src, final String username,
-        final String groupname) throws IOException {
-      (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          namenode.setOwner(src, username, groupname);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void setPermission(final String src, final FsPermission permission)
-        throws IOException {
-      (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          namenode.setPermission(src, permission);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void setQuota(final String path, final long namespaceQuota,
-        final long diskspaceQuota) throws IOException {
-      (new MutableFSCaller<Boolean>() {
-        Boolean call(int retry) throws IOException {
-          namenode.setQuota(path, namespaceQuota, diskspaceQuota);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean setReplication(final String src, final short replication)
-        throws IOException {
-      return (new MutableFSCaller<Boolean>() {
-        Boolean call(int retry) throws IOException {
-          return namenode.setReplication(src, replication);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean setSafeMode(final SafeModeAction action) throws IOException {
-      return (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          return namenode.setSafeMode(action);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public void setTimes(final String src, final long mtime, final long atime)
-        throws IOException {
-      (new MutableFSCaller<Boolean>() {
-
-        @Override
-        Boolean call(int retry) throws IOException {
-          namenode.setTimes(src, mtime, atime);
-          return true;
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    @Deprecated
-    public void concat(final String trg, final String[] srcs
-        ) throws IOException {
-      concat(trg, srcs, true);
-    }
-    
-    @Override
-    public void concat(final String trg, final String[] srcs,
-        final boolean restricted) throws IOException {
-      (new MutableFSCaller<Boolean>() {
-        Boolean call(int r) throws IOException {
-          namenode.concat(trg, srcs, restricted);
-          return true;
-        }
-      }).callFS();
-    }
-    
-    @Override
-    public long getProtocolVersion(final String protocol,
-        final long clientVersion) throws VersionIncompatible, IOException {
-      return (new ImmutableFSCaller<Long>() {
-
-        @Override
-        Long call() throws IOException {
-          return namenode.getProtocolVersion(protocol, clientVersion);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public ProtocolSignature getProtocolSignature(final String protocol,
-        final long clientVersion, final int clientMethodsHash) throws IOException {
-      return (new ImmutableFSCaller<ProtocolSignature>() {
-
-        @Override
-        ProtocolSignature call() throws IOException {
-          return namenode.getProtocolSignature(
-              protocol, clientVersion, clientMethodsHash);
-        }
-
-      }).callFS();
-    }
-
-    @Override
-    public void recoverLease(final String src, final String clientName)
-    throws IOException {
-      // Treating this as immutable
-      (new ImmutableFSCaller<Boolean>() {
-        Boolean call() throws IOException {
-          namenode.recoverLease(src, clientName);
-          return true;
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean closeRecoverLease(final String src, final String clientName)
-    throws IOException {
-      // Treating this as immutable
-      return (new ImmutableFSCaller<Boolean>() {
-        Boolean call() throws IOException {
-          return namenode.closeRecoverLease(src, clientName, false);
-        }
-      }).callFS();
-    }
-
-    @Override
-    public boolean closeRecoverLease(final String src, final String clientName,
-                                     final boolean discardLastBlock)
-       throws IOException {
-      // Treating this as immutable
-      return (new ImmutableFSCaller<Boolean>() {
-        Boolean call() throws IOException {
-          return namenode.closeRecoverLease(src, clientName, discardLastBlock);
-        }
-      }).callFS();
-    }
-   
-    @Override
-    public LocatedBlockWithFileName getBlockInfo(final long blockId) 
-    		throws IOException {
-    	
-    	return (new ImmutableFSCaller<LocatedBlockWithFileName>() {
-    		LocatedBlockWithFileName call() throws IOException {
-          return namenode.getBlockInfo(blockId);
-        }
-      }).callFS();
-    }
+  @Override
+  public boolean isFailoverInProgress() {
+    return failoverClient.getNameNode() == null;
   }
 
-  private boolean shouldHandleException(IOException ex) {
-    if (ex.getMessage().contains("java.io.EOFException")) {
-      return true;
-    }
-    return ex.getMessage().toLowerCase().contains("connection");
+  @Override
+  public void nameNodeDown() {
+    failoverClient.setNameNode(null);
   }
 
-  /**
-   * @return true if a failover has happened, false otherwise
-   * requires write lock
-   */
-  private boolean zkCheckFailover() {
-    try {
-      long registrationTime = zk.getPrimaryRegistrationTime(logicalName);
-      LOG.debug("File is in ZK");
-      LOG.debug("Checking mod time: " + registrationTime + 
-                " > " + lastPrimaryUpdate);
-      if (registrationTime > lastPrimaryUpdate) {
-        // Failover has happened happened already
-        failoverClient.nameNodeDown();
-        return true;
-      }
-    } catch (Exception x) {
-      // just swallow for now
-      LOG.error(x);
-    }
-    return false;
+  @Override
+  public void newNamenode(VersionedProtocol namenode) {
+    failoverClient.setNameNode((ClientProtocol) namenode);
   }
 
-  private void handleFailure(IOException ex, int failures) throws IOException {
-    // Check if the exception was thrown by the network stack
-    if (shutdown || !shouldHandleException(ex)) {
-      throw ex;
-    }
-
-    if (failures > FAILURE_RETRY) {
-      throw ex;
-    }
-    try {
-      // This might've happened because we are failing over
-      if (!watchZK) {
-        LOG.debug("Not watching ZK, so checking explicitly");
-        // Check with zookeeper
-        fsLock.readLock().unlock();
-        fsLock.writeLock().lock();
-        boolean failover = zkCheckFailover();
-        fsLock.writeLock().unlock();
-        fsLock.readLock().lock();
-        if (failover) {
-          return;
-        }
-      }
-      Thread.sleep(1000);
-    } catch (InterruptedException iex) {
-      LOG.error("Interrupted while waiting for a failover", iex);
-      Thread.currentThread().interrupt();
-    }
-
+  @Override
+  public boolean isShuttingdown() {
+    return shutdown;
   }
 
   @Override
@@ -1374,7 +264,7 @@ public void close() throws IOException {
       super.close();
       return;
     }
-    readLock();
+    failoverHandler.readLock();
     try {
       super.close();
       if (failoverFS != null) {
@@ -1384,151 +274,12 @@ public void close() throws IOException {
         standbyFS.close();
       }
       try {
-        zk.shutdown();
+        failoverHandler.shutdown();
       } catch (InterruptedException e) {
         LOG.error("Error shutting down ZooKeeper client", e);
       }
     } finally {
-      readUnlock();
-    }
-  }
-
-
-  /**
-   * ZooKeeper communication
-   */
-
-  private class ZooKeeperFSWatcher implements Watcher {
-    @Override
-    public void process(WatchedEvent event) {
-      /**
-       * This is completely inaccurate by now since we
-       * switched from deletion and recreation of the node
-       * to updating the node information.
-       * I am commenting it out for now. Will revisit once we
-       * decide to go to the watchers approach.
-       */
-//      if (Event.EventType.NodeCreated == event.getType()
-//          && event.getPath().equals(zNode)) {
-//        fsLock.writeLock().lock();
-//        try {
-//          initUnderlyingFileSystem(true);
-//        } catch (IOException ex) {
-//          LOG.error("Error initializing fs", ex);
-//        } finally {
-//          fsLock.writeLock().unlock();
-//        }
-//        return;
-//      }
-//      if (Event.EventType.NodeDeleted == event.getType()
-//          && event.getPath().equals(zNode)) {
-//        fsLock.writeLock().lock();
-//        failoverClient.nameNodeDown();
-//        try {
-//          // Subscribe for changes
-//          if (zk.getNodeStats(zNode) != null) {
-//            // Failover already happened - initialize
-//            initUnderlyingFileSystem(true);
-//          }
-//        } catch (Exception iex) {
-//          LOG.error(iex);
-//        } finally {
-//          fsLock.writeLock().unlock();
-//        }
-//      }
-    }
-  }
-
-  private void readUnlock() {
-    fsLock.readLock().unlock();
-  }
-
-  private void readLock() throws IOException {
-    for (int i = 0; i < FAILOVER_RETRIES; i++) {
-      fsLock.readLock().lock();
-
-      if (failoverClient.isDown()) {
-        // This means the underlying filesystem is not initialized
-        // and there is no way to make a call
-        // Failover might be in progress, so wait for it
-        // Since we do not want to miss the notification on failoverMonitor
-        fsLock.readLock().unlock();
-        try {
-          boolean failedOver = false;
-          fsLock.writeLock().lock();
-          if (!watchZK && failoverClient.isDown()) {
-            LOG.debug("No Watch ZK Failover");
-            // We are in pull failover mode where clients are asking ZK
-            // if the failover is over instead of ZK telling watchers
-            // however another thread in this FS Instance could've done
-            // the failover for us.
-            try {
-              failedOver = initUnderlyingFileSystem(true);
-            } catch (Exception ex) {
-              // Just swallow exception since we are retrying in any event
-            }
-          }
-          fsLock.writeLock().unlock();
-          if (!failedOver)
-            Thread.sleep(failoverCheckPeriod);
-        } catch (InterruptedException ex) {
-          LOG.error("Got interrupted waiting for failover", ex);
-          Thread.currentThread().interrupt();
-        }
-
-      } else {
-        // The client is up and we are holding a readlock.
-        return;
-      }
-    }
-    // We retried FAILOVER_RETRIES times with no luck - fail the call
-    throw new IOException("No FileSystem for " + logicalName);
-  }
-
-  /**
-   * File System implementation
-   */
-
-
-  private abstract class ImmutableFSCaller<T> {
-    
-    abstract T call() throws IOException;
-    
-    public T callFS() throws IOException {
-      int failures = 0;
-      while (true) {
-        readLock();
-        try {
-          return this.call();
-        } catch (IOException ex) {
-          handleFailure(ex, failures);
-          failures++;
-        } finally {
-          readUnlock();
-        }
-      }
-    }
-  }
-
-  private abstract class MutableFSCaller<T> {
-
-    abstract T call(int retry) throws IOException;
-    
-    public T callFS() throws IOException {
-      int retries = 0;
-      while (true) {
-        readLock();
-        try {
-          return this.call(retries);
-        } catch (IOException ex) {
-          if (!alwaysRetryWrites)
-            throw ex;
-          handleFailure(ex, retries);
-          retries++;
-        } finally {
-          readUnlock();
-        }
-      }
+      failoverHandler.readUnlock();
     }
   }
 
@@ -1546,7 +297,7 @@ private T callStandby() throws IOException {
       boolean primaryCalled = false;
       try {
         // grab the read lock but don't check for failover yet
-        fsLock.readLock().lock();
+        failoverHandler.readLockSimple();
 
         if (System.currentTimeMillis() >
             lastStandbyFSCheck + standbyFSCheckInterval ||
@@ -1561,12 +312,12 @@ private T callStandby() throws IOException {
                     " r_interval=" + standbyFSCheckRequestInterval);
 
           // release read lock, grab write lock
-          fsLock.readLock().unlock();
-          fsLock.writeLock().lock();
-          boolean failover = zkCheckFailover();
+          failoverHandler.readUnlock();
+          failoverHandler.writeLock();
+          boolean failover = failoverHandler.zkCheckFailover();
           if (failover) {
             LOG.info("DAFS failover has happened");
-            failoverClient.nameNodeDown();
+            nameNodeDown();
           } else {
             LOG.debug("DAFS failover has not happened");
           }
@@ -1575,22 +326,22 @@ private T callStandby() throws IOException {
           lastStandbyFSCheck = System.currentTimeMillis();
 
           // release write lock
-          fsLock.writeLock().unlock();
+          failoverHandler.writeUnLock();
 
           // now check for failover
-          readLock();
+          failoverHandler.readLock();
         } else if (standbyFS == null && (System.currentTimeMillis() >
                                          lastStandbyFSInit +
                                          standbyFSInitInterval)) {
           // try to initialize standbyFS
 
           // release read lock, grab write lock
-          fsLock.readLock().unlock();
-          fsLock.writeLock().lock();
+          failoverHandler.readUnlock();
+          failoverHandler.writeLock();
           initStandbyFS();
 
-          fsLock.writeLock().unlock();
-          fsLock.readLock().lock();
+          failoverHandler.writeUnLock();
+          failoverHandler.readLockSimple();
         }
 
         standbyFSCheckRequestCount.incrementAndGet();
@@ -1599,7 +350,7 @@ private T callStandby() throws IOException {
           // if there is still no standbyFS, use the primary
           LOG.info("DAFS Standby avatar not available, using primary.");
           primaryCalled = true;
-          fsLock.readLock().unlock();
+          failoverHandler.readUnlock();
           return callPrimary();
         }
         return call(standbyFS);
@@ -1613,12 +364,12 @@ private T callStandby() throws IOException {
                     "Standby exception:\n" +
                     StringUtils.stringifyException(ie));
           primaryCalled = true;
-          fsLock.readLock().unlock();
+          failoverHandler.readUnlock();
           return callPrimary();
         }
       } finally {
         if (!primaryCalled) {
-          fsLock.readLock().unlock();
+          failoverHandler.readUnlock();
         }
       }
     }
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClient.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClient.java
new file mode 100644
index 00000000..e886cbe4
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClient.java
@@ -0,0 +1,42 @@
+package org.apache.hadoop.hdfs;
+
+import java.io.IOException;
+
+import org.apache.hadoop.ipc.VersionedProtocol;
+
+/**
+ * Failover client interface for various implementations to invoke their own
+ * processing during failover.
+ */
+public interface FailoverClient {
+
+  /**
+   * The client tries to failover to the new primary and reports success or
+   * failure.
+   *
+   * @return true if we failed over successfully, false otherwise.
+   */
+  public boolean tryFailover() throws IOException;
+
+  /**
+   * Returns whether or not the client is shut down
+   */
+  public boolean isShuttingdown();
+
+  /**
+   * Denotes whether or not we are in failvoer and don't know who the primary is
+   */
+  public boolean isFailoverInProgress();
+
+  /**
+   * Tells the client that the namenode it was contacting earlier is down and it
+   * should now try to perform a failover
+   */
+  public void nameNodeDown();
+
+  /**
+   * Once we know about a new namenode, instruct the client that it should
+   * failover to this new namenode
+   */
+  public void newNamenode(VersionedProtocol namenode);
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClientHandler.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClientHandler.java
new file mode 100644
index 00000000..f0c5f834
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClientHandler.java
@@ -0,0 +1,254 @@
+package org.apache.hadoop.hdfs;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.ipc.VersionedProtocol;
+import org.apache.zookeeper.data.Stat;
+
+/**
+ * Handles failovers for clients talking to a namenode.
+ */
+public class FailoverClientHandler {
+
+  CachingAvatarZooKeeperClient zk;
+  /*
+   * ReadLock is acquired by the clients performing operations WriteLock is
+   * acquired when we need to failover and modify the proxy. Read and write
+   * because of read and write access to the namenode object.
+   */
+  ReentrantReadWriteLock fsLock = new ReentrantReadWriteLock(true);
+
+  /**
+   * The full address of the node in ZooKeeper
+   */
+  long lastPrimaryUpdate = 0;
+
+  // Should DAFS retry write operations on failures or not
+  boolean alwaysRetryWrites;
+  // Indicates whether subscription model is used for ZK communication
+  boolean watchZK;
+
+  private int failoverCheckPeriod;
+
+  VersionedProtocol namenode;
+
+  // Will try for two minutes checking with ZK every 15 seconds
+  // to see if the failover has happened in pull case
+  // and just wait for two minutes in watch case
+  public static final int FAILOVER_CHECK_PERIOD = 15000;
+  public static final int FAILOVER_RETRIES = 8;
+  // Tolerate up to 5 retries connecting to the NameNode
+  private static final int FAILURE_RETRY = 5;
+
+  private static final Log LOG = LogFactory.getLog(FailoverClientHandler.class);
+  private final URI logicalName;
+  private final FailoverClient failoverClient;
+
+  static {
+    Configuration.addDefaultResource("avatar-default.xml");
+    Configuration.addDefaultResource("avatar-site.xml");
+  }
+
+  public FailoverClientHandler(Configuration conf, URI logicalName,
+      FailoverClient failoverClient) {
+    /*
+     * If false - on Mutable call to the namenode we fail If true we try to make
+     * the call go through by resolving conflicts
+     */
+    alwaysRetryWrites = conf.getBoolean("fs.ha.retrywrites", false);
+
+    // Create AvatarZooKeeperClient
+    zk = new CachingAvatarZooKeeperClient(conf, null);
+
+    failoverCheckPeriod = conf.getInt("fs.avatar.failover.checkperiod",
+        FAILOVER_CHECK_PERIOD);
+    this.logicalName = logicalName;
+    this.failoverClient = failoverClient;
+  }
+
+  public String getPrimaryAvatarAddress(URI logicalName, Stat stat,
+      boolean retry,
+      boolean firstAttempt) throws Exception {
+    String primaryAddr = zk.getPrimaryAvatarAddress(logicalName, stat, true,
+        firstAttempt);
+    lastPrimaryUpdate = stat.getMtime();
+    return primaryAddr;
+  }
+
+  public boolean isZKCacheEnabled() {
+    return zk.isCacheEnabled();
+  }
+
+  /**
+   * @return true if a failover has happened, false otherwise requires write
+   *         lock
+   */
+  boolean zkCheckFailover() {
+    try {
+      long registrationTime = zk.getPrimaryRegistrationTime(logicalName);
+      LOG.debug("File is in ZK");
+      LOG.debug("Checking mod time: " + registrationTime + " > "
+          + lastPrimaryUpdate);
+      if (registrationTime > lastPrimaryUpdate) {
+        // Failover has happened happened already
+        failoverClient.nameNodeDown();
+        return true;
+      }
+    } catch (Exception x) {
+      // just swallow for now
+      LOG.error(x);
+    }
+    return false;
+  }
+
+  void handleFailure(IOException ex, int failures)
+      throws IOException {
+    // Check if the exception was thrown by the network stack
+    if (failoverClient.isShuttingdown() || !shouldHandleException(ex)) {
+      throw ex;
+    }
+
+    if (failures > FAILURE_RETRY) {
+      throw ex;
+    }
+    try {
+      // This might've happened because we are failing over
+      if (!watchZK) {
+        LOG.debug("Not watching ZK, so checking explicitly");
+        // Check with zookeeper
+        fsLock.readLock().unlock();
+        InjectionHandler.processEvent(InjectionEvent.DAFS_CHECK_FAILOVER);
+        fsLock.writeLock().lock();
+        boolean failover = zkCheckFailover();
+        fsLock.writeLock().unlock();
+        fsLock.readLock().lock();
+        if (failover) {
+          return;
+        }
+      }
+      Thread.sleep(1000);
+    } catch (InterruptedException iex) {
+      LOG.error("Interrupted while waiting for a failover", iex);
+      Thread.currentThread().interrupt();
+    }
+
+  }
+
+  private boolean shouldHandleException(IOException ex) {
+    if (ex.getMessage().contains("java.io.EOFException")) {
+      return true;
+    }
+    return ex.getMessage().toLowerCase().contains("connection");
+  }
+
+  void shutdown() throws IOException, InterruptedException {
+    zk.shutdown();
+  }
+
+  void readUnlock() {
+    fsLock.readLock().unlock();
+  }
+
+  void readLockSimple() {
+    fsLock.readLock().lock();
+  }
+
+  void writeLock() {
+    fsLock.writeLock().lock();
+  }
+
+  void writeUnLock() {
+    fsLock.writeLock().unlock();
+  }
+
+  void readLock() throws IOException {
+    for (int i = 0; i < FAILOVER_RETRIES; i++) {
+      fsLock.readLock().lock();
+
+      if (failoverClient.isFailoverInProgress()) {
+        // This means Failover might be in progress, so wait for it
+        fsLock.readLock().unlock();
+        try {
+          boolean failedOver = false;
+          fsLock.writeLock().lock();
+          if (!watchZK && failoverClient.isFailoverInProgress()) {
+            // We are in pull failover mode where clients are asking ZK
+            // if the failover is over instead of ZK telling watchers
+            // however another thread in this Instance could've done
+            // the failover for us.
+            try {
+              failedOver = failoverClient.tryFailover();
+            } catch (Exception ex) {
+              // Just swallow exception since we are retrying in any event
+            }
+          }
+          fsLock.writeLock().unlock();
+          if (!failedOver)
+            Thread.sleep(failoverCheckPeriod);
+        } catch (InterruptedException ex) {
+          LOG.error("Got interrupted waiting for failover", ex);
+          Thread.currentThread().interrupt();
+        }
+
+      } else {
+        // The client is up and we are holding a readlock.
+        return;
+      }
+    }
+    // We retried FAILOVER_RETRIES times with no luck - fail the call
+    throw new IOException("No namenode for " + logicalName);
+  }
+
+  /**
+   * File System implementation
+   */
+
+  public abstract class ImmutableFSCaller<T> {
+
+    public abstract T call() throws IOException;
+
+    public T callFS() throws IOException {
+      int failures = 0;
+      while (true) {
+        readLock();
+        try {
+          return this.call();
+        } catch (IOException ex) {
+          handleFailure(ex, failures);
+          failures++;
+        } finally {
+          readUnlock();
+        }
+      }
+    }
+  }
+
+  public abstract class MutableFSCaller<T> {
+
+    public abstract T call(int retry) throws IOException;
+
+    public T callFS() throws IOException {
+      int retries = 0;
+      while (true) {
+        readLock();
+        try {
+          return this.call(retries);
+        } catch (IOException ex) {
+          if (!alwaysRetryWrites)
+            throw ex;
+          handleFailure(ex, retries);
+          retries++;
+        } finally {
+          readUnlock();
+        }
+      }
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClientProtocol.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClientProtocol.java
new file mode 100644
index 00000000..7d9ddf3e
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/FailoverClientProtocol.java
@@ -0,0 +1,1100 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hdfs;
+
+import java.io.IOException;
+
+import org.apache.hadoop.fs.ContentSummary;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.OpenFileInfo;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.CorruptFileBlocks;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.DirectoryListing;
+import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlockWithMetaInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlockWithFileName;
+import org.apache.hadoop.hdfs.protocol.LocatedDirectoryListing;
+import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlock;
+import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlocks;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.hdfs.protocol.FSConstants.UpgradeAction;
+import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
+import org.apache.hadoop.ipc.ProtocolSignature;
+import org.apache.hadoop.ipc.RPC.VersionIncompatible;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.security.AccessControlException;
+
+
+/**
+ * Implementation of the {@link ClientProtocol} so that Avatar clients are
+ * able to talk to the NameNode correctly even after an Avatar failover.
+ */
+public class FailoverClientProtocol implements ClientProtocol {
+
+  private ClientProtocol namenode;
+  private final FailoverClientHandler failoverHandler;
+
+  public FailoverClientProtocol(ClientProtocol namenode, FailoverClientHandler failoverHandler) {
+    this.namenode = namenode;
+    this.failoverHandler = failoverHandler;
+  }
+
+  public ClientProtocol getNameNode() {
+    return this.namenode;
+  }
+
+  public void setNameNode(ClientProtocol namenode) {
+    this.namenode = namenode;
+  }
+
+  @Override
+  public int getDataTransferProtocolVersion() throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<Integer>() {
+      @Override
+      public Integer call() throws IOException {
+        return namenode.getDataTransferProtocolVersion();
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void abandonBlock(final Block b, final String src,
+      final String holder) throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+
+      @Override
+      public Boolean call(int retry) throws IOException {
+        namenode.abandonBlock(b, src, holder);
+        return true;
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public void abandonFile(final String src,
+      final String holder) throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+
+      @Override
+      public Boolean call(int retry) throws IOException {
+        namenode.abandonFile(src, holder);
+        return true;
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedDirectoryListing getLocatedPartialListing(final String src,
+      final byte[] startAfter) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<LocatedDirectoryListing>() {
+
+      @Override
+      public LocatedDirectoryListing call() throws IOException {
+        return namenode.getLocatedPartialListing(src, startAfter);
+      }
+
+    }).callFS();
+  }
+
+  public LocatedBlock addBlock(final String src, final String clientName,
+      final DatanodeInfo[] excludedNodes, final DatanodeInfo[] favoredNodes)
+  throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlock>() {
+      @Override
+      public LocatedBlock call(int retries) throws IOException {
+        if (retries > 0) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            if (blocks.locatedBlockCount() > 0 ) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode
+        .addBlock(src, clientName, excludedNodes,
+            favoredNodes);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlock addBlock(final String src, final String clientName,
+      final DatanodeInfo[] excludedNodes) throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlock>() {
+      @Override
+      public LocatedBlock call(int retries) throws IOException {
+        if (retries > 0) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            // If atleast one block exists.
+            if (blocks.locatedBlockCount() > 0) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode.addBlock(src, clientName, excludedNodes);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public VersionedLocatedBlock addBlockAndFetchVersion(
+      final String src, final String clientName,
+      final DatanodeInfo[] excludedNodes) throws IOException {
+    return (failoverHandler.new MutableFSCaller<VersionedLocatedBlock>() {
+      @Override
+      public VersionedLocatedBlock call(int retries) throws IOException {
+        if (retries > 0) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            // If atleast one block exists.
+            if (blocks.locatedBlockCount() > 0) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode
+        .addBlockAndFetchVersion(src, clientName, excludedNodes);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(
+      final String src, final String clientName,
+      final DatanodeInfo[] excludedNodes) throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlockWithMetaInfo>() {
+      @Override
+      public LocatedBlockWithMetaInfo call(int retries) throws IOException {
+        if (retries > 0) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            if (blocks.locatedBlockCount() > 0 ) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode.addBlockAndFetchMetaInfo(src, clientName,
+            excludedNodes);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(
+      final String src, final String clientName,
+      final DatanodeInfo[] excludedNodes,
+      final long startPos) throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlockWithMetaInfo>() {
+      @Override
+      public LocatedBlockWithMetaInfo call(int retries) throws IOException {
+        if (retries > 0) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            if (blocks.locatedBlockCount() > 0 ) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode.addBlockAndFetchMetaInfo(src, clientName,
+            excludedNodes, startPos);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(final String src,
+      final String clientName, final DatanodeInfo[] excludedNodes,
+      final DatanodeInfo[] favoredNodes)
+  throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlockWithMetaInfo>() {
+      @Override
+      public LocatedBlockWithMetaInfo call(int retries) throws IOException {
+        if (retries > 0) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            if (blocks.locatedBlockCount() > 0 ) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode.addBlockAndFetchMetaInfo(src, clientName,
+            excludedNodes, favoredNodes);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(final String src,
+      final String clientName, final DatanodeInfo[] excludedNodes,
+      final DatanodeInfo[] favoredNodes, final long startPos)
+  throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlockWithMetaInfo>() {
+      @Override
+      public LocatedBlockWithMetaInfo call(int retries) throws IOException {
+        if (retries > 0) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            if (blocks.locatedBlockCount() > 0 ) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode.addBlockAndFetchMetaInfo(src, clientName,
+            excludedNodes, favoredNodes, startPos);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlockWithMetaInfo addBlockAndFetchMetaInfo(final String src,
+      final String clientName, final DatanodeInfo[] excludedNodes,
+      final DatanodeInfo[] favoredNodes, final long startPos,
+      final Block lastBlock)
+  throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlockWithMetaInfo>() {
+      @Override
+      public LocatedBlockWithMetaInfo call(int retries) throws IOException {
+        if (retries > 0 && lastBlock == null) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            if (blocks.locatedBlockCount() > 0 ) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode.addBlockAndFetchMetaInfo(src, clientName,
+            excludedNodes, favoredNodes, startPos, lastBlock);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlock addBlock(final String src, final String clientName)
+  throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlock>() {
+      @Override
+      public LocatedBlock call(int retries) throws IOException {
+        if (retries > 0) {
+          FileStatus info = namenode.getFileInfo(src);
+          if (info != null) {
+            LocatedBlocks blocks = namenode.getBlockLocations(src, 0,
+                info
+                .getLen());
+            // If atleast one block exists.
+            if (blocks.locatedBlockCount() > 0) {
+              LocatedBlock last = blocks.get(blocks.locatedBlockCount() - 1);
+              if (last.getBlockSize() == 0) {
+                // This one has not been written to
+                namenode.abandonBlock(last.getBlock(), src, clientName);
+              }
+            }
+          }
+        }
+        return namenode.addBlock(src, clientName);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlock append(final String src, final String clientName)
+  throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlock>() {
+      @Override
+      public LocatedBlock call(int retries) throws IOException {
+        if (retries > 0) {
+          namenode.complete(src, clientName);
+        }
+        return namenode.append(src, clientName);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlockWithMetaInfo appendAndFetchMetaInfo(final String src,
+      final String clientName) throws IOException {
+    return (failoverHandler.new MutableFSCaller<LocatedBlockWithMetaInfo>() {
+      @Override
+      public LocatedBlockWithMetaInfo call(int retries) throws IOException {
+        if (retries > 0) {
+          namenode.complete(src, clientName);
+        }
+        return namenode.appendAndFetchMetaInfo(src, clientName);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean complete(final String src, final String clientName)
+  throws IOException {
+    // Treating this as Immutable even though it changes metadata
+    // but the complete called on the file should result in completed file
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        if (r > 0) {
+          try {
+            return namenode.complete(src, clientName);
+          } catch (IOException ex) {
+            if (namenode.getFileInfo(src) != null) {
+              // This might mean that we closed that file
+              // which is why namenode can no longer find it
+              // in the list of UnderConstruction
+              if (ex.getMessage()
+                  .contains("Could not complete write to file")) {
+                // We guess that we closed this file before because of the
+                // nature of exception
+                return true;
+              }
+            }
+            throw ex;
+          }
+        }
+        return namenode.complete(src, clientName);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean complete(final String src, final String clientName,
+      final long fileLen)
+  throws IOException {
+    // Treating this as Immutable even though it changes metadata
+    // but the complete called on the file should result in completed file
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        if (r > 0) {
+          try {
+            return namenode.complete(src, clientName, fileLen);
+          } catch (IOException ex) {
+            if (namenode.getFileInfo(src) != null) {
+              // This might mean that we closed that file
+              // which is why namenode can no longer find it
+              // in the list of UnderConstruction
+              if (ex.getMessage()
+                  .contains("Could not complete write to file")) {
+                // We guess that we closed this file before because of the
+                // nature of exception
+                return true;
+              }
+            }
+            throw ex;
+          }
+        }
+        return namenode.complete(src, clientName, fileLen);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean complete(final String src, final String clientName,
+      final long fileLen, final Block lastBlock)
+  throws IOException {
+    // Treating this as Immutable even though it changes metadata
+    // but the complete called on the file should result in completed file
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        if (r > 0 && lastBlock == null) {
+          try {
+            return namenode.complete(src, clientName, fileLen, lastBlock);
+          } catch (IOException ex) {
+            if (namenode.getFileInfo(src) != null) {
+              // This might mean that we closed that file
+              // which is why namenode can no longer find it
+              // in the list of UnderConstruction
+              if (ex.getMessage()
+                  .contains("Could not complete write to file")) {
+                // We guess that we closed this file before because of the
+                // nature of exception
+                return true;
+              }
+            }
+            throw ex;
+          }
+        }
+        return namenode.complete(src, clientName, fileLen, lastBlock);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void create(final String src, final FsPermission masked,
+      final String clientName, final boolean overwrite,
+      final short replication, final long blockSize) throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      @Override
+      public Boolean call(int retries) throws IOException {
+        namenode.create(src, masked, clientName, overwrite,
+            replication, blockSize);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void create(final String src, final FsPermission masked,
+      final String clientName, final boolean overwrite,
+      final boolean createParent,
+      final short replication, final long blockSize) throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      @Override
+      public Boolean call(int retries) throws IOException {
+        if (retries > 0) {
+          // This I am not sure about, because of lease holder I can tell if
+          // it
+          // was me or not with a high level of certainty
+          FileStatus stat = namenode.getFileInfo(src);
+          if (stat != null) {
+            /*
+             * Since the file exists already we need to perform a number of
+             * checks to see if it was created by us before the failover
+             */
+
+            if (stat.getBlockSize() == blockSize
+                && stat.getReplication() == replication && stat.getLen() == 0
+                && stat.getPermission().equals(masked)) {
+              // The file has not been written to and it looks exactly like
+              // the file we were trying to create. Last check:
+              // call create again and then parse the exception.
+              // Two cases:
+              // it was the same client who created the old file
+              // or it was created by someone else - fail
+              try {
+                namenode.create(src, masked, clientName, overwrite,
+                    createParent, replication, blockSize);
+              } catch (RemoteException re) {
+                if (re.unwrapRemoteException() instanceof AlreadyBeingCreatedException) {
+                  AlreadyBeingCreatedException aex = (AlreadyBeingCreatedException) re
+                  .unwrapRemoteException();
+                  if (aex.getMessage().contains(
+                  "current leaseholder is trying to recreate file")) {
+                    namenode.delete(src, false);
+                  } else {
+                    throw re;
+                  }
+                } else {
+                  throw re;
+                }
+              }
+            }
+          }
+        }
+        namenode.create(src, masked, clientName, overwrite, createParent,
+            replication,
+            blockSize);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean delete(final String src, final boolean recursive)
+  throws IOException {
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+      @Override
+      public Boolean call(int retries) throws IOException {
+        if (retries > 0) {
+          namenode.delete(src, recursive);
+          return true;
+        }
+        return namenode.delete(src, recursive);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public boolean delete(final String src) throws IOException {
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+      @Override
+      public Boolean call(int retries) throws IOException {
+        if (retries > 0) {
+          namenode.delete(src);
+          return true;
+        }
+        return namenode.delete(src);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public UpgradeStatusReport distributedUpgradeProgress(
+      final UpgradeAction action) throws IOException {
+    return (failoverHandler.new MutableFSCaller<UpgradeStatusReport>() {
+      public UpgradeStatusReport call(int r) throws IOException {
+        return namenode.distributedUpgradeProgress(action);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void finalizeUpgrade() throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int retry) throws IOException {
+        namenode.finalizeUpgrade();
+        return true;
+      }
+    }).callFS();
+
+  }
+
+  @Override
+  public void fsync(final String src, final String client) throws IOException {
+    // TODO Is it Mutable or Immutable
+    (failoverHandler.new ImmutableFSCaller<Boolean>() {
+
+      @Override
+      public Boolean call() throws IOException {
+        namenode.fsync(src, client);
+        return true;
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlocks getBlockLocations(final String src, final long offset,
+      final long length) throws IOException {
+    // TODO Make it cache values as per Dhruba's suggestion
+    return (failoverHandler.new ImmutableFSCaller<LocatedBlocks>() {
+      public LocatedBlocks call() throws IOException {
+        return namenode.getBlockLocations(src, offset, length);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public VersionedLocatedBlocks open(final String src, final long offset,
+      final long length) throws IOException {
+    // TODO Make it cache values as per Dhruba's suggestion
+    return (failoverHandler.new ImmutableFSCaller<VersionedLocatedBlocks>() {
+      public VersionedLocatedBlocks call() throws IOException {
+        return namenode.open(src, offset, length);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlocksWithMetaInfo openAndFetchMetaInfo(final String src, final long offset,
+      final long length) throws IOException {
+    // TODO Make it cache values as per Dhruba's suggestion
+    return (failoverHandler.new ImmutableFSCaller<LocatedBlocksWithMetaInfo>() {
+      public LocatedBlocksWithMetaInfo call() throws IOException {
+        return namenode.openAndFetchMetaInfo(src, offset, length);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public ContentSummary getContentSummary(final String src) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<ContentSummary>() {
+      public ContentSummary call() throws IOException {
+        return namenode.getContentSummary(src);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public String getClusterName() throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<String>() {
+      public String call() throws IOException {
+        return namenode.getClusterName();
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void recount() throws IOException {
+    (failoverHandler.new ImmutableFSCaller<Boolean>() {
+      public Boolean call() throws IOException {
+        namenode.recount();
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Deprecated @Override
+  public FileStatus[] getCorruptFiles() throws AccessControlException,
+  IOException {
+    return (failoverHandler.new ImmutableFSCaller<FileStatus[]>() {
+      public FileStatus[] call() throws IOException {
+        return namenode.getCorruptFiles();
+      }
+    }).callFS();
+  }
+
+  @Override
+  public CorruptFileBlocks
+  listCorruptFileBlocks(final String path, final String cookie)
+  throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<CorruptFileBlocks>() {
+      public CorruptFileBlocks call()
+      throws IOException {
+        return namenode.listCorruptFileBlocks(path, cookie);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public DatanodeInfo[] getDatanodeReport(final DatanodeReportType type)
+  throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<DatanodeInfo[]>() {
+      public DatanodeInfo[] call() throws IOException {
+        return namenode.getDatanodeReport(type);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public FileStatus getFileInfo(final String src) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<FileStatus>() {
+      public FileStatus call() throws IOException {
+        return namenode.getFileInfo(src);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public HdfsFileStatus getHdfsFileInfo(final String src) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<HdfsFileStatus>() {
+      public HdfsFileStatus call() throws IOException {
+        return namenode.getHdfsFileInfo(src);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public HdfsFileStatus[] getHdfsListing(final String src) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<HdfsFileStatus[]>() {
+      public HdfsFileStatus[] call() throws IOException {
+        return namenode.getHdfsListing(src);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public FileStatus[] getListing(final String src) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<FileStatus[]>() {
+      public FileStatus[] call() throws IOException {
+        return namenode.getListing(src);
+      }
+    }).callFS();
+  }
+
+  public DirectoryListing getPartialListing(final String src,
+      final byte[] startAfter) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<DirectoryListing>() {
+      public DirectoryListing call() throws IOException {
+        return namenode.getPartialListing(src, startAfter);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public long getPreferredBlockSize(final String filename) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<Long>() {
+      public Long call() throws IOException {
+        return namenode.getPreferredBlockSize(filename);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public long[] getStats() throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<long[]>() {
+      public long[] call() throws IOException {
+        return namenode.getStats();
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void metaSave(final String filename) throws IOException {
+    (failoverHandler.new ImmutableFSCaller<Boolean>() {
+      public Boolean call() throws IOException {
+        namenode.metaSave(filename);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public OpenFileInfo[] iterativeGetOpenFiles(
+      final String path, final int millis, final String start) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<OpenFileInfo[]>() {
+      public OpenFileInfo[] call() throws IOException {
+        return namenode.iterativeGetOpenFiles(path, millis, start);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean mkdirs(final String src, final FsPermission masked)
+  throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<Boolean>() {
+      public Boolean call() throws IOException {
+        return namenode.mkdirs(src, masked);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void refreshNodes() throws IOException {
+    (failoverHandler.new ImmutableFSCaller<Boolean>() {
+      public Boolean call() throws IOException {
+        namenode.refreshNodes();
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean hardLink(final String src, final String dst) throws IOException {
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+
+      @Override
+      public Boolean call(int retries) throws IOException {
+        return namenode.hardLink(src, dst);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public String[] getHardLinkedFiles(final String src) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<String[]>() {
+      @Override
+      public String[] call() throws IOException {
+        return namenode.getHardLinkedFiles(src);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean rename(final String src, final String dst) throws IOException {
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+
+      @Override
+      public Boolean call(int retries) throws IOException {
+        if (retries > 0) {
+          /*
+           * Because of the organization of the code in the namenode if the
+           * source is still there then the rename did not happen
+           *
+           * If it doesn't exist then if the rename happened, the dst exists
+           * otherwise rename did not happen because there was an error return
+           * false
+           *
+           * This is of course a subject to races between clients but with
+           * certain assumptions about a system we can make the call succeed
+           * on failover
+           */
+          if (namenode.getFileInfo(src) != null)
+            return namenode.rename(src, dst);
+          return namenode.getFileInfo(dst) != null;
+        }
+        return namenode.rename(src, dst);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public void renewLease(final String clientName) throws IOException {
+    // Treating this as immutable
+    (failoverHandler.new ImmutableFSCaller<Boolean>() {
+      public Boolean call() throws IOException {
+        namenode.renewLease(clientName);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void reportBadBlocks(final LocatedBlock[] blocks) throws IOException {
+    // TODO this might be a good place to send it to both namenodes
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        namenode.reportBadBlocks(blocks);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void saveNamespace() throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        namenode.saveNamespace();
+        return true;
+      }
+    }).callFS();
+  }
+  
+  @Override
+  public void rollEditLogAdmin() throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        namenode.rollEditLogAdmin();
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void saveNamespace(final boolean force, final boolean uncompressed) throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        namenode.saveNamespace(force, uncompressed);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void setOwner(final String src, final String username,
+      final String groupname) throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        namenode.setOwner(src, username, groupname);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void setPermission(final String src, final FsPermission permission)
+  throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        namenode.setPermission(src, permission);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void setQuota(final String path, final long namespaceQuota,
+      final long diskspaceQuota) throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int retry) throws IOException {
+        namenode.setQuota(path, namespaceQuota, diskspaceQuota);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean setReplication(final String src, final short replication)
+  throws IOException {
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int retry) throws IOException {
+        return namenode.setReplication(src, replication);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean setSafeMode(final SafeModeAction action) throws IOException {
+    return (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        return namenode.setSafeMode(action);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public void setTimes(final String src, final long mtime, final long atime)
+  throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+
+      @Override
+      public Boolean call(int retry) throws IOException {
+        namenode.setTimes(src, mtime, atime);
+        return true;
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  @Deprecated
+  public void concat(final String trg, final String[] srcs
+  ) throws IOException {
+    concat(trg, srcs, true);
+  }
+
+  @Override
+  public void concat(final String trg, final String[] srcs,
+      final boolean restricted) throws IOException {
+    (failoverHandler.new MutableFSCaller<Boolean>() {
+      public Boolean call(int r) throws IOException {
+        namenode.concat(trg, srcs, restricted);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public long getProtocolVersion(final String protocol,
+      final long clientVersion) throws VersionIncompatible, IOException {
+    return (failoverHandler.new ImmutableFSCaller<Long>() {
+
+      @Override
+      public Long call() throws IOException {
+        return namenode.getProtocolVersion(protocol, clientVersion);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public ProtocolSignature getProtocolSignature(final String protocol,
+      final long clientVersion, final int clientMethodsHash) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<ProtocolSignature>() {
+
+      @Override
+      public ProtocolSignature call() throws IOException {
+        return namenode.getProtocolSignature(
+            protocol, clientVersion, clientMethodsHash);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public void recoverLease(final String src, final String clientName)
+  throws IOException {
+    // Treating this as immutable
+    (failoverHandler.new ImmutableFSCaller<Boolean>() {
+      public Boolean call() throws IOException {
+        namenode.recoverLease(src, clientName);
+        return true;
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean closeRecoverLease(final String src, final String clientName)
+  throws IOException {
+    // Treating this as immutable
+    return (failoverHandler.new ImmutableFSCaller<Boolean>() {
+      public Boolean call() throws IOException {
+        return namenode.closeRecoverLease(src, clientName, false);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public boolean closeRecoverLease(final String src, final String clientName,
+      final boolean discardLastBlock)
+  throws IOException {
+    // Treating this as immutable
+    return (failoverHandler.new ImmutableFSCaller<Boolean>() {
+      public Boolean call() throws IOException {
+        return namenode
+        .closeRecoverLease(src, clientName, discardLastBlock);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public LocatedBlockWithFileName getBlockInfo(final long blockId)
+  throws IOException {
+
+    return (failoverHandler.new ImmutableFSCaller<LocatedBlockWithFileName>() {
+      public LocatedBlockWithFileName call() throws IOException {
+        return namenode.getBlockInfo(blockId);
+      }
+    }).callFS();
+  }
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/protocol/AvatarConstants.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/protocol/AvatarConstants.java
index b23a678f..858692f5 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/protocol/AvatarConstants.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/protocol/AvatarConstants.java
@@ -90,6 +90,7 @@ static public enum StartupOption {
     ROLLBACK("-rollback"),
     FINALIZE("-finalize"),
     IMPORT  ("-importCheckpoint"),
+    FORCE ("-forceStartup"),
     SERVICE ("-service");
     
 
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/protocol/AvatarProtocol.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/protocol/AvatarProtocol.java
index b3d806a8..4ef979e3 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/protocol/AvatarProtocol.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/protocol/AvatarProtocol.java
@@ -60,12 +60,48 @@ public interface AvatarProtocol extends ClientProtocol {
 
   /**
    * Set the avatar of this instance
+   * 
    * @throws IOException
+   * @deprecated Use {@link #quiesceForFailover()} followed by
+   *             {@link #performFailover()} instead
    */
   public void setAvatar(Avatar avatar) throws IOException;
-  
+
+  /**
+   * Quiesces the Standby Avatar to make sure the standby has consumed all
+   * transactions and also performs certain verifications that the Standby
+   * avatar's state is consistent.
+   *
+   * @param noverification
+   *          whether or not to perform verification
+   * @throws IOException
+   *           if this is the Primary Avatar or the Standby had some error
+   */
+  public void quiesceForFailover(boolean noverification) throws IOException;
+
+  /**
+   * Instructs the Standby to come as the Primary.
+   *
+   * @throws IOException
+   *           if this is the Primary Avatar or the Standby had some error
+   */
+  public void performFailover() throws IOException;
+
+  /**
+   * Set the avatar of this instance.
+   * 
+   * @param force
+   *          whether or not to force the failover
+   * 
+   * @throws IOException
+   * @deprecated Use {@link #quiesceForFailover()} followed by
+   *             {@link #performFailover()} instead
+   */
+  public void setAvatar(Avatar avatar, boolean force) throws IOException;
+
   /**
    * Cleanly shutdown this instance.
+   * 
    * @throws IOException
    */
   public void shutdownAvatar() throws IOException;
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/FailoverNameNodeProtocol.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/FailoverNameNodeProtocol.java
new file mode 100644
index 00000000..bde8abda
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/FailoverNameNodeProtocol.java
@@ -0,0 +1,143 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hdfs.server;
+
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.FailoverClientHandler;
+import org.apache.hadoop.hdfs.server.namenode.CheckpointSignature;
+import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations;
+import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.ipc.ProtocolSignature;
+import org.apache.hadoop.ipc.RPC.VersionIncompatible;
+
+/**
+ * This class implements the NamenodeProtocol such that it can work correctly
+ * across AvatarNode failovers. Currently we support this protocol only for
+ * the use case of the Balancer. Rest of the API's are left for implementation
+ * in future when we actually need them.
+ */
+public class FailoverNameNodeProtocol implements NamenodeProtocol {
+
+  private NamenodeProtocol namenode;
+  private final FailoverClientHandler failoverHandler;
+  private final Log LOG = LogFactory.getLog(FailoverNameNodeProtocol.class);
+
+  public FailoverNameNodeProtocol(NamenodeProtocol namenode,
+      FailoverClientHandler failoverHandler) {
+    this.namenode = namenode;
+    this.failoverHandler = failoverHandler;
+  }
+
+  public NamenodeProtocol getNameNode() {
+    return this.namenode;
+  }
+
+  public void setNameNode(NamenodeProtocol namenode) {
+    this.namenode = namenode;
+  }
+
+  @Override
+  public long getProtocolVersion(final String protocol, final long clientVersion)
+      throws VersionIncompatible, IOException {
+    return (failoverHandler.new ImmutableFSCaller<Long>() {
+
+      @Override
+      public Long call() throws IOException {
+        return namenode.getProtocolVersion(protocol, clientVersion);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public ProtocolSignature getProtocolSignature(final String protocol,
+      final long clientVersion, final int clientMethodsHash) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<ProtocolSignature>() {
+
+      @Override
+      public ProtocolSignature call() throws IOException {
+        return namenode.getProtocolSignature(protocol, clientVersion,
+            clientMethodsHash);
+      }
+
+    }).callFS();
+  }
+
+  @Override
+  public BlocksWithLocations getBlocks(final DatanodeInfo datanode,
+      final long size) throws IOException {
+    return (failoverHandler.new ImmutableFSCaller<BlocksWithLocations>() {
+      @Override
+      public BlocksWithLocations call() throws IOException {
+        return namenode.getBlocks(datanode, size);
+      }
+    }).callFS();
+  }
+
+  @Override
+  public CheckpointSignature rollEditLog() throws IOException {
+    throw new IOException("Operation not supported");
+  }
+
+  @Override
+  public void rollFsImage(CheckpointSignature newImageSignature)
+      throws IOException {
+    throw new IOException("Operation not supported");
+  }
+
+  @Override
+  public long[] getBlockLengths(final long[] blockIds) {
+    throw new RuntimeException("Operation not supported");
+  }
+
+  @Override
+  public CheckpointSignature getCheckpointSignature() {
+    throw new RuntimeException("Operation not supported");
+  }
+
+  @Override
+  public LocatedBlocksWithMetaInfo updateDatanodeInfo(
+      LocatedBlocks locatedBlocks) throws IOException {
+    throw new IOException("Operation not supported");
+  }
+
+  @Override
+  public long getTransactionID() throws IOException {
+    // TODO Auto-generated method stub
+    return 0;
+  }
+
+  @Override
+  public RemoteEditLogManifest getEditLogManifest(long l) throws IOException {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  @Override
+  public void register() throws IOException {
+    // TODO Auto-generated method stub  
+  }
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/balancer/AvatarBalancer.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/balancer/AvatarBalancer.java
new file mode 100644
index 00000000..9972c77f
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/balancer/AvatarBalancer.java
@@ -0,0 +1,170 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hdfs.server.balancer;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FilterFileSystem;
+import org.apache.hadoop.hdfs.DistributedAvatarFileSystem;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.FailoverClient;
+import org.apache.hadoop.hdfs.FailoverClientHandler;
+import org.apache.hadoop.hdfs.server.FailoverNameNodeProtocol;
+import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
+import org.apache.hadoop.ipc.VersionedProtocol;
+import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.util.ToolRunner;
+import org.apache.zookeeper.data.Stat;
+
+/**
+ * Extension of the HDFS Balancer utility such that it works correctly with
+ * AvatarNodes and can run during and after an AvatarNode failover.
+ */
+public class AvatarBalancer extends Balancer implements FailoverClient {
+
+  private FailoverNameNodeProtocol failoverNamenode;
+  private FailoverClientHandler failoverHandler;
+  private URI logicalName;
+
+  public AvatarBalancer() {
+    super();
+  }
+
+  public AvatarBalancer(Configuration conf) {
+    super(conf);
+  }
+
+  public AvatarBalancer(Configuration conf, double threshold) {
+    super(conf, threshold);
+  }
+
+  static int runBalancer(String[] args) throws Exception {
+    return ToolRunner.run(null, new AvatarBalancer(), args);
+  }
+
+  @Override
+  public void setConf(Configuration conf) {
+    conf.setClass("dfs.balancer.impl", AvatarBalancer.class, Balancer.class);
+    conf.setClass("fs.hdfs.impl", DistributedAvatarFileSystem.class,
+        FileSystem.class);
+    conf.setBoolean("fs.ha.retrywrites", true);
+    super.setConf(conf);
+  }
+
+  /**
+   * Run a balancer
+   *
+   * @param args
+   */
+  public static void main(String[] args) {
+    try {
+      System.exit(runBalancer(args));
+    } catch (Throwable e) {
+      LOG.error(StringUtils.stringifyException(e));
+      System.exit(-1);
+    }
+
+  }
+
+  @Override
+  protected void initFS() throws IOException {
+    super.initFS();
+    logicalName = this.fs.getUri();
+    failoverHandler = new FailoverClientHandler(this.conf, logicalName, this);
+  }
+
+  @Override
+  protected void initNameNodes() throws IOException {
+    if (this.fs instanceof FilterFileSystem) {
+      this.client = ((DistributedFileSystem) ((FilterFileSystem) this.fs)
+          .getRawFileSystem()).getClient().getNameNodeRPC();
+    } else {
+      this.client = ((DistributedFileSystem) this.fs).getClient()
+          .getNameNodeRPC();
+    }
+    initNamenodeProtocol(false);
+  }
+
+  private void initNamenodeProtocol(boolean failover) throws IOException {
+    boolean firstAttempt = true;
+    Stat stat = new Stat();
+    while (true) {
+      try {
+        String primaryAddr = failoverHandler.getPrimaryAvatarAddress(
+            logicalName, stat, true, firstAttempt);
+        String parts[] = primaryAddr.split(":");
+        if (parts.length != 2) {
+          throw new IOException("Invalid address : " + primaryAddr);
+        }
+        InetSocketAddress nnAddr = new InetSocketAddress(parts[0],
+            Integer.parseInt(parts[1]));
+        NamenodeProtocol nn = createNamenode(nnAddr, conf);
+        if (failover) {
+          newNamenode(nn);
+        } else {
+          failoverNamenode = new FailoverNameNodeProtocol(this.namenode,
+              failoverHandler);
+          this.namenode = failoverNamenode;
+        }
+        break;
+      } catch (Exception e) {
+        if (firstAttempt && failoverHandler.isZKCacheEnabled()) {
+          firstAttempt = false;
+          continue;
+        } else {
+          Balancer.LOG.error(e);
+          throw new IOException(e);
+        }
+      }
+    }
+
+  }
+
+  @Override
+  public boolean tryFailover() throws IOException {
+    initNamenodeProtocol(true);
+    return true;
+  }
+
+  @Override
+  public boolean isShuttingdown() {
+    return this.shuttingDown;
+  }
+
+  @Override
+  public boolean isFailoverInProgress() {
+    return failoverNamenode.getNameNode() == null;
+  }
+
+  @Override
+  public void nameNodeDown() {
+    failoverNamenode.setNameNode(null);
+  }
+
+  @Override
+  public void newNamenode(VersionedProtocol namenode) {
+    failoverNamenode.setNameNode((NamenodeProtocol) namenode);
+  }
+
+
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/datanode/AvatarDataNode.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/datanode/AvatarDataNode.java
index cc5b6fda..d3549be2 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/datanode/AvatarDataNode.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/datanode/AvatarDataNode.java
@@ -21,7 +21,10 @@
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
+import java.net.NoRouteToHostException;
+import java.net.PortUnreachableException;
 import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -58,6 +61,7 @@
 import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.DiskChecker;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.zookeeper.data.Stat;
@@ -84,8 +88,6 @@ public class AvatarDataNode extends DataNode {
   }
   public static final Log LOG = LogFactory.getLog(AvatarDataNode.class.getName());
 
-  volatile boolean shutdown = false;
-
   public AvatarDataNode(Configuration conf, AbstractList<File> dataDirs, 
                         String dnThreadName) throws IOException {
     super(conf, dataDirs);
@@ -259,11 +261,14 @@ void refreshNamenodes(
             remove(nsos);
           }
         }
+        for (NamespaceService nsos : toStop) {
+          nsos.stop();
+        }
+        for (NamespaceService nsos : toStop) {
+          nsos.join();
+        }
+        startAll();
       }
-      for (NamespaceService nsos : toStop) {
-        nsos.stop();
-      }
-      startAll();
     }
   }
 
@@ -447,7 +452,7 @@ public void restartService1() throws IOException {
       }
     }
 
-    private void stopService1() {
+    void stopService1() {
       RPC.stopProxy(avatarnode1);
       RPC.stopProxy(namenode1);
       avatarnode1 = null;
@@ -460,7 +465,7 @@ private void stopService1() {
       }
     }
 
-    private void stopService2() {
+    void stopService2() {
       RPC.stopProxy(avatarnode2);
       RPC.stopProxy(namenode2);
       avatarnode2 = null;
@@ -566,7 +571,6 @@ public void shutdown() {
       stop();
       join();
     }
-
     
   // connect to both name node if possible. 
   // If doWait is true, then return only when at least one handshake is
@@ -581,6 +585,12 @@ private NamespaceInfo handshake(boolean startup) throws IOException {
     // we failover and hence we can speak to any one of the nodes to find out
     // the NamespaceInfo.
     boolean noPrimary = false;
+    boolean needResolveNNAddr1 = false;
+    long lastResolveTime1 = 0;
+    boolean needResolveNNAddr2 = false;
+    long lastResolveTime2 = 0;
+    long DNS_RESOLVE_MIN_INTERVAL = 120 * 1000;
+    
     do {
       if (startup) {
         // The startup option is used when the datanode is first created
@@ -599,17 +609,54 @@ private NamespaceInfo handshake(boolean startup) throws IOException {
         }
       }
       try {
-          if ((firstIsPrimary && startup) || !startup || noPrimary) {
-          // only try to connect to the first NN if it is not the
-          // startup connection or if it is primary on startup
-          // This way if it is standby we are not wasting datanode startup time
+          if ((firstIsPrimary && startup) || !startup || noPrimary) {          
+            // only try to connect to the first NN if it is not the
+            // startup connection or if it is primary on startup
+            // This way if it is standby we are not wasting datanode startup
+            // time
+            if (needResolveNNAddr1
+                && System.currentTimeMillis() - lastResolveTime1 > DNS_RESOLVE_MIN_INTERVAL) {
+              // Try to resolve DNS address again
+              InetSocketAddress newAddr;
+              boolean addressChanged = false;
+              newAddr = NetUtils.resolveAddress(nameAddr1);
+              if (newAddr != null) {
+                nameAddr1 = newAddr;
+                addressChanged = true;
+              }
+              newAddr = NetUtils.resolveAddress(avatarAddr1);
+              if (newAddr != null) {
+                avatarAddr1 = newAddr;
+                addressChanged = true;
+              }
+              lastResolveTime1 = System.currentTimeMillis();
+              needResolveNNAddr1 = false;
+              
+              if (addressChanged) {
+                stopService1();
+              }
+            }
             initProxy1();
-          if (startup) {
-            nsInfo = handshake(namenode1, nameAddr1);
-          }
+
+            if (startup) {
+              nsInfo = handshake(namenode1, nameAddr1);
+            }
         }
       } catch(ConnectException se) {  // namenode has not been started
         LOG.info("Server at " + nameAddr1 + " not available yet, Zzzzz...");
+        needResolveNNAddr1 = true;
+      } catch (NoRouteToHostException nrhe) {
+        LOG.info("NoRouteToHostException connecting to server. " + nameAddr1,
+            nrhe);
+        needResolveNNAddr1 = true;
+      } catch (PortUnreachableException pue) {
+        LOG.info("PortUnreachableException connecting to server. "
+            + nameAddr1, pue);
+        needResolveNNAddr1 = true;
+       } catch (UnknownHostException uhe) {
+         LOG.info("UnknownHostException connecting to server. " + nameAddr1,
+             uhe);
+        needResolveNNAddr1 = true;
       } catch(SocketTimeoutException te) {  // namenode is busy
         LOG.info("Problem connecting to server timeout. " + nameAddr1);
       } catch (IOException ioe) {
@@ -617,7 +664,32 @@ private NamespaceInfo handshake(boolean startup) throws IOException {
       }
       try {
         if ((!firstIsPrimary && startup) || !startup || noPrimary) {
+            if (needResolveNNAddr2
+                && System.currentTimeMillis() - lastResolveTime1 > DNS_RESOLVE_MIN_INTERVAL) {
+            // Try to resolve DNS address again
+            InetSocketAddress newAddr;
+            boolean addressChanged = false;
+            newAddr = NetUtils.resolveAddress(nameAddr2);
+            if (newAddr != null) {
+              nameAddr2 = newAddr;
+              addressChanged = true;
+            }
+            newAddr = NetUtils.resolveAddress(avatarAddr2);
+            if (newAddr != null) {
+              avatarAddr2 = newAddr;
+              addressChanged = true;
+            }
+            lastResolveTime2 = System.currentTimeMillis();
+            needResolveNNAddr2 = false;
+            
+            if (addressChanged) {
+              stopService2();
+            }
+
+          }
+
           initProxy2();
+
           if (startup) {
             NamespaceInfo tempInfo = handshake(namenode2, nameAddr2);
             // During failover both layouts should match.
@@ -632,6 +704,19 @@ private NamespaceInfo handshake(boolean startup) throws IOException {
         }
       } catch(ConnectException se) {  // namenode has not been started
         LOG.info("Server at " + nameAddr2 + " not available yet, Zzzzz...");
+        needResolveNNAddr2 = true;
+      } catch (NoRouteToHostException nrhe) {
+        LOG.info("NoRouteToHostException connecting to server. " + nameAddr2,
+            nrhe);
+        needResolveNNAddr2 = true;
+      } catch (PortUnreachableException pue) {
+        LOG.info("PortUnreachableException connecting to server. "
+            + nameAddr2, pue);
+        needResolveNNAddr2 = true;
+       } catch (UnknownHostException uhe) {
+         LOG.info("UnknownHostException connecting to server. " + nameAddr2,
+             uhe);
+        needResolveNNAddr2 = true;
       } catch(SocketTimeoutException te) {  // namenode is busy
         LOG.info("Problem connecting to server timeout. " + nameAddr2);
       } catch (RemoteException re) {
@@ -753,6 +838,37 @@ void setPrimaryOfferService(OfferService service) {
     }
   }
   
+  private void register1() throws IOException {
+    synchronized(avatarAddr1) {
+      InjectionHandler.processEvent(InjectionEvent.AVATARDATANODE_BEFORE_START_OFFERSERVICE1);
+      if (avatarnode1 != null && namenode1 != null && !doneRegister1 &&
+          register(namenode1, nameAddr1)) {
+        InjectionHandler.processEvent(InjectionEvent.AVATARDATANODE_START_OFFERSERVICE1);
+        doneRegister1 = true;
+        offerService1 = new OfferService(AvatarDataNode.this, this,
+            namenode1, nameAddr1,
+            avatarnode1, avatarAddr1);
+        of1 = new Thread(offerService1, "OfferService1 " + nameAddr1);
+        of1.start();
+      }
+    }
+  }
+
+  private void register2() throws IOException {
+    synchronized(avatarAddr2) {
+      if (avatarnode2 != null && namenode2 != null && !doneRegister2 &&
+          register(namenode2, nameAddr2)) {
+        InjectionHandler.processEvent(InjectionEvent.AVATARDATANODE_START_OFFERSERVICE2);
+        doneRegister2 = true;
+        offerService2 = new OfferService(AvatarDataNode.this, this,
+            namenode2, nameAddr2,
+            avatarnode2, avatarAddr2);
+        of2 = new Thread(offerService2, "OfferService2 " + nameAddr2);
+        of2.start();
+      }
+    }
+  }
+
   @Override
   public void run() {
     LOG.info(nsRegistration + "In AvatarDataNode.run, data = " + data);
@@ -768,34 +884,15 @@ public void run() {
       return;
     }
     
-    while (shouldServiceRun) {
+    while (shouldServiceRun && shouldRun) {
       try {
         // try handshaking with any namenode that we have not yet tried
         handshake(false);
 
-        synchronized(avatarAddr1) {
-          if (avatarnode1 != null && namenode1 != null && !doneRegister1 &&
-              register(namenode1, nameAddr1)) {
-            InjectionHandler.processEvent(InjectionEvent.AVATARDATANODE_START_OFFERSERVICE1);
-            doneRegister1 = true;
-            offerService1 = new OfferService(AvatarDataNode.this, this,
-                namenode1, nameAddr1, 
-                avatarnode1, avatarAddr1);
-            of1 = new Thread(offerService1, "OfferService1 " + nameAddr1);
-            of1.start();
-          }
-        }
-        synchronized(avatarAddr2) {
-          if (avatarnode2 != null && namenode2 != null && !doneRegister2 &&
-              register(namenode2, nameAddr2)) {
-            InjectionHandler.processEvent(InjectionEvent.AVATARDATANODE_START_OFFERSERVICE2);
-            doneRegister2 = true;
-            offerService2 = new OfferService(AvatarDataNode.this, this,
-                namenode2, nameAddr2,
-                avatarnode2, avatarAddr2);
-            of2 = new Thread(offerService2, "OfferService2 " + nameAddr2);
-            of2.start();
-          }
+        try {
+          register1();
+        } finally {
+          register2();
         }
 
         this.initialized = true;
@@ -805,7 +902,7 @@ public void run() {
       } catch (Exception ex) {
         LOG.error("Exception: ", ex);
       }
-      if (shouldServiceRun && !shutdown) {
+      if (shouldServiceRun && shouldRun) {
         try {
           Thread.sleep(5000);
         } catch (InterruptedException ie) {
@@ -936,7 +1033,7 @@ public void scheduleBlockReceivedAndDeleted(long delay) {
   * Tells the datanode to start the shutdown process.
   */
   public synchronized void shutdownDN() {
-    shutdown = true;
+    shouldRun = false;
     if (namespaceManager != null) {
       namespaceManager.stopAll();
     }
@@ -1070,7 +1167,7 @@ public static AvatarDataNode instantiateDataNode(String args[],
           " anymore. RackID resolution is handled by the NameNode.");
       System.exit(-1);
     }
-    String[] dataDirs = conf.getStrings("dfs.data.dir");
+    String[] dataDirs = getListOfDataDirs(conf);
     return makeInstance(dataDirs, conf);
   }
 
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/datanode/OfferService.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/datanode/OfferService.java
index c273e0e7..38b8108a 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/datanode/OfferService.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/datanode/OfferService.java
@@ -28,33 +28,35 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.hadoop.ipc.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hdfs.DFSUtil;
-import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.hdfs.protocol.AvatarProtocol;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.BlockListAsLongs;
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.server.datanode.AvatarDataNode.ServicePair;
+import org.apache.hadoop.hdfs.server.datanode.DataNode.BlockRecord;
+import org.apache.hadoop.hdfs.server.datanode.DataNode.BlockRecoveryTimeoutException;
+import org.apache.hadoop.hdfs.server.datanode.DataNode.KeepAliveHeartbeater;
+import org.apache.hadoop.hdfs.server.datanode.metrics.DataNodeMetrics;
+import org.apache.hadoop.hdfs.server.protocol.BlockAlreadyCommittedException;
 import org.apache.hadoop.hdfs.server.protocol.BlockCommand;
 import org.apache.hadoop.hdfs.server.protocol.BlockReport;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeCommand;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeProtocol;
+import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
 import org.apache.hadoop.hdfs.server.protocol.IncrementalBlockReport;
 import org.apache.hadoop.hdfs.server.protocol.InterDatanodeProtocol;
 import org.apache.hadoop.hdfs.server.protocol.ReceivedBlockInfo;
 import org.apache.hadoop.hdfs.server.protocol.UpgradeCommand;
-import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
-import org.apache.hadoop.hdfs.server.datanode.AvatarDataNode.ServicePair;
-import org.apache.hadoop.hdfs.server.datanode.DataNode.BlockRecord;
-import org.apache.hadoop.hdfs.server.datanode.DataNode.KeepAliveHeartbeater;
-import org.apache.hadoop.hdfs.server.datanode.metrics.DataNodeMetrics;
 import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.hdfs.util.LightWeightBitSet;
-import org.apache.hadoop.hdfs.protocol.AvatarProtocol;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.util.StringUtils;
 import org.apache.zookeeper.data.Stat;
 
 public class OfferService implements Runnable {
@@ -267,6 +269,8 @@ private void sendIncrementalBlockReport(long startTime) throws Exception {
   }
 
   public void offerService() throws Exception {
+    InjectionHandler.processEvent(InjectionEvent.OFFERSERVICE_START,
+        anode.getPort(), this.avatarnodeAddress);
 
     LOG.info("using BLOCKREPORT_INTERVAL of " + anode.blockReportInterval + "msec" + 
        " Initial delay: " + anode.initialBlockReportDelay + "msec for " + namenodeAddress);
@@ -535,24 +539,15 @@ private static boolean isValidStandbyCommand(DatanodeCommand cmd) {
   /**
    * Determines whether a failover has happened and accordingly takes the
    * appropriate action.
-   * 
-   * @param cmd
-   *          the command received from the AvatarNode
-   * @return whether or not this service is the primary service
+   * @return whether or not failover happened
    */
-  private boolean checkFailover(DatanodeCommand cmd) throws InterruptedException {
+  private boolean checkFailover() throws InterruptedException {
     boolean isPrimary = isPrimaryServiceCached();
     if (!isPrimary && isPrimaryService()) {
-      // The datanode has received a register command after the failover, this
-      // means that the offerservice thread for the datanode was down for a
-      // while and it most probably did not clean up its deletion queue, hence
-      // force a cleanup.
-      if (cmd.getAction() == DatanodeProtocol.DNA_REGISTER) {
-        this.clearPrimary();
-      }
       this.servicePair.setPrimaryOfferService(this);
+      return true;
     }
-    return isPrimaryServiceCached();
+    return false;
   }
 
   /**
@@ -563,18 +558,26 @@ private boolean checkFailover(DatanodeCommand cmd) throws InterruptedException {
    */
   private boolean processCommand(DatanodeCommand[] cmds) throws InterruptedException {
     if (cmds != null) {
+      // at each heartbeat the standby offer service will talk to ZK!
+      boolean switchedFromStandbyToPrimary = checkFailover();
       for (DatanodeCommand cmd : cmds) {
-        boolean isPrimary = checkFailover(cmd);
         try {
-          // The standby service thread is allowed to process only a small set
-          // of valid commands.
-          if (!isValidStandbyCommand(cmd) && !isPrimaryService()) {
-              continue;
-          } else if (cmd.getAction() == DatanodeProtocol.DNA_REGISTER && 
-                 !isPrimaryService() && !isPrimary) {
-            // Standby issued a DNA_REGISTER. 
+          // The datanode has received a register command after the failover, this
+          // means that the offerservice thread for the datanode was down for a
+          // while and it most probably did not clean up its deletion queue, hence
+          // force a cleanup.
+          if (switchedFromStandbyToPrimary
+              && cmd.getAction() == DatanodeProtocol.DNA_REGISTER) {
             this.clearPrimary();
           }
+          
+          // The standby service thread is allowed to process only a small set
+          // of valid commands.
+          if (!isPrimaryServiceCached() && !isValidStandbyCommand(cmd)) {
+            LOG.warn("Received an invalid command " + cmd
+                + " from standby " + this.namenodeAddress);
+            continue;
+          } 
           if (processCommand(cmd) == false) {
             return false;
           }
@@ -634,9 +637,21 @@ private boolean processCommand(DatanodeCommand cmd) throws IOException, Interrup
       // namenode requested a registration - at start or if NN lost contact
       LOG.info("AvatarDatanodeCommand action: DNA_REGISTER");
       if (shouldRun()) {
-        servicePair.register(namenode, namenodeAddress);
-        firstBlockReportSent = false;
-        scheduleBlockReport(0);
+        try {
+          InjectionHandler
+              .processEventIO(InjectionEvent.OFFERSERVICE_BEFORE_REGISTRATION);
+          servicePair.register(namenode, namenodeAddress);
+          firstBlockReportSent = false;
+          scheduleBlockReport(0);
+        } catch (IOException e) {
+          LOG.warn("Registration failed, will restart offerservice threads..",
+              e);
+          servicePair.stopService1();
+          servicePair.doneRegister1 = false;
+          servicePair.stopService2();
+          servicePair.doneRegister2 = false;
+          throw e;
+        }
       }
       break;
     case DatanodeProtocol.DNA_FINALIZE:
@@ -706,6 +721,7 @@ private boolean clearPrimary() throws InterruptedException {
             + this.avatarnodeAddress);
         this.forceIncrementalReport = true;
       }
+      InjectionHandler.processEvent(InjectionEvent.OFFERSERVICE_CLEAR_PRIMARY);
     } catch (IOException e) {
       LOG.error("Exception processing CLEAR PRIMARY", e);
       return false;
@@ -831,7 +847,17 @@ LocatedBlock syncBlock(
     List<DatanodeID> successList = new ArrayList<DatanodeID>();
 
     DataNode.throwIfAfterTime(deadline);
-    long generationstamp = namenode.nextGenerationStamp(block, closeFile);
+    long generationstamp = -1;
+    try {
+      generationstamp = namenode.nextGenerationStamp(block, closeFile);
+    } catch (RemoteException e) {
+      if (e.unwrapRemoteException() instanceof BlockAlreadyCommittedException) {
+        throw new BlockAlreadyCommittedException(e);
+      } else {
+        throw e;
+      }
+    }
+
     Block newblock = new Block(block.getBlockId(), block.getNumBytes(), generationstamp);
 
     for(BlockRecord r : syncList) {
@@ -839,6 +865,8 @@ LocatedBlock syncBlock(
         DataNode.throwIfAfterTime(deadline);
         r.datanode.updateBlock(servicePair.namespaceId, r.info.getBlock(), newblock, closeFile);
         successList.add(r.id);
+      } catch (BlockRecoveryTimeoutException e) {
+        throw e;
       } catch (IOException e) {
         InterDatanodeProtocol.LOG.warn("Failed to updateBlock (newblock="
             + newblock + ", datanode=" + r.id + ")", e);
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/AvatarNode.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/AvatarNode.java
index f308ac5a..435c7be1 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/AvatarNode.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/AvatarNode.java
@@ -28,21 +28,21 @@
 import java.io.FileInputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
+import java.net.SocketTimeoutException;
+import java.net.URI;
 import java.net.UnknownHostException;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Set;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 
@@ -56,15 +56,13 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
-import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.metrics.util.MBeanUtil;
 import org.apache.hadoop.hdfs.AvatarFailoverSnapshot;
-import org.apache.hadoop.hdfs.AvatarZooKeeperClient;
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.FileStatusExtended;
 import org.apache.hadoop.hdfs.OpenFilesInfo;
-import org.apache.hadoop.hdfs.protocol.BlockListAsLongs;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.util.StringUtils;
@@ -73,7 +71,6 @@
 import org.apache.hadoop.hdfs.protocol.AvatarConstants.StartupOption;
 import org.apache.hadoop.hdfs.protocol.AvatarConstants.InstanceId;
 import org.apache.hadoop.hdfs.protocol.Block;
-import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.server.protocol.AvatarDatanodeCommand;
 import org.apache.hadoop.hdfs.server.protocol.BlockFlags;
 import org.apache.hadoop.hdfs.server.protocol.BlockCommand;
@@ -81,16 +78,18 @@
 import org.apache.hadoop.hdfs.server.protocol.DatanodeCommand;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
 import org.apache.hadoop.hdfs.server.protocol.IncrementalBlockReport;
+import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
 import org.apache.hadoop.hdfs.server.protocol.ReceivedBlockInfo;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
 import org.apache.hadoop.hdfs.server.datanode.DatanodeProtocols;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 import org.apache.hadoop.hdfs.server.namenode.ClusterJspHelper.NameNodeKey;
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
 import org.apache.hadoop.hdfs.server.namenode.metrics.AvatarNodeStatusMBean;
 import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.hdfs.util.LightWeightBitSet;
-import org.apache.zookeeper.data.Stat;
 
 /**
  * This is an implementation of the AvatarNode, a hot
@@ -140,15 +139,8 @@ public class AvatarNode extends NameNode
 
   public static final Log LOG = LogFactory.getLog(AvatarNode.class.getName());
   private static final int    INVALIDATES_CLEANUP_INTERVAL = 60 * 1000;
-  private static final String STORAGE_FILE_LOCK     = "in_use.lock";
-  private static final String EDITSFILE     = "/current/edits";
-  private static final String EDITSNEW     = "/current/edits.new";
-  private static final String TIMEFILE     = "/current/fstime";
-  private static final String IMAGENEW     ="/current/fsimage.ckpt";
-  public static final long TXID_IGNORE = -1;
+  
   public static final String FAILOVER_SNAPSHOT_FILE = "failover_snapshot_file";
-  static final SimpleDateFormat dateForm =
-    new SimpleDateFormat("yyyy-MM-dd-HH:mm:ss.SSS");
 
   // The instanceId is assigned at startuptime and does not change for
   // the lifetime of the Node. The adminstrator has to name each instance
@@ -158,8 +150,8 @@ public class AvatarNode extends NameNode
   //
   private InstanceId instance;
 
-  // The time when (and if) the fsimage was sync-ed from the remote AvatarNode
-  volatile private long startCheckpointTime;
+  // The txid the fsimage was sync-ed from the remote AvatarNode
+  volatile private long startCheckpointTxId;
 
   private Server server;                   /** RPC server */
   private InetSocketAddress serverAddress; /** RPC server address */
@@ -168,7 +160,7 @@ public class AvatarNode extends NameNode
   private Configuration confg;             // config for the standby namenode
   private Configuration startupConf;       // config for the namenode
   private Thread standbyThread;            // the standby daemon thread
-  private InvalidatesCleaner cleaner;      // The thread cleaning up invalidates
+  private Cleaner cleaner;      // The thread cleaning up invalidates and mis-replicated blocks
   private Thread cleanerThread;
 
   private RunInfo runInfo;
@@ -181,6 +173,24 @@ public class AvatarNode extends NameNode
   protected final boolean enableTestFrameworkFsck;
   
   private String failoverFsck = "";
+  private String oldPrimaryFsck = "";
+  private volatile FailoverState failoverState = FailoverState.BEFORE_FAILOVER;
+
+  static public enum FailoverState {
+    BEFORE_FAILOVER("BeforeFailover"),
+    START_FAILOVER("StartFailover"),
+    FAILED_FAILOVER("FailedFailover"),
+    AWAIT_FAILOVER("AwaitFailover"),
+    PERFORM_FAILOVER("PerformFailover");
+
+    private String name = null;
+    private FailoverState(String arg) {this.name = arg;}
+
+    @Override
+    public String toString() {
+      return name;
+    }
+  }
 
   /**
    * The startup Conf is the original configuration of the AvatarNode. It is used by the
@@ -188,8 +198,17 @@ public class AvatarNode extends NameNode
    * The conf is the modified configuration that is used by the standby namenode
    */
   AvatarNode(Configuration startupConf, Configuration conf,
-             StartupInfo startInfo, RunInfo runInfo, long sessionId) throws IOException {
+      StartupInfo startInfo, RunInfo runInfo, long sessionId,
+      InetSocketAddress nameNodeAddr, NamenodeProtocol primaryNamenode)
+      throws IOException {
     super(conf);    
+    
+    // check if we talk to primary
+    if (startInfo.isStandby
+        && (nameNodeAddr == null || primaryNamenode == null)) {
+      throw new IOException("RPC to primary namenode not initialized");
+    }
+    
     this.sessionId = sessionId;
     this.runInfo = runInfo;
     this.instance = startInfo.instance;
@@ -203,7 +222,8 @@ public class AvatarNode extends NameNode
     if (startInfo.isStandby) {
       // Set the checkpoint time to the fstime of the image and edits
       // that were copied
-      setStartCheckpointTime(readLocalFstime(conf));
+      setStartCheckpointTxId(namesystem.getFSImage().storage
+          .getMostRecentCheckpointTxId());
     }
 
     initialize(conf);
@@ -231,10 +251,10 @@ public class AvatarNode extends NameNode
 
       // Create a standby object which does the actual work of 
       // processing transactions from the primary and checkpointing
-      standby = new Standby(this, startupConf, confg); 
+      standby = new Standby(this, startupConf, confg, nameNodeAddr, primaryNamenode); 
       standbyThread = new Thread(standby);
       standbyThread.start();
-      cleaner = new InvalidatesCleaner();
+      cleaner = new Cleaner();
       cleanerThread = new Thread(cleaner);
       cleanerThread.start();
     }
@@ -245,54 +265,10 @@ protected void setFailoverFsck(String fsck) {
     failoverFsck = fsck;
   }
 
-  /**
-   * Generates a new session id for the cluster and writes it to zookeeper. Some
-   * other data in zookeeper (like the last transaction id) is written to
-   * zookeeper with the sessionId so that we can easily determine in which
-   * session was this data written. The sessionId is unique since it uses the
-   * current time.
-   * 
-   * @return the session id that it wrote to ZooKeeper
-   * @throws IOException
-   */
-  private static long writeSessionIdToZK(Configuration conf) throws IOException {
-    long ssid = -1;
-    int maxTries = conf.getInt("dfs.avatarnode.sync.ssidtxid.retries", 3);
-    // Whether or not to verify the sessionid after writing it to ZK.
-    int tries = 0;
-    while (tries < maxTries) {
-      AvatarZooKeeperClient zk = new AvatarZooKeeperClient(conf, null);
-      try {
-        ssid = now();
-        zk.registerPrimarySsId(getClusterAddress(conf), ssid);
-        // Be extra careful and verify the data was synced to zk.
-        Long ssIdInZk = zk.getPrimarySsId(getClusterAddress(conf));
-        if (ssid != ssIdInZk) {
-          throw new IOException("Session Id in the NameNode : " + ssid +
-              " does not match the session Id in Zookeeper : " + ssIdInZk);
-        }
-        break;
-      } catch(Exception e) {
-        if (tries == maxTries - 1 ) {
-          throw new IOException(e);
-        }
-      } finally {
-        try {
-          zk.shutdown();
-        } catch (InterruptedException ie) {
-          if (tries == maxTries - 1) {
-            throw new IOException(ie);
-          }
-        }
-      }
-    }
-    return ssid;
-  }
-
   /**
    * Wait for the StandbyNode to exit. If it does, then stop the underlying namenode.
    */
-  void waitForRestart() {
+  public void waitForRestart() {
     if (standbyThread != null) {
       try {
         // if this is the standby avatarnode, then wait for the Standby to exit
@@ -303,12 +279,25 @@ void waitForRestart() {
       standbyThread = null;
       LOG.info("waitForRestart Standby thread exited.");
 
-      // if we are still in standbymode, that means we need to restart from scratch.
+      InjectionHandler.processEvent(InjectionEvent.AVATARNODE_WAIT_FOR_RESTART);
+      while (failoverState == FailoverState.START_FAILOVER
+          || failoverState == FailoverState.AWAIT_FAILOVER) {
+        LOG.info("Current state : " + failoverState
+            + ". Waiting for failover ....");
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException ie) {
+          throw new RuntimeException("waitForRestart() interrupted");
+        }
+      }
+
+      // if we are still in standbymode, that means we need to restart from
+      // scratch.
       if (getAvatar() == Avatar.STANDBY) {
         runInfo.isRunning = false;
         LOG.info("waitForRestart Stopping encapsulated namenode.");
-        super.stop();            // terminate encapsulated namenode
-        super.join();            // wait for encapsulated namenode to exit
+        super.stop(); // terminate encapsulated namenode
+        super.join(); // wait for encapsulated namenode to exit
         shutdownStandby();
         LOG.info("waitForRestart exiting");
         return;
@@ -339,11 +328,9 @@ public String getState() {
   
   @Override
   public long getLagBytes() {
-    if (this.standby == null)
-    return 0;
-    return this.standby.getLagBytes();
+    return standby == null ? 0 : standby.getLagBytes();
   }
-
+    
   public Configuration getStartupConf() {
     return this.startupConf;
   }
@@ -408,6 +395,16 @@ public boolean isInitialized() {
     return isInitialized;
   }
 
+  /**
+   * @inheritDoc
+   */
+  protected boolean shouldCheckHeartbeat() {
+    if (currentAvatar == Avatar.ACTIVE) {
+      return super.shouldCheckHeartbeat();
+    }
+    return true;
+  }
+
   private static class ShutdownAvatarThread extends Thread {
     private final AvatarNode node;
 
@@ -422,7 +419,7 @@ public void run() {
         if (node.currentAvatar == Avatar.STANDBY) {
           // make sure that all transactions are consumed
           try {
-            node.standby.quiesce(AvatarNode.TXID_IGNORE);
+            node.standby.quiesce(FSEditLogLoader.TXID_IGNORE);
           } catch (Throwable e) {
             LOG.warn("Standby: ", e);
           }
@@ -430,8 +427,7 @@ public void run() {
         // Need to stop RPC threads before capturing any final data about the
         // primary avatar.
         node.stopRPC(false);
-
-        long totalBlocks = node.namesystem.getBlocksTotal();
+        
         String fsck = "";
         try {
           if (node.enableTestFramework 
@@ -450,7 +446,9 @@ public void run() {
         node.stop();
         node.join();            // wait for encapsulated namenode to exit
         
-        if (InjectionHandler.falseCondition(InjectionEvent.AVATARNODE_SHUTDOWN)) {
+        long totalBlocks = node.namesystem.getBlocksTotal();
+        if (InjectionHandler.falseCondition(InjectionEvent.AVATARNODE_SHUTDOWN,
+            totalBlocks)) {
           // simulate crash
           return;
         }
@@ -461,7 +459,13 @@ public void run() {
           // If we are the primary we need to sync our last transaction id to
           // zookeeper.
           node.writeFailoverTestData(fsck);
-          node.writeLastTxidToZookeeper(totalBlocks);
+          AvatarNodeZkUtil.writeLastTxidToZookeeper(
+              node.getLastWrittenTxId(), 
+              totalBlocks,
+              node.namesystem.getFilesAndDirectoriesTotal(), 
+              node.sessionId,
+              node.startupConf, 
+              node.confg);
         }
       } catch (Exception e) {
         LOG.error("shutdownAvatar() failed", e);
@@ -472,9 +476,9 @@ public void run() {
   private void verifyEditStreams() throws IOException {
     if (currentAvatar == Avatar.STANDBY)
       return;
-    int expectedEditStreams = FSNamesystem.getNamespaceEditsDirs(confg).size();
+    int expectedEditStreams = NNStorageConfiguration.getNamespaceEditsDirs(confg).size();
     int actualEditStreams = this.namesystem.getFSImage().getEditLog()
-        .getNumEditStreams();
+        .getNumberOfAvailableJournals();
     if (expectedEditStreams != actualEditStreams
         || InjectionHandler
             .falseCondition(InjectionEvent.AVATARNODE_CHECKEDITSTREAMS)) {
@@ -520,16 +524,6 @@ public void shutdownAvatar() throws IOException {
     shutdown(false);
   }
   
-  /**
-   * Used only for testing.
-   */
-  public void doCheckpoint() throws IOException {
-    if (currentAvatar != Avatar.STANDBY) {
-      throw new IOException("This is not the standby avatar");
-    }
-    standby.doCheckpoint();
-  }
-  
   /**
    * Used only for testing.
    */
@@ -563,50 +557,6 @@ public static String getClusterAddress(Configuration conf)
     return addr.getHostName() + ":" + addr.getPort();
   }
 
-  /**
-   * Writes the last transaction id of the primary avatarnode to zookeeper.
-   * 
-   * @throws IOException
-   */
-  private void writeLastTxidToZookeeper(long totalBlocks) throws IOException {
-    long lastTxid = super.getLastWrittenTxId();
-    LOG.info("Failover - writing lastTxId: " + lastTxid + ", total blocks: " + totalBlocks);
-    if (lastTxid < 0) {
-      LOG.warn("Invalid last transaction id : " + lastTxid
-          + " skipping write to zookeeper.");
-      return;
-    }
-    ZookeeperTxId zkTxid = new ZookeeperTxId(this.sessionId, lastTxid,
-        totalBlocks);
-    int maxTries = startupConf.getInt("dfs.avatarnode.sync.ssidtxid.retries", 3);
-    int tries = 0;
-    while (true) {
-      AvatarZooKeeperClient zk = new AvatarZooKeeperClient(confg, null);
-      try {
-        zk.registerLastTxId(getClusterAddress(this.startupConf), zkTxid);
-        return;
-      } catch (Exception e) {
-        if (tries > maxTries) {
-          throw new IOException(e);
-        } else {
-          tries++;
-          LOG.warn("Error syncing last txid to zk, retrying ....", e);
-          try {
-            Thread.sleep(5000);
-          } catch (InterruptedException ie) {
-            throw new IOException("writeLastTxidToZookeeper() interrupted", ie);
-          }
-        }
-      } finally {
-        try {
-          zk.shutdown();
-        } catch (InterruptedException ie) {
-          throw new IOException(ie);
-        }
-      }
-    }
-  }
-
   public void shutdownStandby() {
     standby.shutdown();
 
@@ -639,93 +589,52 @@ public void shutdownStandby() {
   protected void stopRPC(boolean interruptClientHadlers) throws IOException {
     try {
       super.stopRPC(interruptClientHadlers);
+      LOG.info("stopRPC: Stopping avatardatanode server");
       this.server.stop(interruptClientHadlers);
       this.server.waitForHandlers();
+      this.server.stopResponder();
     } catch (InterruptedException ex) {
       throw new IOException("stopRPC() interrupted", ex);
     }
   }
 
-  private ZookeeperTxId getLastTransactionId() throws IOException {
-    try {
-      AvatarZooKeeperClient zk = new AvatarZooKeeperClient(confg, null);
-      try {
-        // Gather session id and transaction id data.
-        String address = getClusterAddress(this.startupConf);
-        long sessionId = zk.getPrimarySsId(address);
-        ZookeeperTxId zkTxId = zk.getPrimaryLastTxId(address);
-        long zkLastTxId = zkTxId.getTransactionId();
-        if (sessionId != zkTxId.getSessionId()) {
-          throw new IOException("Session Id in the ssid node : " + sessionId
-              + " does not match the session Id in the txid node : "
-              + zkTxId.getSessionId());
-        }
-        return zkTxId;
-      } finally {
-        zk.shutdown();
-      }
-    } catch (Exception e) {
-      throw new IOException(e);
-    }
-  }
-
   private void verifyTransactionIds(ZookeeperTxId zkTxId) throws IOException {
+    // TODO for unit test it can happen than rollEditLog happens after 
+    // obtaining the txid so we might have a difference of 2 !!!
     long zkLastTxId = zkTxId.getTransactionId();
     long totalBlocks = zkTxId.getTotalBlocks();
     long lastTxId = super.getLastWrittenTxId();
+    long totalInodes = zkTxId.getTotalInodes();
 
     // Verify transacation ids.
     if (lastTxId < 0 || zkLastTxId < 0) {
-      throw new IOException("Invalid transacation ids, txid in NameNode : "
+      throw new StandbyStateException(
+          "Invalid transacation ids, txid in NameNode : "
           + lastTxId + " txid in Zookeeper : " + zkLastTxId);
     } else if (lastTxId != zkLastTxId) {
-      throw new IOException("The transacation id in the namenode : "
+      throw new StandbyStateException("The transacation id in the namenode : "
           + lastTxId + " does not match the transaction id in zookeeper : "
           + zkLastTxId);
     } else if (totalBlocks != super.namesystem.getBlocksTotal()) {
-      throw new IOException("Total blocks in ZK : " + totalBlocks
+      throw new StandbyStateException("Total blocks in ZK : " + totalBlocks
           + " don't match up with total blocks on Standby : "
           + super.namesystem.getBlocksTotal());
+    } else if (totalInodes != super.namesystem.getFilesAndDirectoriesTotal()) {
+      throw new StandbyStateException("Total inodes in ZK : " + totalInodes
+          + " don't match up with total inodes on Standby : "
+          + super.namesystem.getFilesAndDirectoriesTotal());
     }
   }
 
-  private void registerAddressToZK(AvatarZooKeeperClient zk, String confParam)
+  
+  private File getSnapshotFile(Configuration conf, boolean remote)
       throws IOException {
-    String address = startupConf.get(confParam);
-    String realAddress = confg.get(confParam);
-    if (address != null && realAddress != null) {
-      zk.registerPrimary(address, realAddress, true);
-    }
-  }
-
-  private void registerAsPrimaryToZK() throws IOException {
-    // Register client port address.
-    String address = getClusterAddress(startupConf);
-    String realAddress = getClusterAddress(confg);
-    AvatarZooKeeperClient zk = new AvatarZooKeeperClient(confg, null);
-    try {
-      zk.registerPrimary(address, realAddress, true);
-
-      // Register dn protocol address
-      registerAddressToZK(zk, "dfs.namenode.dn-address");
-
-      // Register http address
-      registerAddressToZK(zk, "dfs.http.address");
-
-      // Register rpc address
-      registerAddressToZK(zk, AvatarNode.DFS_NAMENODE_RPC_ADDRESS_KEY);
-    } finally {
-      try {
-        zk.shutdown();
-      } catch (InterruptedException e) {
-        throw new IOException("Could not shutdown zk client", e);
-      }
-    }
-  }
-
-  private File getSnapshotFile(Configuration conf) throws IOException {
-    return new File(getRemoteEditsFile(conf).getParentFile(),
-        FAILOVER_SNAPSHOT_FILE);
+    URI sharedEditsDirectory = remote ? getRemoteSharedEditsURI(confg)
+        : getLocalSharedEditsURI(confg);
+    if (!isFile(sharedEditsDirectory))
+      return null;
+    return new File(sharedEditsDirectory.getPath(), "current" + Path.SEPARATOR
+        + FAILOVER_SNAPSHOT_FILE);
   }
 
   private void writeFailoverTestData(String fsck) throws IOException {
@@ -733,6 +642,10 @@ private void writeFailoverTestData(String fsck) throws IOException {
       LOG.info("Failover: Test framework - disabled");
       return;
     }  
+    File snapshotFile = getSnapshotFile(confg, true);
+    if (snapshotFile == null)
+       return;
+        
     float samplePercent = confg.getFloat(
         "dfs.avatarnode.failover.sample.percent", 0.05f);
     LOG.info("Failover: Test framework - using " + (100.0*samplePercent) 
@@ -740,8 +653,6 @@ private void writeFailoverTestData(String fsck) throws IOException {
     List<FileStatusExtended> stat = super.getRandomFilesSample(samplePercent);
     AvatarFailoverSnapshot snapshot = new AvatarFailoverSnapshot(
         super.namesystem.getOpenFiles(), stat);
-    File snapshotFile = new File(
-        getSharedEditsFile(confg).getParentFile(), FAILOVER_SNAPSHOT_FILE);
     DataOutputStream out = new DataOutputStream(
         new BufferedOutputStream(new FileOutputStream(snapshotFile)));  
     try {
@@ -779,15 +690,17 @@ private void verifyOpenFiles(OpenFilesInfo openFilesInfo) throws IOException {
     }
   }
 
-  private String verifyFailoverTestData() throws IOException {
+  private void verifyFailoverTestData() throws IOException {
     if (!enableTestFramework) {
       LOG.info("Failover: Test framework - disabled");
-      return "";
+      return;
     }
     String fsck = "";
     LOG.info("Failover: Test framework - verification - starting...");
     AvatarFailoverSnapshot snapshot = new AvatarFailoverSnapshot();
-    File snapshotFile = getSnapshotFile(confg);
+    File snapshotFile = getSnapshotFile(confg, false);
+    if (snapshotFile == null)
+      return;
     DataInputStream in = new DataInputStream(
         new BufferedInputStream(new FileInputStream(snapshotFile)));
     try {
@@ -813,7 +726,7 @@ private String verifyFailoverTestData() throws IOException {
     }
 
     LOG.info("Failover: Test framework - verification - succeeded");
-    return fsck;
+    this.oldPrimaryFsck = fsck;
   }
   
   protected String runFailoverFsck() throws IOException {
@@ -828,89 +741,134 @@ protected String runFailoverFsck() throws IOException {
     return stringWriter.toString();
   }
 
-  /**
-   * @inheritDoc
-   */
-  public synchronized void setAvatar(Avatar avatar) throws IOException {
-    if (avatar == currentAvatar) {
-      LOG.info("Failover: Trying to change avatar to " + avatar +
-               " but am already in that state.");
-      return;
+  @Override
+  public synchronized void performFailover() throws IOException {
+    failoverState = FailoverState.PERFORM_FAILOVER;
+    enforceStandby("Cannot perform failover on active");
+    cleaner.stop();
+    cleanerThread.interrupt();
+    try {
+      cleanerThread.join();
+    } catch (InterruptedException iex) {
+      Thread.currentThread().interrupt();
+    }
+
+    // change the value to the one for the primary
+    int maxStandbyBufferedTransactions = confg.getInt(
+        "dfs.max.buffered.transactions",
+        HdfsConstants.DEFAULT_MAX_BUFFERED_TRANSACTIONS);
+    FSEditLog.setMaxBufferedTransactions(maxStandbyBufferedTransactions);
+
+    // Clear up deletion and replication queues.
+    clearInvalidateAndReplicationQueues();
+
+    // if the log was closed by ingestion, re-open it
+    if (!getFSImage().getEditLog().isOpen())
+      getFSImage().getEditLog().open();
+
+    LOG.info("Failover: Triggering safemode failover");
+    standbySafeMode.triggerFailover();
+
+    LOG.info("Failover: Registering to ZK as primary");
+    AvatarNodeZkUtil.registerAsPrimaryToZK(startupConf, confg);
+
+    LOG.info("Failover: Writting session id to ZK");
+    sessionId = AvatarNodeZkUtil.writeSessionIdToZK(startupConf);
+    LOG.info("Failover: Changed avatar from " + currentAvatar + " to "
+        + Avatar.ACTIVE);
+    if (enableTestFramework && enableTestFrameworkFsck) {
+      if (!failoverFsck.equals(oldPrimaryFsck)) {
+        LOG.warn("Failover: FSCK on old primary and new primary do not match");
+        LOG.info("----- FSCK ----- OLD BEGIN");
+        LOG.info("Failover: Old primary fsck: \n " + oldPrimaryFsck + "\n");
+        LOG.info("----- FSCK ----- NEW BEGIN");
+        LOG.info("Failover: New primary fsck: \n " + failoverFsck + "\n");
+        LOG.info("----- FSCK ----- END");
+      } else {
+        LOG.info("Failover: Verified fsck.");
+      }
     }
-    if (avatar == Avatar.STANDBY) {   // ACTIVE to STANDBY
-      String msg = "Failover: Changing state from active to standby is not allowed." +
-                   "If you really want to pause your primary, put it in safemode.";
-      LOG.warn(msg);
-      throw new IOException(msg);
-    } else {                  // STANDBY to ACTIVE
-      // Check to see if the primary is somehow checkpointing itself. If so, then 
+
+    currentAvatar = Avatar.ACTIVE;
+    // Setting safe mode to null here so that we don't throw NPE in
+    // getNameNodeSpecificKeys().
+    standbySafeMode = null;
+    confg.setClass("dfs.safemode.impl", NameNodeSafeModeInfo.class,
+        SafeModeInfo.class);
+  }
+
+  @Override
+  public synchronized void quiesceForFailover(boolean noverification)
+      throws IOException {
+    failoverState = FailoverState.START_FAILOVER;
+    enforceStandby("Cannot quiesce primary");
+    try {
+      // Check to see if the primary is somehow checkpointing itself. If so,
+      // then
       // refuse to switch to active mode. This check is not foolproof but is a
       // defensive mechanism to prevent administrator errors.
+      LOG.info("Failover: Checking is the primary is empty");
       try {
-        if (!zkIsEmpty()) {
-          throw new IOException("Can't switch the AvatarNode to primary since " +
-          		"zookeeper record is not clean. Either use shutdownAvatar to kill " +
-          		"the current primary and clean the ZooKeeper entry, " +
-          		"or clear out the ZooKeeper entry if the primary is dead");
+        if (!AvatarNodeZkUtil.zkIsEmpty(startupConf, confg)) {
+          throw new IOException(
+              "Can't switch the AvatarNode to primary since "
+                  + "zookeeper record is not clean. Either use shutdownAvatar to kill "
+                  + "the current primary and clean the ZooKeeper entry, "
+                  + "or clear out the ZooKeeper entry if the primary is dead");
         }
       } catch (Exception ex) {
         throw new IOException("Cancelling setAvatar because of Exception", ex);
       }
-      if (standby.hasStaleCheckpoint()) {
-        String msg = "Failover: Failed to change avatar from " + currentAvatar + 
-                     " to " + avatar +
-                     " because the Standby has not yet consumed all transactions.";
-        LOG.warn(msg);
-        throw new IOException(msg);
-      }
 
-      ZookeeperTxId zkTxId = getLastTransactionId();
-      standby.quiesce(zkTxId.getTransactionId());
-      cleaner.stop();
-      cleanerThread.interrupt();
-      try {
-        cleanerThread.join();
-      } catch (InterruptedException iex) {
-        Thread.currentThread().interrupt();
+      ZookeeperTxId zkTxId = null;
+      if (!noverification) {
+        LOG.info("Failover: Obtaining last transaction id from ZK");
+        zkTxId = AvatarNodeZkUtil.getLastTransactionId(startupConf, confg);
+        standby.quiesce(zkTxId.getTransactionId());
+      } else {
+        standby.quiesce(FSEditLogLoader.TXID_IGNORE);
       }
 
-      verifyTransactionIds(zkTxId);
-      String oldPrimaryFsck = verifyFailoverTestData();
-
-      // change the value to the one for the primary
-      int maxStandbyBufferedTransactions = confg.getInt(
-          "dfs.max.buffered.transactions",
-          HdfsConstants.DEFAULT_MAX_BUFFERED_TRANSACTIONS);
-      FSEditLog.setMaxBufferedTransactions(maxStandbyBufferedTransactions);
-
-      // Clear up deletion queue.
-      clearInvalidates();
-
-      standbySafeMode.triggerFailover();
+      if (!noverification) {
+        verifyTransactionIds(zkTxId);
+        verifyFailoverTestData();
+      }
+      failoverState = FailoverState.AWAIT_FAILOVER;
+    } catch (StandbyStateException se) {
+      failoverState = FailoverState.AWAIT_FAILOVER;
+      throw se;
+    } finally {
+      if (failoverState != FailoverState.AWAIT_FAILOVER) {
+        failoverState = FailoverState.FAILED_FAILOVER;
+      }
+    }
+  }
 
-      this.registerAsPrimaryToZK();
+  /**
+   * @deprecated
+   */
+  @Override
+  public synchronized void setAvatar(Avatar avatar) throws IOException {
+    setAvatar(avatar, false);
+  }
 
-      sessionId = writeSessionIdToZK(this.startupConf);
-      LOG.info("Failover: Changed avatar from " + currentAvatar + " to " + avatar);
-      if (enableTestFramework && enableTestFrameworkFsck) {        
-        if (!failoverFsck.equals(oldPrimaryFsck)) {
-          LOG.warn("Failover: FSCK on old primary and new primary do not match");
-          LOG.info("----- FSCK ----- OLD BEGIN");
-          LOG.info("Failover: Old primary fsck: \n " + oldPrimaryFsck + "\n");
-          LOG.info("----- FSCK ----- NEW BEGIN");
-          LOG.info("Failover: New primary fsck: \n " + failoverFsck + "\n");
-          LOG.info("----- FSCK ----- END");
-        } else {
-          LOG.info("Failover: Verified fsck.");
-        }
+  /**
+   * @deprecated
+   */
+  @Override
+  public synchronized void setAvatar(Avatar avatar, boolean force)
+      throws IOException {
+    try {
+      if (avatar == currentAvatar) {
+        LOG.info("Failover: Trying to change avatar to " + avatar +
+                 " but am already in that state.");
+        return;
       }
-      
-      currentAvatar = avatar;
-      // Setting safe mode to null here so that we don't throw NPE in
-      // getNameNodeSpecificKeys().
-      standbySafeMode = null;
-      confg.setClass("dfs.safemode.impl", NameNodeSafeModeInfo.class,
-          SafeModeInfo.class);
+      quiesceForFailover(force);
+      performFailover();
+    } catch (IOException e) {
+      LOG.fatal("Exception when setting avatar", e);
+      throw e;
     }
   }
 
@@ -925,15 +883,20 @@ public synchronized void setAvatar(Avatar avatar) throws IOException {
    * To help prevent filling up the memory we clear these queues
    * periodically. And we do a final cleanup jsut before switching
    * to primary.
+   * 
+   * Also, we make sure that the replication queues are cleaned 
+   * periodically. They are never processed at standby, and grow
+   * indefinitely.
    */
-  private class InvalidatesCleaner implements Runnable {
+  private class Cleaner implements Runnable {
 
     volatile boolean running = true;
 
     @Override
     public void run() {
+      LOG.info("Starting Standby Cleaner thread");
       while (running) {
-        clearInvalidates();
+        clearInvalidateAndReplicationQueues();
         try {
           Thread.sleep(INVALIDATES_CLEANUP_INTERVAL);
         } catch (InterruptedException iex) {
@@ -950,10 +913,13 @@ public void stop() {
     
   }
   
-  private void clearInvalidates() {
+  private void clearInvalidateAndReplicationQueues() {
     try {
+      LOG.info("Standby Cleaner: cleaning queues");
       DatanodeInfo[] nodes = super.getDatanodeReport(DatanodeReportType.ALL);
-      assert namesystem.isInSafeMode();
+      if(!namesystem.isInSafeMode()) {
+        throw new IOException("Avatar is not in safemode");
+      }
       super.namesystem.writeLock();
       try {
         for (DatanodeInfo node : nodes) {
@@ -962,10 +928,10 @@ private void clearInvalidates() {
       } finally {
         super.namesystem.writeUnlock();
       }
+      super.namesystem.clearReplicationQueues();
     } catch (IOException e) {
       e.printStackTrace();
     }
-
   }
 
   private boolean ignoreDatanodes() {
@@ -984,6 +950,16 @@ public void primaryCleared(DatanodeRegistration registration) {
     }
   }
 
+  @Override
+  public DatanodeRegistration register(DatanodeRegistration nodeReg)
+      throws IOException {
+    DatanodeRegistration reg = super.register(nodeReg);
+    if (standbySafeMode != null) {
+      standbySafeMode.reportRegister(nodeReg);
+    }
+    return reg;
+  }
+
   public DatanodeCommand[] sendHeartbeatNew(DatanodeRegistration registration,
                                        long capacity,
                                        long dfsUsed, long remaining,
@@ -1215,6 +1191,66 @@ public long[] blockReceivedAndDeletedNew(DatanodeRegistration nodeReg,
     super.blockReceivedAndDeleted(nodeReg, receivedAndDeletedBlocks);
     return failedMap;
   }
+  
+  /**
+   * Roll the edit log.
+   */
+  public CheckpointSignature rollEditLog() throws IOException {
+    enforceActive("Cannot roll edit log on standby");
+    return super.rollEditLog();
+  }
+  
+  /**
+   * Roll the edit log manually.
+   */
+  public void rollEditLogAdmin() throws IOException {
+    enforceActive("Cannot roll edit log on standby");
+    super.rollEditLogAdmin();
+  }
+
+  /**
+   * Roll the image 
+   */
+  public void rollFsImage(CheckpointSignature newImageSignature) throws IOException {
+    enforceActive("Cannot roll image on standby");
+    super.rollFsImage(newImageSignature);
+  }
+ 
+  @Override
+  public void saveNamespace() throws IOException {
+    enforceActive("Cannot save namespace on standby");
+    super.saveNamespace(false, false);
+  }
+
+  @Override
+  public void saveNamespace(boolean force, boolean uncompressed)
+  throws IOException {
+    enforceActive("Cannot save namespace on standby");
+    super.saveNamespace(force, uncompressed);
+  }
+  
+  void enforceActive(String msg) throws IOException {
+    if (currentAvatar == Avatar.STANDBY) {
+      throw new IOException(msg);
+    }
+  }
+
+  private void enforceStandby(String msg) throws IOException {
+    if (currentAvatar != Avatar.STANDBY) {
+      throw new IOException(msg);
+    }
+  }
+  
+  /** 
+   * Register standby with this primary
+   */
+  @Override
+  public void register() throws IOException {
+    enforceActive("Standby can only register with active namenode");
+    InetAddress configuredRemoteAddress = getRemoteNamenodeAddress(getConf(),
+       instance).getAddress();
+    validateCheckpointerAddress(configuredRemoteAddress);
+  }
 
   /**
    * Returns the hostname:port for the AvatarNode. The default
@@ -1264,13 +1300,15 @@ private static class StartupInfo {
     InstanceId instance;
     boolean isStandby;
     String serviceName;
+    boolean forceStartup;
     
-    public StartupInfo(StartupOption startOpt, InstanceId instance, 
-                       boolean isStandby, String serviceName) {
+    public StartupInfo(StartupOption startOpt, InstanceId instance,
+        boolean isStandby, String serviceName, boolean forceStartup) {
       this.startOpt = startOpt;
       this.instance = instance;
       this.isStandby = isStandby;
       this.serviceName = serviceName;
+      this.forceStartup = forceStartup;
     }
   }
 
@@ -1282,6 +1320,7 @@ private static StartupInfo parseArguments(String args[]) {
     StartupOption startOpt = StartupOption.REGULAR;
     boolean isStandby= false;
     String serviceName = null;
+    boolean force = false;
     int argsLen = (args == null) ? 0 : args.length;
     for (int i=0; i < argsLen; i++) {
       String cmd = args[i];
@@ -1311,11 +1350,13 @@ private static StartupInfo parseArguments(String args[]) {
         startOpt = StartupOption.FINALIZE;
       } else if (StartupOption.IMPORT.getName().equalsIgnoreCase(cmd)) {
         startOpt = StartupOption.IMPORT;
+      } else if (StartupOption.FORCE.getName().equalsIgnoreCase(cmd)) {
+        force = true;
       } else {
         return null;
       }
     }
-    return new StartupInfo(startOpt, instance, isStandby, serviceName);
+    return new StartupInfo(startOpt, instance, isStandby, serviceName, force);
   }
 
   /**
@@ -1406,7 +1447,7 @@ protected static void adjustMetaDirectoryNames(Configuration conf, String servic
    * Tries to bind to the address specified in ZooKeeper, this will always fail
    * if the primary is alive either on the same machine or on a remote machine.
    */
-  private static void isPrimaryAlive(String zkRegistry) throws Exception {
+  private static void isPrimaryAlive(String zkRegistry) throws IOException {
     String parts[] = zkRegistry.split(":");
     if (parts.length != 2) {
       throw new IllegalArgumentException("Invalid Address : " + zkRegistry);
@@ -1418,6 +1459,11 @@ private static void isPrimaryAlive(String zkRegistry) throws Exception {
     socket.bind(clientSocket);
     socket.close();
   }
+  
+  private static void failStartup(String message) throws IOException {
+    LOG.error(message);
+    throw new IOException(message);
+  }
 
   public static AvatarNode createAvatarNode(String argv[],
                                             Configuration conf,
@@ -1453,60 +1499,37 @@ public static AvatarNode createAvatarNode(String argv[],
     InetSocketAddress actualAddr = NameNode.getClientProtocolAddress(conf);
     String actualName = actualAddr.getHostName() + ":" + actualAddr.getPort();
 
-
-    AvatarZooKeeperClient zk = new AvatarZooKeeperClient(conf, null);
-    boolean zkRegistryMatch = true;
-    boolean primaryPresent = false;
     String errorMsg = null;
-    try {
-      Stat stat = new Stat();
-      String zkRegistry = zk.getPrimaryAvatarAddress(fsname, stat, false);
-      if (zkRegistry == null) {
-        // The registry is empty. Usually this means failover is in progress
-        // we need to manually fix it before starting primary
-        errorMsg = "A zNode that indicates the primary is empty. "
-            + "AvatarNode can only be started as primary if it "
-            + "is registered as primary with ZooKeeper";
-        zkRegistryMatch = false;
-      } else {
-        primaryPresent = true;
-        if (!zkRegistry.equalsIgnoreCase(actualName)) {
-          zkRegistryMatch = false;
-          errorMsg = "Registration information in ZooKeeper doesn't "
-              + "match the address of this node. AvatarNode can "
-              + "only be started as primary if it is registered as "
-              + "primary with ZooKeeper. zkRegistry = " + zkRegistry
-              + ", actual name = " + actualName;
-        }
-      }
-      if (!startInfo.isStandby) {
-        isPrimaryAlive(zkRegistry);
-      }
-    } catch (Exception e) {
-      LOG.error("Got Exception reading primary node registration "
-          + "from ZooKeeper. Aborting the start", e);
-      zkRegistryMatch = false;
+    String zkRegistry = AvatarNodeZkUtil.getPrimaryRegistration(startupConf, startupConf, fsname);
 
-    } finally {
-      try {
-        zk.shutdown();
-      } catch (InterruptedException e) {
-        LOG.error("Error shutting down ZooKeeper client", e);
+    if (zkRegistry == null) {
+      // The registry is empty. Usually this means failover is in progress
+      // we need to manually fix it before starting primary
+      if (!startInfo.forceStartup) {
+        errorMsg = "A zNode that indicates the primary is empty. "
+          + "AvatarNode can only be started as primary if it "
+          + "is registered as primary with ZooKeeper";
+        failStartup(errorMsg);
+      } 
+    } else {
+      if (!zkRegistry.equalsIgnoreCase(actualName) && !startInfo.isStandby) {
+        errorMsg = "Registration information in ZooKeeper doesn't "
+            + "match the address of this node. AvatarNode can "
+            + "only be started as primary if it is registered as "
+            + "primary with ZooKeeper. zkRegistry = " + zkRegistry
+            + ", actual name = " + actualName;
+        failStartup(errorMsg);
       }
     }
-    if (!zkRegistryMatch && !startInfo.isStandby) {
-      LOG.error(errorMsg);
-      throw new IOException("Cannot start this AvatarNode as Primary.");
-    }
-    if (!primaryPresent && startInfo.isStandby) {
-      throw new IOException("Cannot start Standby since the " +
-      		"primary is unknown");
+    
+    if (!startInfo.isStandby && !startInfo.forceStartup) {
+      isPrimaryAlive(zkRegistry);
     }
-
+      
     long ssid = 0;
     // We are the primary avatar, write session Id to ZK.
-    if (zkRegistryMatch && !startInfo.isStandby) {
-      ssid = writeSessionIdToZK(startupConf);
+    if (!startInfo.isStandby) {
+      ssid = AvatarNodeZkUtil.writeSessionIdToZK(startupConf);
     }
 
     // If sync is requested, then we copy only the fsimage
@@ -1514,7 +1537,21 @@ public static AvatarNode createAvatarNode(String argv[],
     // If we are NODEONE, then modify the configuration to 
     // set fs.name.dir, fs.default.name and dfs.http.address.
     //
-    conf = copyFsImage(conf, startInfo);
+    
+    // setup rpc proxy if we are starting as standby
+    NamenodeProtocol primaryNamenode = null;
+    InetSocketAddress nameNodeAddr = null;
+    if (startInfo.isStandby) {
+      nameNodeAddr = getRemoteNamenodeAddress(conf, startInfo.instance);
+      LOG.info("Connecting to the primary namenode: " + nameNodeAddr);
+      primaryNamenode = (NamenodeProtocol) RPC.waitForProxy(
+          NamenodeProtocol.class, NamenodeProtocol.versionID, nameNodeAddr,
+          conf);
+      // make sure we can talk to this primary
+      primaryNamenode.register();
+    }
+
+    conf = setupAvatarNodeStorage(conf, startInfo, primaryNamenode);
 
     // namenode options.
     switch (startOpt) {
@@ -1544,206 +1581,88 @@ public static AvatarNode createAvatarNode(String argv[],
     conf.setBoolean("dfs.persist.blocks", true);
     
     return new AvatarNode(startupConf, conf, 
-                          startInfo, runInfo, ssid);
+                          startInfo, runInfo, ssid, nameNodeAddr, primaryNamenode);
   }
-  
-  private boolean zkIsEmpty() throws Exception {
-      InetSocketAddress defaultAddr = NameNode.getClientProtocolAddress(startupConf);
-      String fsname = defaultAddr.getHostName() + ":" + defaultAddr.getPort();
 
-      AvatarZooKeeperClient zk = 
-        new AvatarZooKeeperClient(this.confg, null);
-      try {
-        Stat stat = new Stat();
-        String zkRegistry = zk.getPrimaryAvatarAddress(fsname, stat, false);
-        return zkRegistry == null;
-      } catch (Exception e) {
-        LOG.error("Got Exception reading primary node registration " +
-        		"from ZooKeeper.", e);
-        throw e;
-      } finally {
-        try {
-          zk.shutdown();
-        } catch (InterruptedException e) {
-          LOG.error("Error shutting down ZooKeeper client", e);
-        }
-      }
+  /*
+   * Temporarily we only deal with files...
+   */
+  private static void checkFileURIScheme(URI... uris) throws IOException {
+    for(URI uri : uris)
+      if (uri.getScheme().compareTo(JournalType.FILE.name().toLowerCase()) != 0)
+        throw new IOException("The specified path is not a file." +
+        		"Avatar supports file namenode storage only...");
   }
   
-  static void copyFiles(FileSystem fs, File src, 
-      File dest, Configuration conf) throws IOException {
-    int MAX_ATTEMPT = 3;
-    for (int i = 0; i < MAX_ATTEMPT; i++) {
-      try {
-        String mdate = dateForm.format(new Date(now()));
-        if (dest.exists()) {
-          File tmp = new File (dest + File.pathSeparator + mdate);
-          if (!dest.renameTo(tmp)) {
-            throw new IOException("Unable to rename " + dest +
-                                  " to " +  tmp);
-          }
-          cleanupBackup(conf, dest);
-          LOG.info("Moved aside " + dest + " as " + tmp);
-        }
-        if (!FileUtil.copy(fs, new Path(src.toString()), 
-                          fs, new Path(dest.toString()), 
-                          false, conf)) {
-          String msg = "Error copying " + src + " to " + dest;
-          throw new IOException(msg);
-        }
-        LOG.info("Copied " + src + " into " + dest);
-        return;
-      } catch (IOException e) {
-        if (i == MAX_ATTEMPT - 1) {
-          LOG.error(e);
-          throw e;
-        }
-        try {
-          Thread.sleep(1000);
-        } catch (InterruptedException iex) {
-          throw new IOException(iex);
-        }
-      }
-    }
+  private static boolean isFile(URI uri) throws IOException {
+    return uri.getScheme().compareTo(JournalType.FILE.name().toLowerCase()) == 0;
   }
-
+  
   /**
    * Return the configuration that should be used by this instance of AvatarNode
    * Copy fsimages from the remote shared device. 
    */
-  static Configuration copyFsImage(Configuration conf, StartupInfo startInfo)
-    throws IOException {
-    String img0 = conf.get("dfs.name.dir.shared0");
-    String img1 = conf.get("dfs.name.dir.shared1");
-    String edit0 = conf.get("dfs.name.edits.dir.shared0");
-    String edit1 = conf.get("dfs.name.edits.dir.shared1");
-    Collection<String> namedirs = conf.getStringCollection("dfs.name.dir");
-    Collection<String> editsdir = conf.getStringCollection("dfs.name.edits.dir");
+  static Configuration setupAvatarNodeStorage(Configuration conf,
+      StartupInfo startInfo, NamenodeProtocol primaryNamenode)
+      throws IOException {
+    
+    // shared loations for image and edits
+    URI img0 = NNStorageConfiguration.getURIKey(conf, "dfs.name.dir.shared0");
+    URI img1 = NNStorageConfiguration.getURIKey(conf, "dfs.name.dir.shared1");
+    URI edit0 = NNStorageConfiguration.getURIKey(conf, "dfs.name.edits.dir.shared0");
+    URI edit1 = NNStorageConfiguration.getURIKey(conf, "dfs.name.edits.dir.shared1");
+    
+    // local locations for image and edits
+    Collection<URI> namedirs = NNStorageConfiguration.getNamespaceDirs(conf, null);
+    Collection<URI> editsdir = NNStorageConfiguration.getNamespaceEditsDirs(conf, null);
     String msg = "";
-
-    if (img0 == null || img0.isEmpty()) {
-      msg += "No values specified in dfs.name.dir.share0";
-    }
-    if (img1 == null || img1.isEmpty()) {
-      msg += " No values specified in dfs.name.dir.share1";
-    }
-    if (edit0 == null || edit0.isEmpty()) {
-      msg += " No values specified in dfs.name.edits.dir.share0";
-    }
-    if (edit1 == null || edit1.isEmpty()) {
-      msg += " No values specified in dfs.name.edits.dir.share1";
-    }
-    if (msg.length() != 0) {
-      LOG.info(msg);
-      throw new IOException(msg);
+    
+    if (img0 == null || img1 == null || edit0 == null || edit1 == null) {
+      msg = "Configuration does not contain shared locations for image and edits";
     }
 
-    // verify that the shared dirctories are not specified as dfs.name.dir
-    for (String str : namedirs) {
-      if (str.equalsIgnoreCase(img0)) {
-        msg = "The name specified in dfs.name.dir.shared0 " +
-              img0 + " is already part of dfs.name.dir ";
-      }
-      if (str.equalsIgnoreCase(img1)) {
-        msg += " The name specified in dfs.name.dir.shared1 " +
-              img1 + " is already part of dfs.name.dir ";
-      }
+    // verify that the shared image dirctories are not specified as dfs.name.dir
+    if (namedirs.contains(img0)) {
+      msg = "The name specified in dfs.name.dir.shared0 " + img0
+          + " is already part of dfs.name.dir ";
     }
-    if (msg.length() != 0) {
-      LOG.info(msg);
-      throw new IOException(msg);
+    if (namedirs.contains(img1)) {
+      msg += " The name specified in dfs.name.dir.shared1 " + img1
+          + " is already part of dfs.name.dir ";
     }
+
     // verify that the shared edits directories are not specified as dfs.name.edits.dir
-    for (String str : editsdir) {
-      if (str.equalsIgnoreCase(edit0)) {
-        msg = "The name specified in dfs.name.edits.dir.shared0 " +
-              img0 + " is already part of dfs.name.dir ";
-      }
-      if (str.equalsIgnoreCase(edit1)) {
-        msg += " The name specified in dfs.name.edits.dir.shared1 " +
-              img1 + " is already part of dfs.name.dir ";
-      }
+    if (editsdir.contains(edit0)) {
+      msg = "The name specified in dfs.name.edits.dir.shared0 " + img0
+          + " is already part of dfs.name.dir ";
     }
-    if (msg.length() != 0) {
-      LOG.info(msg);
-      throw new IOException(msg);
+    if (editsdir.contains(edit1)) {
+      msg += " The name specified in dfs.name.edits.dir.shared1 " + img1
+          + " is already part of dfs.name.dir ";
     }
 
-    File primary = new File(img0);
-    File standby = new File(img1);
+    // fail with configuration problems
+    checkMessage(msg);
+    
+    // For now we store images only in NFS
+    // but we will download them instead of copying.
+    checkFileURIScheme(img0, img1);
+    
     FileSystem localFs = FileSystem.getLocal(conf).getRaw();
-    File src = null;
-    File dest = null;
-    File srcedit = null;
-    File destedit = null;
+    
+    URI ownSharedImage = null;
+    URI ownSharedEdits = null;
 
     //
     // if we are instance one then copy from primary to secondary
     // otherwise copy from secondary to primary.
     //
     if (startInfo.instance == InstanceId.NODEONE) {
-      src = primary;
-      dest = standby;
-      srcedit = new File(edit0);
-      destedit = new File(edit1);
+      ownSharedImage = img1;
+      ownSharedEdits = edit1;
     } else if (startInfo.instance == InstanceId.NODEZERO) {
-      dest = primary;
-      src = standby;
-      destedit = new File(edit0);
-      srcedit = new File(edit1);
-    }
-
-    // copy fsimage directory if needed
-    if (src.exists() && startInfo.isStandby) {
-      copyFiles(localFs, src, dest, conf);
-
-      // Remove the lock file from the newly synced directory
-      File lockfile = new File(dest, STORAGE_FILE_LOCK);
-      lockfile.delete();
-
-      // Remove fsimage.ckpt if it exists.
-      File ckptfile = new File(dest.toString() + IMAGENEW);
-      ckptfile.delete();
-
-      // Now, copy from the now-updated shared directory to all other
-      // local dirs specified in fs.name.dir
-      src = dest;
-      if (!namedirs.isEmpty()) {
-        for (String str : namedirs) {
-          dest = new File(str);
-          copyFiles(localFs, src, dest, conf);
-        }
-      }
-    }
-
-    // copy edits directory if needed
-    if (srcedit.exists() && startInfo.isStandby) {
-      copyFiles(localFs, srcedit, destedit, conf);
-
-      // Remove the lock file from the newly synced directory
-      File lockfile = new File(destedit, STORAGE_FILE_LOCK);
-      if (lockfile.exists() && lockfile.delete() == false) {
-        throw new IOException("Unable to delete lock file " + lockfile);
-      }
-
-      // Remove edits and edits.new. Create empty edits file.
-      File efile = new File(destedit.toString() + EDITSFILE);
-      if (efile.exists() && efile.delete() == false) {
-        throw new IOException("Unable to delete edits file " + efile);
-      }
-      efile = new File(destedit + EDITSNEW);
-      efile.delete();
-      createEditsFile(destedit.toString());
-
-      // Now, copy from the now-updated shared directory to all other
-      // local dirs specified in fs.name.edits.dir
-      srcedit = destedit;
-      if (!editsdir.isEmpty()) {
-        for (String str : editsdir) {
-          destedit = new File(str);
-          copyFiles(localFs, srcedit, destedit, conf);
-        }
-      }
+      ownSharedImage = img0;
+      ownSharedEdits = edit0;
     }
 
     // allocate a new configuration and update fs.name.dir approprately
@@ -1755,7 +1674,7 @@ static Configuration copyFsImage(Configuration conf, StartupInfo startInfo)
     } else if (startInfo.instance == InstanceId.NODEZERO) {
       buf.append(img0);
     }
-    for (String str : namedirs) {
+    for (URI str : namedirs) {
       buf.append(",");
       buf.append(str);
     }
@@ -1770,81 +1689,106 @@ static Configuration copyFsImage(Configuration conf, StartupInfo startInfo)
     } else if (startInfo.instance == InstanceId.NODEZERO) {
       buf1.append(edit0);
     }
-    for (String str : editsdir) {
+    for (URI str : editsdir) {
       buf1.append(",");
       buf1.append(str);
     }
     newconf.set("dfs.name.edits.dir", buf1.toString());
+    
+    // copy fsimage directory if needed
+    if (startInfo.isStandby) {
+      
+      // do not open edit log at startup
+      newconf.setBoolean("dfs.namenode.openlog", false);
+      
+      // connect to primary
+      String fsName = getRemoteNamenodeHttpName(conf, startInfo.instance);
+      NNStorage tempStorage = new NNStorage(newconf,
+          NNStorageConfiguration.getNamespaceDirs(newconf),
+          NNStorageConfiguration.getNamespaceEditsDirs(newconf));
+      
+      // will block until Primary has left the safemode
+      CheckpointSignature cs = getCheckpointSignature(primaryNamenode);
+      
+      long lastCheckpointTxId = cs.mostRecentCheckpointTxId;
+      
+      if(cs.layoutVersion != FSConstants.LAYOUT_VERSION) {
+        throw new IOException("Upgrade for standby is not supported");      
+      }
+     
+      if (isFile(ownSharedImage)) {
+        File destFile = new File (ownSharedImage.getPath());
+        StandbyStorageRetentionManager.backupFiles(localFs, destFile, conf);
+      }
+      if (isFile(ownSharedEdits)) {
+        File destFile = new File (ownSharedEdits.getPath());
+        StandbyStorageRetentionManager.backupFiles(localFs, destFile, newconf);
+      }
 
+      // setup storage
+      tempStorage.format();
+      tempStorage.setStorageInfo(cs);
+      tempStorage.writeAll();
+
+      // Download the image to all storage directories
+      LOG.info("Downloading image to all storage directories.");
+      MD5Hash digest = downloadImageToStorage(fsName, lastCheckpointTxId, tempStorage);
+      List<StorageDirectory> badSds = new ArrayList<StorageDirectory>();
+      tempStorage.checkpointUploadDone(lastCheckpointTxId, digest);
+      LOG.info("Downloading image to all storage directories. DONE");
+      FSImage.saveDigestAndRenameCheckpointImage(lastCheckpointTxId, digest,
+          tempStorage);
+      tempStorage.reportErrorsOnDirectories(badSds);
+      tempStorage.close(); 
+    }
     return newconf;
   }
   
-  static void cleanupBackup(Configuration conf, File origin) {
-    File root = origin.getParentFile();
-    final String originName = origin.getName();
-    String[] backups = root.list(new FilenameFilter() {
-      @Override
-      public boolean accept(File dir, String name) {
-        if (!name.startsWith(originName) || name.equals(originName))
-          return false;
-        try {
-          dateForm.parse(name.substring(name.indexOf(File.pathSeparator) + 1));
-        } catch (ParseException pex) {
-          return false;
-        }
-        return true;
-      }
-    });
-
-    Arrays.sort(backups, new Comparator<String>() {
-
-      @Override
-      public int compare(String back1, String back2) {
+  private static MD5Hash downloadImageToStorage(String fsName,
+      long lastCheckpointTxId, NNStorage tempStorage) throws IOException {
+    IOException e = null;
+    for (int i = 0; i < 3; i++) {
+      try {
+        return TransferFsImage.downloadImageToStorage(fsName,
+            lastCheckpointTxId, tempStorage, true);
+      } catch (SocketTimeoutException ex) {
+        e = ex;
+        LOG.info("Downloading image - socked timeout exception. Will retry...");
         try {
-          Date date1 = dateForm.parse(back1.substring(back1
-              .indexOf(File.pathSeparator) + 1));
-          Date date2 = dateForm.parse(back2.substring(back2
-              .indexOf(File.pathSeparator) + 1));
-          // Sorting in reverse order, from later dates to earlier
-          return date2.compareTo(date1);
-        } catch (ParseException pex) {
-          return 0;
+          Thread.sleep(1000);
+        } catch (InterruptedException ie) {
+          Thread.currentThread().interrupt();
+          break;
         }
       }
-    });
-    
-    int copiesToKeep = conf.getInt("standby.image.copies.tokeep", 0);
-    int daysToKeep = conf.getInt("standby.image.days.tokeep", 0);
-    if (copiesToKeep == 0 && daysToKeep == 0) {
-      // Do not delete anything in this case
-      return;
     }
-    Date now = new Date(now());
-    int copies = 0;
-    for (String backup : backups) {
-      copies++;
-      Date backupDate = null;
+    throw e;
+  }
+  
+  private static CheckpointSignature getCheckpointSignature(
+      NamenodeProtocol primaryNamenode) throws IOException {
+    while (true) {
       try {
-        backupDate = dateForm.parse(backup.substring(backup
-            .indexOf(File.pathSeparator) + 1));
-      } catch (ParseException pex) {
-        // This should not happen because of the 
-        // way we construct the list
-      }
-      long backupAge = now.getTime() - backupDate.getTime();
-      if (copies > copiesToKeep && backupAge > daysToKeep * 24 * 60 * 60 * 1000) {
-        // This backup is both old and we have enough of newer backups stored -
-        // delete
+        return primaryNamenode.getCheckpointSignature();
+      } catch (RemoteException e) {
+        LOG.info("Active namenode is not available. Standby cannot initialize" , e);
         try {
-          FileUtil.fullyDelete(new File(root, backup));
-          LOG.info("Deleted backup " + new File(root, backup));
-        } catch (IOException iex) {
-          LOG.error("Error deleting backup " + new File(root, backup), iex);
+          Thread.sleep(1000);
+        } catch (InterruptedException ex) {
+          throw new IOException(ex);
         }
       }
     }
-
   }
+  
+  private static void checkMessage(String msg) throws IOException {
+    if (msg.length() != 0) {
+      LOG.fatal(msg);
+      throw new IOException(msg);
+    }
+  }
+  
+
 
   public static Configuration updateAddressConf(Configuration conf, InstanceId instance) {
     Configuration newconf = new Configuration(conf);
@@ -1896,7 +1840,8 @@ public static Configuration updateAddressConf(Configuration conf, InstanceId ins
   /**
    * Returns the address of the remote namenode
    */
-  InetSocketAddress getRemoteNamenodeAddress(Configuration conf) 
+  static InetSocketAddress getRemoteNamenodeAddress(Configuration conf, 
+      InstanceId instance) 
     throws IOException {
     String fs = null;
     if (instance == InstanceId.NODEZERO) {
@@ -1920,7 +1865,8 @@ InetSocketAddress getRemoteNamenodeAddress(Configuration conf)
   /**
    * Returns the name of the http server of the local namenode
    */
-  String getRemoteNamenodeHttpName(Configuration conf) 
+  static String getRemoteNamenodeHttpName(Configuration conf, 
+      InstanceId instance) 
     throws IOException {
     if (instance == InstanceId.NODEZERO) {
       return conf.get("dfs.http.address1");
@@ -1930,175 +1876,50 @@ String getRemoteNamenodeHttpName(Configuration conf)
       throw new IOException("Unknown instance " + instance);
     }
   }
-
+  
   /**
-   * Create an empty edits log
+   * Return the shared edits file of the remote NameNode
    */
-  static void createEditsFile(String editDir) throws IOException {
-    File editfile = new File(editDir + EDITSFILE);
-    FileOutputStream fp = new FileOutputStream(editfile);
-    DataOutputBuffer buf = new DataOutputBuffer(1024);
-    buf.writeInt(FSConstants.LAYOUT_VERSION);
-    buf.writeTo(fp);
-    buf.close();
-    fp.close();
+  URI getRemoteSharedEditsURI(Configuration conf) throws IOException {
+    return getSharedEditsURI(conf, true);
   }
 
   /**
-   * Return the edits file that is shared.
+   * Return the shared edits file of the local NameNode
    */
-  File getSharedEditsFile(Configuration conf) throws IOException {
-    String edit = null;
-    if (instance == InstanceId.NODEZERO) {
-      edit = conf.get("dfs.name.edits.dir.shared0");
-    } else if (instance == InstanceId.NODEONE) {
-      edit = conf.get("dfs.name.edits.dir.shared1");
-    } else {
-      LOG.info("Instance is invalid. " + instance);
-      throw new IOException("Instance is invalid. " + instance);
-    }
-    return new File(edit + EDITSFILE);
+  URI getLocalSharedEditsURI(Configuration conf) throws IOException {
+    return getSharedEditsURI(conf, false);
   }
 
-  /**
-   * Return the edits file of the remote NameNode
-   */
-  File getRemoteEditsFile(Configuration conf) throws IOException {
-    String edit = null;
-    if (instance == InstanceId.NODEZERO) {
-      edit = conf.get("dfs.name.edits.dir.shared1");
-    } else if (instance == InstanceId.NODEONE) {
-      edit = conf.get("dfs.name.edits.dir.shared0");
-    } else {
-      LOG.info("Instance is invalid. " + instance);
-      throw new IOException("Instance is invalid. " + instance);
-    }
-    return new File(edit + EDITSFILE);
-  }
-  
-  /**
-   * Return the edits.new file of the remote NameNode
-   */
-  File getRemoteEditsFileNew(Configuration conf) throws IOException {
-    String edit = null;
-    if (instance == InstanceId.NODEZERO) {
-      edit = conf.get("dfs.name.edits.dir.shared1");
-    } else if (instance == InstanceId.NODEONE) {
-      edit = conf.get("dfs.name.edits.dir.shared0");
-    } else {
-      LOG.info("Instance is invalid. " + instance);
-      throw new IOException("Instance is invalid. " + instance);
-    }
-    return new File(edit + EDITSNEW);
-  }
-  
-  /**
-   * Return the fstime file of the remote NameNode
-   */
-  File getRemoteTimeFile(Configuration conf) throws IOException {
-    String edit = null;
+  private URI getSharedEditsURI(Configuration conf, boolean remote)
+      throws IOException {
+    URI edits = null;
     if (instance == InstanceId.NODEZERO) {
-      edit = conf.get("dfs.name.edits.dir.shared1");
-    } else if (instance == InstanceId.NODEONE) {
-      edit = conf.get("dfs.name.edits.dir.shared0");
-    } else {
-      LOG.info("Instance is invalid. " + instance);
-      throw new IOException("Instance is invalid. " + instance);
-    }
-    return new File(edit + TIMEFILE);
-  }
 
-  /**
-   * Reads the timestamp of the last checkpoint from the remote fstime file.
-   */
-  long readRemoteFstime(Configuration conf) 
-    throws IOException {
-    String edit = null;
-    if (instance == InstanceId.NODEZERO) {
-      edit = conf.get("dfs.name.edits.dir.shared1");
+      edits = remote ? NNStorageConfiguration.getURIKey(conf,
+          "dfs.name.edits.dir.shared1") : NNStorageConfiguration.getURIKey(
+          conf, "dfs.name.edits.dir.shared0");
     } else if (instance == InstanceId.NODEONE) {
-      edit = conf.get("dfs.name.edits.dir.shared0");
+
+      edits = remote ? NNStorageConfiguration.getURIKey(conf,
+          "dfs.name.edits.dir.shared0") : NNStorageConfiguration.getURIKey(
+          conf, "dfs.name.edits.dir.shared1");
     } else {
       LOG.info("Instance is invalid. " + instance);
       throw new IOException("Instance is invalid. " + instance);
     }
-    return readFstime(edit);
-  }
-
-  long readFstime(String location) throws IOException {
-    File timeFile = new File(location + TIMEFILE);
-    long timeStamp = 0L;
-    DataInputStream in = null;
-    try {
-      in = new DataInputStream(new FileInputStream(timeFile));
-      timeStamp = in.readLong();
-    } catch (IOException e) {
-      if (!timeFile.exists()) {
-        String msg = "Error reading checkpoint time file " + timeFile +
-                     " file does not exist.";
-        LOG.error(msg);
-        throw new IOException(msg + e);
-      } else if (!timeFile.canRead()) {
-        String msg = "Error reading checkpoint time file " + timeFile +
-                     " cannot read file of size " + timeFile.length() +
-                     " last modified " + 
-                     dateForm.format(new Date(timeFile.lastModified()));
-        LOG.error(msg);
-        throw new IOException(msg + e);
-      } else {
-        String msg = "Error reading checkpoint time file " + timeFile;
-        LOG.error(msg);
-        throw new IOException(msg + e);
-      }
-    } finally {
-      if (in != null) {
-        in.close();
-      }
-    }
-    return timeStamp;
-  }
-
-  long readLocalFstime(Configuration conf) throws IOException {
-    String edits = null;
-    if (instance == InstanceId.NODEZERO) {
-      edits = conf.get("dfs.name.edits.dir.shared0");
-    } else {
-      edits = conf.get("dfs.name.edits.dir.shared1");
-    }
-
-    long editsTime = readFstime(edits);
-
-    String image = null;
-    if (instance == InstanceId.NODEZERO) {
-      image = conf.get("dfs.name.dir.shared0");
-    } else {
-      image = conf.get("dfs.name.dir.shared1");
-    }
-
-    if (editsTime == readFstime(image)) {
-      return editsTime;
-    }
-    throw new IOException("The checkpoint time of the local fsimage does not" +
-		" match the time of the local edits");
+    return edits;
   }
 
   /**
    * Returns the starting checkpoint time of this AvatarNode
    */
-  long getStartCheckpointTime() {
-    return startCheckpointTime;
-  }
-
-  /**
-   * Sets the starting checkpoint time of this AvatarNode
-   */
-  void setStartCheckpointTime(Configuration conf)
-    throws IOException {
-    startCheckpointTime = readRemoteFstime(conf);
+  long getStartCheckpointTxId() {
+    return startCheckpointTxId;
   }
 
-  void setStartCheckpointTime(long time) {
-    startCheckpointTime = time;
+  void setStartCheckpointTxId(long txid) {
+    startCheckpointTxId = txid;
   }
 
   /**
@@ -2108,24 +1929,6 @@ void doRestart() {
     runInfo.doRestart = true; 
   }
 
-  /**
-   * Returns true if both edits and edits.new for the
-   * remote namenode exists.
-   */
-  boolean twoEditsFile(Configuration conf) throws IOException{
-    File f1 = getRemoteEditsFile(conf);
-    File f2 = getRemoteEditsFileNew(conf);
-    return f1.exists() && f2.exists();
-  }
-
-  /**
-   * Returns the size of the edits file for the remote
-   * namenode.
-   */
-  long editSize(Configuration conf) throws IOException{
-    return getRemoteEditsFile(conf).length();
-  }
-
   /**
    * Current system time.
    * @return current time in msec.
@@ -2133,75 +1936,6 @@ long editSize(Configuration conf) throws IOException{
   static long now() {
     return System.currentTimeMillis();
   }
-
-  /**
-   * Verify that configured directories exist, then
-   * Interactively confirm that formatting is desired 
-   * for each existing directory and format them.
-   * 
-   * @param conf
-   * @param isConfirmationNeeded
-   * @return true if formatting was aborted, false otherwise
-   * @throws IOException
-   */
-  private static boolean format(Configuration conf,
-                                boolean isConfirmationNeeded
-                                ) throws IOException {
-    boolean allowFormat = conf.getBoolean("dfs.namenode.support.allowformat", 
-                                          true);
-    if (!allowFormat) {
-      throw new IOException("The option dfs.namenode.support.allowformat is "
-                            + "set to false for this filesystem, so it "
-                            + "cannot be formatted. You will need to set "
-                            + "dfs.namenode.support.allowformat parameter "
-                            + "to true in order to format this filesystem");
-    }
-    Collection<File> dirsToFormat = FSNamesystem.getNamespaceDirs(conf);
-    Collection<File> editDirsToFormat = 
-                 FSNamesystem.getNamespaceEditsDirs(conf);
-    for(Iterator<File> it = dirsToFormat.iterator(); it.hasNext();) {
-      File curDir = it.next();
-      if (!curDir.exists())
-        continue;
-      if (isConfirmationNeeded) {
-        System.err.print("Re-format filesystem in " + curDir +" ? (Y or N) ");
-        if (!(System.in.read() == 'Y')) {
-          System.err.println("Format aborted in "+ curDir);
-          return true;
-        }
-        while(System.in.read() != '\n'); // discard the enter-key
-      }
-    }
-
-    FSNamesystem nsys = new FSNamesystem(new FSImage(dirsToFormat,
-                                         editDirsToFormat), conf);
-    nsys.dir.fsImage.format();
-    return false;
-  }
-
-  private static boolean finalize(Configuration conf,
-                               boolean isConfirmationNeeded
-                               ) throws IOException {
-    Collection<File> dirsToFormat = FSNamesystem.getNamespaceDirs(conf);
-    Collection<File> editDirsToFormat = 
-                               FSNamesystem.getNamespaceEditsDirs(conf);
-    FSNamesystem nsys = new FSNamesystem(new FSImage(dirsToFormat,
-                                         editDirsToFormat), conf);
-    System.err.print(
-        "\"finalize\" will remove the previous state of the files system.\n"
-        + "Recent upgrade will become permanent.\n"
-        + "Rollback option will not be available anymore.\n");
-    if (isConfirmationNeeded) {
-      System.err.print("Finalize filesystem state ? (Y or N) ");
-      if (!(System.in.read() == 'Y')) {
-        System.err.println("Finalize aborted.");
-        return true;
-      }
-      while(System.in.read() != '\n'); // discard the enter-key
-    }
-    nsys.dir.fsImage.finalizeUpgrade();
-    return false;
-  }
   
   protected Map<NameNodeKey, String> getNameNodeSpecificKeys(){
     Map<NameNodeKey, String> map = new HashMap<NameNodeKey, String>();   
@@ -2213,10 +1947,14 @@ protected Map<NameNodeKey, String> getNameNodeSpecificKeys(){
       if (currentAvatar == Avatar.STANDBY) {
         map.put(new NameNodeKey("Standby: ignore datanodes",
             NameNodeKey.STANDBY), toStr(this.ignoreDatanodes()));
+        map.put(new NameNodeKey("Standby: ingest state", NameNodeKey.STANDBY),
+            toStr((standby == null) ? "" : standby.currentIngestState));
         map.put(new NameNodeKey("Standby: ingest fell behind", NameNodeKey.STANDBY),
-            toStr(this.standby.fellBehind()));
+            toStr((standby == null) ? "" : standby.fellBehind()));
         map.put(new NameNodeKey("Standby: ingest lag bytes", NameNodeKey.STANDBY),
             toStr((standby == null) ? 0L : standby.getLagBytes()));
+        map.put(new NameNodeKey("Standby: checkpoint status", NameNodeKey.STANDBY),
+            toStr((standby == null) ? "" : standby.getCheckpointStatus()));
         map.put(new NameNodeKey("Standby: failover in progress",
             NameNodeKey.STANDBY), toStr(standbySafeMode.failoverInProgress()));
         if (standbySafeMode.failoverInProgress()) {
@@ -2229,8 +1967,11 @@ protected Map<NameNodeKey, String> getNameNodeSpecificKeys(){
         }
 
       } else {
-        map.put(new NameNodeKey("Checkpoint state", NameNodeKey.ACTIVE), 
-            this.getFSImage().ckptState.toString());
+        map.put(new NameNodeKey("Last checkpoint txid", NameNodeKey.ACTIVE), 
+            toStr(this.getFSImage().storage.getMostRecentCheckpointTxId()));
+        map.put(new NameNodeKey("Last checkpoint time", NameNodeKey.ACTIVE), 
+            this.getFSImage().storage.getMostRecentCheckpointTime());
+        
       }
     } catch (Exception e) {
       // send partial information
@@ -2273,6 +2014,10 @@ public InetSocketAddress getNameNodeAddress() {
   public StandbySafeMode getStandbySafeMode() {
     return this.standbySafeMode;
   }
+  
+  public InstanceId getInstanceId() {
+    return this.instance;
+  }
 
   /**
    */
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/AvatarNodeZkUtil.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/AvatarNodeZkUtil.java
new file mode 100644
index 00000000..db2c56ae
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/AvatarNodeZkUtil.java
@@ -0,0 +1,239 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.AvatarZooKeeperClient;
+import org.apache.zookeeper.data.Stat;
+
+public class AvatarNodeZkUtil {
+
+  private static final Log LOG = LogFactory.getLog(AvatarNodeZkUtil.class);
+
+  static boolean zkIsEmpty(Configuration startupConf, Configuration confg)
+      throws Exception {
+    AvatarZooKeeperClient zk = null;
+    InetSocketAddress defaultAddr = NameNode
+        .getClientProtocolAddress(startupConf);
+    String fsname = defaultAddr.getHostName() + ":" + defaultAddr.getPort();
+
+    int maxTries = startupConf.getInt("dfs.avatarnode.zk.retries", 3);
+    for (int i = 0; i < maxTries; i++) {
+      try {
+        zk = new AvatarZooKeeperClient(confg, null);
+        String zkRegistry = zk.getPrimaryAvatarAddress(fsname, new Stat(),
+            false);
+        return zkRegistry == null;
+      } catch (Exception e) {
+        LOG.error("Got Exception reading primary node registration "
+            + "from ZooKeeper. Will retry...", e);
+      } finally {
+        shutdownZkClient(zk);
+      }
+    }
+    throw new IOException("Cannot connect to zk");
+  }
+
+  /**
+   * Obtain last transaction id of the primary form zk.
+   */
+  static ZookeeperTxId getLastTransactionId(Configuration startupConf,
+      Configuration confg) throws IOException {
+    AvatarZooKeeperClient zk = null;
+    int maxTries = startupConf.getInt("dfs.avatarnode.zk.retries", 3);
+    for (int i = 0; i < maxTries; i++) {
+      try {
+        zk = new AvatarZooKeeperClient(confg, null);
+        // Gather session id and transaction id data.
+        String address = AvatarNode.getClusterAddress(startupConf);
+        long sessionId = zk.getPrimarySsId(address);
+        ZookeeperTxId zkTxId = zk.getPrimaryLastTxId(address);
+        if (sessionId != zkTxId.getSessionId()) {
+          throw new IOException("Session Id in the ssid node : " + sessionId
+              + " does not match the session Id in the txid node : "
+              + zkTxId.getSessionId());
+        }
+        return zkTxId;
+      } catch (Exception e) {
+        LOG.error("Got Exception reading last transaction id of the primary "
+            + "from ZooKeeper. Will retry...", e);
+      } finally {
+        shutdownZkClient(zk);
+      }
+    }
+    throw new IOException("Cannot connect to zk");
+  }
+
+  /**
+   * Register given node as a primary to zk.
+   */
+  static void registerAsPrimaryToZK(Configuration startupConf,
+      Configuration confg) throws IOException {
+    AvatarZooKeeperClient zk = null;
+    // Register client port address.
+    String address = AvatarNode.getClusterAddress(startupConf);
+    String realAddress = AvatarNode.getClusterAddress(confg);
+
+    int maxTries = startupConf.getInt("dfs.avatarnode.zk.retries", 3);
+    for (int i = 0; i < maxTries; i++) {
+      try {
+        zk = new AvatarZooKeeperClient(confg, null);
+        zk.registerPrimary(address, realAddress, true);
+
+        // Register dn protocol address
+        registerAddressToZK(zk, "dfs.namenode.dn-address", startupConf, confg);
+        // Register http address
+        registerAddressToZK(zk, "dfs.http.address", startupConf, confg);
+        // Register rpc address
+        registerAddressToZK(zk, AvatarNode.DFS_NAMENODE_RPC_ADDRESS_KEY,
+            startupConf, confg);
+        return;
+      } catch (Exception e) {
+        LOG.error("Got Exception registering the new primary "
+            + "with ZooKeeper. Will retry...", e);
+      } finally {
+        shutdownZkClient(zk);
+      }
+    }
+    throw new IOException("Cannot connect to zk");
+  }
+
+  /**
+   * Writes the last transaction id of the primary avatarnode to zookeeper.
+   */
+  static void writeLastTxidToZookeeper(long lastTxid, long totalBlocks,
+      long totalInodes, long ssid, Configuration startupConf,
+      Configuration confg) throws IOException {
+    AvatarZooKeeperClient zk = null;
+    LOG.info("Writing lastTxId: " + lastTxid + ", total blocks: " + totalBlocks
+        + ", total inodes: " + totalInodes);
+    if (lastTxid < 0) {
+      LOG.warn("Invalid last transaction id : " + lastTxid
+          + " skipping write to zookeeper.");
+      return;
+    }
+    ZookeeperTxId zkTxid = new ZookeeperTxId(ssid, lastTxid, totalBlocks,
+        totalInodes);
+    int maxTries = startupConf.getInt("dfs.avatarnode.zk.retries", 3);
+    for (int i = 0; i < maxTries; i++) {
+      try {
+        zk = new AvatarZooKeeperClient(confg, null);
+        zk.registerLastTxId(AvatarNode.getClusterAddress(startupConf), zkTxid);
+        return;
+      } catch (Exception e) {
+        LOG.error("Got Exception when syncing last txid to zk. Will retry...",
+            e);
+      } finally {
+        shutdownZkClient(zk);
+      }
+    }
+    throw new IOException("Cannot connect to zk");
+  }
+
+  /**
+   * Generates a new session id for the cluster and writes it to zookeeper. Some
+   * other data in zookeeper (like the last transaction id) is written to
+   * zookeeper with the sessionId so that we can easily determine in which
+   * session was this data written. The sessionId is unique since it uses the
+   * current time.
+   * 
+   * @return the session id that it wrote to ZooKeeper
+   * @throws IOException
+   */
+  static long writeSessionIdToZK(Configuration conf) throws IOException {
+    AvatarZooKeeperClient zk = null;
+    long ssid = -1;
+    int maxTries = conf.getInt("dfs.avatarnode.zk.retries", 3);
+    boolean mismatch = false;
+    Long ssIdInZk = -1L;
+
+    for (int i = 0; i < maxTries; i++) {
+      try {
+        zk = new AvatarZooKeeperClient(conf, null);
+        ssid = AvatarNode.now();
+        zk.registerPrimarySsId(AvatarNode.getClusterAddress(conf), ssid);
+        // Be extra careful and verify the data was synced to zk.
+        ssIdInZk = zk.getPrimarySsId(AvatarNode.getClusterAddress(conf));
+        if (ssid != ssIdInZk) {
+          mismatch = true;
+          break;
+        }
+        return ssid;
+      } catch (Exception e) {
+        LOG.error("Got Exception when writing session id to zk. Will retry...",
+            e);
+      } finally {
+        shutdownZkClient(zk);
+      }
+    }
+    if (mismatch)
+      throw new IOException("Session Id in the NameNode : " + ssid
+          + " does not match the session Id in Zookeeper : " + ssIdInZk);
+    throw new IOException("Cannot connect to zk");
+  }
+
+  /**
+   * Obtain the registration of the primary from zk.
+   */
+  static String getPrimaryRegistration(Configuration startupConf,
+      Configuration conf, String fsname) throws IOException {
+    AvatarZooKeeperClient zk = null;
+    int maxTries = startupConf.getInt("dfs.avatarnode.zk.retries", 3);
+    for (int i = 0; i < maxTries; i++) {
+      try {
+        zk = new AvatarZooKeeperClient(conf, null);
+        Stat stat = new Stat();
+        String zkRegistry = zk.getPrimaryAvatarAddress(fsname, stat, false);
+        return zkRegistry;
+      } catch (Exception e) {
+        LOG.error(
+            "Got Exception when reading primary registration. Will retry...", e);
+      } finally {
+        shutdownZkClient(zk);
+      }
+    }
+    throw new IOException("Cannot connect to zk");
+  }
+
+  // helpers
+
+  private static void registerAddressToZK(AvatarZooKeeperClient zk,
+      String confParam, Configuration startupConf, Configuration confg)
+      throws IOException {
+    String address = startupConf.get(confParam);
+    String realAddress = confg.get(confParam);
+    if (address != null && realAddress != null) {
+      zk.registerPrimary(address, realAddress, true);
+    }
+  }
+
+  static void shutdownZkClient(AvatarZooKeeperClient zk) {
+    if (zk != null) {
+      try {
+        zk.shutdown();
+      } catch (InterruptedException e) {
+        LOG.error("Error shutting down ZooKeeper client", e);
+      }
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/Ingest.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/Ingest.java
index c98eaa9d..45382b37 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/Ingest.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/Ingest.java
@@ -19,42 +19,24 @@
 
 import java.io.IOException;
 import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
 import java.lang.Thread;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.EnumMap;
 import java.text.SimpleDateFormat;
 
-import java.util.zip.CheckedInputStream;
-import java.util.zip.Checksum;
-
 import org.apache.commons.logging.Log;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.ChecksumException;
-import org.apache.hadoop.io.*;
-import org.apache.hadoop.fs.permission.*;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
-import org.apache.hadoop.hdfs.protocol.Block;
-import org.apache.hadoop.hdfs.protocol.DatanodeID;
-import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
+import org.apache.hadoop.hdfs.protocol.LayoutVersion;
+import org.apache.hadoop.hdfs.protocol.LayoutVersion.Feature;
 import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
-import org.apache.hadoop.hdfs.server.namenode.FSImage;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLog;
 import org.apache.hadoop.hdfs.server.namenode.Standby.StandbyIngestState;
-import org.apache.hadoop.hdfs.server.common.Storage;
 import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.hdfs.util.Holder;
-import org.apache.hadoop.hdfs.util.InjectionEvent;
-import org.apache.hadoop.hdfs.util.InjectionHandler;
 
 /**
  * This class reads transaction logs from the primary's shared device
@@ -69,26 +51,30 @@ public class Ingest implements Runnable {
 
   private Standby standby;
   private Configuration confg;  // configuration of local namenode
-  private File ingestFile;
   volatile private boolean running = true;
   volatile private boolean catchingUp = true;
   volatile private long catchUpLag;
   volatile private boolean lastScan = false; // is this the last scan?
-  volatile private boolean reopen = false; // Close and open the file again
-  private CheckpointSignature lastSignature;
   private int logVersion;
   volatile private boolean success = false;  // not successfully ingested yet
+  
   EditLogInputStream inputEditLog = null;
   long currentPosition; // current offset in the transaction log
   final FSNamesystem fsNamesys;
+  
+  // startTxId is known when the ingest is instantiated
+  long startTxId = -1;
+  // endTxId is -1 until the ingest completes
+  long endTxId = -1;
 
-  Ingest(Standby standby, FSNamesystem ns, Configuration conf, File edits) 
-  throws IOException {
+  Ingest(Standby standby, FSNamesystem ns, Configuration conf, long startTxId) 
+      throws IOException {
     this.fsNamesys = ns;
     this.standby = standby;
     this.confg = conf;
-    this.ingestFile = edits;
+    this.startTxId = startTxId;
     catchUpLag = conf.getLong("avatar.catchup.lag", 2 * 1024 * 1024L);
+    inputEditLog = standby.setupIngestStreamWithRetries(startTxId);
   }
 
   public void run() {
@@ -101,11 +87,6 @@ public void run() {
         		"checkpoint was in progress, but there is no signature of the " +
         		"fsedits available");
       }
-      if (sig.editsTime != ingestFile.lastModified()) {
-        // This means that the namenode checkpointed itself in the meanwhile
-        throw new RuntimeException("Ingest: The primary node has checkpointed" +
-        		" so we cannot proceed. Restarting Avatar is the only option");
-      }
       /**
        * If the checkpoint is in progress it means that the edits file was 
        * already read and we cannot read it again from the start. 
@@ -136,24 +117,29 @@ void stop() {
     running = false;
   }
   
-  public boolean catchingUp() {
+  public boolean isCatchingUp() {
     return catchingUp;
   }
-
+  
   /**
-   * Indicate that this is the last pass over the transaction log
-   * Verify that file modification time of the edits log matches
-   * that of the signature.
+   * Checks if the ingest is catching up.
+   * If the ingest is consuming finalized segment, it's assumed to be behind.
+   * Otherwise, catching up is based on the position of the input stream.
+   * @throws IOException
    */
-  synchronized void quiesce(CheckpointSignature sig) {
-    if (sig != null) {
-      lastSignature = sig;
+  private void setCatchingUp() throws IOException {
+    if (!standby.getRemoteJournal().isSegmentInProgress(startTxId)) {
+      catchingUp = true;
+    } else {
+      catchingUp = (inputEditLog.length() - inputEditLog.getPosition() > catchUpLag);
     }
-    lastScan = true;
   }
 
-  private synchronized CheckpointSignature getLastCheckpointSignature() {
-    return this.lastSignature;
+  /**
+   * Indicate that this is the last pass over the transaction log
+   */
+  synchronized void quiesce() {
+    lastScan = true;
   }
 
   /**
@@ -164,11 +150,12 @@ boolean getIngestStatus() {
     return success;
   }
   
-  /**
-   * Get version of the consumed log
-   */
-  int getLogVersion(){
-    return logVersion;
+  boolean isRunning() {
+    return running;
+  }
+  
+  long getStartTxId() {
+    return startTxId;
   }
 
   /**
@@ -177,8 +164,11 @@ int getLogVersion(){
    */ 
   public long getLagBytes() {
     try {
-      return this.inputEditLog == null ? -1 :
-        (this.inputEditLog.length() - this.inputEditLog.getPosition());
+      if (standby.getRemoteJournal().isSegmentInProgress(startTxId)) {
+        return this.inputEditLog == null ? -1 :
+          (this.inputEditLog.length() - this.inputEditLog.getPosition());
+      } 
+      return -1;
     } catch (IOException ex) {
       LOG.error("Error getting the lag", ex);
       return -1;
@@ -193,34 +183,58 @@ private int loadFSEdits() throws IOException {
     FSDirectory fsDir = fsNamesys.dir;
     int numEdits = 0;
     long startTime = FSNamesystem.now();
-    synchronized (standby.ingestStateLock) {
-      ingestFile = standby.getCurrentIngestFile();
-      inputEditLog = new EditLogFileInputStream(ingestFile);
-    }
-    LOG.info("Ingest: Consuming transactions from file " + ingestFile +
-        " of size " + ingestFile.length());
+    LOG.info("Ingest: Consuming transactions: " + this.toString());
 
     try {
       logVersion = inputEditLog.getVersion();
-      assert logVersion <= Storage.LAST_UPGRADABLE_LAYOUT_VERSION :
-                            "Unsupported version " + logVersion;
+      if (!LayoutVersion.supports(Feature.TXID_BASED_LAYOUT, logVersion))
+        throw new RuntimeException("Log version is too old");
+      
       currentPosition = inputEditLog.getPosition();
       numEdits = ingestFSEdits(); // continue to ingest 
     } finally {
-      LOG.info("Ingest: Closing transactions file " + ingestFile);
+      LOG.info("Ingest: Closing ingest for segment: " + this.toString());
       // At this time we are done reading the transaction log
       // We need to sync to have on disk status the same as in memory
-      fsDir.fsImage.getEditLog().logSync();
+      // if we saw end segment, we already synced
+      if(endTxId == -1 && fsDir.fsImage.getEditLog().isOpen()) {
+        fsDir.fsImage.getEditLog().logSync();
+      }
       inputEditLog.close();
+      standby.clearIngestState();
     }
-    LOG.info("Ingest: Edits file " + ingestFile.getName() 
-        + " of size " + ingestFile.length() + " edits # " + numEdits 
+    LOG.info("Ingest: Edits segment: " + this.toString()
+        + " edits # " + numEdits 
         + " loaded in " + (FSNamesystem.now()-startTime)/1000 + " seconds.");
 
     if (logVersion != FSConstants.LAYOUT_VERSION) // other version
       numEdits++; // save this image asap
     return numEdits;
   }
+  
+  /**
+   * Read a single transaction from the input edit log
+   * @param inputEditLog the log to read from
+   * @return a single edit log entry, null if EOF
+   * @throws IOException on error
+   */
+  private FSEditLogOp ingestFSEdit(EditLogInputStream inputEditLog)
+      throws IOException {
+    FSEditLogOp op = null;
+    try {
+      op = inputEditLog.readOp();
+      InjectionHandler.processEventIO(InjectionEvent.INGEST_READ_OP);
+    } catch (EOFException e) {
+      return null; // No more transactions.
+    } catch (IOException e) {
+      // rethrow, it's handled in ingestFSEdits()
+      throw e;
+    } catch (Exception e) {
+      // some other problem, maybe unchecked exception
+      throw new IOException(e);
+    }
+    return op;
+  }
 
   /**
    * Continue to ingest transaction logs until the currentState is 
@@ -236,19 +250,17 @@ int ingestFSEdits() throws IOException {
     EnumMap<FSEditLogOpCodes, Holder<Integer>> opCounts =
         new EnumMap<FSEditLogOpCodes, Holder<Integer>>(FSEditLogOpCodes.class);
     
-    long startTime = FSNamesystem.now();
     boolean error = false;
+    boolean reopen = false;    
     boolean quitAfterScan = false;
-    long diskTxid = AvatarNode.TXID_IGNORE;
-    long logTxid = AvatarNode.TXID_IGNORE;
+    
+    long sharedLogTxId = FSEditLogLoader.TXID_IGNORE;
+    long localLogTxId = FSEditLogLoader.TXID_IGNORE;
 
     FSEditLogOp op = null;
+    FSEditLog localEditLog = fsDir.fsImage.getEditLog();
 
-    while (running && !quitAfterScan) {
-      // refresh the file to have correct name (for printing logs only)
-      // to reopen, must synchronize
-      ingestFile = standby.getCurrentIngestFile();
-      
+    while (running && !quitAfterScan) {      
       // if the application requested that we make a final pass over 
       // the transaction log, then we remember it here. We close and
       // reopen the file to ensure that we can see all the data in the
@@ -257,60 +269,18 @@ int ingestFSEdits() throws IOException {
       //
       if (reopen || lastScan) {
         inputEditLog.close();
-        synchronized (standby.ingestStateLock) {
-          ingestFile = standby.getCurrentIngestFile();
-          inputEditLog = new EditLogFileInputStream(ingestFile);
-        }
+        inputEditLog = standby.setupIngestStreamWithRetries(startTxId);
         if (lastScan) {
-          LOG.info("Ingest: Starting last scan of transaction log " + ingestFile);
+          LOG.info("Ingest: Starting last scan of transaction log: " + this.toString());
           quitAfterScan = true;
         }
 
         // discard older buffers and start a fresh one.
-        inputEditLog.refresh(currentPosition);
-        catchingUp = (inputEditLog.length() - inputEditLog.getPosition() > catchUpLag);
+        inputEditLog.refresh(currentPosition);       
+        setCatchingUp();
         reopen = false;
       }
 
-      //
-      // Verify that signature of file matches. This is imporatant in the
-      // case when the Primary NN was configured to write transactions to 
-      // to devices (local and NFS) and the Primary had encountered errors
-      // to the NFS device and has continued writing transactions to its
-      // device only. In this case, the rollEditLog() RPC would return the
-      // modtime of the edits file of the Primary's local device and will
-      // not match with the timestamp of our local log from where we are
-      // ingesting.
-      //
-      CheckpointSignature signature = getLastCheckpointSignature();
-      if (signature != null) {
-        long localtime = ingestFile.lastModified();
-        if (localtime == signature.editsTime) {
-          LOG.debug("Ingest: Matched modification time of edits log. ");
-        } else if (localtime < signature.editsTime) {
-          LOG.info("Ingest: Timestamp of transaction log on local machine is " +
-                   localtime +
-                   " and on remote namenode is " + signature.editsTime);
-          String msg = "Ingest: Timestamp of transaction log on local machine is " + 
-                       DATE_FORM.format(new Date(localtime)) +
-                       " and on remote namenode is " +
-                       DATE_FORM.format(new Date(signature.editsTime));
-          LOG.info(msg);
-          throw new IOException(msg);
-        } else {
-          LOG.info("Ingest: Timestamp of transaction log on local machine is " +
-                   localtime +
-                   " and on remote namenode is " + signature.editsTime);
-          String msg = "Ingest: Timestamp of transaction log on localmachine is " + 
-                       DATE_FORM.format(new Date(localtime)) +
-                       " and on remote namenode is " +
-                       DATE_FORM.format(new Date(signature.editsTime)) +
-                       ". But this can never happen.";
-          LOG.info(msg);
-          throw new IOException(msg);
-        }
-      }
-
       //
       // Process all existing transactions till end of file
       //
@@ -321,54 +291,78 @@ int ingestFSEdits() throws IOException {
         fsNamesys.writeLock();
         try {
           error = false;
-          try {
-            op = inputEditLog.readOp();
-            InjectionHandler.processEventIO(InjectionEvent.INGEST_READ_OP);
-            if (op == null) {
-              FSNamesystem.LOG.debug("Ingest: Invalid opcode, reached end of log " +
-                                     "Number of transactions found " + 
-                                     numEdits);
-              break; // No more transactions.
-            }
-            if (logVersion <= FSConstants.STORED_TXIDS) {
-              diskTxid = op.txid;
-              // Verify transaction ids match.
-              logTxid = fsDir.fsImage.getEditLog().getCurrentTxId();
-              // Error only when the log contains transactions from the future
-              // we allow to process a transaction with smaller txid than local
-              // we will simply skip it later after reading from the ingest edits
-              if (logTxid < diskTxid) {
-                throw new IOException("The transaction id in the edit log : "
-                    + diskTxid + " does not match the transaction id inferred"
-                    + " from FSIMAGE : " + logTxid);
-              }
-            } else {
-              diskTxid = AvatarNode.TXID_IGNORE;
-              logTxid = fsDir.fsImage.getEditLog().getCurrentTxId();
-            }
-          } catch (EOFException e) {
+          op = ingestFSEdit(inputEditLog);
+          
+          if (op == null) {
+            FSNamesystem.LOG.debug("Ingest: Invalid opcode, reached end of log " +
+                                   "Number of transactions found " + 
+                                   numEdits);
             break; // No more transactions.
           }
-          if(!canApplyTransaction(diskTxid, logTxid))
+          sharedLogTxId = op.txid;
+          // Verify transaction ids match.
+          localLogTxId = localEditLog.getLastWrittenTxId() + 1;
+          // Fatal error only when the log contains transactions from the future
+          // we allow to process a transaction with smaller txid than local
+          // we will simply skip it later after reading from the ingest edits
+          if (localLogTxId < sharedLogTxId
+              || InjectionHandler
+                  .falseCondition(InjectionEvent.INGEST_TXID_CHECK)) {
+            String message = "The transaction id in the edit log : "
+                + sharedLogTxId
+                + " does not match the transaction id inferred"
+                + " from FSIMAGE : " + localLogTxId;
+            LOG.fatal(message);
+            throw new RuntimeException(message);
+          }
+
+          // skip previously loaded transactions
+          if (!canApplyTransaction(sharedLogTxId, localLogTxId, op))
             continue;
           
-          FSEditLogLoader.loadEditRecord(logVersion, 
-              inputEditLog, 
-              recentOpcodeOffsets, 
-              opCounts, 
-              fsNamesys, 
-              fsDir, 
-              numEdits, 
-              op);        
-          fsDir.fsImage.getEditLog().logEdit(op);
+          // for recovery, we do not want to re-load transactions,
+          // but we want to populate local log with them
+          if (shouldLoad(sharedLogTxId)) {
+            FSEditLogLoader.loadEditRecord(
+                logVersion, 
+                inputEditLog,
+                recentOpcodeOffsets, 
+                opCounts, 
+                fsNamesys, 
+                fsDir, 
+                numEdits, 
+                op);
+          }     
+          
+          LOG.info("Ingest: " + this.toString() 
+                            + ", size: " + inputEditLog.length()
+                            + ", processing transaction at offset: " + currentPosition 
+                            + ", txid: " + op.txid
+                            + ", opcode: " + op.opCode);
           
-          if (inputEditLog.getReadChecksum() != FSEditLog.getChecksumForWrite().getValue()) {
-            throw new IOException(
-                "Ingest: mismatched r/w checksums for transaction #" + numEdits);
+          if (op.opCode == FSEditLogOpCodes.OP_START_LOG_SEGMENT) {
+            LOG.info("Ingest: Opening log segment: " + this.toString());
+            localEditLog.open();
+          } else if (op.opCode == FSEditLogOpCodes.OP_END_LOG_SEGMENT) {
+            InjectionHandler
+                .processEventIO(InjectionEvent.INGEST_CLEAR_STANDBY_STATE);
+            LOG.info("Ingest: Closing log segment: " + this.toString());
+            tearDown(localEditLog, localLogTxId, true, true);
+            numEdits++;
+            LOG.info("Ingest: Reached log segment end. " + this.toString());
+            break;
+          } else {
+            localEditLog.logEdit(op);
+            if (inputEditLog.getReadChecksum() != FSEditLog
+                .getChecksumForWrite().getValue()) {
+              throw new IOException(
+                  "Ingest: mismatched r/w checksums for transaction #"
+                      + numEdits);
+            }
           }
+          
           numEdits++;
-          LOG.info("Ingest: Processed transaction from " + ingestFile + " opcode " + op.opCode +
-                   " file offset " + currentPosition);
+          standby.setLastCorrectTxId(op.txid);
         }
         catch (ChecksumException cex) {
           LOG.info("Checksum error reading the transaction #" + numEdits +
@@ -381,21 +375,21 @@ int ingestFSEdits() throws IOException {
           error = true; // if we haven't reached eof, then error.
           break;
         } finally {
-          fsDir.fsImage.getEditLog().logSyncIfNeeded();
+          if (localEditLog.isOpen()) {
+            localEditLog.logSyncIfNeeded();
+          }
           fsNamesys.writeUnlock();
         }
-      }
-      
+      } // end inner while(running) -- all breaks come here
    
       // if we failed to read the entire transaction from disk, 
       // then roll back to the offset where there was a last good 
       // read, sleep for sometime for new transaction to
       // appear in the file and then continue;
-      //
       if (error || running) {
         // discard older buffers and start a fresh one.
         inputEditLog.refresh(currentPosition);
-        catchingUp = (inputEditLog.length() - inputEditLog.getPosition() > catchUpLag);
+        setCatchingUp();
 
         if (error) {
           LOG.info("Ingest: Incomplete transaction record at offset " + 
@@ -406,113 +400,88 @@ int ingestFSEdits() throws IOException {
 
         if (running && !lastScan) {
           try {
-            Thread.sleep(1000); // sleep for a second
+            Thread.sleep(100); // sleep for a second
           } catch (InterruptedException e) {
             // break out of waiting if we receive an interrupt.
           }
         }
       }
-    }
+    } //end outer while(running)
+    
+    ///////////////////// FINAL ACTIONS /////////////////////
     
+    // This was the last scan of the file but we could not read a full
+    // transaction from disk. If we proceed this will corrupt the image
     if (error) {
-      // Catch Throwable because in the case of a truly corrupt edits log, any
-      // sort of error might be thrown (NumberFormat, NullPointer, EOF, etc.)
-      StringBuilder sb = new StringBuilder();
-      sb.append("Error replaying edit log at offset " + currentPosition);
-      if (recentOpcodeOffsets[0] != -1) {
-        Arrays.sort(recentOpcodeOffsets);
-        sb.append("\nRecent opcode offsets:");
-        for (long offset : recentOpcodeOffsets) {
-          if (offset != -1) {
-            sb.append(' ').append(offset);
-          }
-        }
-      }
-      String errorMessage = sb.toString();
+      String errorMessage = FSEditLogLoader.getErrorMessage(recentOpcodeOffsets, currentPosition);
       LOG.error(errorMessage);
-      // This was the last scan of the file but we could not read a full
-      // transaction from disk. If we proceed this will corrupt the image
       throw new IOException("Failed to read the edits log. " + 
-            "Incomplete transaction at " + currentPosition);
+          "Incomplete transaction at " + currentPosition);
     }
-    LOG.info("Ingest: Edits file " + ingestFile.getName() +
-      " numedits " + numEdits +
-      " loaded in " + (FSNamesystem.now()-startTime)/1000 + " seconds.");
     
-    if (LOG.isDebugEnabled()) {
-      FSEditLog.dumpOpCounts(opCounts);
-    }
-
     // If the last Scan was completed, then stop the Ingest thread.
     if (lastScan && quitAfterScan) {
-      LOG.info("Ingest: lastScan completed.");
+      LOG.info("Ingest: lastScan completed. " + this.toString());
       running = false;
+      if(localEditLog.isOpen()) {
+        // quiesced non-finalized segment
+        LOG.info("Ingest: Reached non-finalized log segment end. "+ this.toString());
+        tearDown(localEditLog, localLogTxId, false, localLogTxId != startTxId);
+      }
     }
+    FSEditLogLoader.dumpOpCounts(opCounts);
     return numEdits; // total transactions consumed
   }
+  
+  private void tearDown(FSEditLog localEditLog, long localLogTxId,
+      boolean writeEndTxn, boolean updateLastCorrectTxn) throws IOException {
+    localEditLog.endCurrentLogSegment(writeEndTxn);
+    endTxId = localLogTxId;
+    running = false;
+    lastScan = true;
+    if (updateLastCorrectTxn) {
+      standby.setLastCorrectTxId(localLogTxId);
+    }
+    standby.clearIngestState(localLogTxId + 1);
+  }
+  
+  public String toString() {
+    String endStr = (endTxId == -1) ? "in progress" : ("" + endTxId);
+    return "Log segment (" + startTxId + ", " + endStr + ")";
+  }
 
-  private boolean canApplyTransaction(long diskTxid, long localLogTxid) {
+  private boolean canApplyTransaction(long sharedLogTxid, long localLogTxid,
+      FSEditLogOp op) {
     boolean canApply = false;
     // process all transaction if log has no tx id's
     // it is up to the avatarnode to ensure we 
     // do not re-consume the same edits
-    if(diskTxid == AvatarNode.TXID_IGNORE){
+    if (sharedLogTxid == FSEditLogLoader.TXID_IGNORE){
       canApply = true;
     } else {
       // otherwise we can apply the transaction if the txid match
-      canApply = (diskTxid == localLogTxid);
+      canApply = (sharedLogTxid == localLogTxid);
     }
     if (!canApply) {
-      LOG.info("Skipping transaction txId= " + diskTxid
-          + " the local transaction id is: " + localLogTxid);
+      LOG.info("Ingest: skip loading txId: " + sharedLogTxid
+          + ", local txid: " + localLogTxid 
+          + " txn: " + op);
     }
     return canApply;
   }
-
-  // a place holder for reading a long
-  private static final LongWritable longWritable = new LongWritable();
-
-  /** Read an integer from an input stream */
-  private static long readLongWritable(DataInputStream in) throws IOException {
-    synchronized (longWritable) {
-      longWritable.readFields(in);
-      return longWritable.get();
-    }
-  }
-
+  
   /**
-   * A class to read in blocks stored in the old format. The only two
-   * fields in the block were blockid and length.
+   * Used for ingest recovery, where we erase the local edit log, and
+   * transactions need to be populated to the local log, but they should be 
+   * not loaded into the namespace.
    */
-  static class BlockTwo implements Writable {
-    long blkid;
-    long len;
-
-    static {                                      // register a ctor
-      WritableFactories.setFactory
-        (BlockTwo.class,
-         new WritableFactory() {
-           public Writable newInstance() { return new BlockTwo(); }
-         });
-    }
-
-
-    BlockTwo() {
-      blkid = 0;
-      len = 0;
-    }
-
-    /////////////////////////////////////
-    // Writable
-    /////////////////////////////////////
-    public void write(DataOutput out) throws IOException {
-      out.writeLong(blkid);
-      out.writeLong(len);
-    }
-
-    public void readFields(DataInput in) throws IOException {
-      this.blkid = in.readLong();
-      this.len = in.readLong();
+  private boolean shouldLoad(long txid) {
+    boolean shouldLoad = txid > standby.getLastCorrectTxId();
+    if (!shouldLoad) {
+      LOG.info("Ingest: skip loading txId: " + txid
+          + " to namesystem, but writing to edit log, last correct txid: " 
+          + standby.getLastCorrectTxId());
     }
+    return shouldLoad;
   }
 }
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/OutStandingDatanodesServlet.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/OutStandingDatanodesServlet.java
new file mode 100644
index 00000000..494c8b77
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/OutStandingDatanodesServlet.java
@@ -0,0 +1,110 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.util.*;
+import java.io.*;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.hadoop.hdfs.protocol.AvatarConstants.Avatar;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.namenode.StandbySafeMode;
+import org.apache.hadoop.util.StringUtils;
+
+public class OutStandingDatanodesServlet extends HttpServlet {
+
+  private static String standbyNull = "<br> <a class= \"warning\" " +
+    "name=\"NotStandbyNull\" id=\"title\"> This is the Standby Avatar, " +
+    "but safe mode information is null. This could happen because we have " +
+    "just left safemode during failover </a><br><br>\n";
+  private static String notStandby = "<br> <a class= \"warning\" " +
+    "name=\"NotStandby\" id=\"title\"> This is not the Standby Avatar " +
+    "</a><br><br>\n";
+
+  @SuppressWarnings("unchecked")
+  public void doGet(HttpServletRequest request,
+                    HttpServletResponse response
+                    ) throws ServletException, IOException {
+    ServletContext context = getServletContext();
+    AvatarNode nn = (AvatarNode)context.getAttribute("avatar.node");
+    FSNamesystem fsn = nn.getNamesystem();
+    boolean isStandby = false;
+    boolean isFailover = false;
+    Set <DatanodeID> heartbeats = null;
+    Set <DatanodeID> reports = null;
+    String msg = null;
+    fsn.writeLock();
+    // We need to capture all information under a namesystem lock, since we
+    // might leave safemode and the safemode object might be set to null.
+    try {
+      isStandby = (nn.reportAvatar() == Avatar.STANDBY);
+      StandbySafeMode sm = nn.getStandbySafeMode();
+      if (sm == null && isStandby) {
+        msg = standbyNull;
+      } else if (sm == null) {
+        msg = notStandby;
+      } else {
+        isFailover = sm.failoverInProgress();
+        heartbeats = sm.getOutStandingHeartbeats();
+        reports = sm.getOutStandingReports();
+      }
+    } finally {
+      fsn.writeUnlock();
+    }
+
+    // We print the information separately so that we can release the namesystem
+    // lock quickly.
+    PrintWriter out = null;
+    try {
+      out = response.getWriter();
+      if (msg != null) {
+        out.print(msg);
+        return;
+      }
+      if (!isStandby) {
+        out.print(notStandby);
+        return;
+      } else if (!isFailover) {
+        out.print("<br> <a class = \"warning\" name=\"NotStandbyFailover\"" +
+            " id=\"title\"> The Standby Avatar is not in failover mode" +
+            " </a><br><br>\n");
+        return;
+      }
+      out.print("<br> <a name=\"OutStandingHeartbeats\" id=\"title\"> " +
+          " Following datanodes have outstanding heartbeats : </a><br><br>\n");
+      for (DatanodeID node : heartbeats) {
+        out.print("<br>" + node.getName() + "<br>");
+      }
+      out.print("<br> <a name=\"OutStandingReports\" id=\"title\"> " +
+          " Following datanodes have outstanding reports : </a><br><br>\n");
+      for (DatanodeID node : reports) {
+        out.print("<br>" + node.getName() + "<br>");
+      }
+    } finally {
+      if (out != null) {
+        out.close();
+      }
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/Standby.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/Standby.java
index b92f8f79..1e7f9f73 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/Standby.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/Standby.java
@@ -20,9 +20,11 @@
 import java.io.IOException;
 import java.io.File;
 import java.io.InterruptedIOException;
-import java.util.Date;
 import java.lang.Thread;
 import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.hadoop.conf.Configuration;
@@ -30,8 +32,8 @@
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.net.DNS;
 import org.apache.hadoop.util.StringUtils;
-import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
 import org.apache.hadoop.hdfs.server.namenode.CheckpointSignature;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
 import org.apache.hadoop.hdfs.server.namenode.FSImage;
@@ -71,40 +73,49 @@ public class Standby implements Runnable{
   private int infoPort;
   private String infoBindAddress;
   private long checkpointPeriod;        // in seconds
-  private long checkpointSize;    // size (in MB) of current Edit Log
+  private long checkpointTxnCount;      // in txns
   private long lastCheckpointTime;
   private long earlyScheduledCheckpointTime = Long.MAX_VALUE;
   private long sleepBetweenErrors;
   private boolean checkpointEnabled;
   volatile private Thread backgroundThread;  // thread for secondary namenode 
   volatile private CheckpointSignature sig;
-  
-  // two different types of ingested file
-  enum IngestFile { EDITS, EDITS_NEW };
+  private volatile String checkpointStatus;
   
   // allowed states of the ingest thread
   enum StandbyIngestState {
     NOT_INGESTING, 
     INGESTING_EDITS,
-    QUIESCING_EDITS,
     CHECKPOINTING,
-    INGESTING_EDITS_NEW,
-    QUIESCING_EDITS_NEW,
     STANDBY_QUIESCED
   };
   
-  // currently consumed ingest (edits, or edits.new)
-  private volatile File currentIngestFile = null;
+  private final JournalManager remoteJournal;
+    
+  // lock to protect state
+  private Object ingestStateLock = new Object();  
   protected volatile StandbyIngestState currentIngestState 
     = StandbyIngestState.NOT_INGESTING;
-  protected Object ingestStateLock = new Object();
-  private boolean lastFinalizeCheckpointFailed = false;
+  private volatile long currentSegmentTxId = -1;
   
-  // names of the edits files
-  private final File editsFile;
-  private final File editsFileNew;
+  // this represents last transaction correctly loaded to namesystem
+  // used for recovery, to rewind the state to last known checkpoint, but
+  // reload transaction only from the lastCorrectlyLoadedTxId point
+  private volatile long lastCorrectlyLoadedTxId = -1;
   
+  //counts how many time standby failed to instantiate ingest
+  private int ingestFailures = 0;
+  private final int MAX_INGEST_FAILURES = 10;
+  private int checkpointFailures = 0;
+  private final int MAX_CHECKPOINT_FAILURES = 10;
+  
+  // image validation 
   private final File tmpImageFileForValidation;
+  
+  private final int inputStreamRetries;
+  
+  private Object imageValidatorLock = new Object();
+  private ImageValidator imageValidator;
 
   // The Standby can either be processing transaction logs
   // from the primary namenode or it could be doing a checkpoint to upload a merged
@@ -113,7 +124,8 @@ enum StandbyIngestState {
   // AvatarNode. It is used by the secondary namenode to talk to the primary.
   // The "conf" is the configuration of the local standby namenode.
   //
-  Standby(AvatarNode avatarNode, Configuration startupConf, Configuration conf) 
+  Standby(AvatarNode avatarNode, Configuration startupConf, Configuration conf,
+      InetSocketAddress nameNodeAddr, NamenodeProtocol primaryNamenode) 
     throws IOException {
     this.running = true;
     this.avatarNode = avatarNode;
@@ -122,6 +134,9 @@ enum StandbyIngestState {
     this.fsImage = avatarNode.getFSImage();
     this.fsnamesys = avatarNode.getNamesystem();
     this.sleepBetweenErrors = startupConf.getInt("hdfs.avatarnode.sleep", 5000);
+    this.nameNodeAddr = nameNodeAddr;
+    this.primaryNamenode = primaryNamenode;
+    
     initSecondary(startupConf); // start webserver for secondary namenode
 
     this.machineName =
@@ -129,14 +144,29 @@ enum StandbyIngestState {
                          conf.get("dfs.namenode.dns.nameserver","default"));
     LOG.info("machineName=" + machineName);
     
-    this.editsFile = this.avatarNode.getRemoteEditsFile(conf);
-    this.editsFileNew = this.avatarNode.getRemoteEditsFileNew(conf);
-    
     InetSocketAddress addr = NameNode.getAddress(conf);
-    this.tmpImageFileForValidation = new File("/tmp", 
-        "hadoop_image." + addr.getHostName() + ":" + addr.getPort());
+    this.tmpImageFileForValidation = new File("/tmp", "hadoop_image."
+        + addr.getHostName() + ":" + addr.getPort());
+
+    URI remoteJournalURI = avatarNode.getRemoteSharedEditsURI(conf);
+    if (remoteJournalURI.getScheme().equals(NNStorage.LOCAL_URI_SCHEME)) {
+      StorageDirectory remoteJournalStorage = fsImage.storage.new StorageDirectory(
+          new File(remoteJournalURI.getPath()));
+      remoteJournal = new FileJournalManager(remoteJournalStorage, null);
+    } else {
+      remoteJournal = FSEditLog.createJournal(remoteJournalURI, conf);
+    }
+    // we will start ingestion from the txid of the image
+    this.currentSegmentTxId = avatarNode.getFSImage().storage
+        .getMostRecentCheckpointTxId() + 1;
+    this.inputStreamRetries = confg.getInt("dfs.ingest.retries", 30);
+    checkpointStatus("No checkpoint initiated");
+  } 
+     
+  NamenodeProtocol getPrimaryNameNode(){ 
+    return primaryNamenode;
   }
-
+    
   public void run() {
     backgroundThread = Thread.currentThread();
     while (running) {
@@ -146,19 +176,13 @@ public void run() {
         // exceeded the configured parameters, then also we have to checkpoint
         //
         long now = AvatarNode.now();
-        // Check to see if the primary is somehow checkpointing itself. If so, then 
-        // exit the StandbyNode, we cannot have two daemons checkpointing the same
-        // namespace at the same time
-        if (hasStaleCheckpoint()) {
-          backgroundThread = null;
-          quiesce(AvatarNode.TXID_IGNORE);
-          break;
-        }
+        checkAndRecoverState();
 
         if (lastCheckpointTime == 0 ||
             (lastCheckpointTime + 1000 * checkpointPeriod < now) ||
             (earlyScheduledCheckpointTime < now) ||
-            avatarNode.editSize(confg) > checkpointSize) {
+            getTransactionLag() > checkpointTxnCount ||
+            InjectionHandler.falseCondition(InjectionEvent.STANDBY_CHECKPOINT_TRIGGER)) {
 
           // schedule an early checkpoint if this current one fails.
           earlyScheduledCheckpointTime = now + CHECKPOINT_DELAY;
@@ -166,23 +190,17 @@ public void run() {
           earlyScheduledCheckpointTime = Long.MAX_VALUE;
           lastCheckpointTime = now;
 
-          // set the last expected checkpoint time on the primary.
-          avatarNode.setStartCheckpointTime(startupConf);
-        }
-
-        // if edit and edits.new both exists, then we schedule a checkpoint
-        // to occur very soon.
-        // Only reschedule checkpoint if it is not scheduled to occur even sooner
-        if ((avatarNode.twoEditsFile(startupConf)) &&
-                (earlyScheduledCheckpointTime > now + CHECKPOINT_DELAY)) {
-          LOG.warn("Standby: edits and edits.new found, scheduling early checkpoint.");
-          earlyScheduledCheckpointTime = now + CHECKPOINT_DELAY;
+          InjectionHandler
+              .processEvent(InjectionEvent.STANDBY_AFTER_DO_CHECKPOINT);
         }
 
         // if the checkpoint creation has switched off ingesting, then we restart the
         // ingestion here.
-        if (ingest == null) {
-          instantiateIngest(IngestFile.EDITS);
+        if (currentIngestState == StandbyIngestState.NOT_INGESTING) {
+          // the ingest might have finished but we need to ensure
+          // we joined the thread
+          quiesceIngestWithReprocess();
+          instantiateIngest();
         }
         try {
           Thread.sleep(sleepBetweenErrors);
@@ -212,7 +230,6 @@ public void run() {
             LOG.info(msg);
             throw new RuntimeException(msg);
           }
-          clearIngestState();
         }
       } catch (Throwable e) {
         LOG.warn("Standby: encounter exception ", e);
@@ -220,6 +237,17 @@ public void run() {
       }
     }
   }
+  
+  private long getTransactionLag() {
+    long lastCheckpoint = avatarNode.getFSImage().storage
+        .getMostRecentCheckpointTxId();
+    long currentTransaction = avatarNode.getFSImage().getLastAppliedTxId();
+    return currentTransaction - lastCheckpoint;
+  }
+
+  protected JournalManager getRemoteJournal() {
+    return remoteJournal;
+  }
 
   synchronized void shutdown() {
     if (!running) {
@@ -236,35 +264,90 @@ synchronized void shutdown() {
     }
   }
   
+
+  /**
+   * Instantiate/quiesces edit log segments until the requested transaction 
+   * id has been reached. When -1 is given, it quiesces all available log segments.
+   * Notice that there is a retry logic in ingest instantiation
+   */
+  private long quiesceIngest(long lastTxId) throws IOException {
+    final boolean ignoreLastTxid = lastTxId == FSEditLogLoader.TXID_IGNORE;
+    long startSegmentId = currentSegmentTxId;
+
+    LOG.info("Standby: Quiescing ingest - Consuming transactions up to: "
+        + lastTxId);
+
+    // join current ingest thread
+    quiesceIngestWithReprocess();
+
+    // instantiate ingest for needed segments and quiesce
+    while (avatarNode.getLastWrittenTxId() < lastTxId || ignoreLastTxid) {
+      LOG.info("Standby: Quiescing ingest up to: " + lastTxId
+          + ", setting up ingest for txid: " + currentSegmentTxId);
+      assertState(StandbyIngestState.NOT_INGESTING);
+
+      try {
+        instantiateIngest();
+      } catch (IOException e) {
+        if (ignoreLastTxid) {
+          LOG.warn("Cannot obtain the stream - exiting since the requested txid is " + lastTxId);
+          break;
+        }       
+      }
+      quiesceIngestWithReprocess();
+
+      if (ingest.getIngestStatus() && currentSegmentTxId == startSegmentId) {
+        // no progress, reached the end
+        break;
+      }
+      startSegmentId = currentSegmentTxId;
+    }
+
+    // TODO successful roll can add 2 transactions
+    // we need to take care of this
+    if (lastTxId != FSEditLogLoader.TXID_IGNORE
+        && lastTxId > avatarNode.getLastWrittenTxId()) {
+      String msg = "Standby: Quiescing - Standby could not successfully ingest the edits up to: "
+          + lastTxId
+          + ", last consumed txid: "
+          + avatarNode.getLastWrittenTxId();
+      LOG.fatal(msg);
+      throw new StandbyStateException(msg);
+    }
+    LOG.info("Standby: Quiescing ingest - Consumed transactions up to: "
+        + avatarNode.getLastWrittenTxId());
+    return currentSegmentTxId;
+  }
+  
   /**
-   * Quiesces the ingest for the given file typ
+   * When ingest consumes the end of segment transaction, it sets the state to
+   * not ingesting. This function ensures that the ingest thread exited.
    * 
-   * @param type ingest to quiesce
-   * @param sig signature for quiescing (checkpointing)
+   * @throws IOException
+   */
+  private void quiesceIngestWithReprocess() throws IOException {
+    if (ingest != null) {
+      LOG.info("Standby: Quiescing - quiescing ongoing ingest");
+      quiesceIngest();
+      reprocessCurrentSegmentIfNeeded(ingest.getIngestStatus());
+    }
+  }
+ 
+  /**
+   * Quiesces the currently running ingest
    */
-  private void quiesceIngest(IngestFile type, CheckpointSignature sig) 
-      throws IOException {  
-    File edits; 
+  private void quiesceIngest() throws IOException {
     InjectionHandler.processEvent(InjectionEvent.STANDBY_QUIESCE_INGEST);
     synchronized (ingestStateLock) {
-      if (type == IngestFile.EDITS) {
-        assertState(StandbyIngestState.INGESTING_EDITS,
-            StandbyIngestState.QUIESCING_EDITS);
-      } else {
-        assertState(StandbyIngestState.INGESTING_EDITS_NEW,
-            StandbyIngestState.QUIESCING_EDITS_NEW);
-      }
-      edits = getIngestFile(type);
-      currentIngestState = (type == IngestFile.EDITS)
-          ? StandbyIngestState.QUIESCING_EDITS
-          : StandbyIngestState.QUIESCING_EDITS_NEW;
-      ingest.quiesce(sig);       
-    } 
+      assertState(StandbyIngestState.INGESTING_EDITS,
+          StandbyIngestState.NOT_INGESTING);
+      ingest.quiesce();
+    }
     try {
       ingestThread.join();
       currentIngestState = StandbyIngestState.NOT_INGESTING;
-      LOG.info("Standby: Quiesce - Ingest thread for " 
-          + edits.getName() + " exited.");
+      LOG.info("Standby: Quiesce - Ingest thread for segment: "
+          + ingest.toString() + " exited.");
     } catch (InterruptedException e) {
       LOG.info("Standby: Quiesce - Ingest thread interrupted.");
       throw new IOException(e.getMessage());
@@ -272,98 +355,154 @@ private void quiesceIngest(IngestFile type, CheckpointSignature sig)
   }
   
   /**
-   * Instantiates ingest thread for the given edits file type
-   * 
-   * @param type (EDITS, EDITS_NEW)
+   * Check the correct ingest state for instantiating new ingest
+   * (synchronized on ingestStateLock)
+   * @return true if the ingest for the requested txid is running
+   * @throws IOException when the state is incorrect
    */
-  private void instantiateIngest(IngestFile type)
-      throws IOException {
-    File edits;
-    InjectionHandler.processEvent(InjectionEvent.STANDBY_INSTANTIATE_INGEST);
-    synchronized (ingestStateLock) {
-      assertState(StandbyIngestState.NOT_INGESTING);
-      edits = getIngestFile(type);
-      setCurrentIngestFile(edits);
-      ingest = new Ingest(this, fsnamesys, confg, edits);
-      ingestThread = new Thread(ingest);
-      ingestThread.start(); 
-      currentIngestState = type == IngestFile.EDITS
-          ? StandbyIngestState.INGESTING_EDITS
-          : StandbyIngestState.INGESTING_EDITS_NEW;
-    } 
-    LOG.info("Standby: Instatiated ingest for edits file: " + edits.getName());
+  private boolean checkIngestState() throws IOException {
+    if (currentIngestState == StandbyIngestState.INGESTING_EDITS) {
+      String msg = "";
+      if (ingest == null) {
+        msg = "Standby: Ingest instantiation failed, the state is "
+            + currentIngestState + ", but the ingest is null";
+      }
+      if (currentSegmentTxId != ingest.getStartTxId()) {
+        msg = "Standby: Ingest instantiation failed, trying to instantiate ingest for txid: "
+            + currentSegmentTxId
+            + ", but there is ingest for txid: "
+            + ingest.getStartTxId();
+      }
+      if (currentIngestState == StandbyIngestState.NOT_INGESTING
+          && ingest.isRunning()) {
+        msg = "Standby: Ingest instantiation failed, the state is "
+            + currentIngestState + " but the ingest is running";
+      }
+      if (!msg.isEmpty()) {
+        LOG.warn(msg);
+        throw new IOException(msg);
+      }
+      return true;
+    }
+    return false;
+  }
+
+  private void checkAndRecoverState() throws Exception {
+    if (ingestFailures > MAX_INGEST_FAILURES
+        || InjectionHandler
+            .falseCondition(InjectionEvent.STANDBY_RECOVER_STATE)) {
+      LOG.info("Standby: Recovery - Ingest instantiation failed too many times");
+      long lastCorrectCheckpointTxId = avatarNode.getFSImage().storage
+          .getMostRecentCheckpointTxId();
+      LOG.info("Standby: Recovery - Revert standby state to last checkpointed txid: "
+          + lastCorrectCheckpointTxId
+          + ", last correctly loaded txid: "
+          + getLastCorrectTxId());
+
+      LOG.info("Standby: Recovery - cleaning up ingest thread");
+      clearIngestState(lastCorrectCheckpointTxId + 1);
+      if (ingest != null) {
+        ingest.stop();
+        ingestThread.join();
+        ingest = null;
+        ingestThread = null;
+      }
+      currentIngestState = StandbyIngestState.NOT_INGESTING;
+
+      LOG.info("Standby: Recovery - Purging all local logs");
+      FSEditLog editLog = avatarNode.getFSImage().getEditLog();
+
+      // ingest is down, no one should be writing to edit log
+      if (editLog.isOpen()) {
+        // end current log segment
+        avatarNode.getFSImage().getEditLog().endCurrentLogSegment(true);
+      }
+      // remove all local logs
+      editLog.purgeLogsOlderThan(Long.MAX_VALUE);
+      // reset edit log state to last checkpointed txid
+      editLog.resetTxIds(lastCorrectCheckpointTxId);
+
+      ingestFailures = 0;
+      LOG.info("Standby: Recovery - Completed");
+    }
   }
   
   /**
-   * Processes a given edit file type.
-   * Method to be used when quiescing the standby!
-   * 
-   * @param type (EDITS, EDITS_NEW)
+   * Instantiates ingest thread for the current edits segment.
    */
-  private int processIngestFileForQuiescing(IngestFile type) 
-      throws IOException {
-    boolean editsNew = type == IngestFile.EDITS_NEW;
-    assertState(StandbyIngestState.NOT_INGESTING,
-        editsNew ? StandbyIngestState.INGESTING_EDITS_NEW
-            : StandbyIngestState.INGESTING_EDITS,
-        editsNew ? StandbyIngestState.QUIESCING_EDITS_NEW
-            : StandbyIngestState.QUIESCING_EDITS);
-
-    
-    if (ingest == null) {
-      instantiateIngest(type);
+  private void instantiateIngest() throws IOException {
+    InjectionHandler.processEvent(InjectionEvent.STANDBY_INSTANTIATE_INGEST);
+    try {
+      synchronized (ingestStateLock) {
+        if (checkIngestState()) {
+          LOG.info("Standby: Ingest for txid: " + currentSegmentTxId
+              + " is already running");
+          return;
+        }
+        assertState(StandbyIngestState.NOT_INGESTING);
+        setupIngestStreamWithRetries(currentSegmentTxId);
+        ingest = new Ingest(this, fsnamesys, confg, currentSegmentTxId);
+        ingestThread = new Thread(ingest);
+        ingestThread.start();
+        currentIngestState = StandbyIngestState.INGESTING_EDITS;
+      }
+      LOG.info("Standby: Instatiated ingest for txid: " + currentSegmentTxId);
+    } catch (IOException e) {
+      ingestFailures++;
+      currentIngestState = StandbyIngestState.NOT_INGESTING;
+      throw e;
     }
-    quiesceIngest(type, null);
-    return ingest.getLogVersion();
   }
 
+  
+  
   /**
-   * Processes previously consumed edits file
-   * Method to be used when quiescing the standby!
+   * Processes previously consumed edits segment if needed
    * 
-   * @param type (EDITS, EDITS_NEW)
+   * @param status of the previous ingest
    */
-  private void reprocessIngestFileForQuiescing(IngestFile type) 
-      throws IOException{
-    assertState(StandbyIngestState.NOT_INGESTING);
-    File edits = getIngestFile(type);
-    LOG.info("Standby: Quiesce - reprocessing edits file: " + edits.getName());
-    if (!edits.exists()) {
-      LOG.warn("Standby: Quiesce - reprocessing edits file - edits file: "
-          + edits.getName() + " does not exists.");
+  private void reprocessCurrentSegmentIfNeeded(boolean status)
+      throws IOException {
+    if (status) {
       return;
     }
-    instantiateIngest(type);
-    quiesceIngest(type, null);
-    
+    assertState(StandbyIngestState.NOT_INGESTING);
+    LOG.info("Standby: Quiesce - reprocessing edits segment starting at: "
+        + currentSegmentTxId);
+    instantiateIngest();
+    quiesceIngest();
+
     // verify that the entire transaction log was truly consumed
     // when re-processing, if we fail here, we cannot do anything
     // better than fail
-    if(!ingest.getIngestStatus()){
-      String emsg = "Standby: Quiesce could not successfully ingest " 
-          + edits.getName() + " transaction log.";
+    if (!ingest.getIngestStatus()) {
+      String emsg = "Standby: Quiesce could not successfully ingest "
+          + "transaction log starting at " + currentSegmentTxId;
       LOG.warn(emsg);
+      ingestFailures++;
       throw new IOException(emsg);
     }
-    clearIngestState();
   }
   
-  //
-  // stop checkpointing, read edit and edits.new(if it exists) 
-  // into local namenode
-  //
+  /**
+   * Stop the standby, read all edit log segments.
+   * @param lastTxId - the last txid to be consumed
+   * @throws IOException
+   */
   synchronized void quiesce(long lastTxId) throws IOException {
     if (currentIngestState == StandbyIngestState.STANDBY_QUIESCED) {
       LOG.info("Standby: Quiescing - already quiesced");
       return; // nothing to do
-    }
+    }    
     // have to wait for the main thread to exit here
     // first stop the main thread before stopping the ingest thread
-    LOG.info("Standby: Quiesce - starting");
+    LOG.info("Standby: Quiescing up to txid: " + lastTxId);
     running = false;
-    fsnamesys.cancelSaveNamespace("Standby: Quiescing - Cancel save namespace");
-    InjectionHandler.processEvent(InjectionEvent.STANDBY_INTERRUPT);
-    
+    InjectionHandler.processEvent(InjectionEvent.STANDBY_QUIESCE_INITIATED);
+    fsnamesys.cancelSaveNamespace("Standby: Quiescing - Cancel save namespace");    
+    interruptImageValidation();
+    InjectionHandler.processEvent(InjectionEvent.STANDBY_QUIESCE_INTERRUPT);
+   
     try {
       if (backgroundThread != null) {
         backgroundThread.join();
@@ -382,88 +521,63 @@ synchronized void quiesce(long lastTxId) throws IOException {
       LOG.error(StringUtils.stringifyException(e));
     }
 
-    int logVersion = 0;
-    boolean reprocessEdits = false;
-    
-    // handle "edits"
-    if (!isCurrentEditsNew()) {      
-      // assert correct state
-      logVersion = processIngestFileForQuiescing(IngestFile.EDITS);
-      // reprocess edits if failed
-      if (!ingest.getIngestStatus()){
-        clearIngestState();
-        reprocessIngestFileForQuiescing(IngestFile.EDITS);
-      }
-      clearIngestState();
-      reprocessEdits = true;
-    }
-    
-    // handle "edits.new"
-    if (editsFileNew.exists()) {
-      logVersion = processIngestFileForQuiescing(IngestFile.EDITS_NEW);
-      clearIngestState();
-    } 
-
-    // if for some reason we did not succeed,
-    // or the last transaction doesn't match
-    // try to re-read both files and replay the logs
-    // (skips transactions applied before)
-    if ((ingest != null && !ingest.getIngestStatus()) 
-        || (!transactionsMatch(lastTxId, logVersion))) {       
-      // try to reopen the logs and re-read them
-      if (reprocessEdits) { // re-read edits, if needed
-        reprocessIngestFileForQuiescing(IngestFile.EDITS);
-      }
-      reprocessIngestFileForQuiescing(IngestFile.EDITS_NEW);
-    } 
+    // process all log segments
+    quiesceIngest(lastTxId);
+    clearIngestState(currentSegmentTxId);
     
-    // final sanity verification of transaction id's
-    if(!transactionsMatch(lastTxId, logVersion)){
-      String emsg = "Standby: Quiesce - could not successfully ingest " 
-          + " transaction logs. Transaction Mismatch: " + lastTxId 
-          + " avatar txid: " + avatarNode.getLastWrittenTxId();
-      LOG.warn(emsg);
-      throw new IOException(emsg);
-    }  
-    clearIngestState();
     // mark quiesce as completed
-    LOG.info("Standby: Quiesce - completed");
+    LOG.info("Standby: Quiescing - Consumed transactions up to: "
+        + getLastCorrectTxId() + ", requested: " + lastTxId);
     currentIngestState = StandbyIngestState.STANDBY_QUIESCED;
   }
   
+  protected EditLogInputStream setupIngestStreamWithRetries(long txid)
+      throws IOException {
+    for (int i = 0; i < inputStreamRetries; i++) {
+      try {
+        return setupCurrentEditStream(txid);
+      } catch (IOException e) {
+        if (i == inputStreamRetries - 1) {
+          throw new IOException("Cannot obtain stream for txid: " + txid, e);
+        }
+        LOG.info("Error :", e);
+      }
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        throw new IOException("Standby: - received interruption");
+      }
+      LOG.info("Standby: - retrying to get edit input stream for txid: " + txid
+          + ", tried: " + (i + 1) + " times");
+    }
+    return null;
+  }
+  
+  private EditLogInputStream setupCurrentEditStream(long txid)
+      throws IOException {
+    synchronized (ingestStateLock) {
+      EditLogInputStream currentEditLogInputStream = remoteJournal
+          .getInputStream(txid);
+      InjectionHandler.processEventIO(InjectionEvent.STANDBY_JOURNAL_GETSTREAM);
+      currentSegmentTxId = txid;
+      return currentEditLogInputStream;
+    }
+  }
+  
   /**
-   * Check if the given transaction is the last one applied
-   * 
-   * @param lastTxId given last transaction
-   * @return true if the given transaction is the last one or should be ignored,
-   * or the layout version does not support transaction ids
+   * Set current checkpoint status
    */
-  private boolean transactionsMatch(long lastTxId, int logVersion){
-    return (lastTxId == AvatarNode.TXID_IGNORE) 
-        || (logVersion > FSConstants.STORED_TXIDS)
-        || (lastTxId == avatarNode.getLastWrittenTxId());
+  private void checkpointStatus(String st) {
+    checkpointStatus = new Date(System.currentTimeMillis()).toString() + ": "
+        + st;
   }
 
   /**
-   * Check to see if the remote namenode is doing its own checkpointing. This can happen 
-   * when the remote namenode is restarted. This method returns true if the remote 
-   * namenode has done an unexpected checkpoint. This method retrieves the fstime of the
-   * remote namenode and matches it against the fstime of the checkpoint when this
-   * AvatarNode did a full-sync of the edits log.
+   * Get current checkpoint status.
+   * Used for webui.
    */
-  boolean hasStaleCheckpoint() throws IOException {
-    long remotefsTime = avatarNode.readRemoteFstime(startupConf);
-    long localfsTime = avatarNode.getStartCheckpointTime();
-    if (remotefsTime != localfsTime) {
-      LOG.warn("Standby: The remote active namenode might have been restarted.");
-      LOG.warn("Standby: The fstime of checkpoint from which the Standby was created is " +
-               AvatarNode.dateForm.format(new Date(localfsTime)) +
-               " but remote fstime is " + 
-               AvatarNode.dateForm.format(new Date(remotefsTime)));
-      avatarNode.doRestart();
-      return true;
-    }
-    return false;
+  protected String getCheckpointStatus() {
+    return checkpointStatus;
   }
  
   /**
@@ -471,13 +585,15 @@ boolean hasStaleCheckpoint() throws IOException {
    * and tnen uploads this image to the primary namenode. The transaction 
    * log on the primary is purged too.
    */
-  public void doCheckpoint() throws IOException {
+  // DO NOT CHANGE THIS TO PUBLIC
+  private void doCheckpoint() throws IOException {
     try {
       InjectionHandler.processEvent(InjectionEvent.STANDBY_ENTER_CHECKPOINT, this.sig);
       
       // Tell the remote namenode to start logging transactions in a new edit file
       // Retuns a token that would be used to upload the merged image.
       if (!checkpointEnabled) {
+        checkpointStatus("Disabled");
         // This means the Standby is not meant to checkpoint the primary
         LOG.info("Standby: Checkpointing is disabled - return");
         return;
@@ -487,63 +603,35 @@ public void doCheckpoint() throws IOException {
       try {
         LOG.info("Standby: Checkpointing - Roll edits logs of primary namenode "
             + nameNodeAddr);
-        sig = (CheckpointSignature) primaryNamenode.rollEditLog();
+        checkpointStatus("Edit log rolled on primary");
+        synchronized(ingestStateLock) {
+          sig = (CheckpointSignature) primaryNamenode.rollEditLog();
+        }
       } catch (IOException ex) {
         // In this case we can return since we did not kill the Ingest thread yet
         // Nothing prevents us from doing the next checkpoint attempt
+        checkpointStatus("Checkpoint failed");
         LOG.warn("Standby: Checkpointing - roll Edits on the primary node failed.");
         return;
       }
       
-      if (this.sig != null && this.sig.equals(sig)
-          && lastFinalizeCheckpointFailed) {
-        // previous checkpoint failed, maybe we have the image saved?
-        LOG.info("Standby: Checkpointing - retrying to finalize previous checkpoint");
-        try {
-          finalizeCheckpoint(sig);
-        } catch (IOException ex){
-          LOG.error("Standby: Checkpointing - can't finalize previous checkpoing, "
-              + "will retry later.");
-          lastFinalizeCheckpointFailed = true;
-          throw ex;
-        }
-        return;
-      } else if (this.sig != null && lastFinalizeCheckpointFailed) {
-        // last checkpoint did not succeed, but the primary has
-        // been checkpointed in the meantime
-        throw new RuntimeException(
-            "Last checkpoint did not succeed, but the signatures do not match. "
-                + "The primary was checkpointed in the meantime.");
-      }
-      setLastRollSignature(sig);   
+      setLastRollSignature(sig); 
       
-      // Ingest till end of edits log
-      if (ingest == null) {
-        LOG.info("Standby: Checkpointing - creating ingest thread to process all transactions.");
-        instantiateIngest(IngestFile.EDITS);
-      }  
-            
-      quiesceIngest(IngestFile.EDITS, sig);    
-      LOG.info("Standby: Checkpointing - finished quitting ingest thread just before ckpt.");
+      // consume all finalized log segments up to the required txid
+      long checkpointTxId = sig.curSegmentTxId - 1;  
+      LOG.info("Standby: Checkpointing - checkpoint txid: " + checkpointTxId);
+      checkpointStatus("Quiescing ingest");
+      quiesceIngest(checkpointTxId);
       
-      if (!ingest.getIngestStatus()) {
-        // try to reopen the log and re-read it
-        instantiateIngest(IngestFile.EDITS);
-        quiesceIngest(IngestFile.EDITS, sig);
+      if (currentSegmentTxId != checkpointTxId + 1) {
+        throw new IOException(
+            "Standby: Checkpointing txid mismatch - ingest consumed txns up to "
+                + (currentSegmentTxId - 1) + " but should have up to "
+                + checkpointTxId);
       }
       
-      assertState(StandbyIngestState.NOT_INGESTING);
-      
-      if (!ingest.getIngestStatus()) {
-        clearIngestState();
-        String emsg = "Standby: Checkpointing - could not ingest transaction log.";
-        emsg += " This is real bad because we do not know how much edits we have consumed.";
-        emsg += " It is better to exit the AvatarNode here.";
-        LOG.error(emsg);
-        throw new RuntimeException(emsg);
-      }  
-      clearIngestState();
-      
+      // if everything is fine, the edit log should be closed now
+      LOG.info("Standby: Checkpointing - finished quitting ingest thread just before ckpt.");       
       assertState(StandbyIngestState.NOT_INGESTING);
   
       /**
@@ -555,18 +643,20 @@ public void doCheckpoint() throws IOException {
       try {      
         InjectionHandler.processEvent(InjectionEvent.STANDBY_BEFORE_SAVE_NAMESPACE);
         currentIngestState = StandbyIngestState.CHECKPOINTING;
-        // roll transaction logs on local namenode
-        LOG.info("Standby: Close editlog on local namenode.");
-        fsImage.getEditLog().close();
     
         // save a checkpoint of the current namespace of the local Namenode
         // We should ideally use fsnamesystem.saveNamespace but that works
         // only if namenode is not in safemode.
         LOG.info("Standby: Checkpointing - save fsimage on local namenode.");
+        checkpointStatus("Saving namespace started");
         fsnamesys.saveNamespace(false, false);
+        // get the new signature
+        sig.mostRecentCheckpointTxId = fsImage.getEditLog().getLastWrittenTxId();
+        sig.imageDigest = fsImage.storage.getCheckpointImageDigest(sig.mostRecentCheckpointTxId);
       } catch (SaveNamespaceCancelledException e) {
         InjectionHandler.processEvent(InjectionEvent.STANDBY_CANCELLED_EXCEPTION_THROWN);
         LOG.info("Standby: Checkpointing - cancelled saving namespace");
+        fsnamesys.getFSImage().deleteCheckpoint(checkpointTxId);
         throw e;
       } catch (IOException ex) {
         // Standby failed to save fsimage locally. Need to reinitialize
@@ -574,34 +664,50 @@ public void doCheckpoint() throws IOException {
         		"no image can be uploaded to the primary. The only course of action " +
         		"is to start from the very beginning by reinitializing AvatarNode";
         LOG.error(msg, ex);
+        fsnamesys.getFSImage().deleteCheckpoint(checkpointTxId);
         throw new RuntimeException(msg, ex);
       } finally {
         currentIngestState = StandbyIngestState.NOT_INGESTING;
         fsnamesys.writeUnlock();
       }
       
-      // we can start the ingest again for edits.new!!!
-      instantiateIngest(IngestFile.EDITS_NEW);
+      // we can start the ingest again for next segment
+      instantiateIngest();
       
       try {
         finalizeCheckpoint(sig);
       } catch (IOException ex) {
-        // If the rollFsImage has actually succeeded on the Primary, but
-        // returned with the exception on recreation our Ingest will throw
-        // a runtime exception and the Avatar will be restarted.
         LOG.error("Standby: Checkpointing - rolling the fsimage " +
             "on the Primary node failed.", ex);
-        lastFinalizeCheckpointFailed = true;
         throw ex;
       }
+      checkpointFailures = 0;
     } catch (IOException e) {
       LOG.error("Standby: Checkpointing - failed to complete the checkpoint: "
           + StringUtils.stringifyException(e));
+      checkpointStatus("Checkpoint failed");      
+      handleCheckpointFailure();
+      InjectionHandler.processEvent(InjectionEvent.STANDBY_EXIT_CHECKPOINT_EXCEPTION, e);
       throw e;
     } finally {
+      setLastRollSignature(null);
       InjectionHandler.processEvent(InjectionEvent.STANDBY_EXIT_CHECKPOINT, this.sig);
     }
   }
+  
+  /**
+   * If checkpoint fails continuously, we want to abort the standby. We want to
+   * avoid the situation in which the standby continuously rolls edit log on the
+   * primary without finalizing checkpoint.
+   */
+  private void handleCheckpointFailure() {
+    checkpointFailures++;
+    if (checkpointFailures > MAX_CHECKPOINT_FAILURES) {
+      LOG.fatal("Standby: Checkpointing - standby failed to checkpoint in "
+          + checkpointFailures + " attempts. Aborting");
+      FSEditLog.runtime.exit(-1);
+    }
+  }
 
   /**
    * Load the image to validate that it is not corrupted
@@ -622,6 +728,7 @@ public void run() {
         viewer.go();
         succeeded = true;
       } catch (Throwable e) {
+        LOG.info("Standby: Image validation exception: ", e);
         error = e;
       }
     }
@@ -630,60 +737,89 @@ public void run() {
   private void finalizeCheckpoint(CheckpointSignature sig) 
       throws IOException{
 
-    File[] imageFiles = fsImage.getImageFiles();
-    if (imageFiles.length == 0) {
-      throw new IOException("No good image is left");
+    try {
+      File imageFile = fsImage.storage.getFsImageName(sig.mostRecentCheckpointTxId);
+      InjectionHandler.processEvent(InjectionEvent.STANDBY_BEFORE_PUT_IMAGE,
+          imageFile);
+      
+      // start a thread to validate image while uploading the image to primary
+      createImageValidation(imageFile);
+      
+      // copy image to primary namenode
+      LOG.info("Standby: Checkpointing - Upload fsimage to remote namenode.");
+      checkpointStatus("Image upload started");
+      putFSImage(sig.mostRecentCheckpointTxId);
+  
+      // check if the image is valid
+      checkImageValidation();
+      
+      // make transaction to primary namenode to switch edit logs
+      LOG.info("Standby: Checkpointing - Roll fsimage on primary namenode.");
+      InjectionHandler.processEventIO(InjectionEvent.STANDBY_BEFORE_ROLL_IMAGE);
+        
+      assertState(
+          StandbyIngestState.NOT_INGESTING,
+          StandbyIngestState.INGESTING_EDITS);
+      
+      primaryNamenode.rollFsImage(new CheckpointSignature(fsImage));
+      setLastRollSignature(null);      
+      LOG.info("Standby: Checkpointing - Checkpoint done. New Image Size: "
+          + fsImage.getFsImageName().length());
+      checkpointStatus("Completed");
+    } finally {
+      interruptImageValidation();
     }
-    File imageFile = imageFiles[0];
-    InjectionHandler.processEvent(InjectionEvent.STANDBY_BEFORE_PUT_IMAGE,
-        imageFile);
-    
-    // start a thread to validate image while uploading the image to primary
-    ImageValidator imageValidator = new ImageValidator(imageFile);
-    imageValidator.run();
-    
-    // copy image to primary namenode
-    LOG.info("Standby: Checkpointing - Upload fsimage to remote namenode.");
-    putFSImage(sig);
-
-    // check if the image is valid
+  }
+  
+  /**
+   * Checks the status of image validation during checkpoint.
+   * @throws IOException
+   */
+  private void checkImageValidation() throws IOException {
     try {
       imageValidator.join();
     } catch (InterruptedException ie) {
-      throw (IOException)new InterruptedIOException().initCause(ie);
-    }
+      throw (IOException) new InterruptedIOException().initCause(ie);
+    } 
     if (!imageValidator.succeeded) {
-      throw new IOException("Image file validation failed", imageValidator.error);
+      throw new IOException("Image file validation failed",
+          imageValidator.error);
     }
-    
-    // make transaction to primary namenode to switch edit logs
-    LOG.info("Standby: Checkpointing - Roll fsimage on primary namenode.");
-    InjectionHandler.processEventIO(InjectionEvent.STANDBY_BEFORE_ROLL_IMAGE);
-      
-    assertState(
-        StandbyIngestState.NOT_INGESTING,
-        StandbyIngestState.INGESTING_EDITS_NEW);
-    
-    try {
-      primaryNamenode.rollFsImage(new CheckpointSignature(fsImage));
-    } catch (IOException e) {
-      if (!editsNewExists())
-        throw new RuntimeException(
-            "Roll did not succeed but edits.new does not exist!!!");
-      throw e;
+  }
+
+  /**
+   * Creates image validation thread. 
+   * @param imageFile
+   * @throws IOException on error, or when standby quiesce was invoked
+   */
+  private void createImageValidation(File imageFile) throws IOException {
+    synchronized (imageValidatorLock) {
+      InjectionHandler.processEvent(InjectionEvent.STANDBY_VALIDATE_CREATE);
+      if (!running) {
+        // fails the checkpoint
+        InjectionHandler.processEvent(InjectionEvent.STANDBY_VALIDATE_CREATE_FAIL);
+        throw new IOException("Standby: standby is quiescing");
+      }
+      imageValidator = new ImageValidator(imageFile);
+      imageValidator.start();
     }
-    // after successful roll edits.new is rolled to edits
-    // and we should be consuming it
-    setCurrentIngestFile(editsFile);
-    if (currentIngestState == StandbyIngestState.INGESTING_EDITS_NEW) {
-      // 1) We currently consume edits.new - do the swap
-      currentIngestState = StandbyIngestState.INGESTING_EDITS;
-    } // 2) otherwise we don't consume anything - do not change the state
-    setLastRollSignature(null);
-    lastFinalizeCheckpointFailed = false;
+  }
 
-    LOG.info("Standby: Checkpointing - Checkpoint done. New Image Size: "
-        + fsImage.getFsImageName().length());
+  /**
+   * Interrupts and joins ongoing image validation.
+   * @throws IOException
+   */
+  private void interruptImageValidation() throws IOException {
+    synchronized (imageValidatorLock) {
+      if (imageValidator != null) {
+        imageValidator.interrupt();
+        try {
+          imageValidator.join();
+        } catch (InterruptedException e) {
+          throw new InterruptedIOException("Standby: received interruption");
+        }
+      }
+    }
   }
 
   /**
@@ -692,17 +828,13 @@ private void finalizeCheckpoint(CheckpointSignature sig)
    */
   void initSecondary(Configuration conf) throws IOException {
 
-    nameNodeAddr = avatarNode.getRemoteNamenodeAddress(conf);
-    this.primaryNamenode =
-        (NamenodeProtocol) RPC.waitForProxy(NamenodeProtocol.class,
-            NamenodeProtocol.versionID, nameNodeAddr, conf);
-
-    fsName = avatarNode.getRemoteNamenodeHttpName(conf);
+    fsName = AvatarNode.getRemoteNamenodeHttpName(conf,
+        avatarNode.getInstanceId());
 
     // Initialize other scheduling parameters from the configuration
     checkpointEnabled = conf.getBoolean("fs.checkpoint.enabled", false);
     checkpointPeriod = conf.getLong("fs.checkpoint.period", 3600);
-    checkpointSize = conf.getLong("fs.checkpoint.size", 4194304);
+    checkpointTxnCount = NNStorageConfiguration.getCheckpointTxnCount(conf);
 
     // initialize the webserver for uploading files.
     String infoAddr = 
@@ -719,6 +851,9 @@ void initSecondary(Configuration conf) throws IOException {
     this.infoServer.setAttribute("name.conf", conf);
     infoServer.addInternalServlet("getimage", "/getimage", GetImageServlet.class);
     infoServer.start();
+    avatarNode.httpServer.setAttribute("avatar.node", avatarNode);
+    avatarNode.httpServer.addInternalServlet("outstandingnodes",
+        "/outstandingnodes", OutStandingDatanodesServlet.class);
 
     // The web-server port can be ephemeral... ensure we have the correct info
     infoPort = infoServer.getPort();
@@ -726,20 +861,15 @@ void initSecondary(Configuration conf) throws IOException {
     LOG.info("Secondary Web-server up at: " + infoBindAddress + ":" +infoPort);
     LOG.warn("Checkpoint Period   :" + checkpointPeriod + " secs " +
              "(" + checkpointPeriod/60 + " min)");
-    LOG.warn("Log Size Trigger    :" + checkpointSize + " bytes " +
-             "(" + checkpointSize/1024 + " KB)");
+    LOG.warn("Log Size Trigger    :" + checkpointTxnCount + " transactions.");
   }
 
   /**
    * Copy the new fsimage into the NameNode
    */
-  private void putFSImage(CheckpointSignature sig) throws IOException {
-    String fileid = "putimage=1&port=" + infoPort +
-      "&machine=" +
-      machineName +
-      "&token=" + sig.toString();
-    LOG.info("Standby: Posted URL " + fsName + fileid);
-    TransferFsImage.getFileClient(fsName, fileid, (File[])null, false);
+  private void putFSImage(long txid) throws IOException {
+    TransferFsImage.uploadImageFromStorage(fsName, machineName, infoPort,
+        fsImage.storage, txid);
   }
   
   public void setLastRollSignature(CheckpointSignature sig) {
@@ -749,16 +879,16 @@ public void setLastRollSignature(CheckpointSignature sig) {
   public CheckpointSignature getLastRollSignature() {
     return this.sig;
   }
+
+  public long getLastCheckpointTime() {
+    return lastCheckpointTime;
+  }
   
   public boolean fellBehind() {
     synchronized (ingestStateLock) {
       switch (currentIngestState) {
       case INGESTING_EDITS:
-      case QUIESCING_EDITS:
-        return editsNewExists() ? true : ingest.catchingUp();
-      case INGESTING_EDITS_NEW:
-      case QUIESCING_EDITS_NEW:
-        return ingest.catchingUp();
+        return ingest.isCatchingUp();
       case NOT_INGESTING: 
       case CHECKPOINTING:
         return true;
@@ -766,74 +896,40 @@ public boolean fellBehind() {
         return false;
       default:
         throw new IllegalStateException("Unknown ingest state: "
-            + currentIngestFile);
+            + currentIngestState);
       }
     }
   }
 
+  /**
+   * Tells how far behind the standby is with consuming edits 
+   * (only in progress segments).
+   */
   public long getLagBytes() {
-    if (this.ingest == null) {
-      if (currentIngestState == StandbyIngestState.CHECKPOINTING) {
-        try {
-          // If it's checkpointing, the primary is writing to edits.new
-          File edits = avatarNode.getRemoteEditsFileNew(startupConf);
-          return edits.length();
-        } catch (IOException e) {
-          LOG.error("Fail to get lagbytes", e);
-          return -1;
-        }
-      } else {
-        // two rare cases could come here: quiesce and error, no good value
-        // could return
-        return -1;
-      }
-    }
-    return this.ingest.getLagBytes();
+    return ingest == null ? -1 : this.ingest.getLagBytes();
   }
 
-  private void clearIngestState() {
+  /**
+   * Sets state for standby upon successful ingestion.
+   * @param txid next starting txid
+   */
+  protected void clearIngestState(long txid) {
     synchronized (ingestStateLock) {
+      currentSegmentTxId = txid;
       currentIngestState = StandbyIngestState.NOT_INGESTING;
-      ingest = null;
-      ingestThread = null;
-      setCurrentIngestFile(null);
     }
   }
   
   /**
-   * Set the edits file that the current ingest thread is processing
-   * Set appropriate state to indicate which file is being ingested.
-   * 
-   * @param file - current ingest file
-   */
-  private void setCurrentIngestFile(File file) {
-    currentIngestFile = file;
-  }
-  
-  /**
-   * Get the current ingest file
+   * Sets state for standby upon unsuccessful ingestion.
+   * Ingest will start from the same transaction id.
    */
-  public File getCurrentIngestFile() {
-    return currentIngestFile;
-  }
-  
-  /**
-   * Returns true if we are currently processing edits.new
-   * Should be avoided because it compares strings!!!
-   * @return true if we are consuming edits.new, false otherwise
-   */
-  private boolean isCurrentEditsNew() {
-    // if nothing set, assume that we need to process edits
+  protected void clearIngestState() {
     synchronized (ingestStateLock) {
-      return currentIngestFile == null ? false : currentIngestFile
-          .equals(editsFileNew);
+      currentIngestState = StandbyIngestState.NOT_INGESTING;
     }
   }
   
-  private boolean editsNewExists() { 
-    return editsFileNew.exists();
-  }
-  
   /**
    * Assert that the standby is in the expected state
    * 
@@ -850,11 +946,20 @@ private void assertState(StandbyIngestState... expectedStates)
   }
   
   /**
-   * Helper function which returns the ingest file for the given typ
-   * @param type type (EDITS, EDITS.NEW)
-   * @return the corresponding ingest file
+   * Ingest will keep track of the last correctly loaded transaction
+   * for recovery. Only updated by ingest, does not need to be synchronized.
+   * @param txid the id of the last correctly loaded transaction
    */
-  private File getIngestFile(IngestFile type) {
-    return type == IngestFile.EDITS ? editsFile : editsFileNew;
-  } 
+  protected void setLastCorrectTxId(long txid) {
+    if (txid > lastCorrectlyLoadedTxId)
+      lastCorrectlyLoadedTxId = txid;
+  }
+  
+  /**
+   * Return the last known transaction that has been
+   * successfully loaded.
+   */
+  protected long getLastCorrectTxId() {
+    return lastCorrectlyLoadedTxId;
+  }
 }
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbySafeMode.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbySafeMode.java
index eb8407fa..82a8bbec 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbySafeMode.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbySafeMode.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
@@ -11,6 +12,8 @@
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.util.Daemon;
 import org.apache.hadoop.util.StringUtils;
 
@@ -44,24 +47,32 @@ public String toString() {
   private volatile SafeModeState safeModeState;
   private final Log LOG = LogFactory.getLog(StandbySafeMode.class);
   private Daemon safeModeMonitor;
+  private final float outStandingReportThreshold;
+  
+  private long lastStatusReportTime;
 
   public StandbySafeMode(Configuration conf, FSNamesystem namesystem) {
     super(conf, namesystem);
     this.namesystem = namesystem;
     this.avatarnode = (AvatarNode)namesystem.getNameNode();
+    this.outStandingReportThreshold = conf.getFloat(
+        "dfs.standbysafemode.outstanding.threshold", 1.0f);
+    if (this.outStandingReportThreshold < 0
+        || this.outStandingReportThreshold > 1) {
+      throw new RuntimeException(
+          "Invalid dfs.standbysafemode.outstanding.threshold : "
+              + this.outStandingReportThreshold + " should be between [0, 1.0]");
+    }
     safeModeState = SafeModeState.BEFORE_FAILOVER;
   }
 
   /**
-   * Processes a heartbeat from the datanode and determines whether we should
-   * send a ClearPrimary command to it.
-   * 
+   * Processes a register from the datanode
+   *
    * @param node
    *          the datanode that has reported
-   * @return whether or not we should send a ClearPrimary command to this
-   *         datanode
    */
-  protected boolean reportHeartBeat(DatanodeID node) {
+  protected void reportRegister(DatanodeID node) {
     if (safeModeState == SafeModeState.FAILOVER_IN_PROGRESS) {
       if (!liveDatanodes.contains(node)) {
         // A new node has checked in, we want to send a ClearPrimary command to
@@ -69,6 +80,21 @@ protected boolean reportHeartBeat(DatanodeID node) {
         outStandingHeartbeats.add(node);
         liveDatanodes.add(node);
       }
+    }
+  }
+
+  /**
+   * Processes a heartbeat from the datanode and determines whether we should
+   * send a ClearPrimary command to it.
+   *
+   * @param node
+   *          the datanode that has reported
+   * @return whether or not we should send a ClearPrimary command to this
+   *         datanode
+   */
+  protected boolean reportHeartBeat(DatanodeID node) {
+    if (safeModeState == SafeModeState.FAILOVER_IN_PROGRESS) {
+      reportRegister(node);
       synchronized(this) {
         if (outStandingHeartbeats.remove(node)) {
           outStandingReports.add(node);
@@ -97,7 +123,10 @@ protected void triggerFailover() throws IOException {
       liveDatanodes.add(node);
       outStandingHeartbeats.add(node);
     }
+    InjectionHandler
+        .processEvent(InjectionEvent.STANDBY_ENTER_SAFE_MODE);
     safeModeState = SafeModeState.FAILOVER_IN_PROGRESS;
+    InjectionHandler.processEvent(InjectionEvent.STANDBY_FAILOVER_INPROGRESS);
     safeModeMonitor = new Daemon(new SafeModeMonitor(namesystem, this));
     safeModeMonitor.start();
     try {
@@ -117,6 +146,14 @@ private void clearDataStructures() {
     liveDatanodes.clear();
   }
 
+  private float getDatanodeReportRatio() {
+    if (liveDatanodes.size() != 0) {
+      return ((liveDatanodes.size() - (outStandingHeartbeats.size() +
+              outStandingReports.size())) / (float) liveDatanodes.size());
+    }
+    return 1;
+  }
+
   @Override
   public synchronized String getTurnOffTip() {
     if (!isOn() || safeModeState == SafeModeState.AFTER_FAILOVER) {
@@ -142,11 +179,13 @@ public synchronized String getTurnOffTip() {
         + safeBlockRatioMsg;
     }
 
-    String datanodeReportMsg = "All datanode reports have "
+    String datanodeReportMsg = "All datanode reports ratio "
+        + getDatanodeReportRatio() + " have "
         + (!datanodeReportsReceived() ? "not " : "")
-        + "been received, Outstanding Heartbeats : "
-        + outStandingHeartbeats.size() + " Outstanding Reports : "
-        + outStandingReports.size();
+        + "reached threshold : " + this.outStandingReportThreshold
+        + ", <a href=\"/outstandingnodes\"> Outstanding Heartbeats"
+        + " : " + outStandingHeartbeats.size() + " Outstanding Reports : "
+        + outStandingReports.size() + "</a><br><br>";
     return safeBlockRatioMsg + datanodeReportMsg;
   }
 
@@ -161,37 +200,46 @@ public boolean isOn() {
   }
 
   @Override
-  public synchronized void leave(boolean checkForUpgrades) {
-    if (safeModeState == SafeModeState.BEFORE_FAILOVER) {
-      throw new RuntimeException(
-          "Cannot leave safe mode since Standby is in state : " + safeModeState);
-    }
-
-    // These datanodes have not reported, we are not sure about their state
-    // remove them.
-    removeOutStandingDatanodes();
-    if (avatarnode.enableTestFramework && 
-        avatarnode.enableTestFrameworkFsck) {
-      try {
-        if (namesystem.isPopulatingReplQueues()) {
-          LOG.warn("Failover: Test framework - fsck "
-              + "- queues already initialized");
-          avatarnode.setFailoverFsck("Could not obtain fsck.");
+  public void leave(boolean checkForUpgrades) {
+    namesystem.writeLock();
+    try {
+      synchronized (this) {
+        if (safeModeState == SafeModeState.BEFORE_FAILOVER) {
+          throw new RuntimeException(
+              "Cannot leave safe mode since Standby is in state : " + safeModeState);
         }
-        super.initializeReplQueues();
-        avatarnode.setFailoverFsck(avatarnode.runFailoverFsck());
-      } catch (IOException e) {
-        avatarnode
+        // Recount file counts and quota
+        namesystem.recount();
+
+        // These datanodes have not reported, we are not sure about their state
+        // remove them.
+        removeOutStandingDatanodes();
+        if (avatarnode.enableTestFramework && 
+            avatarnode.enableTestFrameworkFsck) {
+          try {
+            if (namesystem.isPopulatingReplQueues()) {
+              LOG.warn("Failover: Test framework - fsck "
+                  + "- queues already initialized");
+              avatarnode.setFailoverFsck("Could not obtain fsck.");
+            }
+            super.initializeReplQueues();
+            avatarnode.setFailoverFsck(avatarnode.runFailoverFsck());
+          } catch (IOException e) {
+            avatarnode
             .setFailoverFsck("Exception when running fsck after failover. "
                 + StringUtils.stringifyException(e));
+          }
+        }
+
+        super.startPostSafeModeProcessing();
+        // We need to renew all leases, since client has been renewing leases only
+        // on the primary.
+        namesystem.leaseManager.renewAllLeases();
+        safeModeState = SafeModeState.AFTER_FAILOVER;
       }
+    } finally {
+      namesystem.writeUnlock();
     }
-    
-    super.startPostSafeModeProcessing();
-    // We need to renew all leases, since client has been renewing leases only
-    // on the primary.
-    namesystem.leaseManager.renewAllLeases();
-    safeModeState = SafeModeState.AFTER_FAILOVER;
   }
 
   private void setDatanodeDead(DatanodeID node) throws IOException {
@@ -202,18 +250,23 @@ private void setDatanodeDead(DatanodeID node) throws IOException {
   }
 
   /**
-   * This does not need to be synchronized since it is invoked by leave().
+   * This function as a whole need to be synchronized since it is invoked by
+   * leave().
    */
   private void removeOutStandingDatanodes() {
     try {
-      for (DatanodeID node : outStandingHeartbeats) {
-        namesystem.removeDatanode(node);
-        setDatanodeDead(node);
+      synchronized (outStandingHeartbeats) {
+        for (DatanodeID node : outStandingHeartbeats) {
+          namesystem.removeDatanode(node);
+          setDatanodeDead(node);
+        }
       }
 
-      for (DatanodeID node : outStandingReports) {
-        namesystem.removeDatanode(node);
-        setDatanodeDead(node);
+      synchronized (outStandingReports) {
+        for (DatanodeID node : outStandingReports) {
+          namesystem.removeDatanode(node);
+          setDatanodeDead(node);
+        }
       }
     } catch (IOException e) {
       throw new RuntimeException("Remove of datanode failed", e);
@@ -236,13 +289,51 @@ private boolean blocksSafe() {
     return namesystem.getSafeBlockRatio() >= threshold;
   }
 
+  private void checkDatanodes() {
+    try {
+      synchronized (outStandingHeartbeats) {
+        for (Iterator<DatanodeID> it = outStandingHeartbeats.iterator(); it
+            .hasNext();) {
+          DatanodeID node = it.next();
+          DatanodeDescriptor dn = namesystem.getDatanode(node);
+          if (namesystem.isDatanodeDead(dn)) {
+            liveDatanodes.remove(dn);
+            it.remove();
+          }
+        }
+      }
+      synchronized (outStandingReports) {
+        for (Iterator<DatanodeID> it = outStandingReports.iterator(); it
+            .hasNext();) {
+          DatanodeID node = it.next();
+          DatanodeDescriptor dn = namesystem.getDatanode(node);
+          if (namesystem.isDatanodeDead(dn)) {
+            liveDatanodes.remove(dn);
+            it.remove();
+          }
+        }
+      }
+    } catch (IOException ie) {
+      LOG.warn("checkDatanodes() caught : ", ie);
+    }
+  }
+
   private synchronized boolean datanodeReportsReceived() {
-    return (outStandingHeartbeats.size() == 0 && outStandingReports.size() == 0);
+    boolean received = this.getDatanodeReportRatio() >=
+      this.outStandingReportThreshold;
+    if (!received) {
+      checkDatanodes();
+      return this.getDatanodeReportRatio() >= this.outStandingReportThreshold;
+    }
+    return received;
   }
 
   @Override
   public boolean canLeave() {
-    LOG.info(this.getTurnOffTip());
+    if(FSNamesystem.now() - lastStatusReportTime > 1000) {
+      lastStatusReportTime = FSNamesystem.now();
+      LOG.info(this.getTurnOffTip());
+    }
     if (safeModeState == SafeModeState.AFTER_FAILOVER) {
       return true;
     }
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbyStateException.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbyStateException.java
new file mode 100644
index 00000000..b9542d33
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbyStateException.java
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+
+/**
+ * Thrown during failover to indicate that the Standby's in memory state is
+ * inconsistent.
+ */
+public class StandbyStateException extends IOException {
+  public StandbyStateException(String msg) {
+    super(msg);
+  }
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbyStorageRetentionManager.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbyStorageRetentionManager.java
new file mode 100644
index 00000000..882a4649
--- /dev/null
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/StandbyStorageRetentionManager.java
@@ -0,0 +1,229 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+
+/**
+ * StandbyStorageRetentionManager manages the standby backups created on startup.
+ * Whenever the standby starts, it copies all its own storage directories aside,
+ * marking them with a time stamp (e.g., clustername:2012-10-11-06:42:03.149).
+ * 
+ * The policy is governed by two parameters:
+ * 
+ * A) standby.image.days.tokeep - minimum days to keep backups
+ * B) standby.image.copies.tokeep - minimum copies of backup to keep.
+ * 
+ * -------
+ * If A > 0, at startup, the standby will prune all backups older than A,
+ * providing that it retains at least B copies (together with the current one).
+ * If more copies than B are left, the standby will abort startup.
+ * 
+ * If A == 0, the standby will keep B copies (together with the current one.
+ * In this case, the startup would never fail, as the standby will remove the
+ * oldest copies.
+ * 
+ * Special case: If both A and B are 0, standby does not delete any backups.
+ */
+public class StandbyStorageRetentionManager {
+
+  public static final Log LOG = LogFactory.getLog(StandbyStorageRetentionManager.class.getName());
+  public static final String STANDBY_IMAGE_COPIES_TOKEEP = "standby.image.copies.tokeep";
+  public static final int STANDBY_IMAGE_COPIES_TOKEEP_DEFAULT = 5;
+  
+  public static final String STANDBY_IMAGE_DAYS_TOKEEP = "standby.image.days.tokeep";
+  public static final int STANDBY_IMAGE_DAYS_TOKEEP_DEFAULT = 7;
+  
+  public static final SimpleDateFormat dateForm =
+      new SimpleDateFormat("yyyy-MM-dd-HH:mm:ss.SSS");
+  
+  /**
+   * Backup given directory.
+   * Enforce that max number of backups has not been reached.
+   */
+  static void backupFiles(FileSystem fs, File dest, 
+      Configuration conf) throws IOException {
+    
+    // check if we can still backup
+    cleanUpAndCheckBackup(conf, dest);
+    
+    int MAX_ATTEMPT = 3;
+    for (int i = 0; i < MAX_ATTEMPT; i++) {
+      try {
+        String mdate = dateForm.format(new Date(AvatarNode.now()));
+        if (dest.exists()) {
+          File tmp = new File (dest + File.pathSeparator + mdate);
+          if (!dest.renameTo(tmp)) {
+            throw new IOException("Unable to rename " + dest +
+                                  " to " +  tmp);
+          }
+          LOG.info("Moved aside " + dest + " as " + tmp);
+        }
+        return;
+      } catch (IOException e) {
+        LOG.error("Creating backup exception. Will retry ", e);
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException iex) {
+          throw new IOException(iex);
+        }
+      }
+    }
+    throw new IOException("Cannot create backup for: " + dest);
+  }
+
+  
+  /** 
+   * Check if we have not exceeded the maximum number of backups.
+   */
+  static void cleanUpAndCheckBackup(Configuration conf, File origin) throws IOException {
+    // get all backups
+    String[] backups = getBackups(origin);
+    File root = origin.getParentFile();
+    
+    // maximum total number of backups
+    int copiesToKeep = conf.getInt(STANDBY_IMAGE_COPIES_TOKEEP,
+        STANDBY_IMAGE_COPIES_TOKEEP_DEFAULT);
+
+    // days to keep, if set to 0 than keep only last backup
+    int daysToKeep = conf.getInt(STANDBY_IMAGE_DAYS_TOKEEP,
+        STANDBY_IMAGE_DAYS_TOKEEP_DEFAULT);
+    
+    if (copiesToKeep == 0 && daysToKeep == 0) {
+      // Do not delete anything in this case
+      // every startup will create extra checkpoint
+      return;
+    }
+    
+    // cleanup copies older than daysToKeep
+    deleteOldBackups(root, backups, daysToKeep, copiesToKeep);
+    
+    // check remaining backups
+    backups = getBackups(origin);
+    if (backups.length >= copiesToKeep) {
+      throw new IOException("Exceeded maximum number of standby backups of "
+          + origin + " under " + origin.getParentFile() + " max: " + copiesToKeep);
+    }
+  }
+  
+  /**
+   * Delete backups according to the retention policy.
+   * 
+   * @param root root directory
+   * @param backups backups SORTED on the timestamp from oldest to newest
+   * @param daysToKeep
+   * @param copiesToKeep
+   */
+  static void deleteOldBackups(File root, String[] backups, int daysToKeep,
+      int copiesToKeep) {
+    Date now = new Date(AvatarNode.now());
+    
+    // leave the copiesToKeep-1 at least (+1 will be the current backup)
+    int maxIndex = Math.max(0, backups.length - copiesToKeep + 1);
+    
+    for (int i = 0; i < maxIndex; i++) {
+      String backup = backups[i];
+      Date backupDate = null;
+      try {
+        backupDate = dateForm.parse(backup.substring(backup
+            .indexOf(File.pathSeparator) + 1));
+      } catch (ParseException pex) {
+        // This should not happen because of the 
+        // way we construct the list
+      }
+      long backupAge = now.getTime() - backupDate.getTime();
+      
+      // if daysToKeep is set delete everything older providing that
+      // we retain at least copiesToKeep copies
+      boolean deleteOldBackup = (daysToKeep > 0
+          && backupAge > daysToKeep * 24 * 60 * 60 * 1000);
+
+      // if daysToKeep is set to zero retain most recent copies
+      boolean deleteExtraBackup = (daysToKeep == 0);
+      
+      if (deleteOldBackup || deleteExtraBackup) {
+        // This backup is older than daysToKeep, delete it
+        try {
+          FileUtil.fullyDelete(new File(root, backup));
+          LOG.info("Deleted backup " + new File(root, backup));
+        } catch (IOException iex) {
+          LOG.error("Error deleting backup " + new File(root, backup), iex);
+        }
+      } else {
+        // done with deleting old backups
+        break;
+      }
+    }
+  }
+  
+  /**
+   * List all directories that match the backup pattern.
+   * Sort from oldest to newest.
+   */
+  static String[] getBackups(File origin) {
+    File root = origin.getParentFile();
+    final String originName = origin.getName();
+    
+    String[] backups = root.list(new FilenameFilter() {
+      @Override
+      public boolean accept(File dir, String name) {
+        if (!name.startsWith(originName) || name.equals(originName))
+          return false;
+        try {
+          dateForm.parse(name.substring(name.indexOf(File.pathSeparator) + 1));
+        } catch (ParseException pex) {
+          return false;
+        }
+        return true;
+      }
+    });
+    if (backups == null)
+      return new String[0];
+
+    Arrays.sort(backups, new Comparator<String>() {
+
+      @Override
+      public int compare(String back1, String back2) {
+        try {
+          Date date1 = dateForm.parse(back1.substring(back1
+              .indexOf(File.pathSeparator) + 1));
+          Date date2 = dateForm.parse(back2.substring(back2
+              .indexOf(File.pathSeparator) + 1));
+          // Sorting in reverse order, from later dates to earlier
+          return -1 * date2.compareTo(date1);
+        } catch (ParseException pex) {
+          return 0;
+        }
+      }
+    });
+    return backups;
+  } 
+}
diff --git a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/ZookeeperTxId.java b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/ZookeeperTxId.java
index 4861b639..3298e06b 100644
--- a/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/ZookeeperTxId.java
+++ b/src/contrib/highavailability/src/java/org/apache/hadoop/hdfs/server/namenode/ZookeeperTxId.java
@@ -17,14 +17,16 @@ public class ZookeeperTxId implements Serializable {
   private long ssid;
   private long txid;
   private long totalBlocks;
+  private long totalInodes;
 
   public ZookeeperTxId() {
   }
 
-  public ZookeeperTxId(long ssid, long txid, long totalBlocks) {
+  public ZookeeperTxId(long ssid, long txid, long totalBlocks, long totalInodes) {
     this.ssid = ssid;
     this.txid = txid;
     this.totalBlocks = totalBlocks;
+    this.totalInodes = totalInodes;
   }
   
   public static ZookeeperTxId getFromBytes(byte[] data) throws IOException,
@@ -42,6 +44,7 @@ private void writeObject(ObjectOutputStream out)
     out.writeLong(ssid);
     out.writeLong(txid);
     out.writeLong(totalBlocks);
+    out.writeLong(totalInodes);
   }
 
   private void readObject(ObjectInputStream in) throws IOException,
@@ -49,6 +52,11 @@ private void readObject(ObjectInputStream in) throws IOException,
     this.ssid = in.readLong();
     this.txid = in.readLong();
     this.totalBlocks = in.readLong();
+    this.totalInodes = in.readLong();
+  }
+
+  public long getTotalInodes() {
+    return this.totalInodes;
   }
 
   public long getSessionId() {
@@ -70,6 +78,7 @@ public boolean equals(Object obj) {
     if (obj == null || getClass() != obj.getClass())
       return false;
     ZookeeperTxId other = (ZookeeperTxId) obj;
-    return (ssid == other.ssid && txid == other.txid && totalBlocks == other.totalBlocks);
+    return (ssid == other.ssid && txid == other.txid
+        && totalBlocks == other.totalBlocks && totalInodes == other.totalInodes);
   }
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/AvatarSetupUtil.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/AvatarSetupUtil.java
index 328b8abc..6c935aa1 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/AvatarSetupUtil.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/AvatarSetupUtil.java
@@ -2,6 +2,8 @@
 
 import java.io.IOException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileStatus;
@@ -12,6 +14,8 @@
 import org.junit.AfterClass;
 
 public class AvatarSetupUtil {
+  
+  final static Log LOG = LogFactory.getLog(AvatarSetupUtil.class);
 
   protected static final String FILE_PATH = "/dir1/dir2/myfile";
   private static final long FILE_LEN = 512L * 1024L;
@@ -26,24 +30,14 @@ public static void setUpStatic() throws Exception {
     MiniAvatarCluster.createAndStartZooKeeper();
   }
 
-  public void setUp(boolean federation) throws Exception {
-    setUp(federation, new Configuration(), false);
+  public void setUp(boolean federation, String name) throws Exception {
+    setUp(federation, new Configuration(), name);
   }
 
-  public void setUp(boolean federation, Configuration conf) throws Exception {
-    setUp(federation, conf, false);
-  }
-
-  public void setUp(boolean federation, boolean shortFBR) throws Exception {
-    setUp(federation, new Configuration(), shortFBR);
-  }
-
-  public void setUp(boolean federation, Configuration conf, boolean shortFBR)
+  public void setUp(boolean federation, Configuration conf, String name)
     throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");   
     this.conf = conf;
-    if (shortFBR) {
-      conf.setInt("dfs.datanode.fullblockreport.delay", 1000);
-    }
     if (!federation) {
       cluster = new MiniAvatarCluster(conf, 3, true, null, null);
       dafs = cluster.getFileSystem();
@@ -54,12 +48,21 @@ public void setUp(boolean federation, Configuration conf, boolean shortFBR)
 
     path = new Path(FILE_PATH);
     DFSTestUtil.createFile(dafs, path, FILE_LEN, (short) 1, 0L);
+    Path hardlink1 = new Path("/hardlink1");
+    Path hardlink2 = new Path("/hardlink2");
+    DFSTestUtil.createFile(dafs, hardlink1, FILE_LEN, (short) 1,
+        0L);
+    dafs.hardLink(hardlink1, hardlink2);
   }
 
   @After
   public void shutDown() throws Exception {
-    dafs.close();
-    cluster.shutDown();
+    if (dafs != null) {
+      dafs.close();
+    }
+    if (cluster != null) {
+      cluster.shutDown();
+    }
   }
 
   @AfterClass
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/FailoverLoadTestUtil.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/FailoverLoadTestUtil.java
new file mode 100644
index 00000000..bc456b41
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/FailoverLoadTestUtil.java
@@ -0,0 +1,116 @@
+package org.apache.hadoop.hdfs;
+
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.hdfs.CachingAvatarZooKeeperClient.GetStat;
+import org.apache.hadoop.hdfs.CachingAvatarZooKeeperClient.GetAddr;
+import org.apache.hadoop.fs.FileSystem;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+public class FailoverLoadTestUtil {
+
+  protected static MiniAvatarCluster cluster;
+  private static Configuration conf;
+  private static int BLOCK_SIZE = 1024;
+  private static int MAX_BLOCKS = 50;
+  private static int MAX_FILE_SIZE = MAX_BLOCKS * BLOCK_SIZE;
+  protected static volatile boolean pass = true;
+  private static Random random = new Random();
+  protected static Log LOG = LogFactory.getLog(FailoverLoadTestUtil.class);
+  protected static int get_stats = 0;
+  protected static int get_addr = 0;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+    conf = new Configuration();
+    conf.setInt("dfs.block.size", BLOCK_SIZE);
+    conf.setBoolean("fs.ha.retrywrites", true);
+    conf.setInt("fs.avatar.failover.checkperiod", 200);
+    conf.setInt("dfs.client.block.write.locateFollowingBlock.retries", 20);
+    conf.setBoolean("fs.ha.zookeeper.cache", true);
+    conf.setLong("dfs.client.rpc.retry.sleep", 200);
+    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
+    deleteCache();
+    createData();
+  }
+
+  private static void deleteCache() throws Exception {
+    CachingAvatarZooKeeperClient zk = ((DistributedAvatarFileSystem) cluster
+        .getFileSystem()).failoverHandler.zk;
+
+    GetStat stat = zk.new GetStat(cluster.getFileSystem().getUri());
+    stat.getDataFile(zk.getCacheDir()).delete();
+    stat.getLockFile(zk.getCacheDir()).delete();
+
+    GetAddr addr = zk.new GetAddr(cluster.getFileSystem().getUri(), null, false);
+    addr.getDataFile(zk.getCacheDir()).delete();
+    addr.getLockFile(zk.getCacheDir()).delete();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    InjectionHandler.clear();
+    deleteCache();
+    cluster.shutDown();
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  protected static void createData() throws Exception {
+    String topDir = "" + random.nextInt();
+    DFSTestUtil util = new DFSTestUtil(topDir, 10, 3, MAX_FILE_SIZE);
+    util.createFiles(cluster.getFileSystem(), topDir);
+  }
+
+  protected static class TestHandler extends InjectionHandler {
+    @Override
+    public void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.AVATARZK_GET_PRIMARY_ADDRESS) {
+        get_addr++;
+      } else if (event == InjectionEvent.AVATARZK_GET_REGISTRATION_TIME) {
+        get_stats++;
+      }
+    }
+  }
+
+  protected static class LoadThread extends Thread {
+
+    private volatile boolean running = true;
+    private final FileSystem fs;
+
+    public LoadThread() throws Exception {
+      this(cluster.getFileSystem());
+    }
+
+    public LoadThread(FileSystem fs) {
+      this.fs = fs;
+    }
+
+    public void cancel() {
+      running = false;
+    }
+
+    public void run() {
+      try {
+        while (running) {
+          String topDir = "" + random.nextInt();
+          DFSTestUtil util = new DFSTestUtil(topDir, 1, 1, MAX_FILE_SIZE);
+          util.createFiles(fs, topDir);
+          pass = util.checkFiles(fs, topDir);
+          Thread.sleep(1000);
+        }
+      } catch (Exception e) {
+        LOG.warn("Create failed : ", e);
+        pass = false;
+      }
+    }
+  }
+
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/FailoverTestUtil.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/FailoverTestUtil.java
new file mode 100644
index 00000000..e05a68f4
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/FailoverTestUtil.java
@@ -0,0 +1,137 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs;
+
+import java.io.IOException;
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
+import org.apache.hadoop.hdfs.server.namenode.ZookeeperTxId;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+
+import org.junit.After;
+import static org.junit.Assert.*;
+
+public class FailoverTestUtil {
+
+  protected static MiniAvatarCluster cluster;
+  protected static Configuration conf;
+  protected static FileSystem fs;
+  protected static Random random = new Random();
+  protected static AvatarZooKeeperClient zkClient;
+  protected static Log LOG = LogFactory.getLog(TestAvatarSyncLastTxid.class);
+
+  public void setUp(String name) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
+    MiniAvatarCluster.createAndStartZooKeeper();
+    conf = new Configuration();
+    conf.setBoolean("fs.checkpoint.enabled", true);
+    conf.setBoolean("fs.ha.retrywrites", true);
+    conf.setInt("dfs.block.size", 1024);
+    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
+    fs = cluster.getFileSystem();
+    zkClient = new AvatarZooKeeperClient(conf, null);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    zkClient.shutdown();
+    cluster.shutDown();
+    MiniAvatarCluster.clearZooKeeperData();
+    MiniAvatarCluster.shutDownZooKeeper();
+    InjectionHandler.clear();
+  }
+
+  protected void createEditsNotSynced(int nEdits) throws IOException {
+    for (int i = 0; i < nEdits; i++) {
+      // This creates unsynced edits by calling generation stamp.
+      cluster.getPrimaryAvatar(0).avatar.namesystem
+          .nextGenerationStampForTesting();
+    }
+  }
+
+  protected void createEdits(int nEdits) throws IOException {
+    for (int i = 0; i < nEdits / 2; i++) {
+      // Create file ends up logging two edits to the edit log, one for create
+      // file and one for bumping up the generation stamp
+      fs.create(new Path("/" + random.nextInt()));
+    }
+  }
+
+  protected ZookeeperTxId getLastTxid() throws Exception {
+    AvatarNode primaryAvatar = cluster.getPrimaryAvatar(0).avatar;
+    String address = AvatarNode.getClusterAddress(primaryAvatar
+        .getStartupConf());
+    return zkClient.getPrimaryLastTxId(address);
+  }
+
+  protected long getSessionId() throws Exception {
+    AvatarNode primaryAvatar = cluster.getPrimaryAvatar(0).avatar;
+    String address = AvatarNode.getClusterAddress(primaryAvatar
+        .getStartupConf());
+    return zkClient.getPrimarySsId(address);
+  }
+
+  protected void verifyState(long expectedTxid) throws Exception {
+    ZookeeperTxId lastTxId = getLastTxid();
+    assertNotNull(lastTxId);
+    long sessionId = getSessionId();
+    assertEquals(sessionId, lastTxId.getSessionId());
+    assertEquals(expectedTxid - 1, lastTxId.getTransactionId());
+  }
+
+  public static class FailoverTestUtilHandler extends InjectionHandler {
+
+    public volatile boolean simulateEditLogCrash = false;
+    public volatile boolean simulateShutdownCrash = true;
+    public volatile boolean standbyThreadCrash = false;
+    public volatile boolean waitForRestartTrigger = false;
+
+    public boolean _falseCondition(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.AVATARNODE_SHUTDOWN && simulateShutdownCrash) {
+        // used to simulate a situation where zk
+        // is not updated at primary shutdown
+        LOG.info("Skipping the write to ZK");
+        return true;
+      }
+      return false;
+    }
+
+    public boolean _trueCondition(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.FSNAMESYSTEM_CLOSE_DIRECTORY
+          && simulateEditLogCrash) {
+        LOG.warn("Simulating edit log crash, not closing edit log cleanly as"
+            + "part of shutdown");
+        return false;
+      }
+      return true;
+    }
+
+    public void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.AVATARNODE_WAIT_FOR_RESTART) {
+        waitForRestartTrigger = true;
+      }
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/MiniAvatarCluster.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/MiniAvatarCluster.java
index 29e8183a..0000f0e8 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/MiniAvatarCluster.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/MiniAvatarCluster.java
@@ -21,30 +21,36 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Properties;
 import java.util.ArrayList;
+import java.util.Random;
 import java.net.InetSocketAddress;
 
 import junit.framework.Assert;
 
+import org.apache.zookeeper.server.NIOServerCnxnFactory;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
 import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.NIOServerCnxn;
 import org.apache.zookeeper.server.ServerConfig;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniDFSCluster.ShutdownInterface;
+import org.apache.hadoop.hdfs.MiniDFSCluster.ShutDownUtil;
 import org.apache.hadoop.hdfs.protocol.AvatarConstants;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.hdfs.server.namenode.StandbyStorageRetentionManager;
 import org.apache.hadoop.hdfs.server.datanode.AvatarDataNode;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.net.StaticMapping;
@@ -61,8 +67,9 @@ public class MiniAvatarCluster {
 
   public static final String NAMESERVICE_ID_PREFIX = "nameserviceId";
   public static int currNSId = 0;
+  public static int instantiationRetries = 15;
 
-  public static class DataNodeProperties {
+  public static class DataNodeProperties implements ShutdownInterface {
     public AvatarDataNode datanode;
     public Configuration conf;
     public String[] dnArgs;
@@ -72,15 +79,21 @@ public static class DataNodeProperties {
       this.conf = conf;
       this.dnArgs = args;
     }
+
+    @Override
+    public void shutdown() throws IOException {
+      if (this.datanode != null)
+        this.datanode.shutdown();
+    }
   }
 
-  private static enum AvatarState {
+  public static enum AvatarState {
     ACTIVE,
     STANDBY,
     DEAD
   }
   
-  public static class AvatarInfo {
+  public static class AvatarInfo implements ShutdownInterface {
     public AvatarNode avatar;
     AvatarState state;
     int nnPort;
@@ -100,13 +113,19 @@ public static class AvatarInfo {
       this.rpcPort = rpcPort;
       this.startupOption = startupOption;
     }
+
+    @Override
+    public void shutdown() throws IOException {
+      if (this.avatar != null)
+        this.avatar.shutdown(true);
+    }
   }
 
   private static final Log LOG = LogFactory.getLog(MiniAvatarCluster.class);
 
   private static final String DEFAULT_TEST_DIR = 
     "build/contrib/highavailability/test/data";
-  private static final String TEST_DIR =
+  public static final String TEST_DIR =
     new File(System.getProperty("test.build.data", DEFAULT_TEST_DIR)).
     getAbsolutePath();
 
@@ -293,10 +312,14 @@ public void cleanupAvatarDirs() throws IOException {
   }
 
   private static ZooKeeperServer zooKeeper;
-  private static NIOServerCnxn.Factory cnxnFactory;
+  private static NIOServerCnxnFactory cnxnFactory;
 
   private ArrayList<DataNodeProperties> dataNodes = 
     new ArrayList<DataNodeProperties>();
+  
+  static {
+    DataNode.setSecureRandom(new Random());
+  }
 
   public MiniAvatarCluster(Configuration conf,
                            int numDataNodes,
@@ -306,6 +329,16 @@ public MiniAvatarCluster(Configuration conf,
     throws IOException, ConfigException, InterruptedException {
     this(conf, numDataNodes, format, racks, hosts, 1, false);
   }
+  public MiniAvatarCluster(Configuration conf,
+                           int numDataNodes,
+                           boolean format,
+                           String[] racks,
+                           String[] hosts,
+                           int numNameNodes,
+                           boolean federation)
+    throws IOException, ConfigException, InterruptedException {
+    this(conf, numDataNodes, format, racks, hosts, numNameNodes, federation, null);
+  }
   /**
    * Modify the config and start up the servers.  The rpc and info ports for
    * servers are guaranteed to use free ports.
@@ -328,7 +361,8 @@ public MiniAvatarCluster(Configuration conf,
                            String[] racks,
                            String[] hosts,
                            int numNameNodes,
-                           boolean federation) 
+                           boolean federation,
+                           long[] simulatedCapacities)
     throws IOException, ConfigException, InterruptedException {
 
     final String testDir = TEST_DIR + "/" + conf.get(MiniDFSCluster.DFS_CLUSTER_ID, "");
@@ -343,8 +377,14 @@ public MiniAvatarCluster(Configuration conf,
     conf.setInt("dfs.secondary.info.port", 0);
     conf.set("fs.ha.zookeeper.prefix", "/hdfs");
     conf.set("fs.ha.zookeeper.quorum", "localhost:" + zkClientPort);
+    conf.setInt("fs.ha.zookeeper.connect.timeout", 30000);
+    conf.setInt("fs.ha.zookeeper.timeout", 30000);
     
     // datanodes
+    
+    conf.setInt("dfs.datanode.fullblockreport.delay", 1000);
+    conf.setInt("dfs.datanode.blockreceived.retry.internval", 1000);
+    
     conf.set("dfs.datanode.address", "localhost:0");
     conf.set("dfs.datanode.http.address", "localhost:0");
     conf.set("dfs.datanode.ipc.address", "localhost:0");
@@ -359,6 +399,25 @@ public MiniAvatarCluster(Configuration conf,
     conf.setLong("dfs.blockreport.initialDelay", 0);
     conf.setClass("topology.node.switch.mapping.impl", 
                   StaticMapping.class, DNSToSwitchMapping.class);
+    
+    conf.setInt("dfs.ingest.retries", 2);
+    
+    // enable checkpoint by default
+    if(conf.get("fs.checkpoint.enabled") == null) {
+      conf.setBoolean("fs.checkpoint.enabled", true);
+    }
+    
+    //http image download timeout - 5s
+    if(conf.get("dfs.image.transfer.timeout") == null) {
+      conf.setInt("dfs.image.transfer.timeout", 5 * 1000);
+    }
+    
+    // make the standby actions (e.g., checkpoint trigger) quicker
+    conf.setInt("hdfs.avatarnode.sleep", 1000);
+    
+    // disable standby backup limits
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_DAYS_TOKEEP, 0);
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_COPIES_TOKEEP, 0);
 
     this.federation = federation;
     Collection<String> nameserviceIds = DFSUtil.getNameServiceIds(conf);
@@ -400,13 +459,14 @@ public MiniAvatarCluster(Configuration conf,
     // wouldn't return from the standby initialization we would never start the
     // datanodes and hence we enter a deadlock.
     registerZooKeeperNodes();
-    startDataNodes();
+    startDataNodes(simulatedCapacities);
     startAvatarNodes();
     waitAvatarNodesActive();
 
     waitDataNodesActive();
 
     waitExitSafeMode();
+    waitForTheFirstCheckpoint();
   }
   
   private void initFederationConf(Configuration conf,
@@ -439,7 +499,7 @@ private static ServerConfig createZooKeeperConf()
     zkConfProps.setProperty("tickTime", "2000");
     zkConfProps.setProperty("dataDir", ZK_DATA_DIR);
     zkConfProps.setProperty("clientPort", new Integer(zkClientPort).toString());
-    zkConfProps.setProperty("maxClientCnxns", "30");
+    zkConfProps.setProperty("maxClientCnxns", "500");
     zkConfProps.store(new FileOutputStream(zkConfFile), "");
 
     // create config object
@@ -469,6 +529,7 @@ public static boolean clearZooKeeperData() throws Exception {
     
   public static void createAndStartZooKeeper() 
     throws IOException, ConfigException, InterruptedException {
+    logStateChange("Creating zookeeper server");
     ServerConfig zkConf = createZooKeeperConf();
 
     zooKeeper = new ZooKeeperServer();
@@ -480,45 +541,65 @@ public static void createAndStartZooKeeper()
     zooKeeper.setMinSessionTimeout(zkConf.getMinSessionTimeout());
     zooKeeper.setMaxSessionTimeout(zkConf.getMaxSessionTimeout());
 
-    cnxnFactory =
-      new NIOServerCnxn.Factory(zkConf.getClientPortAddress(),
-                                zkConf.getMaxClientCnxns());
+    cnxnFactory = new NIOServerCnxnFactory();
+    cnxnFactory.configure(zkConf.getClientPortAddress(),
+        zkConf.getMaxClientCnxns());
     cnxnFactory.startup(zooKeeper);
-
+    logStateChange("Creating zookeeper server - completed");
   }
 
   private void registerZooKeeperNode(int nnPrimaryPort, int nnDnPrimaryPort,
       int httpPrimaryPort, int rpcPrimaryPort, NameNodeInfo nni) throws IOException {
-    AvatarZooKeeperClient zkClient = new AvatarZooKeeperClient(nni.conf, null);
-    zkClient.registerPrimary("localhost:" + nni.nnPort, 
-    "localhost:" + nnPrimaryPort);
-    zkClient.registerPrimary("localhost:" + nni.nnDnPort, 
-    "localhost:" + nnDnPrimaryPort);
-    zkClient.registerPrimary("localhost:" + nni.httpPort,
-    "localhost:" + httpPrimaryPort);
-    zkClient.registerPrimary("localhost:" + nni.rpcPort,
-    "localhost:" + rpcPrimaryPort);
-    try {
-      zkClient.shutdown();
-    } catch (InterruptedException ie) {
-      throw new IOException("zkClient.shutdown() interrupted");
+    int retries = 5;    
+    for(int i =0; i<retries; i++) {
+      try {
+        AvatarZooKeeperClient zkClient = new AvatarZooKeeperClient(nni.conf, null);
+        zkClient.registerPrimary("localhost:" + nni.nnPort, 
+        "localhost:" + nnPrimaryPort);
+        zkClient.registerPrimary("localhost:" + nni.nnDnPort, 
+        "localhost:" + nnDnPrimaryPort);
+        zkClient.registerPrimary("localhost:" + nni.httpPort,
+        "localhost:" + httpPrimaryPort);
+        zkClient.registerPrimary("localhost:" + nni.rpcPort,
+        "localhost:" + rpcPrimaryPort);
+        try {
+          zkClient.shutdown();
+        } catch (InterruptedException ie) {
+          throw new IOException("zkClient.shutdown() interrupted");
+        }
+        LOG.info("Closed zk client connection for registerZookeeper");
+        return;
+      } catch (IOException e) {
+        LOG.info("Got exception when registering to zk, retrying", e);
+        sleep(1000);
+      }
     }
-    LOG.info("Closed zk client connection for registerZookeeper");
+    throw new IOException("Cannot talk to ZK.");
   }
 
-  private void clearZooKeeperNode(int nnIndex) throws IOException {
-    NameNodeInfo nni = this.nameNodes[nnIndex];
-    AvatarZooKeeperClient zkClient = new AvatarZooKeeperClient(nni.conf, null);
-    zkClient.clearPrimary("localhost:" + nni.httpPort);
-    zkClient.clearPrimary("localhost:" + nni.nnPort);
-    zkClient.clearPrimary("localhost:" + nni.nnDnPort);
-    zkClient.clearPrimary("localhost:" + nni.rpcPort);
-    try {
-      zkClient.shutdown();
-    } catch (InterruptedException ie) {
-      throw new IOException("zkClient.shutdown() interrupted");
+  public void clearZooKeeperNode(int nnIndex) throws IOException {
+    int retries = 5;
+    for(int i =0; i<retries; i++) {
+      try {   
+        NameNodeInfo nni = this.nameNodes[nnIndex];
+        AvatarZooKeeperClient zkClient = new AvatarZooKeeperClient(nni.conf, null);
+        zkClient.clearPrimary("localhost:" + nni.httpPort);
+        zkClient.clearPrimary("localhost:" + nni.nnPort);
+        zkClient.clearPrimary("localhost:" + nni.nnDnPort);
+        zkClient.clearPrimary("localhost:" + nni.rpcPort);
+        try {
+          zkClient.shutdown();
+        } catch (InterruptedException ie) {
+          throw new IOException("zkClient.shutdown() interrupted");
+        }
+        LOG.info("Closed zk client connection for clearZKNode");
+        return;
+      } catch (IOException e) {
+        LOG.info("Got exception when clearing zk, retrying", e);
+        sleep(1000);
+      }
     }
-    LOG.info("Closed zk client connection for clearZKNode");
+    throw new IOException("Cannot talk to ZK.");
   }
 
   static Configuration getServerConf(String startupOption,
@@ -536,7 +617,7 @@ static Configuration getServerConf(String startupOption,
     }
   }
   
-  private void registerZooKeeperNodes() throws IOException {
+  public void registerZooKeeperNodes() throws IOException {
     for (NameNodeInfo nni : this.nameNodes) {
       nni.updateAvatarConf(this.conf);
       registerZooKeeperNode(nni.nn0Port, nni.nnDn0Port, nni.http0Port,
@@ -570,8 +651,8 @@ private void startAvatarNode(NameNodeInfo nni, StartupOption operation) throws I
       }
       a0FormatArgs = new String[argList.size()];
       argList.toArray(a0FormatArgs);
-      AvatarNode.createAvatarNode(a0FormatArgs, 
-                                  getServerConf(AvatarConstants.StartupOption.
+      instantiateAvatarNode(a0FormatArgs, 
+                            getServerConf(AvatarConstants.StartupOption.
                                                 NODEZERO.getName(), nni));
     }
     ArrayList<AvatarInfo> avatars = new ArrayList<AvatarInfo>(2);
@@ -589,8 +670,7 @@ private void startAvatarNode(NameNodeInfo nni, StartupOption operation) throws I
       }
       a0Args = new String[argList.size()];
       argList.toArray(a0Args);
-      AvatarNode a0 = AvatarNode.
-        createAvatarNode(a0Args, 
+      AvatarNode a0 = instantiateAvatarNode(a0Args, 
                          getServerConf(AvatarConstants.
                                        StartupOption.
                                        NODEZERO.
@@ -601,7 +681,17 @@ private void startAvatarNode(NameNodeInfo nni, StartupOption operation) throws I
                                  nni.nn0Port, nni.nnDn0Port, nni.http0Port, nni.rpc0Port,
                                  AvatarConstants.StartupOption.NODEZERO.
                                  getName()));
-
+      
+      // wait for up to 10 seconds until the ACTIVE is initialized
+      for (int i = 0; i < 10; i++) {
+        if (a0.isInitialized())
+          break;
+        LOG.info("Waiting for the ACTIVE to be initialized...");
+        sleep(1000);
+      }
+      if (!a0.isInitialized()) {
+        throw new IOException("The ACTIVE cannot be initialized");
+      }
     }
 
     {
@@ -617,9 +707,9 @@ private void startAvatarNode(NameNodeInfo nni, StartupOption operation) throws I
       }
       a1Args = new String[argList.size()];
       argList.toArray(a1Args);
-      avatars.add(new AvatarInfo(AvatarNode.
-                                 createAvatarNode(a1Args, 
-                                                  getServerConf(AvatarConstants.
+      avatars.add(new AvatarInfo(
+          instantiateAvatarNode(a1Args, 
+                                getServerConf(AvatarConstants.
                                                                 StartupOption.
                                                                 NODEONE.
                                                                 getName(), nni)),
@@ -643,6 +733,7 @@ private void startAvatarNode(NameNodeInfo nni, StartupOption operation) throws I
   }
 
   public void restartAvatarNodes() throws Exception {
+    logStateChange("Restarting avatar nodes");
     shutDownAvatarNodes();
     for (NameNodeInfo nni : this.nameNodes) {
       nni.avatars.clear();
@@ -655,62 +746,106 @@ public void restartAvatarNodes() throws Exception {
     waitDataNodesActive();
 
     waitExitSafeMode();
+    logStateChange("Restarting avatar nodes - completed");
   }
-
-  public void shutDownDataNode(int i) throws IOException, InterruptedException {
-    dataNodes.get(i).datanode.shutdown();
-  }
-
-  public void shutDownDataNodes() throws IOException, InterruptedException {
+  
+  /*
+   * Adds all datanodes to shutdown list
+   */
+  private void processDatanodesForShutdown(Collection<Thread> threads) {
     for (int i = 0; i < dataNodes.size(); i++) {
-      LOG.info("shutting down data node " + i);
-      shutDownDataNode(i);
-      LOG.info("data node " + i + " shut down");
+      LOG.info("Shutting down data node " + i);
+      Thread st = new Thread(new ShutDownUtil(dataNodes.get(i)));
+      st.start();
+      threads.add(st);
     }
   }
-
-  public void shutDownAvatarNodes() throws IOException, InterruptedException {
+  
+  /*
+   * Adds all namenodes to shutdown list
+   */
+  private void processNamenodesForShutdown(Collection<Thread> threads) {
     for (NameNodeInfo nni : this.nameNodes) {
       for (AvatarInfo avatar: nni.avatars) {
         if (avatar.state == AvatarState.ACTIVE || 
             avatar.state == AvatarState.STANDBY) {
-          LOG.info("shutdownAvatar");
-          avatar.avatar.shutdown(true);
+          LOG.info("Shutting down Avatar " + avatar.state);
+          Thread st = new Thread(new ShutDownUtil(avatar));
+          st.start();
+          threads.add(st);
         }
       }
     }
+  }
+
+  public void shutDownDataNode(int i) throws IOException, InterruptedException {
+    logStateChange("Shutting down datanode: " + i);
+    dataNodes.get(i).datanode.shutdown();
+    logStateChange("Shutting down datanode: " + i + " - completed");
+  }
 
+  public void shutDownDataNodes() throws IOException, InterruptedException {
+    logStateChange("Shutting down avatar datanodes");
+    List<Thread> threads = new ArrayList<Thread>();
+    processDatanodesForShutdown(threads);
+    MiniDFSCluster.joinThreads(threads);
+    logStateChange("Shutting down avatar datanodes - completed");
+  }
+
+  public void shutDownAvatarNodes() throws IOException, InterruptedException {
+    logStateChange("Shutting down avatar nodes");
+    List<Thread> threads = new ArrayList<Thread>();
+    processNamenodesForShutdown(threads);   
+    MiniDFSCluster.joinThreads(threads);
     try {
       Thread.sleep(1000);
     } catch (InterruptedException ignore) {
       // do nothing
     }
+    logStateChange("Shutting down avatar nodes - completed");
   }
 
   public static void shutDownZooKeeper() throws IOException, InterruptedException {
+    logStateChange("Shutting down zookeeper server");
     cnxnFactory.shutdown();
     cnxnFactory.join();
     LOG.info("Zookeeper Connection Factory shutdown");
     if (zooKeeper.isRunning()) {
       zooKeeper.shutdown();
     }
-    LOG.info("Zookeepr Server shutdown");
+    logStateChange("Shutting down zookeeper server - completed");
   }
   
   /**
    * Shut down the cluster
    */
   public void shutDown() throws IOException, InterruptedException {
-    System.out.println("Shutting down the Mini Avatar Cluster");
-    // this doesn't work, so just leave the datanodes running,
-    // they won't interfere with the next run
-    shutDownDataNodes();
-    
-    shutDownAvatarNodes(); 
+    logStateChange("Shutting down Mini Avatar Cluster");
+    List<Thread> threads = new ArrayList<Thread>();   
+    // add all datanodes to be shutdown
+    processDatanodesForShutdown(threads);    
+    // add all namenodes to be shutdown
+    processNamenodesForShutdown(threads);   
+    MiniDFSCluster.joinThreads(threads);
+    logStateChange("Shutting down Mini Avatar Cluster - completed");
+  }
 
+  private void startDataNodes(long[] simulatedCapacities) throws IOException {
+    startDataNodes(simulatedCapacities, numDataNodes, hosts, racks, conf);
   }
 
   private void startDataNodes() throws IOException {
+    startDataNodes(numDataNodes, racks, hosts, conf);
+  }
+
+  public void startDataNodes(int numDataNodes, String[] racks, String[] hosts,
+      Configuration conf) throws IOException {
+    startDataNodes(null, numDataNodes, racks, hosts, conf);
+  }
+
+  public void startDataNodes(long[] simulatedCapacities, int numDataNodes,
+      String[] racks, String[] hosts, Configuration conf) throws IOException {
+    int curDn = dataNodes.size();
     if (racks != null && numDataNodes > racks.length ) {
       throw new IllegalArgumentException( "The length of racks [" + 
                                           racks.length +
@@ -731,63 +866,97 @@ private void startDataNodes() throws IOException {
       LOG.info("Generating host names for datanodes");
       hosts = new String[numDataNodes];
       for (int i = 0; i < numDataNodes; i++) {
-        hosts[i] = "host" + i + ".foo.com";
+        hosts[i] = "host" + (curDn + i) + ".foo.com";
       }
     }
+
+    ArrayList<Thread> threads = new ArrayList<Thread>();
+    for (int i = 0; i < numDataNodes; i++) {
+      Thread st = new Thread(new StartDatanodeUtil(i, curDn, simulatedCapacities));
+      st.start();
+      threads.add(st);
+    }
+    if(!MiniDFSCluster.joinThreads(threads)){
+      throw new IOException("Failed to startup the nodes");
+    }
+    this.numDataNodes = dataNodes.size();
+  }
+  
+  class StartDatanodeUtil implements Runnable {
+    private int i;
+    private int curDn;
+    private long[] simulatedCapacities;
     
+    StartDatanodeUtil(int node, int curDn, long[] simulatedCapacities) {
+      this.i = node;
+      this.curDn = curDn;
+      this.simulatedCapacities = simulatedCapacities;
+    }
     
-    String[] dnArgs = { HdfsConstants.StartupOption.REGULAR.getName() };
-    
-    for (int i = 0; i < numDataNodes; i++) {
-      Configuration dnConf = new Configuration(conf);
-
-      File dir1 = new File(dataDir, "data"+(2*i+1));
-      File dir2 = new File(dataDir, "data"+(2*i+2));
-      dir1.mkdirs();
-      dir2.mkdirs();
-      if (!dir1.isDirectory() || !dir2.isDirectory()) { 
-        throw new IOException("Mkdirs failed to create directory for DataNode "
-                              + i + ": " + dir1 + " or " + dir2);
-      }
-      dnConf.set("dfs.data.dir", dir1.getPath() + "," + dir2.getPath()); 
+    @Override
+    public void run() {
+      try {
+        String[] dnArgs = { HdfsConstants.StartupOption.REGULAR.getName() };
+        int iN = curDn + i;
+        Configuration dnConf = new Configuration(conf);
+
+        if (simulatedCapacities != null) {
+          dnConf.setBoolean("dfs.datanode.simulateddatastorage", true);
+          dnConf.setLong(SimulatedFSDataset.CONFIG_PROPERTY_CAPACITY,
+              simulatedCapacities[i]);
+        }
 
-      LOG.info("Starting DataNode " + i + " with dfs.data.dir: " 
-                         + dnConf.get("dfs.data.dir"));
-      
-      if (hosts != null) {
-        dnConf.set("slave.host.name", hosts[i]);
-        LOG.info("Starting DataNode " + i + " with hostname set to: " 
-                           + dnConf.get("slave.host.name"));
-      }
+        File dir1 = new File(dataDir, "data" + (2 * iN + 1));
+        File dir2 = new File(dataDir, "data" + (2 * iN + 2));
+        dir1.mkdirs();
+        dir2.mkdirs();
+        if (!dir1.isDirectory() || !dir2.isDirectory()) {
+          throw new IOException(
+              "Mkdirs failed to create directory for DataNode " + iN + ": "
+              + dir1 + " or " + dir2);
+        }
+        dnConf.set("dfs.data.dir", dir1.getPath() + "," + dir2.getPath());
 
-      if (racks != null) {
-        String name = hosts[i];
-        LOG.info("Adding node with hostname : " + name + " to rack "+
-                           racks[i]);
-        StaticMapping.addNodeToRack(name,
-                                    racks[i]);
-      }
-      Configuration newconf = new Configuration(dnConf); // save config
-      if (hosts != null) {
-        NetUtils.addStaticResolution(hosts[i], "localhost");
-      }
-      AvatarDataNode dn = AvatarDataNode.instantiateDataNode(dnArgs, dnConf);
-      //since the HDFS does things based on IP:port, we need to add the mapping
-      //for IP:port to rackId
-      
-      String ipAddr = dn.getSelfAddr().getAddress().getHostAddress();
-      if (racks != null) {
-        int port = dn.getSelfAddr().getPort();
-        System.out.println("Adding node with IP:port : " + ipAddr + ":" + port+
-                            " to rack " + racks[i]);
-        StaticMapping.addNodeToRack(ipAddr + ":" + port,
-                                  racks[i]);
-      }
-      dn.runDatanodeDaemon();
-      dataNodes.add(new DataNodeProperties(dn, newconf, dnArgs));
+        LOG.info("Starting DataNode " + iN + " with dfs.data.dir: "
+            + dnConf.get("dfs.data.dir"));
 
-    }
 
+        if (hosts != null) {
+          dnConf.set("slave.host.name", hosts[i]);
+          LOG.info("Starting DataNode " + iN + " with hostname set to: "
+              + dnConf.get("slave.host.name"));
+        }
+
+        if (racks != null) {
+          String name = hosts[i];
+          LOG.info("Adding node with hostname : " + name + " to rack "
+              + racks[i]);
+          StaticMapping.addNodeToRack(name, racks[i]);
+        }
+        Configuration newconf = new Configuration(dnConf); // save config
+        if (hosts != null) {
+          NetUtils.addStaticResolution(hosts[i], "localhost");
+        }
+        AvatarDataNode dn = instantiateDataNode(dnArgs, dnConf);
+        // since the HDFS does things based on IP:port, we need to add the
+        // mapping
+        // for IP:port to rackId
+
+        String ipAddr = dn.getSelfAddr().getAddress().getHostAddress();
+        if (racks != null) {
+          int port = dn.getSelfAddr().getPort();
+          System.out.println("Adding node with IP:port : " + ipAddr + ":"
+              + port + " to rack " + racks[i]);
+          StaticMapping.addNodeToRack(ipAddr + ":" + port, racks[i]);
+        }
+        dn.runDatanodeDaemon();
+        synchronized (dataNodes) {
+          dataNodes.add(new DataNodeProperties(dn, newconf, dnArgs));
+        }
+      } catch (IOException e) {
+        LOG.error("Exception when creating datanode", e);
+      }
+    }
   }
 
   public void waitAvatarNodesActive() {
@@ -801,7 +970,7 @@ public void waitAvatarNodesActive(int nnIndex) {
     for (AvatarInfo avatar: nni.avatars) {
       while (avatar.avatar.getNameNodeDNAddress() == null) {
         try {
-          LOG.info("waiting for avatar");
+          logStateChange("Waiting for avatar");
           Thread.sleep(200);
         } catch (InterruptedException ignore) {
           // do nothing
@@ -820,16 +989,15 @@ public void waitDataNodesActive() throws IOException {
   /* wait Datanodes active for specific namespaces */
   public void waitDataNodesActive(int nnIndex) throws IOException {
     DistributedAvatarFileSystem dafs = null;
-
+    logStateChange("Waiting for data nodes");
     int liveDataNodes = 0;
     // make sure all datanodes are alive
     while(liveDataNodes != numDataNodes) {
       try {
         dafs = getFileSystem(nnIndex);
-        LOG.info("waiting for data nodes... ");
         Thread.sleep(200);
-        LOG.info("waiting for data nodes : live=" + liveDataNodes + ", total=" + numDataNodes);
         liveDataNodes = dafs.getLiveDataNodeStats(false).length;
+        logStateChange("Waiting for data nodes : live=" + liveDataNodes + ", total=" + numDataNodes);
       } catch (Exception e) {
         LOG.warn("Exception waiting for datanodes : ", e);
       } finally {
@@ -838,6 +1006,7 @@ public void waitDataNodesActive(int nnIndex) throws IOException {
         }
       }
     }
+    logStateChange("Waiting for data nodes - completed");
   }
   
   private void checkSingleNameNode() {
@@ -867,6 +1036,40 @@ private AvatarInfo getAvatarByState(int nnIndex, AvatarState state) {
     return null;
   }
 
+
+  /**
+   * Wait until the primary avatars have been checkpointed
+   */
+  private void waitForTheFirstCheckpoint() {
+    if((!conf.getBoolean("fs.checkpoint.wait", true)) ||
+        (!conf.getBoolean("fs.checkpoint.enabled", true))) {
+      logStateChange("Waiting for checkpoint is disabled");
+      return;
+    }
+    logStateChange("Waiting for first checkpoint");
+    // wait for the first checkpoint to happen, as we
+    // assert txids which depend on the checkpoints
+    for (int nnIndex=0; nnIndex < this.nameNodes.length; nnIndex++) {
+      while(!isCheckpointed(nnIndex)) {
+        try {
+          logStateChange("Waiting until avatar0 has been checkpointed");
+          Thread.sleep(50);
+        } catch (InterruptedException ignore) {
+          // do nothing
+        }
+      }
+    }
+    logStateChange("Waiting for first checkpoint - completed");
+  }
+  
+  /**
+   * Return if the primary avatar has been checkpointed.
+   */
+  private boolean isCheckpointed(int nnIndex) {
+    AvatarInfo primary = getPrimaryAvatar(nnIndex);
+    return (primary != null && primary.avatar.getFSImage().getLastCheckpointTxId() > -1);
+  }
+  
   /**
    * Return true if primary avatar has left safe mode
    */
@@ -882,7 +1085,7 @@ private void waitExitSafeMode() throws IOException {
       // make sure all datanodes are alive
       while(!hasLeftSafeMode(nnIndex)) {
         try {
-          LOG.info("waiting until avatar0 has left safe mode");
+          logStateChange("Waiting until avatar0 has left safe mode");
           Thread.sleep(50);
         } catch (InterruptedException ignore) {
           // do nothing
@@ -890,8 +1093,9 @@ private void waitExitSafeMode() throws IOException {
       }
     }
   }
-  
-  public DistributedAvatarFileSystem getFileSystem() throws IOException {
+
+  public DistributedAvatarFileSystem getFileSystem()
+      throws IOException {
     checkSingleNameNode();
     return getFileSystem(0);
   }
@@ -899,8 +1103,10 @@ public DistributedAvatarFileSystem getFileSystem() throws IOException {
   /**
    * Get DAFS.
    */
-  public DistributedAvatarFileSystem getFileSystem(int nnIndex) throws IOException {
-    FileSystem fs = FileSystem.get(this.nameNodes[nnIndex].clientConf);
+  public DistributedAvatarFileSystem getFileSystem(int nnIndex)
+      throws IOException {
+    FileSystem fs = FileSystem
+        .get(this.nameNodes[nnIndex].clientConf);
 
     if (!(fs instanceof DistributedAvatarFileSystem)) {
       throw new IOException("fs is not avatar fs");
@@ -932,6 +1138,7 @@ public void killPrimary(boolean clearZK) throws IOException {
    * @param clearZK clear zookeeper?
    */
   public void killPrimary(int nnIndex, boolean clearZK) throws IOException {
+    logStateChange("Killing primary avatar: " + nnIndex);
     AvatarInfo primary = getPrimaryAvatar(nnIndex);
     if (primary != null) {
       if (clearZK) {
@@ -948,7 +1155,7 @@ public void killPrimary(int nnIndex, boolean clearZK) throws IOException {
       } catch (InterruptedException ignore) {
         // do nothing
       }
-      
+      logStateChange("Killing primary avatar: " + nnIndex + " - completed");
     } else {
       throw new IOException("can't kill primary avatar, already dead");
     }
@@ -963,6 +1170,7 @@ public void killStandby() throws IOException {
    * Kill the standby avatar node.
    */
   public void killStandby(int nnIndex) throws IOException {
+    logStateChange("Killing standby avatar: " + nnIndex);
     AvatarInfo standby = getStandbyAvatar(nnIndex);
     if (standby != null) {
       standby.avatar.shutdown(true);
@@ -975,15 +1183,19 @@ public void killStandby(int nnIndex) throws IOException {
       } catch (InterruptedException ignore) {
         // do nothing
       }
-      
+      logStateChange("Killing standby avatar: " + nnIndex + " - completed");
     } else {
-      LOG.info("can't kill standby avatar, already dead");
+      logStateChange("Can't kill standby avatar, already dead");
     }
   }
 
   public void failOver() throws IOException {
+    failOver(false);
+  }
+
+  public void failOver(boolean force) throws IOException {
     checkSingleNameNode();
-    failOver(0);
+    failOver(0, force);
   }
 
   /**
@@ -991,6 +1203,11 @@ public void failOver() throws IOException {
    * primary avatar first if necessary.
    */
   public void failOver(int nnIndex) throws IOException {
+    failOver(nnIndex, false);
+  }
+
+  public void failOver(int nnIndex, boolean force) throws IOException {
+    logStateChange("Failover avatar: " + nnIndex);
     if (getPrimaryAvatar(nnIndex) != null) {
       LOG.info("killing primary avatar before failover");
       killPrimary(nnIndex);
@@ -1001,10 +1218,17 @@ public void failOver(int nnIndex) throws IOException {
       throw new IOException("no standby avatar running");
     }
 
-    standby.avatar.setAvatar(AvatarConstants.Avatar.ACTIVE);
+    standby.avatar.quiesceForFailover(force);
+    // Introduce a synthetic delay since this is what will happen in practice.
+    // There will be some delay between both calls and this is to make sure
+    // there are no locking issues since this was earlier one RPC under a single
+    // lock and now its two RPCs which take the lock twice.
+    DFSTestUtil.waitNSecond(5);
+    standby.avatar.performFailover();
     standby.state = AvatarState.ACTIVE;
     registerZooKeeperNode(standby.nnPort, standby.nnDnPort, standby.httpPort,
         standby.rpcPort, this.nameNodes[nnIndex]);
+    logStateChange("Failover avatar: " + nnIndex + " : completed");
   }
   
   public void restartStandby() throws IOException {
@@ -1021,7 +1245,7 @@ public void restartStandby(int nnIndex) throws IOException {
                             "primary or dead avatar not found");
       
     }
-    LOG.info("restarting " + dead.startupOption + " as standby");
+    logStateChange("Restarting " + dead.startupOption + " as standby");
     NameNodeInfo nni = this.nameNodes[nnIndex];
     String[] args; 
     ArrayList<String> argList = new ArrayList<String>();
@@ -1034,13 +1258,13 @@ public void restartStandby(int nnIndex) throws IOException {
     }
     args = new String[argList.size()];
     argList.toArray(args);
-    dead.avatar = AvatarNode.createAvatarNode(args, 
-        getServerConf(dead.startupOption, nni));
+    dead.avatar = instantiateAvatarNode(args, getServerConf(dead.startupOption, nni));
     dead.state = AvatarState.STANDBY;
 
     if (dead.avatar == null) {
       throw new IOException("cannot start avatar node");
     }
+    logStateChange("Restarting " + dead.startupOption + " as standby - completed");
   }
   
   /**
@@ -1177,14 +1401,13 @@ public void addCluster(MiniAvatarCluster cluster, boolean format)
 
     for (DataNodeProperties dn : dataNodes) {
       dn.conf.set(FSConstants.DFS_FEDERATION_NAMESERVICES, nameserviceIds);
-      dn.datanode = AvatarDataNode.instantiateDataNode(dn.dnArgs, 
-          new Configuration(dn.conf));
+      dn.datanode = instantiateDataNode(dn.dnArgs, dn.conf);
       dn.datanode.runDatanodeDaemon();
     }
 
     for (i = 0; i < nameNodes.length; i++) {
       NameNodeInfo nni = nameNodes[i];
-
+      Thread.sleep(2000);
       if (i < nnIndex) {
         startAvatarNode(nni, StartupOption.UPGRADE);
       } else {
@@ -1206,6 +1429,7 @@ public synchronized boolean restartDataNodes() throws IOException,
    */
   public synchronized boolean restartDataNodes(boolean waitActive)
       throws IOException, InterruptedException {
+    logStateChange("Restarting avatar datanodes");
     shutDownDataNodes();
     int i = 0;
     for (DataNodeProperties dn : dataNodes) {
@@ -1214,14 +1438,16 @@ public synchronized boolean restartDataNodes(boolean waitActive)
       // Use the same port since dn is identified by host:port.
       int port = dn.datanode.getSelfAddr().getPort();
       dn.conf.set("dfs.datanode.address", "localhost:" + port);
-      dn.datanode = AvatarDataNode.instantiateDataNode(dn.dnArgs, 
-          new Configuration(dn.conf));
+      dn.datanode = instantiateDataNode(dn.dnArgs, dn.conf);
       dn.datanode.runDatanodeDaemon();
-      waitDataNodeInitialized(dn.datanode);
+      if (waitActive) {
+        waitDataNodeInitialized(dn.datanode);
+      }
     }
     if (waitActive) {
       waitDataNodesActive();
     }
+    logStateChange("Restarting avatar datanodes - completed");
     return true;
   }
   
@@ -1259,4 +1485,50 @@ public int getNamespaceId(int index) {
   static public int getNSId() {
     return MiniAvatarCluster.currNSId++;
   }
+  
+  public static AvatarDataNode instantiateDataNode(String[] dnArgs,
+      Configuration conf) throws IOException {
+    IOException e = null;
+    for (int i = 0; i < instantiationRetries; i++) {
+      try {
+        return AvatarDataNode.instantiateDataNode(dnArgs, new Configuration(
+            conf));
+      } catch (IOException ioe) {
+        e = ioe;
+        LOG.info("Trying to instantiate datanode... ", e);
+      }
+      sleep(1000);
+    }
+    LOG.fatal("Exception when instantiating avatardatanode", e);
+    throw e;
+  }
+  
+  public static AvatarNode instantiateAvatarNode(String argv[],
+      Configuration conf) throws IOException {
+    IOException e = null;
+    for (int i = 0; i < instantiationRetries; i++) {
+      try {
+        return AvatarNode.createAvatarNode(argv, conf);
+      } catch (IOException ioe) {
+        e = ioe;
+        LOG.info("Trying to instantiate avatarnode... ", e);
+      }
+      sleep(1000);
+    }
+    LOG.fatal("Exception when instantiating avatarnode", e);
+    throw e;
+  }
+  
+  private static void sleep(long time) throws IOException {
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException e) {
+      LOG.fatal("Thread interrupted");
+      throw new IOException(e.toString());
+    }
+  }
+  
+  private static void logStateChange(String msg) {
+    LOG.info("----- " + msg + " -----");
+  }
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarAPI.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarAPI.java
index b98d8078..2d3bf853 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarAPI.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarAPI.java
@@ -64,7 +64,8 @@ public static void setUpClass() throws Exception {
   /**
    * Set up MiniAvatarCluster.
    */
-  public void setUp(boolean federation) throws Exception {
+  public void setUp(boolean federation, String name) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
     conf = new Configuration();
     // populate repl queues on standby (in safe mode)
     conf.setFloat("dfs.namenode.replqueue.threshold-pct", 0f);
@@ -151,7 +152,7 @@ private void checkStandby() throws Exception {
   
   @Test
   public void testPrimaryShutdownFailure() throws Exception {
-    setUp(false);
+    setUp(false, "testPrimaryShutdownFailure");
     InjectionHandler.set(new TestAvatarAPIHandler());
     LOG.info("DAFS testPrimary");
     try {
@@ -168,7 +169,7 @@ public void testPrimaryShutdownFailure() throws Exception {
    */
   @Test
   public void testPrimary() throws Exception {
-    setUp(false);
+    setUp(false, "testPrimary");
     LOG.info("DAFS testPrimary");
     cluster.killStandby();
     checkPrimary();
@@ -179,7 +180,7 @@ public void testPrimary() throws Exception {
    */
   @Test
   public void testStandby() throws Exception {
-    setUp(false);
+    setUp(false, "testStandby");
     LOG.info("DAFS testStandby");
     long lastTxId = getLastTxId();
     cluster.killPrimary(false);
@@ -193,7 +194,7 @@ public void testStandby() throws Exception {
    */
   @Test
   public void testFailOver() throws Exception {
-    setUp(false);
+    setUp(false, "testFailOver");
     LOG.info("DAFS testFailOver");
     long lastTxId = getLastTxId();
     cluster.killPrimary();
@@ -215,7 +216,7 @@ public void testFailOver() throws Exception {
   
   @Test
   public void testStandbyWithFederation() throws Exception {
-    setUp(true);
+    setUp(true, "testStandbyWithFederation");
     LOG.info("DAFS testStandby");
     long lastTxId = getLastTxId();
     cluster.killPrimary(0, false);
@@ -226,7 +227,7 @@ public void testStandbyWithFederation() throws Exception {
   
   @Test
   public void testPrimaryWithFederation() throws Exception {
-    setUp(true);
+    setUp(true, "testPrimaryWithFederation");
     LOG.info("DAFS testPrimary");
     cluster.killStandby(0);
     checkPrimary();
@@ -234,7 +235,7 @@ public void testPrimaryWithFederation() throws Exception {
   
   @Test
   public void testFailOverWithFederation() throws Exception {
-    setUp(true);
+    setUp(true, "testFailoverWithFederation");
     LOG.info("DAFS testFailOver");
     long lastTxId = getLastTxId();
     cluster.killPrimary(0);
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCheckpointing.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCheckpointing.java
index 1fe0427c..12c1a29d 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCheckpointing.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCheckpointing.java
@@ -1,18 +1,42 @@
+/**
+ * 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.
+ */
 package org.apache.hadoop.hdfs;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Random;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.TestFileCreation;
+import org.apache.hadoop.hdfs.TestFileHardLink;
 import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
 import org.apache.hadoop.hdfs.server.namenode.CheckpointSignature;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil.CheckpointTrigger;
 import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
@@ -35,17 +59,20 @@ public class TestAvatarCheckpointing {
   public static void setUpBeforeClass() throws Exception {
     MiniAvatarCluster.createAndStartZooKeeper();
   }
-
-  private void setUp() throws Exception {
-    setUp(3600);
+  
+  private void setUp(String name) throws Exception {
+    setUp(3600, name, true);
   }
   
-  private void setUp(long ckptPeriod) throws Exception {
+  private void setUp(long ckptPeriod, String name, boolean waitForCheckpoint)
+      throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
     conf = new Configuration();
     
     conf.setBoolean("fs.ha.retrywrites", true);
     conf.setBoolean("fs.checkpoint.enabled", true);
     conf.setLong("fs.checkpoint.period", ckptPeriod);
+    conf.setBoolean("fs.checkpoint.wait", waitForCheckpoint);
     
     cluster = new MiniAvatarCluster(conf, 2, true, null, null);
     fs = cluster.getFileSystem();
@@ -55,6 +82,7 @@ private void setUp(long ckptPeriod) throws Exception {
   public void tearDown() throws Exception {
     fs.close();
     cluster.shutDown();
+    InjectionHandler.clear();
   }
 
   @AfterClass
@@ -75,116 +103,186 @@ public long getCurrentTxId(AvatarNode avatar) {
   }
   
   //////////////////////////////
+  
+  @Test
+  public void testHardLinkWithCheckPoint() throws Exception {
+    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(null, null, false);
+    InjectionHandler.set(h);
+    setUp("testHardLinkWithCheckPoint");
+    
+    // Create a new file
+    Path root = new Path("/user/");
+    Path file10 = new Path(root, "file1");
+    FSDataOutputStream stm1 = TestFileCreation.createFile(fs, file10, 1);
+    byte[] content = TestFileCreation.writeFile(stm1);
+    stm1.close();
+
+    LOG.info("Create the hardlinks");
+    Path file11 =  new Path(root, "file-11");
+    Path file12 =  new Path(root, "file-12");
+    fs.hardLink(file10, file11);
+    fs.hardLink(file11, file12);
+
+    LOG.info("Verify the hardlinks");
+    TestFileHardLink.verifyLinkedFileIdenticial(fs, cluster.getPrimaryAvatar(0).avatar,
+        fs.getFileStatus(file10), fs.getFileStatus(file11), content);
+    TestFileHardLink.verifyLinkedFileIdenticial(fs, cluster.getPrimaryAvatar(0).avatar,
+        fs.getFileStatus(file10), fs.getFileStatus(file12), content);
 
+    LOG.info("NN checkpointing");
+    h.doCheckpoint();
+    
+    // Restart the namenode
+    LOG.info("NN restarting");
+    cluster.restartAvatarNodes();
+    
+    // Verify the hardlinks again
+    LOG.info("Verify the hardlinks again after the NN restarts");
+    TestFileHardLink.verifyLinkedFileIdenticial(fs, cluster.getPrimaryAvatar(0).avatar, 
+        fs.getFileStatus(file10), fs.getFileStatus(file11), content);
+    TestFileHardLink.verifyLinkedFileIdenticial(fs, cluster.getPrimaryAvatar(0).avatar, 
+        fs.getFileStatus(file10), fs.getFileStatus(file12), content);
+  }
+  
   @Test
   public void testFailSuccFailQuiesce() throws Exception {
     LOG.info("TEST: ----> testFailCheckpointOnceAndSucceed");
     // fail once
-    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(null, true);
+    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(null,
+        null, true);
     InjectionHandler.set(h);
-    setUp();
+    setUp("testFailSuccFailQuiesce");
     createEdits(20);
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
     
     
     try {
-      Thread.sleep(3000);
       h.failNextCheckpoint = true;
-      standby.doCheckpoint();
+      h.doCheckpoint();
       fail("Should get IOException here");
-    } catch (Exception e) {  }
+    } catch (Exception e) { 
+      LOG.warn("Expected: Checkpoint failed", e);
+    }
     
-    // checkpoint failed
-    assertNotNull(h.lastSignature);
+    // current txid should be 20 + SLS + ENS + SLS + initial
+    assertEquals(25, getCurrentTxId(primary));
     
     h.failNextCheckpoint = false;
-    standby.doCheckpoint();
-    // checkpoint succeeded
-    assertNull(h.lastSignature);
     
-    h.failNextCheckpoint = true;
+    // checkpoint should succeed
+    h.doCheckpoint();
+    
+    // another roll adds 2 transactions
+    assertEquals(27, getCurrentTxId(primary));
+    
+    h.failNextCheckpoint = true;    
     try {
-      standby.doCheckpoint();
+      h.doCheckpoint();
       fail("Should get IOException here");
-    } catch (Exception e) {  }
-    // checkpoint failed -> now reading edits.new
+    } catch (Exception e) { 
+      LOG.warn("Expected: Checkpoint failed", e);
+    }
     
+    // another roll adds 2 transactions
+    assertEquals(29, getCurrentTxId(primary));
     
-    assertNotNull(h.lastSignature);  
     createEdits(20);
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(40, getCurrentTxId(primary));
+    assertEquals(49, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
   }
   
   @Test
   public void testFailCheckpointMultiAndCrash() throws Exception {
     LOG.info("TEST: ----> testFailCheckpointMultiAndCrash");
-    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(null, true);
+    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(null,
+        null, true);
     InjectionHandler.set(h);
-    setUp();
+    setUp("testFailCheckpointMultiAndCrash");
     createEdits(20);
+    AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
     
     try {
-      Thread.sleep(3000);
       h.failNextCheckpoint = true;
-      standby.doCheckpoint();
+      h.doCheckpoint();
       fail("Should get IOException here");
-    } catch (IOException e) {  }
-    // checkpoint did not succeed
-    assertNotNull(h.lastSignature);
+    } catch (IOException e) { 
+      LOG.info("Expected: Checkpoint failed", e);
+    }
+    
+    // current txid should be 20 + SLS + ENS + SLS + initial ckpt
+    assertEquals(25, getCurrentTxId(primary));
     
     try {
-      standby.doCheckpoint();
+      h.doCheckpoint();
       fail("Should get IOException here");
-    } catch (IOException e) {  }
-    // checkpoint did not succeed
-    assertNotNull(h.lastSignature);
+    } catch (IOException e) { 
+      LOG.info("Expected: Checkpoint failed", e);
+    }
+    
+    // roll adds 2 transactions
+    assertEquals(27, getCurrentTxId(primary));
     
     try {
-      h.alterSignature = true;
-      standby.doCheckpoint();
-      fail("Checkpoint should not succeed and throw RuntimeException");
+      h.doCheckpoint();
+      fail("Should get IOException here");
     } catch (Exception e) {
-      LOG.info("Expected exception : " + e.toString());
+      LOG.info("Expected: Checkpoint failed", e);
     }
+    
+    // roll adds 2 transactions
+    assertEquals(29, getCurrentTxId(primary));
   }
   
   @Test
   public void testFailCheckpointOnceAndRestartStandby() throws Exception {
     LOG.info("TEST: ----> testFailCheckpointOnceAndRestartStandby");
-    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(null, true);
+    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(null,
+        null, true);
     InjectionHandler.set(h);
-    setUp();
+    setUp("testFailCheckpointOnceAndRestartStandby");
     createEdits(20);
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
+
+    // Wait for first checkpoint.
+    while (standby.getStandby().getLastCheckpointTime() == 0) {
+      LOG.info("Waiting for standby to do checkpoint");
+      Thread.sleep(1000);
+    }
     
     try {
-      Thread.sleep(3000);
       h.failNextCheckpoint = true;
-      standby.doCheckpoint();
+      h.doCheckpoint();
       fail("Should get IOException here");
-    } catch (IOException e) {  }
-    // checkpoint failed
-    assertNotNull(h.lastSignature);
+    } catch (IOException e) { 
+      LOG.info("Expected: Checkpoint failed", e);
+    }
+    
+    // current txid should be 20 + SLS + ENS + SLS + initial ckpt
+    assertEquals(25, getCurrentTxId(primary));
     
     cluster.killStandby(0);
-    cluster.restartStandby(0);
-    Thread.sleep(2000);
+    h.failNextCheckpoint = false;
     
+    cluster.restartStandby(0); // ads one checkpoint
     standby = cluster.getStandbyAvatar(0).avatar;
-    h.failNextCheckpoint = false;
-     
-    standby.doCheckpoint();
-    // checkpoint succeeded
-    assertNull(h.lastSignature);
+    while (standby.getStandby().getLastCheckpointTime() == 0) {
+      LOG.info("Waiting for standby to do checkpoint");
+      Thread.sleep(1000);
+    }
+    
+    // checkpoint should succeed
+    h.doCheckpoint();
+    
+    // roll adds two transactions
+    assertEquals(29, getCurrentTxId(primary));
     
     createEdits(20);
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(40, getCurrentTxId(primary));
+    assertEquals(49, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
   }
   
@@ -192,36 +290,83 @@ public void testFailCheckpointOnceAndRestartStandby() throws Exception {
   public void testFailCheckpointOnCorruptImage() throws Exception {
     LOG.info("TEST: ----> testFailCheckpointOnCorruptImage");
     TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(
-        null, false);
+        null, null, false);
     h.corruptImage = true;
     InjectionHandler.set(h);
-    setUp();
+    setUp(3600, "testFailCheckpointOnCorruptImage", false);
     createEdits(20);
-    AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
-    
+    AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
+   
     try {
-      standby.doCheckpoint();
+      h.doCheckpoint();
       fail("Should get IOException here");
     } catch (IOException e) {  }
+    assertEquals(-1, primary.getCheckpointSignature().getMostRecentCheckpointTxId());
   }
   
-  private void testQuiesceInterruption(InjectionEvent event, boolean scf) throws Exception {
-    LOG.info("TEST Quiesce during checkpoint : " + event);
-    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(event, scf);
-    InjectionHandler.set(h);
-    setUp(3); //simulate interruption, no ckpt failure   
+  @Test
+  public void testCheckpointReprocessEdits() throws Exception {
+    LOG.info("TEST: ----> testCheckpointReprocessEdits");
+    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(null,
+        null, false);   
+    setUp("testCheckpointReprocessEdits");
+    createEdits(20);
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
+
+    h.reprocessIngest = true;
+    // set the handler later no to interfere with the previous checkpoint
+    InjectionHandler.set(h);
+    // checkpoint should be ok
+    h.doCheckpoint();
+    assertEquals(23, primary.getCheckpointSignature()
+        .getMostRecentCheckpointTxId());
+  }
+  
+  private TestAvatarCheckpointingHandler testQuiesceInterruption(
+      InjectionEvent stopOnEvent, boolean testCancellation, boolean rollAfterQuiesce)
+      throws Exception {
+    return testQuiesceInterruption(stopOnEvent,
+        InjectionEvent.STANDBY_QUIESCE_INITIATED, false, testCancellation,
+        rollAfterQuiesce);
+  }
+ 
+  private TestAvatarCheckpointingHandler testQuiesceInterruption(
+      InjectionEvent stopOnEvent, InjectionEvent waitUntilEvent, boolean scf,
+      boolean testCancellation, boolean rollAfterQuiesce) throws Exception {
+    LOG.info("TEST Quiesce during checkpoint : " + stopOnEvent
+        + " waiting on: " + waitUntilEvent);
+    TestAvatarCheckpointingHandler h = new TestAvatarCheckpointingHandler(
+        stopOnEvent, waitUntilEvent, scf);
+    InjectionHandler.set(h);
+    setUp(3, "testQuiesceInterruption", false); //simulate interruption, no ckpt failure   
     
+    AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
+    AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
     createEdits(40);
-    try {
-      Thread.sleep(6000);
-    } catch (Exception e) { }
 
+    while (!h.receivedEvents.contains(stopOnEvent)) {
+      LOG.info("Waiting for event : " + stopOnEvent);
+      Thread.sleep(1000);
+    }
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(40, getCurrentTxId(primary));
-    assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
+    // edits + SLS + ELS + SLS (checkpoint fails, but roll happened)
+    assertEquals(43, getCurrentTxId(primary));
+
+    // if quiesce happened before roll, the standby will be behind by 1 transaction
+    // which will be reclaimed by opening the log after
+    long extraTransaction = rollAfterQuiesce ? 1 : 0;
+    
+    assertEquals(getCurrentTxId(primary), getCurrentTxId(standby) + extraTransaction);
+    // make sure the checkpoint indeed failed
+    assertTrue(h.receivedEvents
+        .contains(InjectionEvent.STANDBY_EXIT_CHECKPOINT_EXCEPTION));
+    if (testCancellation) {
+      assertTrue(h.receivedEvents
+          .contains(InjectionEvent.SAVE_NAMESPACE_CONTEXT_EXCEPTION));
+    }
     tearDown();
+    return h;
   }
   
   /**
@@ -229,80 +374,109 @@ private void testQuiesceInterruption(InjectionEvent event, boolean scf) throws E
    */
   @Test
   public void testQuiescingWhenDoingCheckpoint1() throws Exception{
-    testQuiesceInterruption(InjectionEvent.STANDBY_INSTANTIATE_INGEST, false);
+    testQuiesceInterruption(InjectionEvent.STANDBY_INSTANTIATE_INGEST, true, false);
   }
   @Test
   public void testQuiescingWhenDoingCheckpoint2() throws Exception{
-    testQuiesceInterruption(InjectionEvent.STANDBY_QUIESCE_INGEST, false);
+    testQuiesceInterruption(InjectionEvent.STANDBY_QUIESCE_INGEST, true, false);
   }
   @Test
   public void testQuiescingWhenDoingCheckpoint3() throws Exception{
-    testQuiesceInterruption(InjectionEvent.STANDBY_ENTER_CHECKPOINT, false);
+    // quiesce comes before rolling the log for checkpoint, 
+    // the log will be closed on standby but not opened
+    testQuiesceInterruption(InjectionEvent.STANDBY_ENTER_CHECKPOINT, true, true);
   }
   @Test
   public void testQuiescingWhenDoingCheckpoint4() throws Exception{
-    testQuiesceInterruption(InjectionEvent.STANDBY_BEFORE_ROLL_EDIT, false);
+    // quiesce comes before rolling the log for checkpoint, 
+    // the log will be closed on standby but not opened
+    testQuiesceInterruption(InjectionEvent.STANDBY_BEFORE_ROLL_EDIT, true, true);
   }
   @Test
   public void testQuiescingWhenDoingCheckpoint5() throws Exception{
-    testQuiesceInterruption(InjectionEvent.STANDBY_BEFORE_SAVE_NAMESPACE, false);
+    testQuiesceInterruption(InjectionEvent.STANDBY_BEFORE_SAVE_NAMESPACE, true, false);
   }
   @Test
   public void testQuiescingWhenDoingCheckpoint6() throws Exception{
-    testQuiesceInterruption(InjectionEvent.STANDBY_BEFORE_PUT_IMAGE, false);
-  }
-  @Test
-  public void testQuiescingWhenDoingCheckpoint7() throws Exception{
-    testQuiesceInterruption(InjectionEvent.STANDBY_BEFORE_ROLL_IMAGE, false);
+    // this one does not throw cancelled exception, quiesce after SN
+    testQuiesceInterruption(InjectionEvent.STANDBY_BEFORE_PUT_IMAGE, false, false);
   }
   @Test
   public void testQuiescingBeforeCheckpoint() throws Exception{
-    testQuiesceInterruption(InjectionEvent.STANDBY_BEGIN_RUN, false);
+    // quiesce comes before rolling the log for checkpoint, 
+    // the log will be closed on standby but not opened
+    testQuiesceInterruption(InjectionEvent.STANDBY_BEGIN_RUN, true, true);
   }
   
-  
-  
+  @Test
+  public void testQuiesceImageValidationInterruption() throws Exception {
+    // test if an ongoing image validation is interrupted
+    TestAvatarCheckpointingHandler h = testQuiesceInterruption(
+        InjectionEvent.IMAGE_LOADER_CURRENT_START,
+        InjectionEvent.STANDBY_QUIESCE_INTERRUPT, false, false, false);
+    assertTrue(h.receivedEvents
+        .contains(InjectionEvent.IMAGE_LOADER_CURRENT_INTERRUPT));
+  }
+  @Test
+  public void testQuiesceImageValidationCreation() throws Exception{
+    // test if creation of new validation fails after standby quiesce
+    TestAvatarCheckpointingHandler h = 
+        testQuiesceInterruption(InjectionEvent.STANDBY_VALIDATE_CREATE, false, false);
+    assertTrue(h.receivedEvents.contains(InjectionEvent.STANDBY_VALIDATE_CREATE_FAIL));
+  }
+
   class TestAvatarCheckpointingHandler extends InjectionHandler {
     // specifies where the thread should wait for interruption
-    private InjectionEvent synchronizationPoint;
-    private volatile boolean quiesceStarted = false;
+    
+    public Set<InjectionEvent> receivedEvents = Collections
+        .synchronizedSet(new HashSet<InjectionEvent>());
+    private InjectionEvent stopOnEvent;
+    private InjectionEvent waitUntilEvent;
 
     private boolean simulateCheckpointFailure = false;
     private boolean failNextCheckpoint = false;
 
-    public boolean alterSignature = false;
-    CheckpointSignature lastSignature = null;
     public boolean corruptImage = false;
+    public boolean reprocessIngest = false;
     
+    // for simulateing that edits.new does not exist
+    // and that the ingests gets recreated after upload
+    public boolean simulateEditsNotExists = false;
+    public boolean simulateEditsNotExistsDone = false;
+    public boolean ingestRecreatedAfterFailure = false;
+    
+    private CheckpointTrigger ckptTrigger = new CheckpointTrigger();
 
-    public TestAvatarCheckpointingHandler(InjectionEvent se, boolean scf) {
-      synchronizationPoint = se;
+    public TestAvatarCheckpointingHandler(InjectionEvent stopOnEvent,
+        InjectionEvent waitUntilEvent, boolean scf) {
+      this.stopOnEvent = stopOnEvent;
+      this.waitUntilEvent = waitUntilEvent;
       simulateCheckpointFailure = scf;
     }
     
-    public void setAlterSignature(boolean v) {
-      alterSignature = v;
+    @Override
+    protected boolean _falseCondition(InjectionEvent event, Object... args) {
+      return ckptTrigger.triggerCheckpoint(event);
     }
     
     @Override 
     protected void _processEvent(InjectionEvent event, Object... args) {
-      LOG.debug("processEvent: processing event: " + event);
-      
-      if (synchronizationPoint == event) {
+      LOG.debug("processEvent: processing event: " + event);    
+      receivedEvents.add(event);
+      if (stopOnEvent == event) {
         LOG.info("WAITING ON: " + event);
-        while (!quiesceStarted);
-      } 
-      if (event == InjectionEvent.STANDBY_INTERRUPT) {
-        quiesceStarted = true;
-      } 
-      if (event == InjectionEvent.STANDBY_ENTER_CHECKPOINT
-          && alterSignature) {
-        CheckpointSignature c = (CheckpointSignature)args[0];
-        if (c!=null)
-          c.cTime++;
+        while (!receivedEvents.contains(waitUntilEvent)) {
+          try {
+            Thread.sleep(1000);
+          } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            break;
+          }
+        }
       }
-      if (event == InjectionEvent.STANDBY_EXIT_CHECKPOINT) {
-        lastSignature = (CheckpointSignature)args[0];
+      if (simulateEditsNotExistsDone && 
+          event == InjectionEvent.STANDBY_CREATE_INGEST_RUNLOOP) {
+        ingestRecreatedAfterFailure = true;
       }
       if (event == InjectionEvent.STANDBY_BEFORE_PUT_IMAGE && corruptImage) {
         File imageFile = (File)args[0];
@@ -317,6 +491,7 @@ protected void _processEvent(InjectionEvent event, Object... args) {
           IOUtils.closeStream(out);
         }
       }
+      ckptTrigger.checkpointDone(event, args);
     }
 
     @Override
@@ -328,13 +503,18 @@ protected void _processEventIO(InjectionEvent event, Object... args)
         if (event == InjectionEvent.STANDBY_BEFORE_ROLL_IMAGE
             && failNextCheckpoint) {
           throw new IOException("Simultaing checkpoint failure");
-        } else if (event == InjectionEvent.STANDBY_BEGIN_RUN) {
-          // delay the main loop forever
-          while(!quiesceStarted);
-          throw new IOException("Simulating checkpoint failure");
-        } 
+        }
       } 
+      if (event == InjectionEvent.INGEST_CLEAR_STANDBY_STATE && reprocessIngest) {
+        reprocessIngest = false;
+        throw new IOException("Simulating ingest ending crash");
+      }
       _processEvent(event, args);
+    } 
+     
+    void doCheckpoint() throws Exception { 
+      ckptTrigger.doCheckpoint();  
     }
+    
   }
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCleanShutdown.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCleanShutdown.java
index 87040ecf..1a711100 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCleanShutdown.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCleanShutdown.java
@@ -21,8 +21,11 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
-import java.util.Iterator;
+
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
 
 import org.junit.Test;
 import org.junit.After;
@@ -39,37 +42,40 @@
 import java.util.HashSet;
 
 import org.apache.hadoop.hdfs.server.datanode.AvatarDataNode;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.hdfs.MiniAvatarCluster;
 import org.apache.hadoop.hdfs.MiniAvatarCluster.DataNodeProperties;
 import org.apache.hadoop.hdfs.MiniAvatarCluster.NameNodeInfo;
+import org.apache.hadoop.io.IOUtils;
 
 public class TestAvatarCleanShutdown {
   final static Log LOG = LogFactory.getLog(TestAvatarCleanShutdown.class);
 
   private static final String HOST_FILE_PATH = "/tmp/include_file";
+  private String hosts;
 
   private Configuration conf;
   private MiniAvatarCluster cluster;
   private boolean federation;
   private Set<Thread> oldThreads;
 
-  // A list of threads that might hang around (maybe due to a JVM bug).
-  private static final String[] excludedThreads = { "SunPKCS11" };
-
   @BeforeClass
   public static void setUpStatic() throws Exception {
     MiniAvatarCluster.createAndStartZooKeeper();
   }
 
-  public void setUp() throws Exception {
+  public void setUp(String name) throws Exception {
+    LOG.info("------------------- test: " + name + ", federation: "
+        + federation + " START ----------------");
     oldThreads = new HashSet<Thread>(Thread.getAllStackTraces().keySet());
 
     conf = new Configuration();
-    File f = new File(HOST_FILE_PATH);
-    if (f.exists()) {
-      f.delete();
-    }
-    conf.set("dfs.hosts", HOST_FILE_PATH);
+    hosts = HOST_FILE_PATH + "_" + System.currentTimeMillis();
+    File f = new File(hosts);
+    f.delete();
+    f.createNewFile();
+    conf.set("dfs.hosts", hosts);
     conf.setInt("dfs.datanode.failed.volumes.tolerated", 0);
     if (!federation) {
       cluster = new MiniAvatarCluster(conf, 1, true, null, null);
@@ -79,40 +85,9 @@ public void setUp() throws Exception {
     federation = false;
   }
   
-  private boolean isExcludedThread(Thread th) {
-    for (String badThread : excludedThreads) {
-      if (th.getName().contains(badThread)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private void checkRemainingThreads(Set<Thread> old) throws Exception {
-    Thread.sleep(10000);
-    Set<Thread> threads = Thread.getAllStackTraces().keySet();
-    threads.removeAll(old);
-    if (threads.size() != 0) {
-      LOG.error("Following threads are not clean up:");
-      Iterator<Thread> it = threads.iterator();
-      while (it.hasNext()) {
-        Thread th = it.next();
-        if (isExcludedThread(th)) {
-          it.remove();
-          continue;
-        }
-        LOG.error("Thread: " + th.getName());
-        for (StackTraceElement e : th.getStackTrace()) {
-          LOG.error(e);
-        }
-      }
-    }
-    assertTrue("This is not a clean shutdown", threads.size() == 0);
-  }
-  
   private void writeWrongIncludeFile(Configuration conf) throws Exception {
     String includeFN = conf.get("dfs.hosts", "");
-    assertTrue(includeFN.equals(HOST_FILE_PATH));
+    assertTrue(includeFN.equals(hosts));
     File f = new File(includeFN);
     if (f.exists()) {
       f.delete();
@@ -127,7 +102,7 @@ private void writeWrongIncludeFile(Configuration conf) throws Exception {
   
   @Test
   public void testVolumeFailureShutdown() throws Exception {
-    setUp();
+    setUp("testVolumeFailureShutdown");
     LOG.info("Corrupt the volume");
     DataNodeProperties dnp = cluster.getDataNodeProperties().get(0);
     String[] dataDirs = dnp.conf.getStrings("dfs.data.dir");
@@ -147,7 +122,7 @@ public void testVolumeFailureShutdown() throws Exception {
 
   @Test
   public void testRuntimeDisallowedDatanodeShutdown() throws Exception {
-    setUp();
+    setUp("testRuntimeDisallowedDatanodeShutdown");
     LOG.info("Update include file to not include datanode");
     NameNodeInfo nni = cluster.getNameNode(0);
     writeWrongIncludeFile(nni.conf);
@@ -162,7 +137,7 @@ public void testRuntimeDisallowedDatanodeShutdown() throws Exception {
   
   @Test
   public void testStartupDisallowedDatanodeShutdown() throws Exception {
-    setUp();
+    setUp("testStartupDisallowedDatanodeShutdown");
     LOG.info("Update include file to not include datanode");
     NameNodeInfo nni = cluster.getNameNode(0);
     writeWrongIncludeFile(nni.conf);
@@ -182,7 +157,7 @@ public void testStartupDisallowedDatanodeShutdown() throws Exception {
 
   @Test
   public void testNormalShutdown() throws Exception {
-    setUp();
+    setUp("testNormalShutdown");
     LOG.info("shutdown cluster");
     cluster.shutDown();
   }
@@ -211,9 +186,40 @@ public void testVolumeFailureShutdownFederation() throws Exception {
     testVolumeFailureShutdown();
   }
 
+  @Test
+  public void testDataXeiverServerFailureShutdown() throws Exception {
+    setUp("testDataXeiverServerFailureShutdown");
+    LOG.info("Inject a RuntimeException to DataXeiverServer");
+    InjectionHandler.set(new TestAvatarDatanodeShutdownHandler());
+    final FileSystem fileSys = cluster.getFileSystem(0);
+    FSDataOutputStream out = null;
+    try {
+      final Path fileName = new Path("/testFile");
+      out = TestFileCreation.createFile(
+          fileSys, fileName, cluster.getDataNodes().size());
+      // trigger the failure
+      TestFileCreation.writeFile(out);
+    } finally {
+      IOUtils.closeStream(out);
+      fileSys.close();
+      cluster.getDataNodes().get(0).waitAndShutdown();
+      cluster.shutDownAvatarNodes();
+    }
+  }
+  
+  @Test
+  public void testDataXeiverServerFailureShutdownFederation() throws Exception {
+    federation = true;
+    testDataXeiverServerFailureShutdown();
+  }
+  
   @After
   public void shutDown() throws Exception {
-    checkRemainingThreads(oldThreads);
+    if (cluster != null) {
+      cluster.shutDown();
+    }
+    new File(hosts).delete();
+    DFSTestThreadUtil.checkRemainingThreads(oldThreads);
   }
 
   @AfterClass
@@ -221,4 +227,15 @@ public static void shutDownStatic() throws Exception {
     MiniAvatarCluster.shutDownZooKeeper();
   }
 
+  private static class TestAvatarDatanodeShutdownHandler extends InjectionHandler {
+    @Override 
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      LOG.debug("processEvent: processing event: " + event);
+      
+      if (event == InjectionEvent.AVATARXEIVER_RUNTIME_FAILURE) {
+        throw new RuntimeException("Injected failure");
+      }
+    }
+  }
+
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarContinuousFailover.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarContinuousFailover.java
index 8fb3832c..bfa974d1 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarContinuousFailover.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarContinuousFailover.java
@@ -2,53 +2,25 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 
-import org.junit.AfterClass;
 import static org.junit.Assert.*;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class TestAvatarContinuousFailover {
-  private static MiniAvatarCluster cluster;
-  private static Configuration conf;
-  private static int BLOCK_SIZE = 1024;
-  private static int MAX_BLOCKS = 50;
-  private static int MAX_FILE_SIZE = MAX_BLOCKS * BLOCK_SIZE;
-  private static int FAILOVERS = 5;
-  private static volatile boolean pass = true;
-  private static Random random = new Random();
-  private static Log LOG = LogFactory
-      .getLog(TestAvatarContinuousFailover.class);
-  private static int THREADS = 10;
+public class TestAvatarContinuousFailover extends FailoverLoadTestUtil {
+  private static int FAILOVERS = 3;
+  private static int THREADS = 3;
 
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-    MiniAvatarCluster.createAndStartZooKeeper();
-    conf = new Configuration();
-    conf.setInt("dfs.block.size", BLOCK_SIZE);
-    conf.setBoolean("fs.ha.retrywrites", true);
-    conf.setInt("fs.avatar.failover.checkperiod", 200);
-    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-    MiniAvatarCluster.shutDownZooKeeper();
-  }
-
-  @Test
+  @Test(timeout=300000)
   public void testContinuousFailover() throws Exception {
-    String topDir = "" + random.nextInt();
-    DFSTestUtil util = new DFSTestUtil(topDir, 10, 3, MAX_FILE_SIZE);
-    util.createFiles(cluster.getFileSystem(), topDir);
     List<LoadThread> threads = new ArrayList<LoadThread>();
+    InjectionHandler.set(new TestHandler());
     for (int i = 0; i < THREADS; i++) {
-      threads.add(new LoadThread());
+      LoadThread T = new LoadThread();
+      T.setDaemon(true);
+      T.start();
+      threads.add(T);
     }
 
     for (int i = 0; i < FAILOVERS; i++) {
@@ -65,31 +37,9 @@ public void testContinuousFailover() throws Exception {
       thread.join();
     }
 
+    LOG.info("GETADDR : " + get_addr + " GETSTAT : " + get_stats);
+    assertTrue(FAILOVERS >= get_addr);
+    assertTrue(FAILOVERS >= get_stats);
     assertTrue(pass);
   }
-
-  private static class LoadThread extends Thread {
-
-    private volatile boolean running = true;
-
-    public void cancel() {
-      running = false;
-    }
-
-    public void run() {
-      while (running) {
-        try {
-          String topDir = "" + random.nextInt();
-          DFSTestUtil util = new DFSTestUtil(topDir, 10, 3, MAX_FILE_SIZE);
-          util.createFiles(cluster.getFileSystem(), topDir);
-          pass = util.checkFiles(cluster.getFileSystem(), topDir);
-        } catch (Exception e) {
-          LOG.warn("Copy failed : " + e);
-          pass = false;
-          running = false;
-        }
-      }
-    }
-  }
-
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCreateFile.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCreateFile.java
new file mode 100644
index 00000000..47725cdb
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarCreateFile.java
@@ -0,0 +1,99 @@
+package org.apache.hadoop.hdfs;
+
+import java.io.IOException;
+import java.io.EOFException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+
+import org.junit.After;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class TestAvatarCreateFile {
+  private static MiniAvatarCluster cluster;
+  private static Configuration conf;
+  private static FileSystem fs;
+  private static boolean pass = true;
+  private static Log LOG = LogFactory.getLog(TestAvatarCreateFile.class);
+
+  public void setUp(String name) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
+    MiniAvatarCluster.createAndStartZooKeeper();
+    conf = new Configuration();
+    conf.setInt("fs.avatar.failover.checkperiod", 1000);
+    conf.setLong("dfs.client.rpc.retry.sleep", 1000);
+    conf.setBoolean("fs.ha.retrywrites", true);
+    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
+    fs = cluster.getFileSystem();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    cluster.shutDown();
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  private static class FailoverThread extends Thread {
+    public void run() {
+      try {
+        // Wait for a few creates to fail.
+        Thread.sleep(20000);
+        cluster.failOver(true);
+      } catch (Exception e) {
+        LOG.error("Exception in failover :", e);
+        pass = false;
+      }
+    }
+  }
+
+  private class TestHandler extends InjectionHandler {
+
+    protected void _processEventIO(InjectionEvent event, Object... args)
+        throws IOException {
+      if (event == InjectionEvent.NAMENODE_AFTER_CREATE_FILE) {
+        InjectionHandler.clear();
+        throw new EOFException("FAIL create connection!");
+      }
+    }
+  }
+
+  @Test
+  public void testCreateFile() throws Exception {
+    setUp("testCreateFile");
+    InjectionHandler.set(new TestHandler());
+    cluster.clearZooKeeperNode(0);
+    ClientProtocol namenode = ((DistributedAvatarFileSystem) fs).getClient()
+        .getNameNodeRPC();
+    new FailoverThread().start();
+    FsPermission perm = new FsPermission((short) 0264);
+    namenode.create("/test", perm, ((DistributedAvatarFileSystem) fs)
+        .getClient().getClientName(), true, true, (short) 3, (long) 1024);
+    LOG.info("Done with create");
+    assertTrue(fs.exists(new Path("/test")));
+    assertTrue(pass);
+  }
+
+  @Test
+  public void testCreateFileWithoutOverwrite() throws Exception {
+    setUp("testCreateFileWithoutOverwrite");
+    InjectionHandler.set(new TestHandler());
+    cluster.clearZooKeeperNode(0);
+    ClientProtocol namenode = ((DistributedAvatarFileSystem) fs).getClient()
+        .getNameNodeRPC();
+    new FailoverThread().start();
+    FsPermission perm = new FsPermission((short) 0264);
+    namenode.create("/test1", perm, ((DistributedAvatarFileSystem) fs)
+        .getClient().getClientName(), false, true, (short) 3, (long) 1024);
+    LOG.info("Done with create");
+    assertTrue(fs.exists(new Path("/test1")));
+    assertTrue(pass);
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFailover.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFailover.java
index df2b2370..0f1523fa 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFailover.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFailover.java
@@ -34,7 +34,7 @@ public class TestAvatarFailover extends AvatarSetupUtil {
    */
   @Test
   public void testFailOver() throws Exception {
-    setUp(false);
+    setUp(false, "testFailOver");
     int blocksBefore = blocksInFile();
 
     LOG.info("killing primary");
@@ -49,7 +49,7 @@ public void testFailOver() throws Exception {
   
   @Test
   public void testFailOverWithFederation() throws Exception {
-    setUp(true);
+    setUp(true, "testFailOverWithFederation");
     int blocksBefore = blocksInFile();
 
     LOG.info("killing primary");
@@ -67,7 +67,7 @@ public void testFailOverWithFederation() throws Exception {
    */
   @Test
   public void testKillStandby() throws Exception {
-    setUp(false);
+    setUp(false, "testKillStandby");
     int blocksBefore = blocksInFile();
 
     LOG.info("killing standby");
@@ -80,7 +80,7 @@ public void testKillStandby() throws Exception {
   
   @Test
   public void testKillStandbyWithFederation() throws Exception {
-    setUp(true);
+    setUp(true, "testKillStandbyWithFederation");
     int blocksBefore = blocksInFile();
 
     LOG.info("killing standby");
@@ -97,7 +97,7 @@ public void testKillStandbyWithFederation() throws Exception {
    */
   @Test
   public void testResurrectStandbyFailOver() throws Exception {
-    setUp(false);
+    setUp(false, "testResurrectStandbyFailOver");
     int blocksBefore = blocksInFile();
 
     LOG.info("killing standby");
@@ -123,7 +123,7 @@ public void testResurrectStandbyFailOver() throws Exception {
   
   @Test
   public void testResurrectStandbyFailOverWithFederation() throws Exception {
-    setUp(true);
+    setUp(true, "testResurrectStandbyFailOverWithFederation");
     int blocksBefore = blocksInFile();
 
     LOG.info("killing standby");
@@ -156,7 +156,7 @@ public void testResurrectStandbyFailOverWithFederation() throws Exception {
    */
   @Test
   public void testDoubleFailOver() throws Exception {
-    setUp(false);
+    setUp(false, "testDoubleFailOver");
     int blocksBefore = blocksInFile();
 
     LOG.info("killing primary 1");
@@ -167,7 +167,7 @@ public void testDoubleFailOver() throws Exception {
     cluster.restartStandby();
 
     try {
-      Thread.sleep(2000);
+      Thread.sleep(3000);
     } catch (InterruptedException ignore) {
       // do nothing
     }
@@ -184,7 +184,7 @@ public void testDoubleFailOver() throws Exception {
   
   @Test
   public void testDoubleFailOverWithFederation() throws Exception {
-    setUp(true);
+    setUp(true, "testDoubleFailOverWithFederation");
     int blocksBefore = blocksInFile();
 
     LOG.info("killing primary 1");
@@ -195,7 +195,7 @@ public void testDoubleFailOverWithFederation() throws Exception {
     cluster.restartStandby(0);
 
     try {
-      Thread.sleep(2000);
+      Thread.sleep(3000);
     } catch (InterruptedException ignore) {
       // do nothing
     }
@@ -211,7 +211,7 @@ public void testDoubleFailOverWithFederation() throws Exception {
 
   @Test
   public void testDatanodeStartupDuringFailover() throws Exception {
-    setUp(false);
+    setUp(false, "testDatanodeStartupDuringFailover");
     cluster.killPrimary();
     cluster.restartDataNodes(false);
     long start = System.currentTimeMillis();
@@ -242,11 +242,12 @@ public void run() {
 
   @Test
   public void testDatanodeStartupFailover() throws Throwable {
-    setUp(false, true);
+    setUp(false, "testDatanodeStartupFailover");
     cluster.shutDownDataNodes();
     Thread fThread = new FailoverThread();
     fThread.setDaemon(true);
     fThread.start();
+    Thread.sleep(3000);
     cluster.restartDataNodes(false);
     fThread.join(30000);
     try {
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFailoverCaching.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFailoverCaching.java
new file mode 100644
index 00000000..16c851b9
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFailoverCaching.java
@@ -0,0 +1,63 @@
+package org.apache.hadoop.hdfs;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class TestAvatarFailoverCaching extends FailoverLoadTestUtil {
+
+  private static int THREADS = 2;
+  private static volatile AtomicInteger check_failovers = new AtomicInteger();
+
+  @Test
+  public void testCaching() throws Exception {
+    FileSystem fs = cluster.getFileSystem();
+    List<LoadThread> threads = new ArrayList<LoadThread>();
+    InjectionHandler.set(new TestCacheHandler());
+    for (int i = 0; i < THREADS; i++) {
+      LoadThread T = new LoadThread(fs);
+      T.setName("LoadThread" + i);
+      T.start();
+      threads.add(T);
+    }
+
+    Thread.sleep(10000);
+    cluster.failOver();
+
+    for (LoadThread thread : threads) {
+      thread.cancel();
+    }
+
+    for (LoadThread thread : threads) {
+      thread.join();
+    }
+
+    LOG.info("GETADDR : " + get_addr + " GETSTAT : " + get_stats);
+    assertTrue(pass);
+    assertEquals(1, get_stats);
+    assertEquals(1, get_addr);
+  }
+
+  protected static class TestCacheHandler extends TestHandler {
+    @Override
+    public void _processEvent(InjectionEvent event, Object... args) {
+      super._processEvent(event, args);
+      if (event == InjectionEvent.DAFS_CHECK_FAILOVER) {
+        check_failovers.incrementAndGet();
+        while (check_failovers.get() < 2) {
+          try {
+            LOG.info("Waiting for check_failovers : " + check_failovers.get());
+            Thread.sleep(1000);
+          } catch (InterruptedException ie) {
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFastCopy.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFastCopy.java
new file mode 100644
index 00000000..2a5118c9
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarFastCopy.java
@@ -0,0 +1,117 @@
+package org.apache.hadoop.hdfs;
+
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.hdfs.tools.FastCopy;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestAvatarFastCopy {
+
+  private static MiniAvatarCluster cluster;
+  private static Configuration conf;
+  private static FileSystem fs;
+  private static Log LOG = LogFactory.getLog(TestAvatarFastCopy.class);
+  private static boolean pass = true;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+  }
+
+  @Before
+  public void setup() throws Exception {
+    conf = new Configuration();
+    conf.setInt("dfs.block.size", 1024);
+    conf.setInt("fs.avatar.failover.checkperiod", 200);
+    conf.setInt("dfs.blockreport.intervalMsec", 500);
+    conf.setBoolean("fs.ha.retrywrites", true);
+    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
+    fs = cluster.getFileSystem();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    cluster.shutDown();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  @Test
+  public void testFastCopy() throws Exception {
+    DFSTestUtil util = new DFSTestUtil("testFastCopy", 1, 1, 1024 * 5);
+    util.createFiles(fs, "/testFastCopy");
+    FastCopy fcp = new FastCopy(conf);
+    String[] files = util.getFileNames("/testFastCopy");
+    assertEquals(1, files.length);
+    fcp.copy(files[0], "/dst1", (DistributedFileSystem) fs,
+        (DistributedFileSystem) fs);
+    assertTrue(FastCopySetupUtil.compareFiles(files[0], fs, "/dst1", fs));
+
+    cluster.failOver();
+
+    fcp.copy(files[0], "/dst2", (DistributedFileSystem) fs,
+        (DistributedFileSystem) fs);
+    assertTrue(FastCopySetupUtil.compareFiles(files[0], fs, "/dst2", fs));
+  }
+
+  private static class FastCopyThread extends Thread {
+
+    private final String src;
+    private boolean running;
+
+    public FastCopyThread(String src) {
+      this.src = src;
+      running = true;
+    }
+
+    public void run() {
+      try {
+        Random r = new Random();
+        FastCopy fcp = new FastCopy(conf);
+        while (running) {
+          int suffix = r.nextInt();
+          String dstFile = "/dst" + suffix;
+          fcp.copy(src, dstFile, (DistributedFileSystem) fs,
+              (DistributedFileSystem) fs);
+          pass = FastCopySetupUtil.compareFiles(src, fs, dstFile, fs);
+        }
+      } catch (Exception e) {
+        pass = false;
+        LOG.warn("Exception in FastCopy : ", e);
+      }
+    }
+  }
+
+  @Test
+  public void testFastCopyUnderFailovers() throws Exception {
+    DFSTestUtil util = new DFSTestUtil("testFastCopy", 1, 1, 1024 * 5);
+    util.createFiles(fs, "/testFastCopy");
+    String[] files = util.getFileNames("/testFastCopy");
+    assertEquals(1, files.length);
+    FastCopyThread t = new FastCopyThread(files[0]);
+    t.start();
+
+    for (int i = 0; i < 3; i++) {
+      cluster.failOver();
+      cluster.restartStandby();
+      Thread.sleep(20000);
+    }
+    t.running = false;
+    t.join();
+    assertTrue(pass);
+  }
+
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarForceFailover.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarForceFailover.java
new file mode 100644
index 00000000..e2afbb95
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarForceFailover.java
@@ -0,0 +1,86 @@
+package org.apache.hadoop.hdfs;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class TestAvatarForceFailover extends AvatarSetupUtil {
+
+  private class TestAvatarForceFailoverHandler extends InjectionHandler {
+    public boolean simulateFailure = false;
+    @Override
+    public boolean _falseCondition(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.AVATARNODE_SHUTDOWN) {
+        return simulateFailure;
+      }
+      return false;
+    }
+  }
+
+  @Before
+  public void setup() {
+    InjectionHandler.clear();
+  }
+
+  final static Log LOG = LogFactory.getLog(TestAvatarForceFailover.class);
+
+  @Test
+  public void testForceFailoverBasic() throws Exception {
+    failover("testForceFailoverBasic");
+  }
+
+  private void failover(String name) throws Exception {
+    setUp(false, name);
+    int blocksBefore = blocksInFile();
+
+    LOG.info("killing primary");
+    cluster.killPrimary();
+    LOG.info("failing over");
+    cluster.failOver(true);
+
+    int blocksAfter = blocksInFile();
+    assertTrue(blocksBefore == blocksAfter);
+  }
+
+  @Test
+  public void testForceFailoverWithPrimaryFail() throws Exception {
+    TestAvatarForceFailoverHandler h = new TestAvatarForceFailoverHandler();
+    h.simulateFailure = true;
+    InjectionHandler.set(h);
+    failover("testForceFailoverWithPrimaryFail");
+  }
+
+  private void failoverShell(String name) throws Exception {
+    setUp(false, name);
+    int blocksBefore = blocksInFile();
+
+    AvatarShell shell = new AvatarShell(conf);
+    AvatarZKShell zkshell = new AvatarZKShell(conf);
+    assertEquals(0, zkshell.run(new String[] { "-clearZK" }));
+    assertEquals(0, shell.run(new String[] { "-zero", "-shutdownAvatar" }));
+    // Wait for shutdown thread to finish.
+    Thread.sleep(10000);
+    assertEquals(0,
+        shell.run(new String[] { "-one", "-setAvatar", "primary", "-force" }));
+    int blocksAfter = blocksInFile();
+    assertTrue(blocksBefore == blocksAfter);
+  }
+
+  @Test
+  public void testForceFailoverShell() throws Exception {
+    failoverShell("testForceFailoverShell");
+  }
+
+  @Test
+  public void testForceFailoverShellWithPrimaryFail() throws Exception {
+    TestAvatarForceFailoverHandler h = new TestAvatarForceFailoverHandler();
+    h.simulateFailure = true;
+    InjectionHandler.set(h);
+    failoverShell("testForceFailoverShellWithPrimaryFail");
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarIngesting.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarIngesting.java
index 1e2115da..29c8d59b 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarIngesting.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarIngesting.java
@@ -7,7 +7,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
-import org.apache.hadoop.hdfs.server.namenode.CheckpointSignature;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil.CheckpointTrigger;
 import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.fs.ChecksumException;
@@ -22,7 +22,7 @@
 
 public class TestAvatarIngesting {
 
-  final static Log LOG = LogFactory.getLog(TestAvatarCheckpointing.class);
+  final static Log LOG = LogFactory.getLog(TestAvatarIngesting.class);
 
   private MiniAvatarCluster cluster;
   private Configuration conf;
@@ -34,11 +34,12 @@ public static void setUpBeforeClass() throws Exception {
     MiniAvatarCluster.createAndStartZooKeeper();
   }
 
-  private void setUp(long ckptPeriod) throws Exception {
+  private void setUp(long ckptPeriod, String name, boolean ckptEnabled) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
     conf = new Configuration();
 
     conf.setBoolean("fs.ha.retrywrites", true);
-    conf.setBoolean("fs.checkpoint.enabled", false);
+    conf.setBoolean("fs.checkpoint.enabled", ckptEnabled);
     conf.setLong("fs.checkpoint.period", 3600);
 
     cluster = new MiniAvatarCluster(conf, 2, true, null, null);
@@ -72,10 +73,11 @@ public long getCurrentTxId(AvatarNode avatar) {
 
   private void testIngestFailure(InjectionEvent event)
       throws Exception {
-    LOG.info("TEST Quiesce during checkpoint : " + event);
+    LOG.info("TEST Ingest Failure : " + event);
     TestAvatarIngestingHandler h = new TestAvatarIngestingHandler(event);
     InjectionHandler.set(h);
-    setUp(3); // simulate interruption, no ckpt failure
+    setUp(3, "testIngestFailure: " + event, false); 
+          // simulate interruption, no ckpt failure
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
     h.setDisabled(false);
@@ -87,23 +89,106 @@ private void testIngestFailure(InjectionEvent event)
     }
     h.setDisabled(true);
     standby.quiesceStandby(getCurrentTxId(primary) - 1);
-    assertEquals(20, getCurrentTxId(primary));
+    
+    // SLS + 20 edits
+    assertEquals(21, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
     tearDown();
   }
+  
+  @Test
+  public void testCheckpointWithRestarts() throws Exception {
+    TestAvatarIngestingHandler h = new TestAvatarIngestingHandler(
+        InjectionEvent.FSEDIT_LOG_WRITE_END_LOG_SEGMENT);
+    InjectionHandler.set(h);
+    setUp(3, "testCheckpointWithRestarts", true);
+    // simulate interruption, no ckpt failure
+    AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
+    AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
+    createEdits(20);
+    h.doCheckpoint();
+    // 2 for initial checkpoint + 2 for this checkpoint + SLS + 20 edits
+    h.disabled = false;
+    assertEquals(25, getCurrentTxId(primary));
+
+    cluster.killStandby();
+    cluster.killPrimary();
+    h.disabled = false;
+    cluster.restartAvatarNodes();
 
-  /**
-   * Invoke standby quiesce at various points of standby state.
+    h.doCheckpoint();
+
+    assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
+  }
+
+  /*
+   * Simulate exception when reading from edits
    */
   @Test
-  public void testIngestFailure() throws Exception {
+  public void testIngestFailureReading() throws Exception {
     testIngestFailure(InjectionEvent.INGEST_READ_OP);
   }
+  
+  /*
+   * Simulate edit log transaction mismatch
+   * Ingest should be resurrected and consume edits normally
+   */
+  @Test
+  public void testIngestFailureTxidMismatch() throws Exception {
+    testIngestFailure(InjectionEvent.INGEST_TXID_CHECK);
+  }
+  
+  @Test
+  public void testIngestFailureSetupStream() throws Exception {
+    InjectionEvent event = InjectionEvent.STANDBY_JOURNAL_GETSTREAM;
+    TestAvatarIngestingHandler h = new TestAvatarIngestingHandler(event);
+    InjectionHandler.set(h);
+    h.setDisabled(false);
+
+    setUp(3, "testIngestFailure: " + event, false);
+    h.setDisabled(true);
 
+    assertEquals(1, h.exceptions);
+  }
+  
+  @Test
+  public void testRecoverState() throws Exception {
+    TestAvatarIngestingHandler h = new TestAvatarIngestingHandler(
+        InjectionEvent.STANDBY_RECOVER_STATE);
+    InjectionHandler.set(h);
+    setUp(3, "testRecoverState", true);
+    // simulate interruption, no ckpt failure
+    AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
+    AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
+    h.setDisabled(true);
+
+    createEdits(20);
+    h.doCheckpoint();
+    // 2 for initial checkpoint + 2 for this checkpoint + SLS + 20 edits
+    assertEquals(25, getCurrentTxId(primary));
+    createEdits(20);
+    h.setDisabled(false);
+
+    // sleep to see if the state recovers correctly
+    try {
+      Thread.sleep(5000);
+    } catch (Exception e) {
+    }
+    h.doCheckpoint();
+    standby.quiesceStandby(getCurrentTxId(primary) - 1);
+
+    assertEquals(47, getCurrentTxId(primary));
+    assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
+  }
+    
   class TestAvatarIngestingHandler extends InjectionHandler {
+    int exceptions = 0;
     private InjectionEvent synchronizationPoint;
     int simulatedFailure = 0;
     boolean disabled = true;
+    boolean doneRecovery = false;
+
+    private CheckpointTrigger ckptTrigger = new CheckpointTrigger();
 
     public TestAvatarIngestingHandler(InjectionEvent se) {
       synchronizationPoint = se;
@@ -119,19 +204,67 @@ protected void _processEventIO(InjectionEvent event, Object... args)
       if (synchronizationPoint == event) {
         if(disabled)
           return;
-        LOG.info("PROCESSING EVENT: " + synchronizationPoint + " counter: " + simulatedFailure);
+        LOG.info("PROCESSING EVENT: " + event + " counter: " + simulatedFailure);
         simulatedFailure++;
-        if(event == InjectionEvent.INGEST_READ_OP && ((simulatedFailure % 3) == 1)){
-          LOG.info("Throwing checksum exception");   
-          throw new ChecksumException("Testing checksum exception...", 0);
+        if (event == InjectionEvent.INGEST_READ_OP
+            && synchronizationPoint == event && !disabled) {
+          if((simulatedFailure % 3) == 1){
+            LOG.info("Throwing checksum exception");   
+            throw new ChecksumException("Testing checksum exception...", 0);
+          }   
+          if ((simulatedFailure % 5) == 1) {
+            LOG.info("Throwing unchecked exception");
+            throw new ArrayIndexOutOfBoundsException(
+                "Testing uncecked exception...");
+          }
+          if((simulatedFailure % 7) == 1){
+            LOG.info("Throwing IO exception");
+            throw new IOException("Testing IO exception...");
+          }
         }
-        
-        if(event == InjectionEvent.INGEST_READ_OP && ((simulatedFailure % 7) == 1)){
-          LOG.info("Throwing IO exception");
-          throw new IOException("Testing IO exception...");
+        if (event == InjectionEvent.STANDBY_JOURNAL_GETSTREAM
+            && synchronizationPoint == event && !disabled) {
+          if (simulatedFailure < 2) {
+            exceptions++;
+            LOG.info("Throwing exception when setting up the stream");
+            throw new IOException(
+                "Testing I/O exception when getting the stream");
+          }
         }
-        
+      }        
+    }
+       
+    @Override
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      ckptTrigger.checkpointDone(event, args);
+    }
+    
+    @Override
+    protected boolean _falseCondition(InjectionEvent event, Object... args) {
+      if (synchronizationPoint == InjectionEvent.INGEST_TXID_CHECK && !disabled
+          && event == InjectionEvent.INGEST_TXID_CHECK) {
+        return true;
       }
+      if (synchronizationPoint == InjectionEvent.STANDBY_RECOVER_STATE
+          && !disabled && !doneRecovery
+          && event == InjectionEvent.STANDBY_RECOVER_STATE) {
+        doneRecovery = true;
+        return true;
+      }
+      return ckptTrigger.triggerCheckpoint(event);
+    }
+    
+    protected boolean _trueCondition(InjectionEvent event, Object... args) {
+      if (synchronizationPoint == InjectionEvent.FSEDIT_LOG_WRITE_END_LOG_SEGMENT
+          && event == InjectionEvent.FSEDIT_LOG_WRITE_END_LOG_SEGMENT
+          && !disabled) {
+        return false;
+      }
+      return true;
+    }
+    
+    void doCheckpoint() throws IOException {
+      ckptTrigger.doCheckpoint();
     }
   }
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarMultipleStartup.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarMultipleStartup.java
index f0332859..e69de29b 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarMultipleStartup.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarMultipleStartup.java
@@ -1,103 +0,0 @@
-package org.apache.hadoop.hdfs;
-
-import java.util.Random;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.MiniAvatarCluster.NameNodeInfo;
-import org.apache.hadoop.hdfs.protocol.AvatarConstants;
-import org.apache.hadoop.hdfs.protocol.AvatarConstants.StartupOption;
-import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-public class TestAvatarMultipleStartup {
-  private static MiniAvatarCluster cluster;
-  private static Configuration conf;
-  private static AvatarZooKeeperClient zkClient;
-  private static final Random r = new Random();
-  private static final Log LOG = LogFactory
-      .getLog(TestAvatarMultipleStartup.class);
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-    MiniAvatarCluster.createAndStartZooKeeper();
-  }
-
-  public void setUp(boolean federation) throws Exception {
-    conf = new Configuration();
-    conf.setBoolean("dfs.avatarnode.startup.testing", true);
-    if (federation) {
-      cluster = new MiniAvatarCluster(conf, 1, true, null, null,
-          2 + r.nextInt(4), true);
-    } else {
-      cluster = new MiniAvatarCluster(conf, 1, true, null, null);
-    }
-    zkClient = new AvatarZooKeeperClient(conf, null);
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    zkClient.shutdown();
-    cluster.shutDown();
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-    MiniAvatarCluster.shutDownZooKeeper();
-  }
-
-  private long getSessionId(int index) throws Exception {
-    AvatarNode primaryAvatar = cluster.getPrimaryAvatar(index).avatar;
-    String address = AvatarNode.getClusterAddress(primaryAvatar
-        .getStartupConf());
-    return zkClient.getPrimarySsId(address);
-  }
-
-  private void verifyStartup(boolean federation, int index)
-      throws Exception {
-    NameNodeInfo nnInfo = cluster.getNameNode(index);
-    String[] normalArgs = { AvatarConstants.StartupOption.NODEZERO.getName() };
-    String[] federationArgs = {
-        AvatarConstants.StartupOption.NODEZERO.getName(),
-        StartupOption.SERVICE.getName(), nnInfo.nameserviceId };
-    String[] args = (federation) ? federationArgs : normalArgs;
-    AvatarNode primary1 = AvatarNode.createAvatarNode(
-        args,
-        MiniAvatarCluster.getServerConf(
-            AvatarConstants.StartupOption.NODEZERO.getName(), nnInfo));
-    try {
-      AvatarNode.createAvatarNode(args, MiniAvatarCluster.getServerConf(
-              AvatarConstants.StartupOption.NODEONE.getName(), nnInfo));
-      fail("Did not throw exception");
-    } catch (Exception e) {
-      LOG.info("Expected exception : ", e);
-      assertEquals(primary1.getSessionId(), getSessionId(index));
-    }
-  }
-
-  @Test
-  public void testStartup() throws Exception {
-    setUp(false);
-    cluster.shutDownAvatarNodes();
-    int nameNodes = cluster.getNumNameNodes();
-    for (int i = 0; i < nameNodes; i++) {
-      verifyStartup(false, i);
-    }
-  }
-
-  @Test
-  public void testStartupFederation() throws Exception {
-    setUp(true);
-    cluster.shutDownAvatarNodes();
-    int nameNodes = cluster.getNumNameNodes();
-    for (int i = 0; i < nameNodes; i++) {
-      verifyStartup(true, i);
-    }
-  }
-}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarQuiesce.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarQuiesce.java
index fe58c8fc..43839ecd 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarQuiesce.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarQuiesce.java
@@ -1,20 +1,28 @@
 package org.apache.hadoop.hdfs;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.Iterator;
 import java.util.Random;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
 import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
+import org.apache.hadoop.hdfs.server.namenode.FSImage;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage;
+import org.apache.hadoop.hdfs.server.namenode.Standby;
 import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.hdfs.util.MD5FileUtils;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
 import org.junit.After;
 import org.junit.AfterClass;
 import static org.junit.Assert.*;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -32,12 +40,15 @@ public static void setUpBeforeClass() throws Exception {
     MiniAvatarCluster.createAndStartZooKeeper();
   }
 
-  private void setUp() throws Exception {
+  private void setUp(String name, boolean waitForCheckpoint)
+      throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
     conf = new Configuration();
     conf.setBoolean("fs.ha.retrywrites", true);
     conf.setBoolean("fs.checkpoint.enabled", true);
     conf.setLong("fs.checkpoint.period", 2);
-
+    conf.setBoolean("fs.checkpoint.wait", waitForCheckpoint);
+    
     cluster = new MiniAvatarCluster(conf, 3, true, null, null);
     fs = cluster.getFileSystem();
   }
@@ -73,7 +84,7 @@ private void testQuiesceWhenSavingNamespace(InjectionEvent event,
       throws Exception {
     TestAvatarQuiesceHandler h = new TestAvatarQuiesceHandler(event);
     InjectionHandler.set(h);
-    setUp();
+    setUp("testQuiesceWhenSavingNamespace: " + event, false);
     // fail once
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
@@ -86,18 +97,30 @@ private void testQuiesceWhenSavingNamespace(InjectionEvent event,
       Thread.sleep(10000);
     } catch (Exception e) {
     }
-    
+      
     standby.quiesceStandby(getCurrentTxId(primary) - 1);
-    assertEquals(20, getCurrentTxId(primary));
+    // SLS + ELS + SLS + 20 edits
+    assertEquals(23, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
     if(expectException)
       assertTrue(h.exceptionEvent);
+    
+    //assert that the cancelled checkpoint was removed
+    long ckptTxId = h.cancelledCkptTxid;
+    for (Iterator<StorageDirectory> it = standby.getFSImage().dirIterator(); it
+        .hasNext();) {
+      StorageDirectory sd = it.next();
+      File image = new File(sd.getRoot(), NNStorage.getImageFileName(ckptTxId));
+      assertFalse(image.exists());
+      assertFalse(new File(sd.getRoot(),
+          NNStorage.getCheckpointImageFileName(ckptTxId)).exists());
+      assertFalse(MD5FileUtils.getDigestFileForFile(image).exists());
+    }
   }
 
   @Test
   public void testQuiesceWhenSN0() throws Exception {
     // save namespace - initiated
-    // current - not moved
     // saver threads - not initiated
     // sn should stop before moving current
     // interruprion comes before sn starts
@@ -108,7 +131,6 @@ public void testQuiesceWhenSN0() throws Exception {
   @Test
   public void testQuiesceWhenSN1() throws Exception {
     // save namespace - initiated
-    // current - moved
     // saver threads - not initiated
     // sn should get InterruptedException when joining saverThreads
     // interruption comes before calling saver.join()
@@ -119,7 +141,6 @@ public void testQuiesceWhenSN1() throws Exception {
   @Test
   public void testQuiesceWhenSN2() throws Exception {
     // save namespace - initiated
-    // current - moved
     // saver threads - initiated
     // sn should get InterruptedException when joining saverThreads
     // interruption comes during calling saver.join()
@@ -129,10 +150,11 @@ public void testQuiesceWhenSN2() throws Exception {
   
   @Test
   public void testQuiesceWhenSN3() throws Exception {
-    // save namespace - completed
-    // interruption comes during after SN cleanup - hence no exception is thrown
+    // save namespace - initiated
+    // saver threads - initiated
+    // interruption comes during just after the image and md5 were saved
     testQuiesceWhenSavingNamespace(
-        InjectionEvent.FSIMAGE_SN_CLEANUP, false);
+        InjectionEvent.FSIMAGE_SAVED_IMAGE, true);
   }
 
   class TestAvatarQuiesceHandler extends InjectionHandler {
@@ -141,10 +163,13 @@ class TestAvatarQuiesceHandler extends InjectionHandler {
     private InjectionEvent synchronizationPoint;
     public boolean exceptionEvent = false;
     private volatile boolean receivedCancelRequest = false;
+    long cancelledCkptTxid = -1;
 
     public TestAvatarQuiesceHandler(InjectionEvent se) {
       synchronizationPoint = se;
     }
+    
+    private int skipEvents = 2;
 
     @Override
     protected void _processEvent(InjectionEvent event, Object... args) {
@@ -154,8 +179,16 @@ protected void _processEvent(InjectionEvent event, Object... args) {
         return;
       }
       if (synchronizationPoint == event) {
-        LOG.info("Will wait until save namespace is cancelled - TESTING ONLY : "
-            + synchronizationPoint);
+        if ((event == InjectionEvent.FSIMAGE_STARTING_SAVER_THREAD ||
+            event == InjectionEvent.FSIMAGE_SAVED_IMAGE)
+            && skipEvents > 0) {
+          skipEvents--;
+          LOG.info("Skipping event to accommodate format: " + event);
+          return;
+        }
+        if (event == InjectionEvent.FSIMAGE_SAVED_IMAGE) {
+          cancelledCkptTxid = (Long)args[0];
+        }
         while (!receivedCancelRequest) {
           try {
             Thread.sleep(1000);
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarSetQuota.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarSetQuota.java
new file mode 100644
index 00000000..ffbc91e6
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarSetQuota.java
@@ -0,0 +1,52 @@
+package org.apache.hadoop.hdfs;
+
+import java.util.Random;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestAvatarSetQuota {
+
+  private static Configuration conf;
+  private static MiniAvatarCluster cluster;
+  private static FileSystem fs;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+    conf = new Configuration();
+    conf.setInt("dfs.block.size", 1024);
+    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
+    fs = cluster.getFileSystem();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    cluster.shutDown();
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  @Test
+  public void testAvatarSetQuota() throws Exception {
+    String test = "/testAvatarSetQuota";
+    DFSTestUtil util = new DFSTestUtil(test, 10, 10, 1024);
+    util.createFiles(fs, test);
+
+    FSDataOutputStream out = fs.create(new Path(test + "/abc"));
+    byte[] buffer = new byte[10 * 1024];
+    Random r = new Random();
+    r.nextBytes(buffer);
+    out.write(buffer);
+    out.sync();
+    ((DistributedFileSystem) fs).setQuota(new Path(test), 5, -1);
+    out.close();
+    cluster.getStandbyAvatar(0).avatar.quiesceStandby(-1);
+  }
+
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShell.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShell.java
index d853de60..34c5991f 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShell.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShell.java
@@ -9,15 +9,14 @@
 
 public class TestAvatarShell extends AvatarSetupUtil {
 
-  public void setUp(boolean federation) throws Exception {
+  public void setUp(boolean federation, String name) throws Exception {
     Configuration conf = new Configuration();
-    conf.setInt("dfs.datanode.fullblockreport.delay", 200);
-    super.setUp(federation, conf);
+    super.setUp(federation, conf, name);
   }
 
   @Test
   public void testFailoverWithAvatarShell() throws Exception {
-    setUp(false);
+    setUp(false, "testFailoverWithAvatarShell");
     int blocksBefore = blocksInFile();
 
     AvatarShell shell = new AvatarShell(conf);
@@ -33,7 +32,7 @@ public void testFailoverWithAvatarShell() throws Exception {
 
   @Test
   public void testFailoverWithAvatarShellNew() throws Exception {
-    setUp(false);
+    setUp(false, "testFailoverWithAvatarShellNew");
     int blocksBefore = blocksInFile();
 
     AvatarShell shell = new AvatarShell(conf);
@@ -44,7 +43,7 @@ public void testFailoverWithAvatarShellNew() throws Exception {
 
   @Test
   public void testFailoverWithAvatarShellStandby() throws Exception {
-    setUp(false);
+    setUp(false, "testFailoverWithAvatarShellStandby");
     int blocksBefore = blocksInFile();
     cluster.failOver();
     cluster.restartStandby();
@@ -58,7 +57,7 @@ public void testFailoverWithAvatarShellStandby() throws Exception {
   @Test
   public void testFailoverWithAvatarShellFederation()
       throws Exception {
-    setUp(true);
+    setUp(true, "testFailoverWithAvatarShellFederation");
     int blocksBefore = blocksInFile();
     AvatarShell shell = new AvatarShell(conf);
     String nsId = cluster.getNameNode(0).nameserviceId;
@@ -71,7 +70,7 @@ public void testFailoverWithAvatarShellFederation()
 
   @Test
   public void testFailoverWithAvatarShellStandbyFederation() throws Exception {
-    setUp(true);
+    setUp(true, "testFailoverWithAvatarShellStandbyFederation");
     int blocksBefore = blocksInFile();
     cluster.failOver(0);
     cluster.restartStandby(0);
@@ -87,14 +86,14 @@ public void testFailoverWithAvatarShellStandbyFederation() throws Exception {
 
   @Test
   public void testAvatarShellLeaveSafeMode() throws Exception {
-    setUp(false);
+    setUp(false, "testAvatarShellLeaveSafeMode");
     int blocksBefore = blocksInFile();
 
     AvatarShell shell = new AvatarShell(conf);
     AvatarNode primaryAvatar = cluster.getPrimaryAvatar(0).avatar;
     primaryAvatar.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
     assertTrue(primaryAvatar.isInSafeMode());
-    assertEquals(0, shell.run(new String[] { "-zero", "-leaveSafeMode" }));
+    assertEquals(0, shell.run(new String[] { "-zero", "-safemode", "leave" }));
     assertFalse(primaryAvatar.isInSafeMode());
     assertFalse(cluster.getPrimaryAvatar(0).avatar.isInSafeMode());
     int blocksAfter = blocksInFile();
@@ -104,7 +103,7 @@ public void testAvatarShellLeaveSafeMode() throws Exception {
 
   @Test
   public void testAvatarShellLeaveSafeMode1() throws Exception {
-    setUp(false);
+    setUp(false, "testAvatarShellLeaveSafeMode1");
     int blocksBefore = blocksInFile();
     cluster.failOver();
     cluster.restartStandby();
@@ -113,11 +112,71 @@ public void testAvatarShellLeaveSafeMode1() throws Exception {
     AvatarNode primaryAvatar = cluster.getPrimaryAvatar(0).avatar;
     primaryAvatar.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
     assertTrue(primaryAvatar.isInSafeMode());
-    assertEquals(0, shell.run(new String[] { "-one", "-leaveSafeMode" }));
+    assertEquals(0, shell.run(new String[] { "-one", "-safemode", "leave" }));
     assertFalse(primaryAvatar.isInSafeMode());
     assertFalse(cluster.getPrimaryAvatar(0).avatar.isInSafeMode());
     int blocksAfter = blocksInFile();
     assertTrue(blocksBefore == blocksAfter);
   }
 
+  @Test
+  public void testFailoverWithWaitTxid() throws Exception {
+    setUp(false, "testFailoverWithWaitTxid");
+    int blocksBefore = blocksInFile();
+
+    AvatarShell shell = new AvatarShell(conf);
+    AvatarZKShell zkshell = new AvatarZKShell(conf);
+    assertEquals(0, zkshell.run(new String[] { "-clearZK" }));
+    assertEquals(0, shell.run(new String[] { "-zero", "-shutdownAvatar" }));
+    assertEquals(0, shell.run(new String[] { "-waittxid" }));
+    assertEquals(0, shell.run(new String[] { "-one", "-setAvatar", "primary" }));
+    int blocksAfter = blocksInFile();
+    assertTrue(blocksBefore == blocksAfter);
+  }
+
+  @Test
+  public void testFailoverWithWaitTxidWithService() throws Exception {
+    setUp(false, "testFailoverWithWaitTxidWithService");
+    int blocksBefore = blocksInFile();
+
+    AvatarShell shell = new AvatarShell(conf);
+    AvatarZKShell zkshell = new AvatarZKShell(conf);
+    assertEquals(0, zkshell.run(new String[] { "-clearZK" }));
+    assertEquals(0, shell.run(new String[] { "-zero", "-shutdownAvatar" }));
+    String nsId = cluster.getNameNode(0).nameserviceId;
+    assertEquals(0, shell.run(new String[] { "-waittxid", "-service", nsId }));
+    assertEquals(0, shell.run(new String[] { "-one", "-setAvatar", "primary" }));
+    int blocksAfter = blocksInFile();
+    assertTrue(blocksBefore == blocksAfter);
+  }
+
+  @Test
+  public void testGetSafeMode() throws Exception {
+    setUp(false, "testGetSafeMode");
+    AvatarShell shell = new AvatarShell(conf);
+    assertEquals(0, shell.run(new String[] { "-zero", "-safemode", "get" }));
+    assertEquals(0, shell.run(new String[] { "-one", "-safemode", "get" }));
+  }
+
+  public static class ShortTxidWaitAvatarShell extends AvatarShell {
+
+    public ShortTxidWaitAvatarShell(Configuration conf) {
+      super(conf);
+    }
+
+    @Override
+    protected long getMaxWaitTimeForWaitTxid() {
+      return 1000 * 15; // 15 seconds.
+    }
+  }
+
+  @Test
+  public void testFailoverWithWaitTxidFail() throws Exception {
+    setUp(false, "testFailoverWithWaitTxidFail");
+    AvatarShell shell = new ShortTxidWaitAvatarShell(conf);
+    String nsId = cluster.getNameNode(0).nameserviceId;
+    // This should fail.
+    assertEquals(-1, shell.run(new String[] { "-waittxid", "-service", nsId }));
+  }
+
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShellInteractive.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShellInteractive.java
new file mode 100644
index 00000000..3c2bfb02
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShellInteractive.java
@@ -0,0 +1,88 @@
+package org.apache.hadoop.hdfs;
+
+import java.io.PushbackInputStream;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.FailoverTestUtil.FailoverTestUtilHandler;
+import org.apache.hadoop.hdfs.TestAvatarShell.ShortTxidWaitAvatarShell;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.ipc.RemoteException;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class TestAvatarShellInteractive extends AvatarSetupUtil {
+
+  public void setUp(String name) throws Exception {
+    Configuration conf = new Configuration();
+    super.setUp(false, conf, name);
+  }
+
+  public void testFailoverInteractive(String[] input) throws Exception {
+    testFailoverInteractive(input, false);
+  }
+
+  public void testFailoverInteractive(String[] input,
+      boolean simulateEditLogCrash) throws Exception {
+    int blocksBefore = blocksInFile();
+    if (simulateEditLogCrash) {
+      FailoverTestUtilHandler handler = new FailoverTestUtilHandler();
+      InjectionHandler.set(handler);
+    }
+    // Txid will now mismatch.
+    cluster.getPrimaryAvatar(0).avatar.namesystem.getEditLog()
+        .setLastWrittenTxId(0);
+    PushbackInputStream stream = new PushbackInputStream(System.in,
+        100);
+    System.setIn(stream);
+    // PushbackInputStream processes in reverse order.
+    for (int i = input.length - 1; i >= 0; i--) {
+      stream.unread(input[i].getBytes());
+    }
+    ShortTxidWaitAvatarShell shell = new ShortTxidWaitAvatarShell(conf);
+    assertEquals(0, shell.run(new String[] { "-failover" }));
+    int blocksAfter = blocksInFile();
+    assertTrue(blocksBefore == blocksAfter);
+  }
+
+  @Test
+  public void testFailoverInteractiveYes() throws Exception {
+    setUp("testFailoverInteractiveYes");
+    testFailoverInteractive(new String[] { "Y\n" });
+  }
+
+  @Test(expected = AssertionError.class)
+  public void testFailoverInteractiveNo() throws Exception {
+    setUp("testFailoverInteractiveNo");
+    testFailoverInteractive(new String[] { "N\n" });
+  }
+
+  public void testWrongInput(String input[]) throws Exception {
+    PushbackInputStream stream = new PushbackInputStream(System.in,
+        100);
+    System.setIn(stream);
+    // PushbackInputStream processes in reverse order.
+    for (int i = input.length - 1; i >= 0; i--) {
+      stream.unread(input[i].getBytes());
+    }
+    AvatarShell.handleRemoteException(
+        new RemoteException("org.apache.hadoop.hdfs.server.namenode.StandbyStateException",
+          "Test"));
+  }
+
+  @Test
+  public void testFailoverInteractiveYesAfterWrongInput() throws Exception {
+    testWrongInput(new String[] { "a\n", "b\n", "c\n", "Y\n" });
+  }
+
+  @Test(expected = RemoteException.class)
+  public void testFailoverInteractiveNoAfterWrongInput() throws Exception {
+    testWrongInput(new String[] { "a\n", "b\n", "c\n", "N\n" });
+  }
+
+  @Test(expected =AssertionError.class)
+  public void testFailoverInteractiveYesWithEditLogCrash() throws Exception {
+    setUp("testFailoverInteractiveYesWithEditLogCrash");
+    testFailoverInteractive(new String[] { "Y\n" }, true);
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShutdown.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShutdown.java
new file mode 100644
index 00000000..205974cf
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarShutdown.java
@@ -0,0 +1,264 @@
+package org.apache.hadoop.hdfs;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.security.UnixUserGroupInformation;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestAvatarShutdown {
+
+  final static Log LOG = LogFactory.getLog(TestAvatarShutdown.class);
+
+  private MiniAvatarCluster cluster;
+  private Configuration conf;
+  private FileSystem fs;
+  private Random random = new Random();
+  private List<Path> files = Collections
+      .synchronizedList(new ArrayList<Path>());
+  
+  private static int BLOCK_SIZE = 1024;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+  }
+
+  private void setUp(String name, boolean discardLastBlock) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
+    conf = new Configuration();
+    conf.setInt("dfs.block.size", BLOCK_SIZE);
+    conf.setBoolean("fs.ha.retrywrites", true);
+    conf.setBoolean("fs.checkpoint.enabled", true);
+    conf.setLong("fs.checkpoint.period", 2);
+    conf.setBoolean("dfs.leaserecovery.discardlastblock.ifnosync", discardLastBlock);
+    conf.setBoolean("dfs.sync.on.every.addblock", true);
+
+    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
+    fs = cluster.getFileSystem();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    fs.close();
+    cluster.shutDown();
+    InjectionHandler.clear();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  public List<Thread> createEdits(int nEdits) throws IOException {
+    List<Thread> threads = new ArrayList<Thread>();
+    for (int i = 0; i < nEdits / 2; i++) {
+      Thread t = new Thread(new ClientThread());
+      t.start();
+      threads.add(t);
+    }
+    return threads;
+  }
+
+  public void joinThreads(List<Thread> threads) {
+    for (Thread t : threads) {
+      try {
+        t.interrupt();
+        t.join();
+      } catch (InterruptedException e) {
+        LOG.error("Interrupttion received");
+      }
+    }
+  }
+
+  class ClientThread implements Runnable {
+
+    @Override
+    public void run() {
+      try {
+        Path p = new Path("/" + random.nextInt());
+        files.add(p);
+        fs.create(p);
+      } catch (IOException e) {
+        LOG.error("Error when creating a file");
+      }
+    }
+  }
+  
+  ////////////////////////////////////////////////////////////////////////
+  
+  /**
+   * Basic test to check if the number of blocks obtained 
+   * during shutdown is correct.
+   */
+  @Test
+  public void testBasic() throws Exception {
+    TestAvatarShutdownHandler h = new TestAvatarShutdownHandler(null);
+    InjectionHandler.set(h);
+    setUp("testBasic", false);
+    for(int i=0; i<10; i++) {
+      Path p = new Path("/file"+i);
+      DFSTestUtil.createFile(fs, p, 512, (short) 1, 0L);
+    }
+    DFSTestUtil.waitNSecond(5);
+    
+    cluster.shutDown();
+    LOG.info("Cluster is down");
+    assertEquals(10, h.totalBlocks);
+  }
+
+  @Test
+  public void testOngoingRequestSuceedsDuringShutdown() throws Exception {
+    TestAvatarShutdownHandler h = new TestAvatarShutdownHandler(
+        InjectionEvent.NAMENODE_AFTER_CREATE_FILE);
+    InjectionHandler.set(h);
+    setUp("testOngoingRequestSuceedsDuringShutdown", false);
+
+    // start clients
+    List<Thread> threads = createEdits(20);
+    Thread.sleep(5000);
+    
+    cluster.shutDownAvatarNodes();
+    joinThreads(threads);
+    LOG.info("Cluster is down");
+    
+    // restart nodes in the cluster
+    cluster.restartAvatarNodes();
+    for (Path p : files) {
+      assertTrue(fs.exists(p));
+    }
+  }
+  
+  /**
+   * Check if the node shuts down cleanly if the lease recovery is
+   * in progress, and it is to discard last block of the file under
+   * construction.
+   */  
+  @Test
+  public void testLeaseRecoveryShutdownDiscardLastBlock() throws Exception {
+    testLeaseRecoveryShutdown(true);
+  }
+  
+  /**
+   * Check if the node shuts down cleanly if the lease recovery is
+   * in progress, and it is to recover last block of the file under
+   * construction.
+   */ 
+  @Test
+  public void testLeaseRecoveryShutdownDoNotDiscardLastBlock() throws Exception {
+    testLeaseRecoveryShutdown(false);
+  }
+  
+  private void testLeaseRecoveryShutdown(boolean discardLastBlock)
+      throws Exception {
+    TestAvatarShutdownHandler h = new TestAvatarShutdownHandler(
+        InjectionEvent.LEASEMANAGER_CHECKLEASES);
+    InjectionHandler.set(h);
+    setUp("testOngoingLeaseRecoveryDuringShutdown", discardLastBlock);
+
+    // set cgi to avoid NPE at NN, since we talk to it directly
+    UserGroupInformation.setCurrentUser(UnixUserGroupInformation.login(conf));
+    AvatarNode nn = cluster.getPrimaryAvatar(0).avatar;
+    FsPermission perm = new FsPermission((short) 0264);
+    String clientName = ((DistributedAvatarFileSystem) fs)
+        .getClient().getClientName();
+    
+    // create a file directly and add one block
+    nn.create("/test", perm, clientName, true, true, (short) 3, (long) 1024);
+    nn.addBlock("/test", clientName);
+
+    assertEquals(1,
+        cluster.getPrimaryAvatar(0).avatar.namesystem.getBlocksTotal());
+    
+    // set lease period to something short
+    cluster.getPrimaryAvatar(0).avatar.namesystem.leaseManager.setLeasePeriod(
+        1, 1);
+    cluster.getPrimaryAvatar(0).avatar.namesystem.lmthread.interrupt();
+    
+    // wait for the lease manager to kick in
+    while(!h.processedEvents.contains(InjectionEvent.LEASEMANAGER_CHECKLEASES))
+      DFSTestUtil.waitSecond();
+    
+    fs.close();
+    
+    // shutdown the primary, to obtain the block count there
+    cluster.killPrimary();
+    assertEquals(discardLastBlock ? 0 : 1, h.totalBlocks);
+    
+    cluster.shutDown();
+    LOG.info("Cluster is down");
+  }
+
+  class TestAvatarShutdownHandler extends InjectionHandler {
+
+    // specifies where the thread should wait for interruption
+    private InjectionEvent synchronizationPoint;
+    private volatile boolean stopRPCcalled = false;
+    private volatile boolean stopLeaseManagerCalled = false;
+    Set<InjectionEvent> processedEvents = Collections
+        .synchronizedSet(new HashSet<InjectionEvent>());
+    long totalBlocks = -1;
+
+    public TestAvatarShutdownHandler(InjectionEvent se) {
+      synchronizationPoint = se;
+    }
+
+    @Override
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      processedEvents.add(event);
+      // rpc handlers
+      if (synchronizationPoint == event
+          && event == InjectionEvent.NAMENODE_AFTER_CREATE_FILE) {
+        LOG.info("Will wait until shutdown is called: " + synchronizationPoint);
+        while (!stopRPCcalled)
+          DFSTestUtil.waitSecond();
+        LOG.info("Finished waiting: " + synchronizationPoint);
+      } else if (event == InjectionEvent.NAMENODE_STOP_CLIENT_RPC) {
+        stopRPCcalled = true;
+      // lease recovery
+      } else if (synchronizationPoint == event
+          && event == InjectionEvent.LEASEMANAGER_CHECKLEASES) {
+        LOG.info("Will wait until shutdown is called: " + synchronizationPoint);
+        while (!stopLeaseManagerCalled)
+          DFSTestUtil.waitSecond();
+        LOG.info("Finished waiting: " + synchronizationPoint);
+      } else if (event == InjectionEvent.FSNAMESYSTEM_STOP_LEASEMANAGER) {
+        stopLeaseManagerCalled = true;
+      }
+    }
+
+    @Override
+    protected void _processEventIO(InjectionEvent event, Object... args)
+        throws IOException {
+      _processEvent(event, args);
+    }
+    
+    @Override
+    protected boolean _falseCondition(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.AVATARNODE_SHUTDOWN) {
+        totalBlocks = (Long) args[0];
+      }
+      return false;
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarStaleCheckpoint.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarStaleCheckpoint.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarStartup.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarStartup.java
new file mode 100644
index 00000000..1b18491b
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarStartup.java
@@ -0,0 +1,222 @@
+package org.apache.hadoop.hdfs;
+
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniAvatarCluster.NameNodeInfo;
+import org.apache.hadoop.hdfs.protocol.AvatarConstants;
+import org.apache.hadoop.hdfs.protocol.AvatarConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class TestAvatarStartup extends FailoverLoadTestUtil {
+  private static MiniAvatarCluster cluster;
+  private static final List<AvatarNode> extraNodes = new ArrayList<AvatarNode>();
+  private static Configuration conf;
+  private static AvatarZooKeeperClient zkClient;
+  private static final Random r = new Random();
+  private static final Log LOG = LogFactory
+      .getLog(TestAvatarStartup.class);
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+  }
+
+  public void setUp(boolean federation, String testName) throws Exception {
+    setUp(federation, testName, false);
+  }
+
+  public void setUp(boolean federation, String testName, boolean retrywrites)
+      throws Exception {
+    LOG.info("------------------- test: " + testName
+        + " START ----------------");
+    conf = new Configuration();
+    conf.setBoolean("fs.ha.retrywrites", retrywrites);
+    if (federation) {
+      cluster = new MiniAvatarCluster(conf, 1, true, null, null,
+          2 + r.nextInt(4), true);
+    } else {
+      cluster = new MiniAvatarCluster(conf, 1, true, null, null);
+    }
+    zkClient = new AvatarZooKeeperClient(conf, null);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    if (zkClient != null)
+      zkClient.shutdown();
+    if (cluster != null)
+      cluster.shutDown();
+    for(AvatarNode an : extraNodes) {
+      an.shutdown(true);
+    }
+    extraNodes.clear();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  private long getSessionId(int index) throws Exception {
+    AvatarNode primaryAvatar = cluster.getPrimaryAvatar(index).avatar;
+    String address = AvatarNode.getClusterAddress(primaryAvatar
+        .getStartupConf());
+    return zkClient.getPrimarySsId(address);
+  }
+
+  private void verifyStartup(boolean federation, int index,
+      boolean singleStartup, boolean standby) throws Exception {
+    verifyStartup(federation, index, singleStartup, standby, false);
+  }
+
+  private void verifyStartup(boolean federation, int index,
+      boolean singleStartup, boolean standby, boolean forceStartup)
+      throws Exception {
+    MiniAvatarCluster.instantiationRetries = 2;
+    NameNodeInfo nnInfo = cluster.getNameNode(index);
+    String instance = (!standby) ? AvatarConstants.StartupOption.NODEZERO
+        .getName() : AvatarConstants.StartupOption.NODEONE.getName();
+    String force = (forceStartup) ? AvatarConstants.StartupOption.FORCE
+        .getName() : instance;
+    String[] primaryArgs = { instance, force };
+    String[] standbyArgs = { instance, force,
+        AvatarConstants.StartupOption.STANDBY.getName() };
+    String[] normalArgs = (!standby) ? primaryArgs : standbyArgs;
+    String[] federationPrimaryArgs = { instance, force,
+        StartupOption.SERVICE.getName(), nnInfo.nameserviceId };
+    String[] federationStandbyArgs = { instance, force,
+        StartupOption.SERVICE.getName(), nnInfo.nameserviceId,
+        AvatarConstants.StartupOption.STANDBY.getName() };
+    String[] federationArgs = (!standby) ? federationPrimaryArgs
+        : federationStandbyArgs;
+    String[] args = (federation) ? federationArgs : normalArgs;
+    AvatarNode primary1 = MiniAvatarCluster.instantiateAvatarNode(
+        args,
+        MiniAvatarCluster.getServerConf(instance, nnInfo));
+    extraNodes.add(primary1);
+    if (singleStartup) {
+      if (!standby) {
+        assertEquals(primary1.getSessionId(), getSessionId(index));
+      }
+      return;
+    }
+    try {      
+      AvatarNode second = MiniAvatarCluster.instantiateAvatarNode(args,
+          MiniAvatarCluster.getServerConf(instance, nnInfo));
+      extraNodes.add(second);
+      fail("Did not throw exception");
+    } catch (Exception e) {
+      LOG.info("Expected exception : ", e);
+      if (!standby) {
+        assertEquals(primary1.getSessionId(), getSessionId(index));
+      }
+    }
+  }
+
+  @Test
+  public void testStartup() throws Exception {
+    setUp(false, "testStartup");
+    cluster.shutDownAvatarNodes();
+    int nameNodes = cluster.getNumNameNodes();
+    for (int i = 0; i < nameNodes; i++) {
+      verifyStartup(false, i, false, false);
+    }
+  }
+
+  @Test
+  public void testStartupFederation() throws Exception {
+    setUp(true, "testStartupFederation");
+    cluster.shutDownAvatarNodes();
+    int nameNodes = cluster.getNumNameNodes();
+    for (int i = 0; i < nameNodes; i++) {
+      verifyStartup(true, i, false, false);
+    }
+  }
+
+  @Test(expected = IOException.class)
+  public void testNullZKStartupPrimary() throws Exception {
+    setUp(false, "testNullZKStartupPrimary");
+    cluster.shutDownAvatarNodes();
+    cluster.clearZooKeeperNode(0);
+    verifyStartup(false, 0, true, false);
+  }
+
+  @Test(expected = IOException.class)
+  public void testNullZKStartupStandby() throws Exception {
+    setUp(false, "testNullZKStartupStandby");
+    cluster.shutDownAvatarNodes();
+    cluster.clearZooKeeperNode(0);
+    verifyStartup(false, 0, true, true);
+  }
+
+  @Test()
+  public void testNullZKStartupForce() throws Exception {
+    setUp(false, "testNullZKStartupForce");
+    cluster.shutDownAvatarNodes();
+    cluster.clearZooKeeperNode(0);
+    verifyStartup(false, 0, true, false, true);
+    verifyStartup(false, 0, true, true, true);
+  }
+
+  @Test()
+  public void testNullZKStartupForceWithLoad() throws Exception {
+    setUp(false, "testNullZKStartupForceWithLoad", true);
+    LoadThread loadThread = new LoadThread(cluster.getFileSystem());
+    loadThread.start();
+    Thread.sleep(3000);
+    cluster.shutDownAvatarNodes();
+    cluster.clearZooKeeperNode(0);
+    verifyStartup(false, 0, true, false, true);
+    verifyStartup(false, 0, true, true, true);
+    cluster.registerZooKeeperNodes();
+    Thread.sleep(3000);
+    loadThread.cancel();
+    loadThread.join(30000);
+    assertTrue(pass);
+  }
+  
+  @Test
+  public void testFailedHttpStartup() throws Exception {
+    MiniAvatarCluster.instantiationRetries = 1;
+    conf = new Configuration();
+    conf.setInt("dfs.image.transfer.timeout", 1000);
+    TestAvatarStartupInjectionHandler h = new TestAvatarStartupInjectionHandler();
+    InjectionHandler.set(h);
+    try {
+      cluster = new MiniAvatarCluster(conf, 1, true, null, null);
+      fail("Should fail with SocketTimeoutException");
+    } catch (SocketTimeoutException e) {
+      LOG.info("Expected exception", e);
+    }
+  }
+  
+  class TestAvatarStartupInjectionHandler extends InjectionHandler {
+
+    @Override
+    public void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.TRANSFERFSIMAGE_GETFILESERVER3) {
+        LOG.info("Will simulate socket timeout.");
+        try {
+          Thread.sleep(2000);
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+        }
+      }
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarSyncLastTxid.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarSyncLastTxid.java
index 6b9786fb..a99e644a 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarSyncLastTxid.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarSyncLastTxid.java
@@ -1,104 +1,33 @@
 package org.apache.hadoop.hdfs;
 
-import java.io.IOException;
-import java.util.Random;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
 import org.apache.hadoop.hdfs.server.namenode.ZookeeperTxId;
-import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.zookeeper.KeeperException.NoNodeException;
 
-import org.junit.After;
 import static org.junit.Assert.*;
-import org.junit.Before;
 import org.junit.Test;
 
-public class TestAvatarSyncLastTxid {
-
-  private static MiniAvatarCluster cluster;
-  private static Configuration conf;
-  private static FileSystem fs;
-  private static Random random = new Random();
-  private static AvatarZooKeeperClient zkClient;
-  private static Log LOG = LogFactory.getLog(TestAvatarSyncLastTxid.class);
-
-  @Before
-  public void setUp() throws Exception {
-    MiniAvatarCluster.createAndStartZooKeeper();
-    conf = new Configuration();
-    conf.setBoolean("fs.ha.retrywrites", true);
-    conf.setInt("dfs.block.size", 1024);
-    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
-    fs = cluster.getFileSystem();
-    zkClient = new AvatarZooKeeperClient(conf, null);
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    zkClient.shutdown();
-    cluster.shutDown();
-    MiniAvatarCluster.clearZooKeeperData();
-    MiniAvatarCluster.shutDownZooKeeper();
-  }
-
-  private void createEditsNotSynced(int nEdits) throws IOException {
-    for (int i = 0; i < nEdits; i++) {
-      // This creates unsynced edits by calling generation stamp.
-      cluster.getPrimaryAvatar(0).avatar.namesystem
-          .nextGenerationStampForTesting();
-    }
-  }
-
-  private void createEdits(int nEdits) throws IOException {
-    for (int i = 0; i < nEdits / 2; i++) {
-      // Create file ends up logging two edits to the edit log, one for create
-      // file and one for bumping up the generation stamp
-      fs.create(new Path("/" + random.nextInt()));
-    }
-  }
-
-  private ZookeeperTxId getLastTxid() throws Exception {
-    AvatarNode primaryAvatar = cluster.getPrimaryAvatar(0).avatar;
-    String address = AvatarNode.getClusterAddress(primaryAvatar
-        .getStartupConf());
-    return zkClient.getPrimaryLastTxId(address);
-  }
-
-  private long getSessionId() throws Exception {
-    AvatarNode primaryAvatar = cluster.getPrimaryAvatar(0).avatar;
-    String address = AvatarNode.getClusterAddress(primaryAvatar
-        .getStartupConf());
-    return zkClient.getPrimarySsId(address);
-  }
-
-  private void verifyState(long expectedTxid) throws Exception {
-    ZookeeperTxId lastTxId = getLastTxid();
-    assertNotNull(lastTxId);
-    long sessionId = getSessionId();
-    assertEquals(sessionId, lastTxId.getSessionId());
-    assertEquals(expectedTxid - 1, lastTxId.getTransactionId());
-  }
+public class TestAvatarSyncLastTxid extends FailoverTestUtil {
 
   @Test
   public void testBasic() throws Exception {
+    setUp("testBasic");
     createEdits(20);
     // fs.close() creates 10 more edits due to close file ops.
     fs.close();
     cluster.shutDown();
-    verifyState(30);
+    // +3 initial checkpoint +1 shutdown
+    verifyState(34);
   }
 
   @Test
   public void testPrimaryCrash() throws Exception {
+    setUp("testPrimaryCrash");
     createEdits(20);
     fs.close();
-    InjectionHandler.set(new TestAvatarSyncLastTxidInjectionHandler());
+    InjectionHandler.set(new FailoverTestUtilHandler());
     cluster.getPrimaryAvatar(0).avatar.shutdownAvatar();
     InjectionHandler.clear();
     ZookeeperTxId lastTxId = null;
@@ -114,12 +43,14 @@ public void testPrimaryCrash() throws Exception {
 
   @Test
   public void testPrimaryCrashWithExistingZkNode() throws Exception {
+    setUp("testPrimaryCrashWithExistingZkNode");
     // First do a clean shutdown.
     createEdits(20);
     // fs.close() creates 10 more edits due to close file ops.
     fs.close();
     cluster.shutDown();
-    verifyState(30);
+    // 3 for initial checkpoint + 1 shutdown
+    verifyState(34);
 
     // Now we have an existing znode with the last transaction id, now do an
     // unclean shutdown and verify session ids don't match.
@@ -127,7 +58,7 @@ public void testPrimaryCrashWithExistingZkNode() throws Exception {
     fs = cluster.getFileSystem();
     createEdits(20);
     fs.close();
-    InjectionHandler.set(new TestAvatarSyncLastTxidInjectionHandler());
+    InjectionHandler.set(new FailoverTestUtilHandler());
     cluster.getPrimaryAvatar(0).avatar.shutdownAvatar();
     InjectionHandler.clear();
     ZookeeperTxId lastTxId = null;
@@ -143,6 +74,7 @@ public void testPrimaryCrashWithExistingZkNode() throws Exception {
 
   @Test
   public void testWithFailover() throws Exception {
+    setUp("testWithFailover");
     createEdits(20);
     cluster.failOver();
     createEdits(20);
@@ -152,6 +84,7 @@ public void testWithFailover() throws Exception {
 
   @Test
   public void testWithDoubleFailover() throws Exception {
+    setUp("testWithDoubleFailover");
     // Perform first failover
     createEdits(20);
     cluster.failOver();
@@ -169,10 +102,11 @@ public void testWithDoubleFailover() throws Exception {
 
   @Test
   public void testFailoverWithPrimaryCrash() throws Exception {
+    setUp("testFailoverWithPrimaryCrash");
     createEdits(20);
     fs.close();
     
-    InjectionHandler.set(new TestAvatarSyncLastTxidInjectionHandler());
+    InjectionHandler.set(new FailoverTestUtilHandler());
     cluster.killPrimary(0, true);
     InjectionHandler.clear();
     
@@ -187,6 +121,7 @@ public void testFailoverWithPrimaryCrash() throws Exception {
 
   @Test
   public void testDoubleFailoverWithPrimaryCrash() throws Exception {
+    setUp("testDoubleFailoverWithPrimaryCrash");
     // First failover
     createEdits(20);
     cluster.failOver();
@@ -195,7 +130,7 @@ public void testDoubleFailoverWithPrimaryCrash() throws Exception {
     fs.close();
 
     // Second failover.
-    InjectionHandler.set(new TestAvatarSyncLastTxidInjectionHandler());
+    InjectionHandler.set(new FailoverTestUtilHandler());
     cluster.killPrimary(0, true);
     InjectionHandler.clear();
     
@@ -210,10 +145,11 @@ public void testDoubleFailoverWithPrimaryCrash() throws Exception {
 
   @Test
   public void testFailoverAfterUnsuccessfulFailover() throws Exception {
+    setUp("testFailoverAfterUnsuccessfulFailover");
     createEdits(20);
     fs.close();
     
-    InjectionHandler.set(new TestAvatarSyncLastTxidInjectionHandler());
+    InjectionHandler.set(new FailoverTestUtilHandler());
     cluster.killPrimary(0, true);
     InjectionHandler.clear();
     
@@ -233,8 +169,11 @@ public void testFailoverAfterUnsuccessfulFailover() throws Exception {
 
   @Test
   public void testEditLogCrash() throws Exception {
+    setUp("testEditLogCrash");
+    FailoverTestUtilHandler h = new FailoverTestUtilHandler();
+    h.simulateEditLogCrash = true;
+    InjectionHandler.set(h);
     cluster.shutDown();
-    conf.setBoolean("dfs.simulate.editlog.crash", true);
     conf.setBoolean("fs.ha.retrywrites", true);
     cluster = new MiniAvatarCluster(conf, 3, true, null, null);
     fs = cluster.getFileSystem();
@@ -246,7 +185,8 @@ public void testEditLogCrash() throws Exception {
       cluster.failOver();
     } catch (Exception e) {
       LOG.info("Expected exception : ", e);
-      assertEquals(19, cluster.getStandbyAvatar(0).avatar.getLastWrittenTxId());
+      // initial checkpoint 3 + 20
+      assertEquals(23, cluster.getStandbyAvatar(0).avatar.getLastWrittenTxId() + 1);
       return;
     }
     fail("Did not throw exception");
@@ -254,6 +194,7 @@ public void testEditLogCrash() throws Exception {
   
   @Test
   public void testBlocksMisMatch() throws Exception {
+    setUp("testBlocksMisMatch");
     int totalBlocks = 50;
     DFSTestUtil.createFile(fs, new Path("/testBlocksMisMatch"),
         (long) totalBlocks * 1024, (short) 3, System.currentTimeMillis());
@@ -270,17 +211,4 @@ public void testBlocksMisMatch() throws Exception {
     }
     fail("Did not throw exception");
   }
-  
-  class TestAvatarSyncLastTxidInjectionHandler extends InjectionHandler {
-
-    public boolean _falseCondition(InjectionEvent event, Object... args) {
-      if (event == InjectionEvent.AVATARNODE_SHUTDOWN) {
-        // used to simulate a situation where zk 
-        // is not updated at primary shutdown
-        LOG.info("Skipping the write to ZK");
-        return true;
-      }
-      return false;
-    }
-  }
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarTxIds.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarTxIds.java
index cd5fd009..94f79691 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarTxIds.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarTxIds.java
@@ -3,19 +3,26 @@
 import java.io.IOException;
 import java.util.Random;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil.CheckpointTrigger;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
 import org.junit.After;
 import org.junit.AfterClass;
 import static org.junit.Assert.*;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TestAvatarTxIds {
+  
+  final static Log LOG = LogFactory.getLog(TestAvatarTxIds.class);
+  
   private MiniAvatarCluster cluster;
   private Configuration conf;
   private FileSystem fs;
@@ -26,13 +33,15 @@ public static void setUpBeforeClass() throws Exception {
     MiniAvatarCluster.createAndStartZooKeeper();
   }
 
-  @Before
-  public void setUp() throws Exception {
+  public void setUp(String name) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
     conf = new Configuration();
     conf.setBoolean("fs.ha.retrywrites", true);
     conf.setBoolean("fs.checkpoint.enabled", true);
     cluster = new MiniAvatarCluster(conf, 3, true, null, null);
     fs = cluster.getFileSystem();
+    // give it a time to complete the first checkpoint
+    Thread.sleep(3000);
   }
 
   @After
@@ -60,47 +69,62 @@ public long getCurrentTxId(AvatarNode avatar) {
 
   @Test
   public void testBasic() throws Exception {
+    setUp("testBasic");
     createEdits(20);
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(20, getCurrentTxId(primary));
+    
+    // SLS + ELS + SLS + 20 edits
+    assertEquals(23, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
   }
 
   @Test
   public void testWithFailover() throws Exception {
+    setUp("testWithFailover");
     // Create edits before failover.
     createEdits(20);
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
-    assertEquals(20, getCurrentTxId(primary));
+    
+    // SLS + ELS (first checkpoint with no txns) + SLS + 20 edits
+    assertEquals(23, getCurrentTxId(primary));
 
     // Perform failover and restart old primary.
-    cluster.failOver();
+    cluster.failOver(); // shutdown adds ELS (24)
+    assertEquals(25, getCurrentTxId(cluster.getPrimaryAvatar(0).avatar));
+    
     cluster.restartStandby();
 
     // Get new instances after failover.
     primary = cluster.getPrimaryAvatar(0).avatar;
     standby = cluster.getStandbyAvatar(0).avatar;
-    assertEquals(20, getCurrentTxId(primary));
+    
+    // checkpoint by the new standby adds 2 transactions
+    // standby opens the log with SLS (25)
+    // new standby checkpoints ELS + SLS
 
     // Create some more edits and verify.
     createEdits(20);
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(40, getCurrentTxId(primary));
+    
+    assertEquals(47, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
   }
 
   @Test
   public void testWithFailoverTxIdMismatchHard() throws Exception {
+    setUp("testWithFailoverTxIdMismatchHard");
     // Create edits before failover.
     createEdits(20);
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
-    assertEquals(20, getCurrentTxId(primary));
+    
+    // SLS + ELS (first checkpoint with no txns) + SLS + 20 edits
+    assertEquals(23, getCurrentTxId(primary));
 
-    standby.getFSImage().getEditLog().setStartTransactionId(50);
+    standby.getFSImage().getEditLog().setLastWrittenTxId(49);
     assertEquals(50, getCurrentTxId(standby));
 
     // Perform failover and verify it fails.
@@ -115,100 +139,158 @@ public void testWithFailoverTxIdMismatchHard() throws Exception {
 
   @Test
   public void testDoubleFailover() throws Exception {
+    setUp("testDoubleFailover");
     // Create edits before failover.
     createEdits(20);
-
+    
+    // 23 (STS ELS for initial checkpoint + 20 edits
     // Perform failover.
-    cluster.failOver();
-    cluster.restartStandby();
-    createEdits(20);
-
+    cluster.failOver(); // 25
+    cluster.restartStandby(); // 27 after first checkpoint
+    createEdits(20); // 47
+    
     // Perform second failover.
-    cluster.failOver();
-    cluster.restartStandby();
+    cluster.failOver(); // 49
+    cluster.restartStandby(); // 51    
     createEdits(20);
 
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(60, getCurrentTxId(primary));
+    assertEquals(71, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
   }
 
   @Test
   public void testWithStandbyDead() throws Exception {
-    createEdits(20);
-    cluster.killStandby();
-    createEdits(20);
-    cluster.restartStandby();
-    createEdits(20);
+    setUp("testWithStandbyDead");
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
+    createEdits(20); // 23 (initial checkpoint) + 20 edits
+    assertEquals(23, getCurrentTxId(primary));
+    
+    cluster.killStandby();
+    createEdits(20); // 43
+    assertEquals(43, getCurrentTxId(primary));
+    
+    cluster.restartStandby(); // 45 (checkpoint)
+    Thread.sleep(1000); // for checkpoint
+    assertEquals(45, getCurrentTxId(primary));
+    
+    createEdits(20); // 67
+
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(60, getCurrentTxId(primary));
+    assertEquals(65, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
   }
 
   @Test
   public void testWithStandbyDeadAfterFailover() throws Exception {
-    createEdits(20);
-    cluster.failOver();
-    createEdits(20);
+    setUp("testWithStandbyDeadAfterFailover");
+    // initial checkpoint 3
+    AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
+    
+    createEdits(20); //23
+    assertEquals(23, getCurrentTxId(primary));
+    cluster.failOver(); //25
+    primary = cluster.getPrimaryAvatar(0).avatar;
+    assertEquals(25, getCurrentTxId(primary));
+    createEdits(20); //45
+    assertEquals(45, getCurrentTxId(primary));
     cluster.killStandby();
-    createEdits(20);
-    cluster.restartStandby();
+    createEdits(20); //65
+    assertEquals(65, getCurrentTxId(primary));
+    cluster.restartStandby(); //67
+    Thread.sleep(1000);
+    assertEquals(67, getCurrentTxId(primary));
+       
     createEdits(20);
 
-    AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
+    assertEquals(87, getCurrentTxId(cluster.getPrimaryAvatar(0).avatar));
+    
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
+    
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(80, getCurrentTxId(primary));
+    assertEquals(87, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
   }
 
   @Test
   public void testWithCheckPoints() throws Exception {
-    createEdits(20);
+    TestAvatarTxIdsHandler h = new TestAvatarTxIdsHandler();
+    InjectionHandler.set(h);
+    setUp("testWithCheckPoints");
+    // 3 (initial checkpoint)
+    createEdits(20); //23
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
-    standby.doCheckpoint();
-    createEdits(20);
+    h.doCheckpoint(); //25
+    createEdits(20); //45
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(40, getCurrentTxId(primary));
+    assertEquals(45, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
+    InjectionHandler.clear();
   }
 
   @Test
   public void testAcrossRestarts() throws Exception {
-    createEdits(20);
-    cluster.restartAvatarNodes();
+    setUp("testAcrossRestarts");
+    // 3 initial checkpoint
+    createEdits(20); //23
+    cluster.restartAvatarNodes(); //25 + 2 restart finalizes the segment + checkpoint
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
-    assertEquals(20, getCurrentTxId(primary));
+    
+    assertEquals(27, getCurrentTxId(primary));
+    // give time to the standby to start-up
+    Thread.sleep(2000);
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
     createEdits(20);
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(40, getCurrentTxId(primary));
+    assertEquals(47, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
   }
 
   @Test
   public void testCheckpointAndRestart() throws Exception {
-    createEdits(20);
+    TestAvatarTxIdsHandler h = new TestAvatarTxIdsHandler();
+    InjectionHandler.set(h);
+    setUp("testCheckpointAndRestart");
+    // 3 initial checkpoint
+    createEdits(20); //23
     AvatarNode primary = cluster.getPrimaryAvatar(0).avatar;
     AvatarNode standby = cluster.getStandbyAvatar(0).avatar;
-    standby.doCheckpoint();
+    h.doCheckpoint(); //25 checkpoint adds 2 transactions
     createEdits(20);
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(40, getCurrentTxId(primary));
+    assertEquals(45, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
 
-    cluster.restartAvatarNodes();
+    cluster.restartAvatarNodes(); //49 (restart + initial checkpoint)
     primary = cluster.getPrimaryAvatar(0).avatar;
     standby = cluster.getStandbyAvatar(0).avatar;
     createEdits(20);
     standby.quiesceStandby(getCurrentTxId(primary)-1);
-    assertEquals(60, getCurrentTxId(primary));
+    assertEquals(69, getCurrentTxId(primary));
     assertEquals(getCurrentTxId(primary), getCurrentTxId(standby));
+    InjectionHandler.clear();
+  }
+  
+  class TestAvatarTxIdsHandler extends InjectionHandler {
+    private CheckpointTrigger ckptTrigger = new CheckpointTrigger();
+       
+    @Override
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      ckptTrigger.checkpointDone(event, args);
+    }
+    
+    @Override
+    protected boolean _falseCondition(InjectionEvent event, Object... args) {
+      return ckptTrigger.triggerCheckpoint(event);
+    }
+    
+    void doCheckpoint() throws IOException {
+      ckptTrigger.doCheckpoint();
+    }
   }
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarVerification.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarVerification.java
new file mode 100644
index 00000000..c5683e30
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestAvatarVerification.java
@@ -0,0 +1,92 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.ipc.RemoteException;
+
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestAvatarVerification {
+
+  final static Log LOG = LogFactory.getLog(TestAvatarCheckpointing.class);
+
+  private MiniAvatarCluster cluster;
+  private Configuration conf;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    if (cluster != null) {
+      cluster.shutDown();
+    }
+  }
+
+  @Test
+  public void testVerificationAddress() throws Exception {
+    LOG.info("------------------- test: testVerificationAddress START ----------------");
+    TestAvatarVerificationHandler h = new TestAvatarVerificationHandler();
+    InjectionHandler.set(h);
+    MiniAvatarCluster.instantiationRetries = 2;
+
+    conf = new Configuration();
+    try {
+      cluster = new MiniAvatarCluster(conf, 2, true, null, null);
+      fail("Instantiation should not succeed");
+    } catch (IOException e) {
+      // exception during registration
+      assertTrue("Should get remote exception here",
+          e.getClass().equals(RemoteException.class));
+    }
+  }
+
+  class TestAvatarVerificationHandler extends InjectionHandler {
+    @Override
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.NAMENODE_REGISTER) {
+        InetAddress addr = (InetAddress) args[0];
+        LOG.info("Processing event : " + event + " with address: " + addr);
+        try {
+          Field f = addr.getClass().getSuperclass().getDeclaredField("address");
+          f.setAccessible(true);
+          f.set(addr, 0);
+          LOG.info("Changed address to : " + addr);
+        } catch (Exception e) {
+          LOG.info("exception : ", e);
+          return;
+        }
+      }
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestCachingAvatarZooKeeperClient.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestCachingAvatarZooKeeperClient.java
index f4c86b2c..c9631326 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestCachingAvatarZooKeeperClient.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestCachingAvatarZooKeeperClient.java
@@ -19,45 +19,21 @@
 package org.apache.hadoop.hdfs;
 
 import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.Iterator;
-import org.apache.hadoop.fs.FileUtil;
 import java.nio.channels.FileLock;
 import java.lang.reflect.*;
 
 import junit.framework.TestCase;
 import org.junit.Test;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
-
-import static org.junit.Assert.*;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.hadoop.conf.Configuration;
-import java.util.Set;
-import java.util.HashSet;
-
-import org.apache.hadoop.hdfs.server.datanode.AvatarDataNode;
-import org.apache.hadoop.hdfs.MiniAvatarCluster;
-import org.apache.hadoop.hdfs.MiniAvatarCluster.DataNodeProperties;
-import org.apache.hadoop.hdfs.MiniAvatarCluster.NameNodeInfo;
+import org.apache.hadoop.hdfs.CachingAvatarZooKeeperClient.ZooKeeperCall;
+import org.apache.hadoop.hdfs.CachingAvatarZooKeeperClient.FileWithLock;
 
 public class TestCachingAvatarZooKeeperClient {
   final static Log LOG = LogFactory.getLog(TestCachingAvatarZooKeeperClient.class);
 
-  private Configuration conf;
-
-  @BeforeClass
-  public static void setUpStatic() throws Exception {
-  }
-
-  public void setUp() throws Exception {
-  }
-  
   @Test
   public void testTryLock() throws Exception {
     String directoryName = "/tmp/temp" + Long.toString(System.nanoTime());
@@ -66,16 +42,18 @@ public void testTryLock() throws Exception {
       conf.set("fs.ha.zookeeper.cache.dir", directoryName);
       conf.setBoolean("fs.ha.zookeeper.cache", false);
       CachingAvatarZooKeeperClient cazkc = new CachingAvatarZooKeeperClient(conf, null);
-      Method m = CachingAvatarZooKeeperClient.class.getDeclaredMethod("tryLock", Boolean.TYPE);
+      Method m = CachingAvatarZooKeeperClient.class.getDeclaredMethod(
+          "tryLock", ZooKeeperCall.class);
+      ZooKeeperCall call = cazkc.new GetStat(null);
       m.setAccessible(true);
-      FileLock fl = (FileLock) m.invoke(cazkc, true);
-      fl.release();
-      TestCase.assertNotNull(fl);
-      fl = (FileLock) m.invoke(cazkc, true);
-      TestCase.assertNotNull(fl);
-      fl.release();
+      FileWithLock fl = (FileWithLock) m.invoke(cazkc, call);
+      fl.lock.release();
+      TestCase.assertNotNull(fl.lock);
+      fl = (FileWithLock) m.invoke(cazkc, call);
+      TestCase.assertNotNull(fl.lock);
+      fl.lock.release();
       new File(directoryName, ".avatar_zk_cache_lock").delete();
-      m.invoke(cazkc, true);
+      m.invoke(cazkc, call);
     } finally {
       new File(directoryName, ".avatar_zk_cache_lock").delete();
       new File(directoryName).delete();
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestStandbyJournals.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestStandbyJournals.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestStandbySafeMode.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestStandbySafeMode.java
index c90a4753..40be48cf 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestStandbySafeMode.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/TestStandbySafeMode.java
@@ -1,6 +1,8 @@
 package org.apache.hadoop.hdfs;
 
+import java.util.ArrayList;
 import java.util.Random;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -8,13 +10,14 @@
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.MiniAvatarCluster.AvatarState;
 import org.apache.hadoop.hdfs.server.datanode.AvatarDataNode;
-import org.apache.hadoop.hdfs.server.datanode.AvatarDataNode.ServicePair;
-import org.apache.hadoop.hdfs.server.datanode.NamespaceService;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.hdfs.protocol.AvatarConstants.Avatar;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
 import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
 import org.apache.hadoop.hdfs.server.namenode.StandbySafeMode;
@@ -38,27 +41,22 @@ public class TestStandbySafeMode {
   private static boolean pass = true;
   private static Random random = new Random();
   private static final int LEASE_PERIOD = 10000;
+  private static int clearPrimaryCount = 0;
 
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
     MiniAvatarCluster.createAndStartZooKeeper();
   }
 
-  public void setUp(boolean shortlease) throws Exception {
-    setUp(shortlease, true);
-  }
-
-  public void setUp(boolean shortlease, boolean shortFBR) throws Exception {
+  public void setUp(boolean shortlease, String name) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
     h = new TestStandbySafeModeHandler();
     InjectionHandler.set(h);
     conf = new Configuration();
     conf.setInt("dfs.block.size", BLOCK_SIZE);
     conf.setFloat("dfs.namenode.replqueue.threshold-pct", 0.1f);
-    conf.setInt("dfs.datanode.blockreceived.retry.internval", 200);
     conf.setInt("dfs.heartbeat.interval", 1);
-    if (shortFBR) {
-      conf.setInt("dfs.datanode.fullblockreport.delay", 1000);
-    }
+    conf.setBoolean("fs.checkpoint.enabled", true);
     if (shortlease) {
       conf.setInt("dfs.softlease.period", LEASE_PERIOD);
       conf.setBoolean("fs.ha.retrywrites", true);
@@ -67,6 +65,7 @@ public void setUp(boolean shortlease, boolean shortFBR) throws Exception {
     cluster = new MiniAvatarCluster(conf, 3, true, null, null);
     fs = cluster.getFileSystem();
     pass = true;
+    clearPrimaryCount = 0;
   }
 
   @After
@@ -92,6 +91,7 @@ private void waitAndVerifyBlocks() throws Exception {
     // Wait for standby safe mode to catch up to all blocks.
     while (System.currentTimeMillis() - start <= MAX_WAIT_TIME
         && (primaryBlocks != standbyBlocks || standbySafeBlocks != primaryBlocks)) {
+      LOG.info("Verifying blocks...");
       primaryBlocks = primaryNS.getBlocksTotal();
       standbyBlocks = standbyNS.getBlocksTotal();
       standbySafeBlocks = standbyNS.getSafeBlocks();
@@ -111,7 +111,7 @@ private void createTestFiles(String topDir) throws Exception {
 
   @Test
   public void testStandbyFullBlockReport() throws Exception {
-    setUp(false);
+    setUp(false, "testStandbyFullBlockReport");
     h.setIgnoreDatanodes(false);
     // Create test files.
     createTestFiles("/testStandbySafeMode");
@@ -119,10 +119,10 @@ public void testStandbyFullBlockReport() throws Exception {
     cluster.killStandby();
     cluster.restartStandby();
     LOG.info("after restart");
+    Thread.sleep(1000); // do checkpoint
 
     long lastTxid = cluster.getPrimaryAvatar(0).avatar.getLastWrittenTxId();
 
-    // Need to quiesce to ingest edits.new since checkpointing is disabled.
     cluster.getStandbyAvatar(0).avatar.quiesceStandby(lastTxid);
 
     waitAndVerifyBlocks();
@@ -130,14 +130,14 @@ public void testStandbyFullBlockReport() throws Exception {
 
   @Test
   public void testStandbySafeMode() throws Exception {
-    setUp(false);
+    setUp(false, "testStandbySafeMode");
     h.setIgnoreDatanodes(false);
     // Create test files.
     createTestFiles("/testStandbySafeMode");
 
     // Sync all data to the edit log.
+    cluster.getPrimaryAvatar(0).avatar.getFSImage().getEditLog().logSyncAll();
     long lastTxid = cluster.getPrimaryAvatar(0).avatar.getLastWrittenTxId();
-    cluster.getPrimaryAvatar(0).avatar.getFSImage().getEditLog().logSync();
 
     // Need to quiesce to ingest edits.new since checkpointing is disabled.
     cluster.getStandbyAvatar(0).avatar.quiesceStandby(lastTxid);
@@ -156,7 +156,7 @@ private long getDatanodeBlocks() throws Exception {
 
   @Test
   public void testActiveDeletes() throws Exception {
-    setUp(false);
+    setUp(false, "testActiveDeletes");
     h.setIgnoreDatanodes(false);
     // Create test files.
     String fileName = "/testActiveDeletes";
@@ -177,7 +177,7 @@ && getDatanodeBlocks() != 0) {
 
   @Test
   public void testClearDatanodeRetryList() throws Exception {
-    setUp(false);
+    setUp(false, "testClearDatanodeRetryList");
     cluster.restartAvatarNodes();
     h.setIgnoreDatanodes(true);
     // Create test files.
@@ -225,6 +225,7 @@ class TestStandbySafeModeHandler extends InjectionHandler {
     volatile boolean forceblockreport = false;
     boolean ignoreDatanodes;
     public volatile boolean stallIngest = false;
+    volatile boolean stallOfferService = false;
     
     public void setIgnoreDatanodes(boolean v) {
       ignoreDatanodes = v;
@@ -254,13 +255,48 @@ protected void _processEvent(InjectionEvent event, Object... args) {
 
           }
         }
+      } else if (event == InjectionEvent.OFFERSERVICE_START && stallOfferService) {
+        try {
+          while (cluster.getPrimaryAvatar(0) == null) {
+            Set<DatanodeID> beats = cluster.getStandbyAvatar(0).avatar
+              .getStandbySafeMode().getOutStandingHeartbeats();
+            // If the failover is waiting on the datanode that we just
+            // started, then perform failover.
+            if (beats.size() == 1) {
+              DatanodeID node = beats.iterator().next();
+              if (node.getPort() == (Integer) args[0]
+                  && cluster.getStandbyAvatar(0).avatar.getNameNodeAddress()
+                  .equals(args[1])) {
+                break;
+                  }
+            }
+            LOG.info("Waiting for failover");
+            Thread.sleep(1000);
+          }
+        } catch (Throwable e) {
+          LOG.warn("Exception waiting for failover", e);
+          pass = false;
+        }
+      } else if (event == InjectionEvent.OFFERSERVICE_CLEAR_PRIMARY) {
+        clearPrimaryCount++;
+      } else if (event == InjectionEvent.STANDBY_FAILOVER_INPROGRESS
+          && stallOfferService) {
+        try {
+          cluster.startDataNodes(1, null, null, conf);
+          ArrayList<AvatarDataNode> dns = cluster.getDataNodes();
+          cluster.waitDataNodeInitialized(dns.get(dns.size() - 1));
+        } catch (Exception e) {
+          LOG.warn("Start datanode failed", e);
+          pass = false;
+        }
       }
+
     }
   }
 
   @Test
   public void testDeadDatanodeFailover() throws Exception {
-    setUp(false);
+    setUp(false, "testDeadDatanodeFailover");
     h.setIgnoreDatanodes(false);
     // Create test files.
     createTestFiles("/testDeadDatanodeFailover");
@@ -307,7 +343,7 @@ public void run() {
 
   @Test
   public void testLeaseExpiry() throws Exception {
-    setUp(true);
+    setUp(true, "testLeaseExpiry");
     h.setIgnoreDatanodes(false);
     LeaseManager leaseManager = cluster.getStandbyAvatar(0).avatar.namesystem.leaseManager;
     // Set low lease periods.
@@ -368,7 +404,7 @@ private void syncEditLog() throws Exception {
 
   @Test
   public void testStandbySafeModeDel() throws Exception {
-    setUp(false, false);
+    setUp(false, "testStandbySafeModeDel");
     h.setIgnoreDatanodes(false);
     // Create test files.
     String topDir = "/testStandbySafeModeDel";
@@ -422,7 +458,7 @@ public void testStandbySafeModeDel() throws Exception {
 
   @Test
   public void testStandbySafeModeDel1() throws Exception {
-    setUp(false, false);
+    setUp(false, "testStandbySafeModeDel1");
     h.setIgnoreDatanodes(false);
     // Create test files.
     String topDir = "/testStandbySafeModeDel";
@@ -468,4 +504,23 @@ public void testStandbySafeModeDel1() throws Exception {
 
     waitAndVerifyBlocks();
   }
+
+  @Test
+  public void testDatanodeRegisterDuringFailover() throws Exception {
+    String name = "testDatanodeRegisterDuringFailover";
+    setUp(false, name);
+    String topDir = "/" + name;
+    createTestFiles(topDir);
+    h.stallOfferService = true;
+    cluster.failOver();
+    long start = System.currentTimeMillis();
+    while (clearPrimaryCount != 4 &&
+        System.currentTimeMillis() - start < 30000) {
+      LOG.info("Waiting for clearPrimaryCount : " + clearPrimaryCount +
+          " to reach 4");
+      Thread.sleep(1000);
+    }
+    assertEquals(4, clearPrimaryCount);
+    assertTrue(pass);
+  }
 }
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/balancer/TestAvatarBalancer.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/balancer/TestAvatarBalancer.java
new file mode 100644
index 00000000..46be4672
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/balancer/TestAvatarBalancer.java
@@ -0,0 +1,151 @@
+package org.apache.hadoop.hdfs.server.balancer;
+
+import java.io.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.DistributedAvatarFileSystem;
+import org.apache.hadoop.hdfs.MiniAvatarCluster;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.balancer.AvatarBalancer;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestAvatarBalancer {
+  private static MiniAvatarCluster cluster;
+  private static FileSystem fs;
+  private static Configuration conf;
+  private static int BLOCK_SIZE = 1024;
+  private static int TOTAL_BLOCKS = 20;
+  private static int MAX_FILE_SIZE = BLOCK_SIZE * TOTAL_BLOCKS;
+  private static int MAX_FILES = 5;
+  private static int CAPACITY = MAX_FILES * MAX_FILE_SIZE;
+  private static boolean pass = true;
+  private static Log LOG = LogFactory.getLog(TestAvatarBalancer.class);
+
+  @Before
+  public void setUp() throws Exception {
+    conf = new Configuration();
+    conf.setInt("dfs.block.size", 1024);
+    conf.setLong("dfs.heartbeat.interval", 1L);
+    conf.setClass("dfs.balancer.impl", AvatarBalancer.class, Balancer.class);
+    cluster = new MiniAvatarCluster(conf, 2, true, null, null, 1, false,
+        new long[] { CAPACITY, CAPACITY });
+    conf.setLong("dfs.balancer.movedWinWidth", 2000L);
+    fs = cluster.getFileSystem();
+    new DFSTestUtil("/testBasic", MAX_FILES, 5, MAX_FILE_SIZE).createFiles(fs,
+        "/", (short) 2);
+    Balancer.setBlockMoveWaitTime(1000);
+    pass = true;
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    cluster.shutDown();
+  }
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  public void waitForHeartbeats() throws Exception {
+    DatanodeInfo[] dns = cluster.getPrimaryAvatar(0).avatar
+        .getDatanodeReport(DatanodeReportType.ALL);
+    while (true) {
+      int count = 0;
+      for (DatanodeInfo dn : dns) {
+        if (dn.getRemaining() == 5 * MAX_FILE_SIZE || dn.getRemaining() == 0) {
+          LOG.info("Bad dn : " + dn.getName() + " remaining : "
+              + dn.getRemaining());
+          count++;
+        }
+      }
+      dns = cluster.getPrimaryAvatar(0).avatar
+        .getDatanodeReport(DatanodeReportType.ALL);
+      if (count == 1)
+        break;
+      LOG.info("Waiting for heartbeats");
+      Thread.sleep(1000);
+    }
+  }
+
+  private static void runBalancer() throws Exception {
+    Configuration bconf = new Configuration(conf);
+    bconf.setClass("fs.hdfs.impl", DistributedAvatarFileSystem.class,
+        FileSystem.class);
+    Balancer b = new AvatarBalancer(bconf);
+    assertEquals(0, b.run(new String[] { "-threshold", "1" }));
+  }
+
+  @Test
+  public void testBasic() throws Exception {
+    cluster.startDataNodes(new long[] { CAPACITY }, 1, null, null, conf);
+    cluster.waitDataNodesActive();
+    waitForHeartbeats();
+    runBalancer();
+  }
+
+  @Test
+  public void testAfterFailover() throws Exception {
+    cluster.startDataNodes(new long[] { CAPACITY }, 1, null, null, conf);
+    cluster.waitDataNodesActive();
+    cluster.failOver();
+    waitForHeartbeats();
+    runBalancer();
+  }
+
+  private static class BalancerThread extends Thread {
+    public void run() {
+      try {
+        runBalancer();
+      } catch (Throwable e) {
+        LOG.error("Balancer failed : ", e);
+        pass = false;
+      }
+    }
+  }
+
+  @Test
+  public void testDuringFailover() throws Exception {
+    cluster.startDataNodes(new long[] { CAPACITY }, 1, null, null, conf);
+    cluster.waitDataNodesActive();
+    waitForHeartbeats();
+    Thread t = new BalancerThread();
+    t.start();
+    cluster.failOver();
+    t.join();
+    assertTrue(pass);
+  }
+
+  @Test
+  public void testAfterFailoverShell() throws Exception {
+    cluster.startDataNodes(new long[] { CAPACITY }, 1, null, null, conf);
+    cluster.waitDataNodesActive();
+    cluster.failOver();
+    waitForHeartbeats();
+    File confFile = new File(new File(MiniAvatarCluster.TEST_DIR).getParent(),
+        "core-site.xml");
+    conf.unset("dfs.balancer.impl");
+    FileOutputStream out = new FileOutputStream(confFile);
+    conf.writeXml(out);
+    out.close();
+    confFile.deleteOnExit();
+    assertEquals(0,
+        AvatarBalancer.runBalancer(new String[] { "-threshold", "1" }));
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDataNodeMXBean.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDataNodeMXBean.java
index b6e31230..2e5f1e3d 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDataNodeMXBean.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDataNodeMXBean.java
@@ -70,8 +70,9 @@ public void testAvatarDataNode() throws Exception {
     conf.setFloat("dfs.namenode.replqueue.threshold-pct", 0f);
     conf.setLong("fs.avatar.standbyfs.initinterval", 1000);
     conf.setLong("fs.avatar.standbyfs.checkinterval", 1000);
-    MiniAvatarCluster cluster = new MiniAvatarCluster(conf, 1, true, null, null, 2, true); 
+    MiniAvatarCluster cluster = null;
     try {
+      cluster = new MiniAvatarCluster(conf, 1, true, null, null, 2, true); 
       List<AvatarDataNode> datanodes = cluster.getDataNodes();
       Assert.assertEquals(datanodes.size(), 1);
       checkMXBean(datanodes.get(0));
@@ -86,8 +87,9 @@ public void testAvatarDataNode() throws Exception {
   @Test
   public void testDataNode() throws Exception {
     Configuration conf = new Configuration();
-    MiniDFSCluster cluster = new MiniDFSCluster(0, conf, 1, true, null, 2);
+    MiniDFSCluster cluster = null;
     try {
+      cluster = new MiniDFSCluster(0, conf, 1, true, null, 2);
       List<DataNode> datanodes = cluster.getDataNodes();
       Assert.assertEquals(datanodes.size(), 1);
       checkMXBean(datanodes.get(0));
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDataNodeRBW.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDataNodeRBW.java
index 44c528f9..10764724 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDataNodeRBW.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDataNodeRBW.java
@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.Random;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
@@ -22,6 +24,9 @@
 import org.junit.Test;
 
 public class TestAvatarDataNodeRBW {
+  
+  final static Log LOG = LogFactory.getLog(TestAvatarDataNodeRBW.class);
+  
   private Configuration conf;
   private MiniAvatarCluster cluster;
   private static FileSystem dafs;
@@ -37,13 +42,12 @@ public static void setUpBeforeClass() throws Exception {
     MiniAvatarCluster.createAndStartZooKeeper();
   }
 
-  @Before
-  public void setUp() throws Exception {
+  public void setUp(String name) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
     conf = new Configuration();
     conf.setInt("dfs.block.size", BLOCK_SIZE);
     conf.setInt("dfs.replication.min", 3);
     conf.setBoolean("dfs.support.append", true);
-    conf.setInt("dfs.datanode.blockreceived.retry.internval", 1000);
     cluster = new MiniAvatarCluster(conf, 3, true, null, null);
     dafs = cluster.getFileSystem();
   }
@@ -120,6 +124,7 @@ private boolean blocksReceived(int nBlocks, String fileName) throws IOException
 
   @Test
   public void testAvatarDatanodeRBW() throws Exception {
+    setUp("testAvatarDatanodeRBW");
     String testCase = "/testAvatarDatanodeRBW";
     int blocksBefore = initializeTest(testCase);
     // Restart avatar nodes.
@@ -129,6 +134,7 @@ public void testAvatarDatanodeRBW() throws Exception {
 
   @Test
   public void testAvatarDatanodeRBWFailover() throws Exception {
+    setUp("testAvatarDatanodeRBWFailover");
     String testCase = "/testAvatarDatanodeRBWFailover";
     int blocksBefore = initializeTest(testCase);
     // Perform a failover.
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDatanodeNoService.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDatanodeNoService.java
new file mode 100644
index 00000000..5e686ce7
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDatanodeNoService.java
@@ -0,0 +1,80 @@
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniAvatarCluster;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+
+import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestAvatarDatanodeNoService {
+
+  private static Configuration conf;
+  private static MiniAvatarCluster cluster;
+  private static volatile boolean pass = true;
+  private static volatile boolean done = false;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+    conf = new Configuration();
+    cluster = new MiniAvatarCluster(conf, 1, true, null, null);
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    cluster.shutDown();
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  private static class TestHandler extends InjectionHandler {
+    @Override
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.AVATARDATANODE_BEFORE_START_OFFERSERVICE1) {
+        try {
+          if (cluster.getPrimaryAvatar(0) != null) {
+            cluster.killPrimary();
+            done = true;
+          }
+        } catch (IOException e) {
+          System.out.println("KillPrimary failed : " + e);
+          pass = false;
+        }
+      }
+    }
+
+  }
+
+  @Test
+  public void testDatanodeNoService() throws Exception {
+    cluster.shutDownDataNodes();
+    cluster.killStandby();
+    cluster.restartStandby();
+    InjectionHandler.set(new TestHandler());
+    cluster.restartDataNodes(false);
+    // Wait for trigger.
+    while (!done) {
+      System.out.println("Waiting for trigger");
+      Thread.sleep(1000);
+    }
+    int dnReports = cluster.getStandbyAvatar(0).avatar
+        .getDatanodeReport(DatanodeReportType.LIVE).length;
+    long start = System.currentTimeMillis();
+    while (System.currentTimeMillis() - start < 30000 && dnReports != 1) {
+      System.out.println("Waiting for dn report");
+      Thread.sleep(1000);
+      dnReports = cluster.getStandbyAvatar(0).avatar
+          .getDatanodeReport(DatanodeReportType.LIVE).length;
+    }
+    assertEquals(1, dnReports);
+    assertTrue(pass);
+    assertTrue(done);
+  }
+
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDatanodeRetryRegister.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDatanodeRetryRegister.java
new file mode 100644
index 00000000..8f28dc96
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarDatanodeRetryRegister.java
@@ -0,0 +1,67 @@
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniAvatarCluster;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class TestAvatarDatanodeRetryRegister {
+
+  private static int registrations = 0;
+
+  private static class TestAvatarDatanodeRetryRegisterHandler extends InjectionHandler {
+
+    @Override
+    public void _processEventIO(InjectionEvent event, Object... args)
+        throws IOException {
+      if (event == InjectionEvent.OFFERSERVICE_BEFORE_REGISTRATION) {
+        registrations++;
+        throw new IOException("EXCEPTION!!!");
+      }
+    }
+  }
+
+  /**
+   * This tests whether when the datanode is having trouble with registration
+   * to the namenode, the offerservice threads for the datanode are restarted
+   * and the datanode then is correctly able to register to the namenode.
+   */
+  @Test(timeout=60000)
+  public void testAvatarDatanodeRetryRegister() throws Exception {
+    Configuration conf = new Configuration();
+    conf.setLong("dfs.heartbeat.interval", 1);
+    InjectionHandler.set(new TestAvatarDatanodeRetryRegisterHandler());
+    MiniAvatarCluster.createAndStartZooKeeper();
+    MiniAvatarCluster cluster = new MiniAvatarCluster(conf, 1, true, null, null);
+    try {
+      FSNamesystem ns = cluster.getPrimaryAvatar(0).avatar.namesystem;
+      // These two lines make sure the datanode is marked as dead and is no longer registered.
+      ns.setDatanodeDead(ns.getDatanode(cluster.getDataNodes().get(0)
+            .getDNRegistrationForNS(cluster.getNamespaceId(0))));
+      ns.removeDatanode(cluster.getDataNodes().get(0)
+          .getDNRegistrationForNS(cluster.getNamespaceId(0)));
+      assertEquals(0,
+          ns.getNameNode().getDatanodeReport(DatanodeReportType.LIVE).length);
+      int livenodes = ns.getNameNode().getDatanodeReport(DatanodeReportType.LIVE).length;
+      // Wait for the datanode to register successfully.
+      while (registrations != 1 || livenodes != 1) {
+        System.out.println("Waiting for registrations : " + registrations);
+        Thread.sleep(1000);
+        livenodes = ns.getNameNode().getDatanodeReport(DatanodeReportType.LIVE).length;
+      }
+      assertEquals(1,
+          ns.getNameNode().getDatanodeReport(DatanodeReportType.LIVE).length);
+      assertEquals(1, registrations);
+    } finally {
+      cluster.shutDown();
+      MiniAvatarCluster.shutDownZooKeeper();
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarRefreshNamenodes.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarRefreshNamenodes.java
index 52396d4b..84b60144 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarRefreshNamenodes.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/datanode/TestAvatarRefreshNamenodes.java
@@ -76,9 +76,9 @@ private void setupAddress(Configuration conf, int[] nns) {
   
   @Test
   public void testRefreshNamenodes() throws Exception {
-    MiniAvatarCluster cluster = null;
+    MiniAvatarCluster cluster =
+      new MiniAvatarCluster(conf, 1, true, null, null, 1, true); 
     try {
-      cluster = new MiniAvatarCluster(conf, 1, true, null, null, 1, true); 
       DataNode dn = cluster.getDataNodes().get(0);
       assertEquals(dn.getAllNamespaceServices().length, 1);
       
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestAvatarCheckpointingFailure.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestAvatarCheckpointingFailure.java
new file mode 100644
index 00000000..4c1a1362
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestAvatarCheckpointingFailure.java
@@ -0,0 +1,152 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniAvatarCluster;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLog;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil.CheckpointTrigger;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class TestAvatarCheckpointingFailure {
+
+  final static Log LOG = LogFactory
+      .getLog(TestAvatarCheckpointingFailure.class);
+
+  private Runtime runtime;
+  private MiniAvatarCluster cluster;
+  private Configuration conf;
+  private FileSystem fs;
+  private Random random = new Random();
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+  }
+
+  private void setUp(String name) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
+    conf = new Configuration();
+    conf.setLong("fs.checkpoint.period", 3600);
+
+    cluster = new MiniAvatarCluster(conf, 2, true, null, null);
+    fs = cluster.getFileSystem();
+
+    // spy the runtime
+    runtime = Runtime.getRuntime();
+    runtime = spy(runtime);
+    doNothing().when(runtime).exit(anyInt());
+    FSEditLog.setRuntimeForTesting(runtime);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    fs.close();
+    cluster.shutDown();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  public void createEdits(int nEdits) throws IOException {
+    for (int i = 0; i < nEdits / 2; i++) {
+      // Create file ends up logging two edits to the edit log, one for create
+      // file and one for bumping up the generation stamp
+      fs.create(new Path("/" + random.nextInt()));
+    }
+  }
+
+  // ////////////////////////////
+
+  @Test
+  public void testCheckpointMaxFailures() throws Exception {
+    TestAvatarCheckpointingFailureHandler h = new TestAvatarCheckpointingFailureHandler();
+    InjectionHandler.set(h);
+    setUp("testCheckpointWithRestarts");
+    // simulate interruption, no ckpt failure
+    createEdits(20);
+    h.disabled = false;
+
+    // 11-th failed checkpoint should cause runtime.exit()
+    for (int i = 0; i < 11; i++) {
+      try {
+        h.doCheckpoint();
+        fail("Checkpoint should not succeed");
+      } catch (IOException e) {
+        LOG.info("Expected exception", e);
+      }
+    }
+    verify(runtime, times(1)).exit(anyInt());
+  }
+
+  class TestAvatarCheckpointingFailureHandler extends InjectionHandler {
+    private CheckpointTrigger ckptTrigger = new CheckpointTrigger();
+    int checkpointFailureCount = 0;
+    volatile boolean disabled = true;
+
+    @Override
+    protected void _processEventIO(InjectionEvent event, Object... args)
+        throws IOException {
+      if (!disabled) {
+        if (event == InjectionEvent.STANDBY_BEFORE_ROLL_IMAGE) {
+          throw new IOException("Simulating checkpoint failure");
+        }
+      }
+    }
+
+    @Override
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.STANDBY_EXIT_CHECKPOINT_EXCEPTION) {
+        checkpointFailureCount++;
+        LOG.info("Chackpoint failures so far: " + checkpointFailureCount);
+      }
+      ckptTrigger.checkpointDone(event, args);
+    }
+
+    @Override
+    protected boolean _falseCondition(InjectionEvent event, Object... args) {
+      return ckptTrigger.triggerCheckpoint(event);
+    }
+
+    void doCheckpoint() throws IOException {
+      ckptTrigger.doCheckpoint();
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestAvatarLease.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestAvatarLease.java
index beef5523..b60cd2a6 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestAvatarLease.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestAvatarLease.java
@@ -57,7 +57,7 @@ public void testLeaseAfterFailover() throws Exception {
     cluster.restartDataNodes(false);
 
     AvatarNode standbyAvatar = cluster.getStandbyAvatar(0).avatar;
-    standbyAvatar.setAvatar(Avatar.ACTIVE);
+    cluster.failOver();
 
     String lease = standbyAvatar.namesystem.leaseManager
         .getLeaseByPath(fileName).getHolder();
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyDeadnodes.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyDeadnodes.java
new file mode 100644
index 00000000..c540f2a9
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyDeadnodes.java
@@ -0,0 +1,100 @@
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.MiniAvatarCluster;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestStandbyDeadnodes {
+
+  private static MiniAvatarCluster cluster;
+  private static Configuration conf;
+  private static final int recheck = 100;
+  private static final int interval = 1000;
+  private static final int expire = 2 * recheck + 10 * interval;
+  private static final Log LOG = LogFactory.getLog(TestStandbyDeadnodes.class);
+  private static boolean pass = true;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    MiniAvatarCluster.createAndStartZooKeeper();
+  }
+
+  @Before
+  public void setup() throws Exception {
+    pass = true;
+    conf = new Configuration();
+    conf.setLong("dfs.heartbeat.interval", interval / 1000);
+    conf.setInt("heartbeat.recheck.interval", recheck);
+    cluster = new MiniAvatarCluster(conf, 3, true, null, null);
+    new DFSTestUtil("/test", 1, 1, 1024).createFiles(cluster.getFileSystem(),
+        "/test");
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    MiniAvatarCluster.shutDownZooKeeper();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    InjectionHandler.clear();
+    cluster.shutDown();
+  }
+
+  private static class TestHandler extends InjectionHandler {
+
+    @Override
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.STANDBY_ENTER_SAFE_MODE) {
+        try {
+          long starttime = System.currentTimeMillis();
+          FSNamesystem ns = cluster.getStandbyAvatar(0).avatar.namesystem;
+          boolean reached = (ns.getSafeBlocks() == ns.getBlocksTotal());
+          while (System.currentTimeMillis() - starttime < 30000 && !reached) {
+            reached = (ns.getSafeBlocks() == ns.getBlocksTotal());
+            LOG.info("Waiting for blocks");
+            Thread.sleep(1000);
+          }
+          if (!reached) {
+            throw new Exception("Did not reach threshold");
+          }
+          for (int i = 0; i < 2; i++) {
+            cluster.shutDownDataNode(i);
+          }
+        } catch (Exception e) {
+          pass = false;
+          LOG.warn("Shutdown failed : ", e);
+        }
+      }
+    }
+  }
+
+  @Test
+  public void testDeadDatanode() throws Exception {
+    cluster.shutDownDataNodes();
+    // Wait for all heartbeats to expire;
+    Thread.sleep(2 * expire);
+    assertEquals(0,
+        cluster.getPrimaryAvatar(0).avatar.namesystem.heartbeats.size());
+    assertEquals(0,
+        cluster.getStandbyAvatar(0).avatar.namesystem.heartbeats.size());
+  }
+
+  @Test
+  public void testDeadDatanodeDuringFailover() throws Exception {
+    InjectionHandler.set(new TestHandler());
+    cluster.failOver();
+    assertTrue(pass);
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyFailoverRetry.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyFailoverRetry.java
new file mode 100644
index 00000000..7c3cc19a
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyFailoverRetry.java
@@ -0,0 +1,165 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.server.namenode.AvatarNode;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogLoader;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.FailoverTestUtil;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ * Test cases to valid Standby behavior when a failover does not succeed.
+ */
+public class TestStandbyFailoverRetry extends FailoverTestUtil {
+
+  private volatile static boolean restartDone = false;
+
+  private static class WaitForRestart extends Thread {
+    private final AvatarNode node;
+
+    public WaitForRestart(AvatarNode node) {
+      this.node = node;
+    }
+
+    public void run() {
+      node.waitForRestart();
+      restartDone = true;
+    }
+  }
+
+  public void setUp(String name) throws Exception {
+    super.setUp(name);
+    restartDone = false;
+    new WaitForRestart(cluster.getPrimaryAvatar(0).avatar).start();
+    new WaitForRestart(cluster.getStandbyAvatar(0).avatar).start();
+  }
+
+  private void tryConnect(AvatarNode node) throws Exception {
+    for (int i = 0; i < 30; i++) {
+      InetSocketAddress addr = node.getNameNodeAddress();
+      Socket s = new Socket();
+      s.connect(addr);
+      LOG.info("TryConnect : " + i);
+      Thread.sleep(1000);
+    }
+  }
+
+  @Test
+  public void testFailoverWithRestart() throws Exception {
+    setUp("testFailoverWithRestart");
+    DFSTestUtil.createFile(fs, new Path("/testFailoverWithRestart"), 1024,
+        (short) 1, System.currentTimeMillis());
+    FailoverTestUtilHandler handler = new FailoverTestUtilHandler();
+    handler.simulateShutdownCrash = false;
+    InjectionHandler.set(handler);
+    AvatarNode node = cluster.getStandbyAvatar(0).avatar;
+    cluster.killPrimary();
+    cluster.getStandbyAvatar(0).avatar.quiesceForFailover(false);
+    while (!handler.waitForRestartTrigger) {
+      LOG.info("Waiting for restart");
+      Thread.sleep(1000);
+    }
+    Thread.sleep(5000);
+    tryConnect(node);
+    cluster.getStandbyAvatar(0).avatar.performFailover();
+    tryConnect(node);
+  }
+
+  @Test
+  public void testFailoverRetryTxIdMisMatch() throws Exception {
+    setUp("testFailoverRetryTxIdMisMatch");
+    createEditsNotSynced(20);
+    fs.close();
+    FailoverTestUtilHandler handler = new FailoverTestUtilHandler();
+    handler.simulateShutdownCrash = false;
+    InjectionHandler.set(handler);
+    // Txid will now mismatch.
+    cluster.getPrimaryAvatar(0).avatar.namesystem.getEditLog()
+        .setLastWrittenTxId(0);
+    AvatarNode node = cluster.getStandbyAvatar(0).avatar;
+    try {
+      cluster.failOver();
+      fail("Did not throw exception");
+    } catch (IOException ie) {
+      while (!handler.waitForRestartTrigger) {
+        LOG.info("Waiting for restart");
+        Thread.sleep(1000);
+      }
+      tryConnect(node);
+      cluster.failOver(true);
+      tryConnect(node);
+    }
+  }
+
+  @Test
+  public void testFailoverRetryBlocksMisMatch() throws Exception {
+    setUp("testFailoverRetryBlocksMisMatch");
+    int totalBlocks = 50;
+    FailoverTestUtilHandler handler = new FailoverTestUtilHandler();
+    handler.simulateShutdownCrash = false;
+    InjectionHandler.set(handler);
+    DFSTestUtil.createFile(fs, new Path("/testFailoverRetryBlocksMisMatch"),
+        (long) totalBlocks * 1024, (short) 3, System.currentTimeMillis());
+    // This sets the primary number of blocks to 0.
+    cluster.getPrimaryAvatar(0).avatar.namesystem.close();
+    cluster.getPrimaryAvatar(0).avatar.namesystem.blocksMap.close();
+    AvatarNode node = cluster.getStandbyAvatar(0).avatar;
+    try {
+      cluster.failOver();
+      fail("Did not throw exception");
+    } catch (Exception e) {
+      while (!handler.waitForRestartTrigger) {
+        LOG.info("Waiting for restart");
+        Thread.sleep(1000);
+      }
+      tryConnect(node);
+      cluster.failOver(true);
+      tryConnect(node);
+    }
+  }
+
+  @Test
+  public void testFailoverRetryStandbyQuiesce() throws Exception {
+    setUp("testFailoverRetryBlocksMisMatch");
+    int totalBlocks = 50;
+    DFSTestUtil.createFile(fs, new Path("/testFailoverRetryBlocksMisMatch"),
+        (long) totalBlocks * 1024, (short) 3, System.currentTimeMillis());
+    // This should shutdown the standby.
+    cluster.getStandbyAvatar(0).avatar
+        .quiesceStandby(FSEditLogLoader.TXID_IGNORE);
+    while (!restartDone) {
+      LOG.info("Waiting for restart..");
+      Thread.sleep(1000);
+    }
+    try {
+      tryConnect(cluster.getStandbyAvatar(0).avatar);
+      fail("Did not throw exception");
+    } catch (Exception e) {
+      LOG.warn("Expected exception : ", e);
+    }
+  }
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbySafeModeImpl.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbySafeModeImpl.java
index f456aa62..e091681b 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbySafeModeImpl.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbySafeModeImpl.java
@@ -13,7 +13,6 @@
 import org.apache.hadoop.hdfs.server.namenode.StandbySafeMode.SafeModeState;
 
 import static org.junit.Assert.*;
-import org.junit.Before;
 import org.junit.Test;
 
 public class TestStandbySafeModeImpl {
@@ -21,8 +20,7 @@ public class TestStandbySafeModeImpl {
   private static Configuration conf;
   private static MyNamesystem namesystem;
   private static final Random random = new Random();
-  private static Log LOG = LogFactory
-.getLog(TestStandbySafeModeImpl.class);
+  private static Log LOG = LogFactory.getLog(TestStandbySafeModeImpl.class);
 
   private class MyNamesystem extends FSNamesystem {
     public long totalBlocks = 0;
@@ -31,23 +29,74 @@ private class MyNamesystem extends FSNamesystem {
     public long getBlocksTotal() {
       return totalBlocks;
     }
+
+    @Override
+    public boolean isDatanodeDead(DatanodeDescriptor node) {
+      return false;
+    }
   }
 
-  @Before
-  public void setUp() throws Exception {
+  private void setUp(String name) throws Exception {
+    LOG.info("------------------- test: " + name + " START ----------------");
     conf = new Configuration();
     namesystem = new MyNamesystem();
     safeMode = new StandbySafeMode(conf, namesystem);
   }
 
 
-  private DatanodeID generateRandomDatanodeID() {
+  private static DatanodeID generateRandomDatanodeID() {
     String nodeName = "" + random.nextLong();
     return new DatanodeID(nodeName);
   }
 
+  private static class ModificationThread extends Thread {
+    private boolean running = true;
+
+    public void run() {
+      while (running) {
+        List<DatanodeID> datanodes = new ArrayList<DatanodeID>();
+        for (int i = 0; i < 50; i++) {
+          DatanodeID node = generateRandomDatanodeID();
+          datanodes.add(node);
+          safeMode.reportHeartBeat(node);
+        }
+
+        for (DatanodeID node : datanodes) {
+          if (random.nextBoolean()) {
+            safeMode.reportPrimaryCleared(node);
+          }
+        }
+      }
+    }
+
+    public void shutdown() {
+      running = false;
+    }
+  }
+
+  @Test
+  public void testConcurrentModification() throws Exception {
+    setUp("testConcurrentModification");
+    namesystem.totalBlocks = 100;
+    namesystem.blocksSafe = 100;
+    safeMode.setSafeModeStateForTesting(SafeModeState.FAILOVER_IN_PROGRESS);
+    List<DatanodeID> datanodes = new ArrayList<DatanodeID>();
+    for (int i = 0; i < 100; i++) {
+      DatanodeID node = generateRandomDatanodeID();
+      datanodes.add(node);
+      safeMode.reportHeartBeat(node);
+    }
+    ModificationThread t = new ModificationThread();
+    t.start();
+    for (int i = 0; i < 100000; i++) {
+      safeMode.canLeave();
+    }
+    t.shutdown();
+  }
+
   @Test
   public void testBlocks() throws Exception {
+    setUp("testBlocks");
     assertTrue(safeMode.isOn());
     assertFalse(safeMode.canLeave());
 
@@ -61,6 +110,7 @@ public void testBlocks() throws Exception {
 
   @Test
   public void testReports() throws Exception {
+    setUp("testReports");
     assertTrue(safeMode.isOn());
     assertFalse(safeMode.canLeave());
 
@@ -83,6 +133,7 @@ public void testReports() throws Exception {
 
   @Test
   public void testEarlyExit() throws Exception {
+    setUp("testEarlyExit");
     namesystem.totalBlocks = 100;
     namesystem.blocksSafe = 100;
 
@@ -97,6 +148,7 @@ public void testEarlyExit() throws Exception {
 
   @Test
   public void testRandomReports() throws Exception {
+    setUp("testRandomReports");
     int totalNodes = 10;
     List <DatanodeID> datanodes = new ArrayList<DatanodeID>();
     for (int i = 0; i < totalNodes; i++) {
@@ -149,7 +201,8 @@ public void testRandomReports() throws Exception {
   }
 
   @Test
-  public void testBlocksNotSufficient() {
+  public void testBlocksNotSufficient() throws Exception {
+    setUp("testBlocksNotSufficient");
     namesystem.totalBlocks = 100;
     namesystem.blocksSafe = 50;
 
@@ -168,7 +221,8 @@ public void testBlocksNotSufficient() {
   }
 
   @Test
-  public void testReportsNotSufficient() {
+  public void testReportsNotSufficient() throws Exception {
+    setUp("testReportsNotSufficient");
     namesystem.totalBlocks = 100;
     namesystem.blocksSafe = 100;
 
@@ -190,7 +244,8 @@ public void testReportsNotSufficient() {
   }
 
   @Test
-  public void testAllSufficient() {
+  public void testAllSufficient() throws Exception {
+    setUp("testAllSufficient");
     namesystem.totalBlocks = 100;
     namesystem.blocksSafe = 100;
 
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyStorageRetentionManager.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyStorageRetentionManager.java
new file mode 100644
index 00000000..40eb781f
--- /dev/null
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestStandbyStorageRetentionManager.java
@@ -0,0 +1,179 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestStandbyStorageRetentionManager {
+
+  public static final Log LOG = LogFactory
+      .getLog(TestStandbyStorageRetentionManager.class.getName());
+
+  private File base_dir = new File(System.getProperty("test.build.data",
+      "build/test/data"));
+  private Configuration conf;
+  private FileSystem fs;
+  private File dir = new File(base_dir, "test");
+
+  @Before
+  public void setUp() throws IOException {
+    LOG.info("----------------- START ----------------- ");
+    conf = new Configuration();
+    fs = FileSystem.getLocal(conf).getRaw();
+    FileUtil.fullyDelete(base_dir);
+  }
+
+  @Test
+  public void testBackupNoLimit() throws IOException {
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_DAYS_TOKEEP, 0);
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_COPIES_TOKEEP, 0);
+
+    // we can create backups indefinitely
+    createBackups(50, conf, dir, fs, -1);
+  }
+
+  @Test
+  public void testBackupWithLimit() throws IOException {
+    int limit = 5;
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_DAYS_TOKEEP, 1);
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_COPIES_TOKEEP,
+        limit);
+
+    // we can create backups up to limit-1, the limit-th should fail
+    createBackups(10, conf, dir, fs, limit);
+  }
+
+  @Test
+  public void testDeleteOldBackups1() throws IOException {
+    // 3-1 two copies should be retained
+    int daysToKeep = 0;
+    int copiesToKeep = 3;
+    int initialCopies = 10;
+    testDeleteOldBackupsInternal(initialCopies, copiesToKeep, daysToKeep);
+  }
+
+  @Test
+  public void testDeleteOldBackups2() throws IOException {
+    // no copies should be deleted
+    int daysToKeep = 0;
+    int copiesToKeep = 5;
+    int initialCopies = 3;
+    testDeleteOldBackupsInternal(initialCopies, copiesToKeep, daysToKeep);
+  }
+
+  @Test
+  public void testSortedListBackups() throws Exception {
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_DAYS_TOKEEP, 0);
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_COPIES_TOKEEP, 0);
+
+    String[] backups = createBackups(10, conf, dir, fs, -1);
+    assertEquals(10, backups.length);
+    Date[] backupDates = new Date[backups.length];
+    for (int i = 0; i < backups.length; i++) {
+      String b = backups[i];
+      backupDates[i] = StandbyStorageRetentionManager.dateForm.parse(b
+          .substring(b.indexOf(File.pathSeparator) + 1));
+    }
+
+    // aseert that the copies are sorted from oldest to newest
+    for (int i = 1; i < backupDates.length; i++) {
+      backupDates[i].after(backupDates[i - 1]);
+    }
+  }
+
+  // /////////////////////////////////////////////////////////////////////////
+
+  private void testDeleteOldBackupsInternal(int initialCopies,
+      int copiesToKeep, int daysToKeep) throws IOException {
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_DAYS_TOKEEP, 0);
+    conf.setInt(StandbyStorageRetentionManager.STANDBY_IMAGE_COPIES_TOKEEP, 0);
+
+    // create backups
+    String[] backups = createBackups(initialCopies, conf, dir, fs, -1);
+
+    StandbyStorageRetentionManager.deleteOldBackups(dir.getParentFile(),
+        backups, daysToKeep, copiesToKeep);
+
+    String[] backupsAfter = StandbyStorageRetentionManager.getBackups(dir);
+
+    int shift = Math.max(0, initialCopies - copiesToKeep + 1);
+    for (int i = 0; i < backupsAfter.length; i++) {
+      assertTrue(backupsAfter[i].equals(backups[i + shift]));
+    }
+
+    // days to keep is set to 0, so we should keep 3-1 backups
+    // or all
+    int expectedCount = shift == 0 ? initialCopies : copiesToKeep - 1;
+    assertEquals(expectedCount,
+        StandbyStorageRetentionManager.getBackups(dir).length);
+  }
+
+  private static String[] createBackups(int count, Configuration conf,
+      File dir, FileSystem fs, int failAtBackup) throws IOException {
+    // create count backups
+    for (int i = 0; i < count; i++) {
+      // create directory
+      dir.mkdirs();
+
+      try {
+        // create backup for the directory
+        StandbyStorageRetentionManager.backupFiles(fs, dir, conf);
+        if (i == failAtBackup) {
+          fail("Backup should not be created");
+        }
+      } catch (IOException e) {
+        if (i == failAtBackup) {
+          LOG.info("Expected exception", e);
+          break;
+        }
+      }
+
+      // original directory does not exist
+      assertFalse(dir.exists());
+
+      String[] backups = StandbyStorageRetentionManager.getBackups(dir);
+      assertEquals(i + 1, backups.length);
+      sleep();
+    }
+    return StandbyStorageRetentionManager.getBackups(dir);
+  }
+
+  private static void sleep() {
+    try {
+      Thread.sleep(100);
+    } catch (InterruptedException e) {
+      // Ignore
+    }
+  }
+
+}
diff --git a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestZookeeperTxId.java b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestZookeeperTxId.java
index f447340d..ce8a34fe 100644
--- a/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestZookeeperTxId.java
+++ b/src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/server/namenode/TestZookeeperTxId.java
@@ -16,7 +16,7 @@ public class TestZookeeperTxId {
 
   @Test
   public void testSerialize() throws Exception {
-    ZookeeperTxId before = new ZookeeperTxId(0, 1, 2);
+    ZookeeperTxId before = new ZookeeperTxId(0, 1, 2, 3);
     byte[] data = before.toBytes();
     ZookeeperTxId after = ZookeeperTxId.getFromBytes(data);
     assertEquals(before, after);
diff --git a/src/contrib/namespace-notifier/build.xml b/src/contrib/namespace-notifier/build.xml
new file mode 100644
index 00000000..768c78af
--- /dev/null
+++ b/src/contrib/namespace-notifier/build.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+
+<!--
+   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.
+-->
+
+<!--
+Before you can run these subtargets directly, you need
+to call at top-level: ant deploy-contrib compile-core-test
+-->
+<project name="namespace-notifier" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+  <import file="../build-contrib.xml"/>
+
+  <target name="compile" depends="init, ivy-retrieve-common" unless="skip.contrib">
+    <echo message="contrib: ${name}" />
+    <javac
+     includeantruntime="true"
+     encoding="${build.encoding}"
+     srcdir="${src.dir}:${root}/gen-java"
+     includes="**/*.java"
+     destdir="${build.classes}"
+     debug="${javac.debug}"
+     deprecation="${javac.deprecation}">
+      <classpath refid="contrib-classpath"/>
+    </javac>
+    <copy todir="${build.classes}">
+       <fileset dir="${root}/conf">
+         <include name="namespace-notifier-server-default.xml" />
+       </fileset>
+    </copy>
+  </target>
+
+  <target name="package" depends="jar, jar-examples" unless="skip.contrib">
+   <mkdir dir="${dist.dir}/contrib/${name}"/>
+   <mkdir dir="${dist.dir}/contrib/${name}/conf"/>
+   <copy todir="${dist.dir}/contrib/${name}">
+    <fileset dir="${build.dir}">
+       <include name="hadoop-${version}-${name}.jar" />
+     </fileset>
+   </copy>
+   <copy todir="${dist.dir}/contrib/${name}/conf">
+     <fileset dir="${root}/conf">
+       <include name="namespace-notifier-server-site.xml" />
+     </fileset>
+   </copy>
+  </target>
+
+</project>
+
diff --git a/src/contrib/namespace-notifier/conf/namespace-notifier-server-default.xml b/src/contrib/namespace-notifier/conf/namespace-notifier-server-default.xml
new file mode 100644
index 00000000..34244f62
--- /dev/null
+++ b/src/contrib/namespace-notifier/conf/namespace-notifier-server-default.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+<property>
+  <name>notifier.thrift.port</name>
+  <value>31000</value>
+</property>
+
+<property>
+  <name>notifier.server.id</name>
+  <value>-1</value>
+</property>
+
+<property>
+  <name>notifier.dispatcher.count</name>
+  <value>10</value>
+</property>
+
+<property>
+  <name>notifier.dispatcher.pool.size</name>
+  <value>100</value>
+</property>
+
+<property>
+  <name>notifier.client.timeout</name>
+  <value>10000</value>
+</property>
+
+<property>
+  <name>notifier.heartbeat.timeout</name>
+  <value>20000</value>
+</property>
+
+<property>
+  <name>notifier.history.length</name>
+  <value>900000</value>
+</property>
+
+<property>
+  <name>notifier.history.limit</name>
+  <value>-1</value>
+</property>
+
+<property>
+  <name>notifier.edits.dir</name>
+  <value></value>
+</property>
+
+</configuration>
diff --git a/src/contrib/namespace-notifier/conf/namespace-notifier-server-site.xml b/src/contrib/namespace-notifier/conf/namespace-notifier-server-site.xml
new file mode 100644
index 00000000..31b4f17d
--- /dev/null
+++ b/src/contrib/namespace-notifier/conf/namespace-notifier-server-site.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+<property>
+  <name>notifier.thrift.port</name>
+  <value>31000</value>
+</property>
+
+</configuration>
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientConnectionException.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientConnectionException.java
new file mode 100644
index 00000000..23e94714
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientConnectionException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClientConnectionException extends Exception implements org.apache.thrift.TBase<ClientConnectionException, ClientConnectionException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClientConnectionException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClientConnectionException.class, metaDataMap);
+  }
+
+  public ClientConnectionException() {
+  }
+
+  public ClientConnectionException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public ClientConnectionException(ClientConnectionException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public ClientConnectionException deepCopy() {
+    return new ClientConnectionException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public ClientConnectionException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof ClientConnectionException)
+      return this.equals((ClientConnectionException)that);
+    return false;
+  }
+
+  public boolean equals(ClientConnectionException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(ClientConnectionException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    ClientConnectionException typedOther = (ClientConnectionException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("ClientConnectionException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientHandler.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientHandler.java
new file mode 100644
index 00000000..78d00804
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientHandler.java
@@ -0,0 +1,2381 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClientHandler {
+
+  public interface Iface {
+
+    public void handleNotification(NamespaceNotification notification, long serverId) throws InvalidServerIdException, org.apache.thrift.TException;
+
+    public void heartbeat(long serverId) throws InvalidServerIdException, org.apache.thrift.TException;
+
+    public void registerServer(long clientId, long serverId, long token) throws InvalidTokenException, org.apache.thrift.TException;
+
+  }
+
+  public interface AsyncIface {
+
+    public void handleNotification(NamespaceNotification notification, long serverId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.handleNotification_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void heartbeat(long serverId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.heartbeat_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void registerServer(long clientId, long serverId, long token, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.registerServer_call> resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+      public Factory() {}
+      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+        return new Client(prot);
+      }
+      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+        return new Client(iprot, oprot);
+      }
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol prot)
+    {
+      super(prot, prot);
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      super(iprot, oprot);
+    }
+
+    public void handleNotification(NamespaceNotification notification, long serverId) throws InvalidServerIdException, org.apache.thrift.TException
+    {
+      send_handleNotification(notification, serverId);
+      recv_handleNotification();
+    }
+
+    public void send_handleNotification(NamespaceNotification notification, long serverId) throws org.apache.thrift.TException
+    {
+      handleNotification_args args = new handleNotification_args();
+      args.setNotification(notification);
+      args.setServerId(serverId);
+      sendBase("handleNotification", args);
+    }
+
+    public void recv_handleNotification() throws InvalidServerIdException, org.apache.thrift.TException
+    {
+      handleNotification_result result = new handleNotification_result();
+      receiveBase(result, "handleNotification");
+      if (result.invalidServerId != null) {
+        throw result.invalidServerId;
+      }
+      return;
+    }
+
+    public void heartbeat(long serverId) throws InvalidServerIdException, org.apache.thrift.TException
+    {
+      send_heartbeat(serverId);
+      recv_heartbeat();
+    }
+
+    public void send_heartbeat(long serverId) throws org.apache.thrift.TException
+    {
+      heartbeat_args args = new heartbeat_args();
+      args.setServerId(serverId);
+      sendBase("heartbeat", args);
+    }
+
+    public void recv_heartbeat() throws InvalidServerIdException, org.apache.thrift.TException
+    {
+      heartbeat_result result = new heartbeat_result();
+      receiveBase(result, "heartbeat");
+      if (result.invalidServerId != null) {
+        throw result.invalidServerId;
+      }
+      return;
+    }
+
+    public void registerServer(long clientId, long serverId, long token) throws InvalidTokenException, org.apache.thrift.TException
+    {
+      send_registerServer(clientId, serverId, token);
+      recv_registerServer();
+    }
+
+    public void send_registerServer(long clientId, long serverId, long token) throws org.apache.thrift.TException
+    {
+      registerServer_args args = new registerServer_args();
+      args.setClientId(clientId);
+      args.setServerId(serverId);
+      args.setToken(token);
+      sendBase("registerServer", args);
+    }
+
+    public void recv_registerServer() throws InvalidTokenException, org.apache.thrift.TException
+    {
+      registerServer_result result = new registerServer_result();
+      receiveBase(result, "registerServer");
+      if (result.invalidToken != null) {
+        throw result.invalidToken;
+      }
+      return;
+    }
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+        this.clientManager = clientManager;
+        this.protocolFactory = protocolFactory;
+      }
+      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+        return new AsyncClient(protocolFactory, clientManager, transport);
+      }
+    }
+
+    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+      super(protocolFactory, clientManager, transport);
+    }
+
+    public void handleNotification(NamespaceNotification notification, long serverId, org.apache.thrift.async.AsyncMethodCallback<handleNotification_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      handleNotification_call method_call = new handleNotification_call(notification, serverId, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class handleNotification_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private NamespaceNotification notification;
+      private long serverId;
+      public handleNotification_call(NamespaceNotification notification, long serverId, org.apache.thrift.async.AsyncMethodCallback<handleNotification_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.notification = notification;
+        this.serverId = serverId;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("handleNotification", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        handleNotification_args args = new handleNotification_args();
+        args.setNotification(notification);
+        args.setServerId(serverId);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws InvalidServerIdException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_handleNotification();
+      }
+    }
+
+    public void heartbeat(long serverId, org.apache.thrift.async.AsyncMethodCallback<heartbeat_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      heartbeat_call method_call = new heartbeat_call(serverId, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class heartbeat_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private long serverId;
+      public heartbeat_call(long serverId, org.apache.thrift.async.AsyncMethodCallback<heartbeat_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.serverId = serverId;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("heartbeat", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        heartbeat_args args = new heartbeat_args();
+        args.setServerId(serverId);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws InvalidServerIdException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_heartbeat();
+      }
+    }
+
+    public void registerServer(long clientId, long serverId, long token, org.apache.thrift.async.AsyncMethodCallback<registerServer_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      registerServer_call method_call = new registerServer_call(clientId, serverId, token, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class registerServer_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private long clientId;
+      private long serverId;
+      private long token;
+      public registerServer_call(long clientId, long serverId, long token, org.apache.thrift.async.AsyncMethodCallback<registerServer_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.clientId = clientId;
+        this.serverId = serverId;
+        this.token = token;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("registerServer", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        registerServer_args args = new registerServer_args();
+        args.setClientId(clientId);
+        args.setServerId(serverId);
+        args.setToken(token);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws InvalidTokenException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_registerServer();
+      }
+    }
+
+  }
+
+  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
+    public Processor(I iface) {
+      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+    }
+
+    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      processMap.put("handleNotification", new handleNotification());
+      processMap.put("heartbeat", new heartbeat());
+      processMap.put("registerServer", new registerServer());
+      return processMap;
+    }
+
+    private static class handleNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, handleNotification_args> {
+      public handleNotification() {
+        super("handleNotification");
+      }
+
+      protected handleNotification_args getEmptyArgsInstance() {
+        return new handleNotification_args();
+      }
+
+      protected handleNotification_result getResult(I iface, handleNotification_args args) throws org.apache.thrift.TException {
+        handleNotification_result result = new handleNotification_result();
+        try {
+          iface.handleNotification(args.notification, args.serverId);
+        } catch (InvalidServerIdException invalidServerId) {
+          result.invalidServerId = invalidServerId;
+        }
+        return result;
+      }
+    }
+
+    private static class heartbeat<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_args> {
+      public heartbeat() {
+        super("heartbeat");
+      }
+
+      protected heartbeat_args getEmptyArgsInstance() {
+        return new heartbeat_args();
+      }
+
+      protected heartbeat_result getResult(I iface, heartbeat_args args) throws org.apache.thrift.TException {
+        heartbeat_result result = new heartbeat_result();
+        try {
+          iface.heartbeat(args.serverId);
+        } catch (InvalidServerIdException invalidServerId) {
+          result.invalidServerId = invalidServerId;
+        }
+        return result;
+      }
+    }
+
+    private static class registerServer<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerServer_args> {
+      public registerServer() {
+        super("registerServer");
+      }
+
+      protected registerServer_args getEmptyArgsInstance() {
+        return new registerServer_args();
+      }
+
+      protected registerServer_result getResult(I iface, registerServer_args args) throws org.apache.thrift.TException {
+        registerServer_result result = new registerServer_result();
+        try {
+          iface.registerServer(args.clientId, args.serverId, args.token);
+        } catch (InvalidTokenException invalidToken) {
+          result.invalidToken = invalidToken;
+        }
+        return result;
+      }
+    }
+
+  }
+
+  public static class handleNotification_args implements org.apache.thrift.TBase<handleNotification_args, handleNotification_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("handleNotification_args");
+
+    private static final org.apache.thrift.protocol.TField NOTIFICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("notification", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField SERVER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverId", org.apache.thrift.protocol.TType.I64, (short)2);
+
+    public NamespaceNotification notification; // required
+    public long serverId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      NOTIFICATION((short)1, "notification"),
+      SERVER_ID((short)2, "serverId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // NOTIFICATION
+            return NOTIFICATION;
+          case 2: // SERVER_ID
+            return SERVER_ID;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SERVERID_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.NOTIFICATION, new org.apache.thrift.meta_data.FieldMetaData("notification", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NamespaceNotification.class)));
+      tmpMap.put(_Fields.SERVER_ID, new org.apache.thrift.meta_data.FieldMetaData("serverId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(handleNotification_args.class, metaDataMap);
+    }
+
+    public handleNotification_args() {
+    }
+
+    public handleNotification_args(
+      NamespaceNotification notification,
+      long serverId)
+    {
+      this();
+      this.notification = notification;
+      this.serverId = serverId;
+      setServerIdIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public handleNotification_args(handleNotification_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetNotification()) {
+        this.notification = new NamespaceNotification(other.notification);
+      }
+      this.serverId = other.serverId;
+    }
+
+    public handleNotification_args deepCopy() {
+      return new handleNotification_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.notification = null;
+      setServerIdIsSet(false);
+      this.serverId = 0;
+    }
+
+    public NamespaceNotification getNotification() {
+      return this.notification;
+    }
+
+    public handleNotification_args setNotification(NamespaceNotification notification) {
+      this.notification = notification;
+      return this;
+    }
+
+    public void unsetNotification() {
+      this.notification = null;
+    }
+
+    /** Returns true if field notification is set (has been assigned a value) and false otherwise */
+    public boolean isSetNotification() {
+      return this.notification != null;
+    }
+
+    public void setNotificationIsSet(boolean value) {
+      if (!value) {
+        this.notification = null;
+      }
+    }
+
+    public long getServerId() {
+      return this.serverId;
+    }
+
+    public handleNotification_args setServerId(long serverId) {
+      this.serverId = serverId;
+      setServerIdIsSet(true);
+      return this;
+    }
+
+    public void unsetServerId() {
+      __isset_bit_vector.clear(__SERVERID_ISSET_ID);
+    }
+
+    /** Returns true if field serverId is set (has been assigned a value) and false otherwise */
+    public boolean isSetServerId() {
+      return __isset_bit_vector.get(__SERVERID_ISSET_ID);
+    }
+
+    public void setServerIdIsSet(boolean value) {
+      __isset_bit_vector.set(__SERVERID_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case NOTIFICATION:
+        if (value == null) {
+          unsetNotification();
+        } else {
+          setNotification((NamespaceNotification)value);
+        }
+        break;
+
+      case SERVER_ID:
+        if (value == null) {
+          unsetServerId();
+        } else {
+          setServerId((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case NOTIFICATION:
+        return getNotification();
+
+      case SERVER_ID:
+        return Long.valueOf(getServerId());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case NOTIFICATION:
+        return isSetNotification();
+      case SERVER_ID:
+        return isSetServerId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof handleNotification_args)
+        return this.equals((handleNotification_args)that);
+      return false;
+    }
+
+    public boolean equals(handleNotification_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_notification = true && this.isSetNotification();
+      boolean that_present_notification = true && that.isSetNotification();
+      if (this_present_notification || that_present_notification) {
+        if (!(this_present_notification && that_present_notification))
+          return false;
+        if (!this.notification.equals(that.notification))
+          return false;
+      }
+
+      boolean this_present_serverId = true;
+      boolean that_present_serverId = true;
+      if (this_present_serverId || that_present_serverId) {
+        if (!(this_present_serverId && that_present_serverId))
+          return false;
+        if (this.serverId != that.serverId)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(handleNotification_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      handleNotification_args typedOther = (handleNotification_args)other;
+
+      lastComparison = Boolean.valueOf(isSetNotification()).compareTo(typedOther.isSetNotification());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetNotification()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.notification, typedOther.notification);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetServerId()).compareTo(typedOther.isSetServerId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetServerId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverId, typedOther.serverId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // NOTIFICATION
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.notification = new NamespaceNotification();
+              this.notification.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // SERVER_ID
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.serverId = iprot.readI64();
+              setServerIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.notification != null) {
+        oprot.writeFieldBegin(NOTIFICATION_FIELD_DESC);
+        this.notification.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(SERVER_ID_FIELD_DESC);
+      oprot.writeI64(this.serverId);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("handleNotification_args(");
+      boolean first = true;
+
+      sb.append("notification:");
+      if (this.notification == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.notification);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("serverId:");
+      sb.append(this.serverId);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class handleNotification_result implements org.apache.thrift.TBase<handleNotification_result, handleNotification_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("handleNotification_result");
+
+    private static final org.apache.thrift.protocol.TField INVALID_SERVER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("invalidServerId", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public InvalidServerIdException invalidServerId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      INVALID_SERVER_ID((short)1, "invalidServerId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // INVALID_SERVER_ID
+            return INVALID_SERVER_ID;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.INVALID_SERVER_ID, new org.apache.thrift.meta_data.FieldMetaData("invalidServerId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(handleNotification_result.class, metaDataMap);
+    }
+
+    public handleNotification_result() {
+    }
+
+    public handleNotification_result(
+      InvalidServerIdException invalidServerId)
+    {
+      this();
+      this.invalidServerId = invalidServerId;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public handleNotification_result(handleNotification_result other) {
+      if (other.isSetInvalidServerId()) {
+        this.invalidServerId = new InvalidServerIdException(other.invalidServerId);
+      }
+    }
+
+    public handleNotification_result deepCopy() {
+      return new handleNotification_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.invalidServerId = null;
+    }
+
+    public InvalidServerIdException getInvalidServerId() {
+      return this.invalidServerId;
+    }
+
+    public handleNotification_result setInvalidServerId(InvalidServerIdException invalidServerId) {
+      this.invalidServerId = invalidServerId;
+      return this;
+    }
+
+    public void unsetInvalidServerId() {
+      this.invalidServerId = null;
+    }
+
+    /** Returns true if field invalidServerId is set (has been assigned a value) and false otherwise */
+    public boolean isSetInvalidServerId() {
+      return this.invalidServerId != null;
+    }
+
+    public void setInvalidServerIdIsSet(boolean value) {
+      if (!value) {
+        this.invalidServerId = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case INVALID_SERVER_ID:
+        if (value == null) {
+          unsetInvalidServerId();
+        } else {
+          setInvalidServerId((InvalidServerIdException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case INVALID_SERVER_ID:
+        return getInvalidServerId();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case INVALID_SERVER_ID:
+        return isSetInvalidServerId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof handleNotification_result)
+        return this.equals((handleNotification_result)that);
+      return false;
+    }
+
+    public boolean equals(handleNotification_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_invalidServerId = true && this.isSetInvalidServerId();
+      boolean that_present_invalidServerId = true && that.isSetInvalidServerId();
+      if (this_present_invalidServerId || that_present_invalidServerId) {
+        if (!(this_present_invalidServerId && that_present_invalidServerId))
+          return false;
+        if (!this.invalidServerId.equals(that.invalidServerId))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(handleNotification_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      handleNotification_result typedOther = (handleNotification_result)other;
+
+      lastComparison = Boolean.valueOf(isSetInvalidServerId()).compareTo(typedOther.isSetInvalidServerId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetInvalidServerId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.invalidServerId, typedOther.invalidServerId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // INVALID_SERVER_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.invalidServerId = new InvalidServerIdException();
+              this.invalidServerId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetInvalidServerId()) {
+        oprot.writeFieldBegin(INVALID_SERVER_ID_FIELD_DESC);
+        this.invalidServerId.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("handleNotification_result(");
+      boolean first = true;
+
+      sb.append("invalidServerId:");
+      if (this.invalidServerId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.invalidServerId);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class heartbeat_args implements org.apache.thrift.TBase<heartbeat_args, heartbeat_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_args");
+
+    private static final org.apache.thrift.protocol.TField SERVER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverId", org.apache.thrift.protocol.TType.I64, (short)1);
+
+    public long serverId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SERVER_ID((short)1, "serverId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // SERVER_ID
+            return SERVER_ID;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SERVERID_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SERVER_ID, new org.apache.thrift.meta_data.FieldMetaData("serverId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(heartbeat_args.class, metaDataMap);
+    }
+
+    public heartbeat_args() {
+    }
+
+    public heartbeat_args(
+      long serverId)
+    {
+      this();
+      this.serverId = serverId;
+      setServerIdIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public heartbeat_args(heartbeat_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.serverId = other.serverId;
+    }
+
+    public heartbeat_args deepCopy() {
+      return new heartbeat_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setServerIdIsSet(false);
+      this.serverId = 0;
+    }
+
+    public long getServerId() {
+      return this.serverId;
+    }
+
+    public heartbeat_args setServerId(long serverId) {
+      this.serverId = serverId;
+      setServerIdIsSet(true);
+      return this;
+    }
+
+    public void unsetServerId() {
+      __isset_bit_vector.clear(__SERVERID_ISSET_ID);
+    }
+
+    /** Returns true if field serverId is set (has been assigned a value) and false otherwise */
+    public boolean isSetServerId() {
+      return __isset_bit_vector.get(__SERVERID_ISSET_ID);
+    }
+
+    public void setServerIdIsSet(boolean value) {
+      __isset_bit_vector.set(__SERVERID_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SERVER_ID:
+        if (value == null) {
+          unsetServerId();
+        } else {
+          setServerId((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SERVER_ID:
+        return Long.valueOf(getServerId());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SERVER_ID:
+        return isSetServerId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof heartbeat_args)
+        return this.equals((heartbeat_args)that);
+      return false;
+    }
+
+    public boolean equals(heartbeat_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_serverId = true;
+      boolean that_present_serverId = true;
+      if (this_present_serverId || that_present_serverId) {
+        if (!(this_present_serverId && that_present_serverId))
+          return false;
+        if (this.serverId != that.serverId)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(heartbeat_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      heartbeat_args typedOther = (heartbeat_args)other;
+
+      lastComparison = Boolean.valueOf(isSetServerId()).compareTo(typedOther.isSetServerId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetServerId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverId, typedOther.serverId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // SERVER_ID
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.serverId = iprot.readI64();
+              setServerIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(SERVER_ID_FIELD_DESC);
+      oprot.writeI64(this.serverId);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("heartbeat_args(");
+      boolean first = true;
+
+      sb.append("serverId:");
+      sb.append(this.serverId);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class heartbeat_result implements org.apache.thrift.TBase<heartbeat_result, heartbeat_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_result");
+
+    private static final org.apache.thrift.protocol.TField INVALID_SERVER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("invalidServerId", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public InvalidServerIdException invalidServerId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      INVALID_SERVER_ID((short)1, "invalidServerId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // INVALID_SERVER_ID
+            return INVALID_SERVER_ID;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.INVALID_SERVER_ID, new org.apache.thrift.meta_data.FieldMetaData("invalidServerId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(heartbeat_result.class, metaDataMap);
+    }
+
+    public heartbeat_result() {
+    }
+
+    public heartbeat_result(
+      InvalidServerIdException invalidServerId)
+    {
+      this();
+      this.invalidServerId = invalidServerId;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public heartbeat_result(heartbeat_result other) {
+      if (other.isSetInvalidServerId()) {
+        this.invalidServerId = new InvalidServerIdException(other.invalidServerId);
+      }
+    }
+
+    public heartbeat_result deepCopy() {
+      return new heartbeat_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.invalidServerId = null;
+    }
+
+    public InvalidServerIdException getInvalidServerId() {
+      return this.invalidServerId;
+    }
+
+    public heartbeat_result setInvalidServerId(InvalidServerIdException invalidServerId) {
+      this.invalidServerId = invalidServerId;
+      return this;
+    }
+
+    public void unsetInvalidServerId() {
+      this.invalidServerId = null;
+    }
+
+    /** Returns true if field invalidServerId is set (has been assigned a value) and false otherwise */
+    public boolean isSetInvalidServerId() {
+      return this.invalidServerId != null;
+    }
+
+    public void setInvalidServerIdIsSet(boolean value) {
+      if (!value) {
+        this.invalidServerId = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case INVALID_SERVER_ID:
+        if (value == null) {
+          unsetInvalidServerId();
+        } else {
+          setInvalidServerId((InvalidServerIdException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case INVALID_SERVER_ID:
+        return getInvalidServerId();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case INVALID_SERVER_ID:
+        return isSetInvalidServerId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof heartbeat_result)
+        return this.equals((heartbeat_result)that);
+      return false;
+    }
+
+    public boolean equals(heartbeat_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_invalidServerId = true && this.isSetInvalidServerId();
+      boolean that_present_invalidServerId = true && that.isSetInvalidServerId();
+      if (this_present_invalidServerId || that_present_invalidServerId) {
+        if (!(this_present_invalidServerId && that_present_invalidServerId))
+          return false;
+        if (!this.invalidServerId.equals(that.invalidServerId))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(heartbeat_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      heartbeat_result typedOther = (heartbeat_result)other;
+
+      lastComparison = Boolean.valueOf(isSetInvalidServerId()).compareTo(typedOther.isSetInvalidServerId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetInvalidServerId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.invalidServerId, typedOther.invalidServerId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // INVALID_SERVER_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.invalidServerId = new InvalidServerIdException();
+              this.invalidServerId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetInvalidServerId()) {
+        oprot.writeFieldBegin(INVALID_SERVER_ID_FIELD_DESC);
+        this.invalidServerId.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("heartbeat_result(");
+      boolean first = true;
+
+      sb.append("invalidServerId:");
+      if (this.invalidServerId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.invalidServerId);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class registerServer_args implements org.apache.thrift.TBase<registerServer_args, registerServer_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerServer_args");
+
+    private static final org.apache.thrift.protocol.TField CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("clientId", org.apache.thrift.protocol.TType.I64, (short)1);
+    private static final org.apache.thrift.protocol.TField SERVER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverId", org.apache.thrift.protocol.TType.I64, (short)2);
+    private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.I64, (short)3);
+
+    public long clientId; // required
+    public long serverId; // required
+    public long token; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      CLIENT_ID((short)1, "clientId"),
+      SERVER_ID((short)2, "serverId"),
+      TOKEN((short)3, "token");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // CLIENT_ID
+            return CLIENT_ID;
+          case 2: // SERVER_ID
+            return SERVER_ID;
+          case 3: // TOKEN
+            return TOKEN;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __CLIENTID_ISSET_ID = 0;
+    private static final int __SERVERID_ISSET_ID = 1;
+    private static final int __TOKEN_ISSET_ID = 2;
+    private BitSet __isset_bit_vector = new BitSet(3);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("clientId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.SERVER_ID, new org.apache.thrift.meta_data.FieldMetaData("serverId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerServer_args.class, metaDataMap);
+    }
+
+    public registerServer_args() {
+    }
+
+    public registerServer_args(
+      long clientId,
+      long serverId,
+      long token)
+    {
+      this();
+      this.clientId = clientId;
+      setClientIdIsSet(true);
+      this.serverId = serverId;
+      setServerIdIsSet(true);
+      this.token = token;
+      setTokenIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public registerServer_args(registerServer_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.clientId = other.clientId;
+      this.serverId = other.serverId;
+      this.token = other.token;
+    }
+
+    public registerServer_args deepCopy() {
+      return new registerServer_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setClientIdIsSet(false);
+      this.clientId = 0;
+      setServerIdIsSet(false);
+      this.serverId = 0;
+      setTokenIsSet(false);
+      this.token = 0;
+    }
+
+    public long getClientId() {
+      return this.clientId;
+    }
+
+    public registerServer_args setClientId(long clientId) {
+      this.clientId = clientId;
+      setClientIdIsSet(true);
+      return this;
+    }
+
+    public void unsetClientId() {
+      __isset_bit_vector.clear(__CLIENTID_ISSET_ID);
+    }
+
+    /** Returns true if field clientId is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientId() {
+      return __isset_bit_vector.get(__CLIENTID_ISSET_ID);
+    }
+
+    public void setClientIdIsSet(boolean value) {
+      __isset_bit_vector.set(__CLIENTID_ISSET_ID, value);
+    }
+
+    public long getServerId() {
+      return this.serverId;
+    }
+
+    public registerServer_args setServerId(long serverId) {
+      this.serverId = serverId;
+      setServerIdIsSet(true);
+      return this;
+    }
+
+    public void unsetServerId() {
+      __isset_bit_vector.clear(__SERVERID_ISSET_ID);
+    }
+
+    /** Returns true if field serverId is set (has been assigned a value) and false otherwise */
+    public boolean isSetServerId() {
+      return __isset_bit_vector.get(__SERVERID_ISSET_ID);
+    }
+
+    public void setServerIdIsSet(boolean value) {
+      __isset_bit_vector.set(__SERVERID_ISSET_ID, value);
+    }
+
+    public long getToken() {
+      return this.token;
+    }
+
+    public registerServer_args setToken(long token) {
+      this.token = token;
+      setTokenIsSet(true);
+      return this;
+    }
+
+    public void unsetToken() {
+      __isset_bit_vector.clear(__TOKEN_ISSET_ID);
+    }
+
+    /** Returns true if field token is set (has been assigned a value) and false otherwise */
+    public boolean isSetToken() {
+      return __isset_bit_vector.get(__TOKEN_ISSET_ID);
+    }
+
+    public void setTokenIsSet(boolean value) {
+      __isset_bit_vector.set(__TOKEN_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case CLIENT_ID:
+        if (value == null) {
+          unsetClientId();
+        } else {
+          setClientId((Long)value);
+        }
+        break;
+
+      case SERVER_ID:
+        if (value == null) {
+          unsetServerId();
+        } else {
+          setServerId((Long)value);
+        }
+        break;
+
+      case TOKEN:
+        if (value == null) {
+          unsetToken();
+        } else {
+          setToken((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case CLIENT_ID:
+        return Long.valueOf(getClientId());
+
+      case SERVER_ID:
+        return Long.valueOf(getServerId());
+
+      case TOKEN:
+        return Long.valueOf(getToken());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case CLIENT_ID:
+        return isSetClientId();
+      case SERVER_ID:
+        return isSetServerId();
+      case TOKEN:
+        return isSetToken();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof registerServer_args)
+        return this.equals((registerServer_args)that);
+      return false;
+    }
+
+    public boolean equals(registerServer_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_clientId = true;
+      boolean that_present_clientId = true;
+      if (this_present_clientId || that_present_clientId) {
+        if (!(this_present_clientId && that_present_clientId))
+          return false;
+        if (this.clientId != that.clientId)
+          return false;
+      }
+
+      boolean this_present_serverId = true;
+      boolean that_present_serverId = true;
+      if (this_present_serverId || that_present_serverId) {
+        if (!(this_present_serverId && that_present_serverId))
+          return false;
+        if (this.serverId != that.serverId)
+          return false;
+      }
+
+      boolean this_present_token = true;
+      boolean that_present_token = true;
+      if (this_present_token || that_present_token) {
+        if (!(this_present_token && that_present_token))
+          return false;
+        if (this.token != that.token)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(registerServer_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      registerServer_args typedOther = (registerServer_args)other;
+
+      lastComparison = Boolean.valueOf(isSetClientId()).compareTo(typedOther.isSetClientId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientId, typedOther.clientId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetServerId()).compareTo(typedOther.isSetServerId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetServerId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverId, typedOther.serverId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetToken()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // CLIENT_ID
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.clientId = iprot.readI64();
+              setClientIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // SERVER_ID
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.serverId = iprot.readI64();
+              setServerIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // TOKEN
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.token = iprot.readI64();
+              setTokenIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(CLIENT_ID_FIELD_DESC);
+      oprot.writeI64(this.clientId);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(SERVER_ID_FIELD_DESC);
+      oprot.writeI64(this.serverId);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(TOKEN_FIELD_DESC);
+      oprot.writeI64(this.token);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("registerServer_args(");
+      boolean first = true;
+
+      sb.append("clientId:");
+      sb.append(this.clientId);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("serverId:");
+      sb.append(this.serverId);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("token:");
+      sb.append(this.token);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class registerServer_result implements org.apache.thrift.TBase<registerServer_result, registerServer_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerServer_result");
+
+    private static final org.apache.thrift.protocol.TField INVALID_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("invalidToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public InvalidTokenException invalidToken; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      INVALID_TOKEN((short)1, "invalidToken");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // INVALID_TOKEN
+            return INVALID_TOKEN;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.INVALID_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("invalidToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerServer_result.class, metaDataMap);
+    }
+
+    public registerServer_result() {
+    }
+
+    public registerServer_result(
+      InvalidTokenException invalidToken)
+    {
+      this();
+      this.invalidToken = invalidToken;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public registerServer_result(registerServer_result other) {
+      if (other.isSetInvalidToken()) {
+        this.invalidToken = new InvalidTokenException(other.invalidToken);
+      }
+    }
+
+    public registerServer_result deepCopy() {
+      return new registerServer_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.invalidToken = null;
+    }
+
+    public InvalidTokenException getInvalidToken() {
+      return this.invalidToken;
+    }
+
+    public registerServer_result setInvalidToken(InvalidTokenException invalidToken) {
+      this.invalidToken = invalidToken;
+      return this;
+    }
+
+    public void unsetInvalidToken() {
+      this.invalidToken = null;
+    }
+
+    /** Returns true if field invalidToken is set (has been assigned a value) and false otherwise */
+    public boolean isSetInvalidToken() {
+      return this.invalidToken != null;
+    }
+
+    public void setInvalidTokenIsSet(boolean value) {
+      if (!value) {
+        this.invalidToken = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case INVALID_TOKEN:
+        if (value == null) {
+          unsetInvalidToken();
+        } else {
+          setInvalidToken((InvalidTokenException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case INVALID_TOKEN:
+        return getInvalidToken();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case INVALID_TOKEN:
+        return isSetInvalidToken();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof registerServer_result)
+        return this.equals((registerServer_result)that);
+      return false;
+    }
+
+    public boolean equals(registerServer_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_invalidToken = true && this.isSetInvalidToken();
+      boolean that_present_invalidToken = true && that.isSetInvalidToken();
+      if (this_present_invalidToken || that_present_invalidToken) {
+        if (!(this_present_invalidToken && that_present_invalidToken))
+          return false;
+        if (!this.invalidToken.equals(that.invalidToken))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(registerServer_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      registerServer_result typedOther = (registerServer_result)other;
+
+      lastComparison = Boolean.valueOf(isSetInvalidToken()).compareTo(typedOther.isSetInvalidToken());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetInvalidToken()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.invalidToken, typedOther.invalidToken);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // INVALID_TOKEN
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.invalidToken = new InvalidTokenException();
+              this.invalidToken.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetInvalidToken()) {
+        oprot.writeFieldBegin(INVALID_TOKEN_FIELD_DESC);
+        this.invalidToken.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("registerServer_result(");
+      boolean first = true;
+
+      sb.append("invalidToken:");
+      if (this.invalidToken == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.invalidToken);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+}
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientNotSubscribedException.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientNotSubscribedException.java
new file mode 100644
index 00000000..917b99c4
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ClientNotSubscribedException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClientNotSubscribedException extends Exception implements org.apache.thrift.TBase<ClientNotSubscribedException, ClientNotSubscribedException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClientNotSubscribedException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClientNotSubscribedException.class, metaDataMap);
+  }
+
+  public ClientNotSubscribedException() {
+  }
+
+  public ClientNotSubscribedException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public ClientNotSubscribedException(ClientNotSubscribedException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public ClientNotSubscribedException deepCopy() {
+    return new ClientNotSubscribedException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public ClientNotSubscribedException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof ClientNotSubscribedException)
+      return this.equals((ClientNotSubscribedException)that);
+    return false;
+  }
+
+  public boolean equals(ClientNotSubscribedException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(ClientNotSubscribedException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    ClientNotSubscribedException typedOther = (ClientNotSubscribedException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("ClientNotSubscribedException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidClientIdException.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidClientIdException.java
new file mode 100644
index 00000000..2d24b52e
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidClientIdException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InvalidClientIdException extends Exception implements org.apache.thrift.TBase<InvalidClientIdException, InvalidClientIdException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidClientIdException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidClientIdException.class, metaDataMap);
+  }
+
+  public InvalidClientIdException() {
+  }
+
+  public InvalidClientIdException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public InvalidClientIdException(InvalidClientIdException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public InvalidClientIdException deepCopy() {
+    return new InvalidClientIdException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public InvalidClientIdException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof InvalidClientIdException)
+      return this.equals((InvalidClientIdException)that);
+    return false;
+  }
+
+  public boolean equals(InvalidClientIdException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(InvalidClientIdException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    InvalidClientIdException typedOther = (InvalidClientIdException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("InvalidClientIdException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidServerIdException.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidServerIdException.java
new file mode 100644
index 00000000..bcf2935a
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidServerIdException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InvalidServerIdException extends Exception implements org.apache.thrift.TBase<InvalidServerIdException, InvalidServerIdException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidServerIdException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidServerIdException.class, metaDataMap);
+  }
+
+  public InvalidServerIdException() {
+  }
+
+  public InvalidServerIdException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public InvalidServerIdException(InvalidServerIdException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public InvalidServerIdException deepCopy() {
+    return new InvalidServerIdException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public InvalidServerIdException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof InvalidServerIdException)
+      return this.equals((InvalidServerIdException)that);
+    return false;
+  }
+
+  public boolean equals(InvalidServerIdException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(InvalidServerIdException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    InvalidServerIdException typedOther = (InvalidServerIdException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("InvalidServerIdException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidTokenException.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidTokenException.java
new file mode 100644
index 00000000..caada5da
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/InvalidTokenException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InvalidTokenException extends Exception implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTokenException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidTokenException.class, metaDataMap);
+  }
+
+  public InvalidTokenException() {
+  }
+
+  public InvalidTokenException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public InvalidTokenException(InvalidTokenException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public InvalidTokenException deepCopy() {
+    return new InvalidTokenException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public InvalidTokenException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof InvalidTokenException)
+      return this.equals((InvalidTokenException)that);
+    return false;
+  }
+
+  public boolean equals(InvalidTokenException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(InvalidTokenException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    InvalidTokenException typedOther = (InvalidTokenException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("InvalidTokenException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/NamespaceEvent.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/NamespaceEvent.java
new file mode 100644
index 00000000..a40ceb28
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/NamespaceEvent.java
@@ -0,0 +1,413 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Emitted when an operation in the HDFS namespace occured. If a client
+ * subscribed to the server for a particular event, a notification
+ * (see NamespaceNotification) will be sent.
+ */
+public class NamespaceEvent implements org.apache.thrift.TBase<NamespaceEvent, NamespaceEvent._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceEvent");
+
+  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.BYTE, (short)2);
+
+  public String path; // required
+  public byte type; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    PATH((short)1, "path"),
+    TYPE((short)2, "type");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // PATH
+          return PATH;
+        case 2: // TYPE
+          return TYPE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __TYPE_ISSET_ID = 0;
+  private BitSet __isset_bit_vector = new BitSet(1);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NamespaceEvent.class, metaDataMap);
+  }
+
+  public NamespaceEvent() {
+  }
+
+  public NamespaceEvent(
+    String path,
+    byte type)
+  {
+    this();
+    this.path = path;
+    this.type = type;
+    setTypeIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public NamespaceEvent(NamespaceEvent other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    if (other.isSetPath()) {
+      this.path = other.path;
+    }
+    this.type = other.type;
+  }
+
+  public NamespaceEvent deepCopy() {
+    return new NamespaceEvent(this);
+  }
+
+  @Override
+  public void clear() {
+    this.path = null;
+    setTypeIsSet(false);
+    this.type = 0;
+  }
+
+  public String getPath() {
+    return this.path;
+  }
+
+  public NamespaceEvent setPath(String path) {
+    this.path = path;
+    return this;
+  }
+
+  public void unsetPath() {
+    this.path = null;
+  }
+
+  /** Returns true if field path is set (has been assigned a value) and false otherwise */
+  public boolean isSetPath() {
+    return this.path != null;
+  }
+
+  public void setPathIsSet(boolean value) {
+    if (!value) {
+      this.path = null;
+    }
+  }
+
+  public byte getType() {
+    return this.type;
+  }
+
+  public NamespaceEvent setType(byte type) {
+    this.type = type;
+    setTypeIsSet(true);
+    return this;
+  }
+
+  public void unsetType() {
+    __isset_bit_vector.clear(__TYPE_ISSET_ID);
+  }
+
+  /** Returns true if field type is set (has been assigned a value) and false otherwise */
+  public boolean isSetType() {
+    return __isset_bit_vector.get(__TYPE_ISSET_ID);
+  }
+
+  public void setTypeIsSet(boolean value) {
+    __isset_bit_vector.set(__TYPE_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case PATH:
+      if (value == null) {
+        unsetPath();
+      } else {
+        setPath((String)value);
+      }
+      break;
+
+    case TYPE:
+      if (value == null) {
+        unsetType();
+      } else {
+        setType((Byte)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case PATH:
+      return getPath();
+
+    case TYPE:
+      return Byte.valueOf(getType());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case PATH:
+      return isSetPath();
+    case TYPE:
+      return isSetType();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof NamespaceEvent)
+      return this.equals((NamespaceEvent)that);
+    return false;
+  }
+
+  public boolean equals(NamespaceEvent that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_path = true && this.isSetPath();
+    boolean that_present_path = true && that.isSetPath();
+    if (this_present_path || that_present_path) {
+      if (!(this_present_path && that_present_path))
+        return false;
+      if (!this.path.equals(that.path))
+        return false;
+    }
+
+    boolean this_present_type = true;
+    boolean that_present_type = true;
+    if (this_present_type || that_present_type) {
+      if (!(this_present_type && that_present_type))
+        return false;
+      if (this.type != that.type)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(NamespaceEvent other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    NamespaceEvent typedOther = (NamespaceEvent)other;
+
+    lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPath()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetType()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // PATH
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.path = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // TYPE
+          if (field.type == org.apache.thrift.protocol.TType.BYTE) {
+            this.type = iprot.readByte();
+            setTypeIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.path != null) {
+      oprot.writeFieldBegin(PATH_FIELD_DESC);
+      oprot.writeString(this.path);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldBegin(TYPE_FIELD_DESC);
+    oprot.writeByte(this.type);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("NamespaceEvent(");
+    boolean first = true;
+
+    sb.append("path:");
+    if (this.path == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.path);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("type:");
+    sb.append(this.type);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/NamespaceNotification.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/NamespaceNotification.java
new file mode 100644
index 00000000..b57dcf1f
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/NamespaceNotification.java
@@ -0,0 +1,496 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The notification sent from the server to the client when a namespace
+ * event occured.
+ */
+public class NamespaceNotification implements org.apache.thrift.TBase<NamespaceNotification, NamespaceNotification._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceNotification");
+
+  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.BYTE, (short)2);
+  private static final org.apache.thrift.protocol.TField TX_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txId", org.apache.thrift.protocol.TType.I64, (short)3);
+
+  public String path; // required
+  public byte type; // required
+  public long txId; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    PATH((short)1, "path"),
+    TYPE((short)2, "type"),
+    TX_ID((short)3, "txId");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // PATH
+          return PATH;
+        case 2: // TYPE
+          return TYPE;
+        case 3: // TX_ID
+          return TX_ID;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __TYPE_ISSET_ID = 0;
+  private static final int __TXID_ISSET_ID = 1;
+  private BitSet __isset_bit_vector = new BitSet(2);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)));
+    tmpMap.put(_Fields.TX_ID, new org.apache.thrift.meta_data.FieldMetaData("txId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NamespaceNotification.class, metaDataMap);
+  }
+
+  public NamespaceNotification() {
+  }
+
+  public NamespaceNotification(
+    String path,
+    byte type,
+    long txId)
+  {
+    this();
+    this.path = path;
+    this.type = type;
+    setTypeIsSet(true);
+    this.txId = txId;
+    setTxIdIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public NamespaceNotification(NamespaceNotification other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    if (other.isSetPath()) {
+      this.path = other.path;
+    }
+    this.type = other.type;
+    this.txId = other.txId;
+  }
+
+  public NamespaceNotification deepCopy() {
+    return new NamespaceNotification(this);
+  }
+
+  @Override
+  public void clear() {
+    this.path = null;
+    setTypeIsSet(false);
+    this.type = 0;
+    setTxIdIsSet(false);
+    this.txId = 0;
+  }
+
+  public String getPath() {
+    return this.path;
+  }
+
+  public NamespaceNotification setPath(String path) {
+    this.path = path;
+    return this;
+  }
+
+  public void unsetPath() {
+    this.path = null;
+  }
+
+  /** Returns true if field path is set (has been assigned a value) and false otherwise */
+  public boolean isSetPath() {
+    return this.path != null;
+  }
+
+  public void setPathIsSet(boolean value) {
+    if (!value) {
+      this.path = null;
+    }
+  }
+
+  public byte getType() {
+    return this.type;
+  }
+
+  public NamespaceNotification setType(byte type) {
+    this.type = type;
+    setTypeIsSet(true);
+    return this;
+  }
+
+  public void unsetType() {
+    __isset_bit_vector.clear(__TYPE_ISSET_ID);
+  }
+
+  /** Returns true if field type is set (has been assigned a value) and false otherwise */
+  public boolean isSetType() {
+    return __isset_bit_vector.get(__TYPE_ISSET_ID);
+  }
+
+  public void setTypeIsSet(boolean value) {
+    __isset_bit_vector.set(__TYPE_ISSET_ID, value);
+  }
+
+  public long getTxId() {
+    return this.txId;
+  }
+
+  public NamespaceNotification setTxId(long txId) {
+    this.txId = txId;
+    setTxIdIsSet(true);
+    return this;
+  }
+
+  public void unsetTxId() {
+    __isset_bit_vector.clear(__TXID_ISSET_ID);
+  }
+
+  /** Returns true if field txId is set (has been assigned a value) and false otherwise */
+  public boolean isSetTxId() {
+    return __isset_bit_vector.get(__TXID_ISSET_ID);
+  }
+
+  public void setTxIdIsSet(boolean value) {
+    __isset_bit_vector.set(__TXID_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case PATH:
+      if (value == null) {
+        unsetPath();
+      } else {
+        setPath((String)value);
+      }
+      break;
+
+    case TYPE:
+      if (value == null) {
+        unsetType();
+      } else {
+        setType((Byte)value);
+      }
+      break;
+
+    case TX_ID:
+      if (value == null) {
+        unsetTxId();
+      } else {
+        setTxId((Long)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case PATH:
+      return getPath();
+
+    case TYPE:
+      return Byte.valueOf(getType());
+
+    case TX_ID:
+      return Long.valueOf(getTxId());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case PATH:
+      return isSetPath();
+    case TYPE:
+      return isSetType();
+    case TX_ID:
+      return isSetTxId();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof NamespaceNotification)
+      return this.equals((NamespaceNotification)that);
+    return false;
+  }
+
+  public boolean equals(NamespaceNotification that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_path = true && this.isSetPath();
+    boolean that_present_path = true && that.isSetPath();
+    if (this_present_path || that_present_path) {
+      if (!(this_present_path && that_present_path))
+        return false;
+      if (!this.path.equals(that.path))
+        return false;
+    }
+
+    boolean this_present_type = true;
+    boolean that_present_type = true;
+    if (this_present_type || that_present_type) {
+      if (!(this_present_type && that_present_type))
+        return false;
+      if (this.type != that.type)
+        return false;
+    }
+
+    boolean this_present_txId = true;
+    boolean that_present_txId = true;
+    if (this_present_txId || that_present_txId) {
+      if (!(this_present_txId && that_present_txId))
+        return false;
+      if (this.txId != that.txId)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(NamespaceNotification other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    NamespaceNotification typedOther = (NamespaceNotification)other;
+
+    lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPath()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetType()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetTxId()).compareTo(typedOther.isSetTxId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetTxId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txId, typedOther.txId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // PATH
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.path = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // TYPE
+          if (field.type == org.apache.thrift.protocol.TType.BYTE) {
+            this.type = iprot.readByte();
+            setTypeIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 3: // TX_ID
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.txId = iprot.readI64();
+            setTxIdIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.path != null) {
+      oprot.writeFieldBegin(PATH_FIELD_DESC);
+      oprot.writeString(this.path);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldBegin(TYPE_FIELD_DESC);
+    oprot.writeByte(this.type);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(TX_ID_FIELD_DESC);
+    oprot.writeI64(this.txId);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("NamespaceNotification(");
+    boolean first = true;
+
+    sb.append("path:");
+    if (this.path == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.path);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("type:");
+    sb.append(this.type);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("txId:");
+    sb.append(this.txId);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/RampUpException.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/RampUpException.java
new file mode 100644
index 00000000..e6fc22dc
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/RampUpException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RampUpException extends Exception implements org.apache.thrift.TBase<RampUpException, RampUpException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RampUpException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RampUpException.class, metaDataMap);
+  }
+
+  public RampUpException() {
+  }
+
+  public RampUpException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public RampUpException(RampUpException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public RampUpException deepCopy() {
+    return new RampUpException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public RampUpException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof RampUpException)
+      return this.equals((RampUpException)that);
+    return false;
+  }
+
+  public boolean equals(RampUpException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(RampUpException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    RampUpException typedOther = (RampUpException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("RampUpException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ServerHandler.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ServerHandler.java
new file mode 100644
index 00000000..e8249c6a
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/ServerHandler.java
@@ -0,0 +1,3524 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ServerHandler {
+
+  public interface Iface {
+
+    public void subscribe(long clientId, NamespaceEvent subscribedEvent, long txId) throws InvalidClientIdException, TransactionIdTooOldException, org.apache.thrift.TException;
+
+    public void unsubscribe(long clientId, NamespaceEvent subscribedEvent) throws InvalidClientIdException, ClientNotSubscribedException, org.apache.thrift.TException;
+
+    public void registerClient(String host, int port, long token) throws RampUpException, ClientConnectionException, org.apache.thrift.TException;
+
+    public void unregisterClient(long clientId) throws InvalidClientIdException, org.apache.thrift.TException;
+
+  }
+
+  public interface AsyncIface {
+
+    public void subscribe(long clientId, NamespaceEvent subscribedEvent, long txId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.subscribe_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void unsubscribe(long clientId, NamespaceEvent subscribedEvent, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.unsubscribe_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void registerClient(String host, int port, long token, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.registerClient_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void unregisterClient(long clientId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.unregisterClient_call> resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+      public Factory() {}
+      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+        return new Client(prot);
+      }
+      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+        return new Client(iprot, oprot);
+      }
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol prot)
+    {
+      super(prot, prot);
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      super(iprot, oprot);
+    }
+
+    public void subscribe(long clientId, NamespaceEvent subscribedEvent, long txId) throws InvalidClientIdException, TransactionIdTooOldException, org.apache.thrift.TException
+    {
+      send_subscribe(clientId, subscribedEvent, txId);
+      recv_subscribe();
+    }
+
+    public void send_subscribe(long clientId, NamespaceEvent subscribedEvent, long txId) throws org.apache.thrift.TException
+    {
+      subscribe_args args = new subscribe_args();
+      args.setClientId(clientId);
+      args.setSubscribedEvent(subscribedEvent);
+      args.setTxId(txId);
+      sendBase("subscribe", args);
+    }
+
+    public void recv_subscribe() throws InvalidClientIdException, TransactionIdTooOldException, org.apache.thrift.TException
+    {
+      subscribe_result result = new subscribe_result();
+      receiveBase(result, "subscribe");
+      if (result.invalidClientId != null) {
+        throw result.invalidClientId;
+      }
+      if (result.transactionIdTooOld != null) {
+        throw result.transactionIdTooOld;
+      }
+      return;
+    }
+
+    public void unsubscribe(long clientId, NamespaceEvent subscribedEvent) throws InvalidClientIdException, ClientNotSubscribedException, org.apache.thrift.TException
+    {
+      send_unsubscribe(clientId, subscribedEvent);
+      recv_unsubscribe();
+    }
+
+    public void send_unsubscribe(long clientId, NamespaceEvent subscribedEvent) throws org.apache.thrift.TException
+    {
+      unsubscribe_args args = new unsubscribe_args();
+      args.setClientId(clientId);
+      args.setSubscribedEvent(subscribedEvent);
+      sendBase("unsubscribe", args);
+    }
+
+    public void recv_unsubscribe() throws InvalidClientIdException, ClientNotSubscribedException, org.apache.thrift.TException
+    {
+      unsubscribe_result result = new unsubscribe_result();
+      receiveBase(result, "unsubscribe");
+      if (result.invalidClientId != null) {
+        throw result.invalidClientId;
+      }
+      if (result.clientNotSubscribed != null) {
+        throw result.clientNotSubscribed;
+      }
+      return;
+    }
+
+    public void registerClient(String host, int port, long token) throws RampUpException, ClientConnectionException, org.apache.thrift.TException
+    {
+      send_registerClient(host, port, token);
+      recv_registerClient();
+    }
+
+    public void send_registerClient(String host, int port, long token) throws org.apache.thrift.TException
+    {
+      registerClient_args args = new registerClient_args();
+      args.setHost(host);
+      args.setPort(port);
+      args.setToken(token);
+      sendBase("registerClient", args);
+    }
+
+    public void recv_registerClient() throws RampUpException, ClientConnectionException, org.apache.thrift.TException
+    {
+      registerClient_result result = new registerClient_result();
+      receiveBase(result, "registerClient");
+      if (result.rampUp != null) {
+        throw result.rampUp;
+      }
+      if (result.clientConnection != null) {
+        throw result.clientConnection;
+      }
+      return;
+    }
+
+    public void unregisterClient(long clientId) throws InvalidClientIdException, org.apache.thrift.TException
+    {
+      send_unregisterClient(clientId);
+      recv_unregisterClient();
+    }
+
+    public void send_unregisterClient(long clientId) throws org.apache.thrift.TException
+    {
+      unregisterClient_args args = new unregisterClient_args();
+      args.setClientId(clientId);
+      sendBase("unregisterClient", args);
+    }
+
+    public void recv_unregisterClient() throws InvalidClientIdException, org.apache.thrift.TException
+    {
+      unregisterClient_result result = new unregisterClient_result();
+      receiveBase(result, "unregisterClient");
+      if (result.invalidClientId != null) {
+        throw result.invalidClientId;
+      }
+      return;
+    }
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+        this.clientManager = clientManager;
+        this.protocolFactory = protocolFactory;
+      }
+      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+        return new AsyncClient(protocolFactory, clientManager, transport);
+      }
+    }
+
+    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+      super(protocolFactory, clientManager, transport);
+    }
+
+    public void subscribe(long clientId, NamespaceEvent subscribedEvent, long txId, org.apache.thrift.async.AsyncMethodCallback<subscribe_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      subscribe_call method_call = new subscribe_call(clientId, subscribedEvent, txId, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class subscribe_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private long clientId;
+      private NamespaceEvent subscribedEvent;
+      private long txId;
+      public subscribe_call(long clientId, NamespaceEvent subscribedEvent, long txId, org.apache.thrift.async.AsyncMethodCallback<subscribe_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.clientId = clientId;
+        this.subscribedEvent = subscribedEvent;
+        this.txId = txId;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("subscribe", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        subscribe_args args = new subscribe_args();
+        args.setClientId(clientId);
+        args.setSubscribedEvent(subscribedEvent);
+        args.setTxId(txId);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws InvalidClientIdException, TransactionIdTooOldException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_subscribe();
+      }
+    }
+
+    public void unsubscribe(long clientId, NamespaceEvent subscribedEvent, org.apache.thrift.async.AsyncMethodCallback<unsubscribe_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      unsubscribe_call method_call = new unsubscribe_call(clientId, subscribedEvent, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class unsubscribe_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private long clientId;
+      private NamespaceEvent subscribedEvent;
+      public unsubscribe_call(long clientId, NamespaceEvent subscribedEvent, org.apache.thrift.async.AsyncMethodCallback<unsubscribe_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.clientId = clientId;
+        this.subscribedEvent = subscribedEvent;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("unsubscribe", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        unsubscribe_args args = new unsubscribe_args();
+        args.setClientId(clientId);
+        args.setSubscribedEvent(subscribedEvent);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws InvalidClientIdException, ClientNotSubscribedException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_unsubscribe();
+      }
+    }
+
+    public void registerClient(String host, int port, long token, org.apache.thrift.async.AsyncMethodCallback<registerClient_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      registerClient_call method_call = new registerClient_call(host, port, token, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class registerClient_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String host;
+      private int port;
+      private long token;
+      public registerClient_call(String host, int port, long token, org.apache.thrift.async.AsyncMethodCallback<registerClient_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.host = host;
+        this.port = port;
+        this.token = token;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("registerClient", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        registerClient_args args = new registerClient_args();
+        args.setHost(host);
+        args.setPort(port);
+        args.setToken(token);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws RampUpException, ClientConnectionException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_registerClient();
+      }
+    }
+
+    public void unregisterClient(long clientId, org.apache.thrift.async.AsyncMethodCallback<unregisterClient_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      unregisterClient_call method_call = new unregisterClient_call(clientId, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class unregisterClient_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private long clientId;
+      public unregisterClient_call(long clientId, org.apache.thrift.async.AsyncMethodCallback<unregisterClient_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.clientId = clientId;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("unregisterClient", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        unregisterClient_args args = new unregisterClient_args();
+        args.setClientId(clientId);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws InvalidClientIdException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_unregisterClient();
+      }
+    }
+
+  }
+
+  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
+    public Processor(I iface) {
+      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+    }
+
+    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      processMap.put("subscribe", new subscribe());
+      processMap.put("unsubscribe", new unsubscribe());
+      processMap.put("registerClient", new registerClient());
+      processMap.put("unregisterClient", new unregisterClient());
+      return processMap;
+    }
+
+    private static class subscribe<I extends Iface> extends org.apache.thrift.ProcessFunction<I, subscribe_args> {
+      public subscribe() {
+        super("subscribe");
+      }
+
+      protected subscribe_args getEmptyArgsInstance() {
+        return new subscribe_args();
+      }
+
+      protected subscribe_result getResult(I iface, subscribe_args args) throws org.apache.thrift.TException {
+        subscribe_result result = new subscribe_result();
+        try {
+          iface.subscribe(args.clientId, args.subscribedEvent, args.txId);
+        } catch (InvalidClientIdException invalidClientId) {
+          result.invalidClientId = invalidClientId;
+        } catch (TransactionIdTooOldException transactionIdTooOld) {
+          result.transactionIdTooOld = transactionIdTooOld;
+        }
+        return result;
+      }
+    }
+
+    private static class unsubscribe<I extends Iface> extends org.apache.thrift.ProcessFunction<I, unsubscribe_args> {
+      public unsubscribe() {
+        super("unsubscribe");
+      }
+
+      protected unsubscribe_args getEmptyArgsInstance() {
+        return new unsubscribe_args();
+      }
+
+      protected unsubscribe_result getResult(I iface, unsubscribe_args args) throws org.apache.thrift.TException {
+        unsubscribe_result result = new unsubscribe_result();
+        try {
+          iface.unsubscribe(args.clientId, args.subscribedEvent);
+        } catch (InvalidClientIdException invalidClientId) {
+          result.invalidClientId = invalidClientId;
+        } catch (ClientNotSubscribedException clientNotSubscribed) {
+          result.clientNotSubscribed = clientNotSubscribed;
+        }
+        return result;
+      }
+    }
+
+    private static class registerClient<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerClient_args> {
+      public registerClient() {
+        super("registerClient");
+      }
+
+      protected registerClient_args getEmptyArgsInstance() {
+        return new registerClient_args();
+      }
+
+      protected registerClient_result getResult(I iface, registerClient_args args) throws org.apache.thrift.TException {
+        registerClient_result result = new registerClient_result();
+        try {
+          iface.registerClient(args.host, args.port, args.token);
+        } catch (RampUpException rampUp) {
+          result.rampUp = rampUp;
+        } catch (ClientConnectionException clientConnection) {
+          result.clientConnection = clientConnection;
+        }
+        return result;
+      }
+    }
+
+    private static class unregisterClient<I extends Iface> extends org.apache.thrift.ProcessFunction<I, unregisterClient_args> {
+      public unregisterClient() {
+        super("unregisterClient");
+      }
+
+      protected unregisterClient_args getEmptyArgsInstance() {
+        return new unregisterClient_args();
+      }
+
+      protected unregisterClient_result getResult(I iface, unregisterClient_args args) throws org.apache.thrift.TException {
+        unregisterClient_result result = new unregisterClient_result();
+        try {
+          iface.unregisterClient(args.clientId);
+        } catch (InvalidClientIdException invalidClientId) {
+          result.invalidClientId = invalidClientId;
+        }
+        return result;
+      }
+    }
+
+  }
+
+  public static class subscribe_args implements org.apache.thrift.TBase<subscribe_args, subscribe_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("subscribe_args");
+
+    private static final org.apache.thrift.protocol.TField CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("clientId", org.apache.thrift.protocol.TType.I64, (short)1);
+    private static final org.apache.thrift.protocol.TField SUBSCRIBED_EVENT_FIELD_DESC = new org.apache.thrift.protocol.TField("subscribedEvent", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField TX_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txId", org.apache.thrift.protocol.TType.I64, (short)3);
+
+    public long clientId; // required
+    public NamespaceEvent subscribedEvent; // required
+    public long txId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      CLIENT_ID((short)1, "clientId"),
+      SUBSCRIBED_EVENT((short)2, "subscribedEvent"),
+      TX_ID((short)3, "txId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // CLIENT_ID
+            return CLIENT_ID;
+          case 2: // SUBSCRIBED_EVENT
+            return SUBSCRIBED_EVENT;
+          case 3: // TX_ID
+            return TX_ID;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __CLIENTID_ISSET_ID = 0;
+    private static final int __TXID_ISSET_ID = 1;
+    private BitSet __isset_bit_vector = new BitSet(2);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("clientId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.SUBSCRIBED_EVENT, new org.apache.thrift.meta_data.FieldMetaData("subscribedEvent", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NamespaceEvent.class)));
+      tmpMap.put(_Fields.TX_ID, new org.apache.thrift.meta_data.FieldMetaData("txId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(subscribe_args.class, metaDataMap);
+    }
+
+    public subscribe_args() {
+    }
+
+    public subscribe_args(
+      long clientId,
+      NamespaceEvent subscribedEvent,
+      long txId)
+    {
+      this();
+      this.clientId = clientId;
+      setClientIdIsSet(true);
+      this.subscribedEvent = subscribedEvent;
+      this.txId = txId;
+      setTxIdIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public subscribe_args(subscribe_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.clientId = other.clientId;
+      if (other.isSetSubscribedEvent()) {
+        this.subscribedEvent = new NamespaceEvent(other.subscribedEvent);
+      }
+      this.txId = other.txId;
+    }
+
+    public subscribe_args deepCopy() {
+      return new subscribe_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setClientIdIsSet(false);
+      this.clientId = 0;
+      this.subscribedEvent = null;
+      setTxIdIsSet(false);
+      this.txId = 0;
+    }
+
+    public long getClientId() {
+      return this.clientId;
+    }
+
+    public subscribe_args setClientId(long clientId) {
+      this.clientId = clientId;
+      setClientIdIsSet(true);
+      return this;
+    }
+
+    public void unsetClientId() {
+      __isset_bit_vector.clear(__CLIENTID_ISSET_ID);
+    }
+
+    /** Returns true if field clientId is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientId() {
+      return __isset_bit_vector.get(__CLIENTID_ISSET_ID);
+    }
+
+    public void setClientIdIsSet(boolean value) {
+      __isset_bit_vector.set(__CLIENTID_ISSET_ID, value);
+    }
+
+    public NamespaceEvent getSubscribedEvent() {
+      return this.subscribedEvent;
+    }
+
+    public subscribe_args setSubscribedEvent(NamespaceEvent subscribedEvent) {
+      this.subscribedEvent = subscribedEvent;
+      return this;
+    }
+
+    public void unsetSubscribedEvent() {
+      this.subscribedEvent = null;
+    }
+
+    /** Returns true if field subscribedEvent is set (has been assigned a value) and false otherwise */
+    public boolean isSetSubscribedEvent() {
+      return this.subscribedEvent != null;
+    }
+
+    public void setSubscribedEventIsSet(boolean value) {
+      if (!value) {
+        this.subscribedEvent = null;
+      }
+    }
+
+    public long getTxId() {
+      return this.txId;
+    }
+
+    public subscribe_args setTxId(long txId) {
+      this.txId = txId;
+      setTxIdIsSet(true);
+      return this;
+    }
+
+    public void unsetTxId() {
+      __isset_bit_vector.clear(__TXID_ISSET_ID);
+    }
+
+    /** Returns true if field txId is set (has been assigned a value) and false otherwise */
+    public boolean isSetTxId() {
+      return __isset_bit_vector.get(__TXID_ISSET_ID);
+    }
+
+    public void setTxIdIsSet(boolean value) {
+      __isset_bit_vector.set(__TXID_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case CLIENT_ID:
+        if (value == null) {
+          unsetClientId();
+        } else {
+          setClientId((Long)value);
+        }
+        break;
+
+      case SUBSCRIBED_EVENT:
+        if (value == null) {
+          unsetSubscribedEvent();
+        } else {
+          setSubscribedEvent((NamespaceEvent)value);
+        }
+        break;
+
+      case TX_ID:
+        if (value == null) {
+          unsetTxId();
+        } else {
+          setTxId((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case CLIENT_ID:
+        return Long.valueOf(getClientId());
+
+      case SUBSCRIBED_EVENT:
+        return getSubscribedEvent();
+
+      case TX_ID:
+        return Long.valueOf(getTxId());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case CLIENT_ID:
+        return isSetClientId();
+      case SUBSCRIBED_EVENT:
+        return isSetSubscribedEvent();
+      case TX_ID:
+        return isSetTxId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof subscribe_args)
+        return this.equals((subscribe_args)that);
+      return false;
+    }
+
+    public boolean equals(subscribe_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_clientId = true;
+      boolean that_present_clientId = true;
+      if (this_present_clientId || that_present_clientId) {
+        if (!(this_present_clientId && that_present_clientId))
+          return false;
+        if (this.clientId != that.clientId)
+          return false;
+      }
+
+      boolean this_present_subscribedEvent = true && this.isSetSubscribedEvent();
+      boolean that_present_subscribedEvent = true && that.isSetSubscribedEvent();
+      if (this_present_subscribedEvent || that_present_subscribedEvent) {
+        if (!(this_present_subscribedEvent && that_present_subscribedEvent))
+          return false;
+        if (!this.subscribedEvent.equals(that.subscribedEvent))
+          return false;
+      }
+
+      boolean this_present_txId = true;
+      boolean that_present_txId = true;
+      if (this_present_txId || that_present_txId) {
+        if (!(this_present_txId && that_present_txId))
+          return false;
+        if (this.txId != that.txId)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(subscribe_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      subscribe_args typedOther = (subscribe_args)other;
+
+      lastComparison = Boolean.valueOf(isSetClientId()).compareTo(typedOther.isSetClientId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientId, typedOther.clientId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetSubscribedEvent()).compareTo(typedOther.isSetSubscribedEvent());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSubscribedEvent()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.subscribedEvent, typedOther.subscribedEvent);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetTxId()).compareTo(typedOther.isSetTxId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTxId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txId, typedOther.txId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // CLIENT_ID
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.clientId = iprot.readI64();
+              setClientIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // SUBSCRIBED_EVENT
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.subscribedEvent = new NamespaceEvent();
+              this.subscribedEvent.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // TX_ID
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.txId = iprot.readI64();
+              setTxIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(CLIENT_ID_FIELD_DESC);
+      oprot.writeI64(this.clientId);
+      oprot.writeFieldEnd();
+      if (this.subscribedEvent != null) {
+        oprot.writeFieldBegin(SUBSCRIBED_EVENT_FIELD_DESC);
+        this.subscribedEvent.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(TX_ID_FIELD_DESC);
+      oprot.writeI64(this.txId);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("subscribe_args(");
+      boolean first = true;
+
+      sb.append("clientId:");
+      sb.append(this.clientId);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("subscribedEvent:");
+      if (this.subscribedEvent == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.subscribedEvent);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("txId:");
+      sb.append(this.txId);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class subscribe_result implements org.apache.thrift.TBase<subscribe_result, subscribe_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("subscribe_result");
+
+    private static final org.apache.thrift.protocol.TField INVALID_CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("invalidClientId", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField TRANSACTION_ID_TOO_OLD_FIELD_DESC = new org.apache.thrift.protocol.TField("transactionIdTooOld", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public InvalidClientIdException invalidClientId; // required
+    public TransactionIdTooOldException transactionIdTooOld; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      INVALID_CLIENT_ID((short)1, "invalidClientId"),
+      TRANSACTION_ID_TOO_OLD((short)2, "transactionIdTooOld");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // INVALID_CLIENT_ID
+            return INVALID_CLIENT_ID;
+          case 2: // TRANSACTION_ID_TOO_OLD
+            return TRANSACTION_ID_TOO_OLD;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.INVALID_CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("invalidClientId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.TRANSACTION_ID_TOO_OLD, new org.apache.thrift.meta_data.FieldMetaData("transactionIdTooOld", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(subscribe_result.class, metaDataMap);
+    }
+
+    public subscribe_result() {
+    }
+
+    public subscribe_result(
+      InvalidClientIdException invalidClientId,
+      TransactionIdTooOldException transactionIdTooOld)
+    {
+      this();
+      this.invalidClientId = invalidClientId;
+      this.transactionIdTooOld = transactionIdTooOld;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public subscribe_result(subscribe_result other) {
+      if (other.isSetInvalidClientId()) {
+        this.invalidClientId = new InvalidClientIdException(other.invalidClientId);
+      }
+      if (other.isSetTransactionIdTooOld()) {
+        this.transactionIdTooOld = new TransactionIdTooOldException(other.transactionIdTooOld);
+      }
+    }
+
+    public subscribe_result deepCopy() {
+      return new subscribe_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.invalidClientId = null;
+      this.transactionIdTooOld = null;
+    }
+
+    public InvalidClientIdException getInvalidClientId() {
+      return this.invalidClientId;
+    }
+
+    public subscribe_result setInvalidClientId(InvalidClientIdException invalidClientId) {
+      this.invalidClientId = invalidClientId;
+      return this;
+    }
+
+    public void unsetInvalidClientId() {
+      this.invalidClientId = null;
+    }
+
+    /** Returns true if field invalidClientId is set (has been assigned a value) and false otherwise */
+    public boolean isSetInvalidClientId() {
+      return this.invalidClientId != null;
+    }
+
+    public void setInvalidClientIdIsSet(boolean value) {
+      if (!value) {
+        this.invalidClientId = null;
+      }
+    }
+
+    public TransactionIdTooOldException getTransactionIdTooOld() {
+      return this.transactionIdTooOld;
+    }
+
+    public subscribe_result setTransactionIdTooOld(TransactionIdTooOldException transactionIdTooOld) {
+      this.transactionIdTooOld = transactionIdTooOld;
+      return this;
+    }
+
+    public void unsetTransactionIdTooOld() {
+      this.transactionIdTooOld = null;
+    }
+
+    /** Returns true if field transactionIdTooOld is set (has been assigned a value) and false otherwise */
+    public boolean isSetTransactionIdTooOld() {
+      return this.transactionIdTooOld != null;
+    }
+
+    public void setTransactionIdTooOldIsSet(boolean value) {
+      if (!value) {
+        this.transactionIdTooOld = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        if (value == null) {
+          unsetInvalidClientId();
+        } else {
+          setInvalidClientId((InvalidClientIdException)value);
+        }
+        break;
+
+      case TRANSACTION_ID_TOO_OLD:
+        if (value == null) {
+          unsetTransactionIdTooOld();
+        } else {
+          setTransactionIdTooOld((TransactionIdTooOldException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        return getInvalidClientId();
+
+      case TRANSACTION_ID_TOO_OLD:
+        return getTransactionIdTooOld();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        return isSetInvalidClientId();
+      case TRANSACTION_ID_TOO_OLD:
+        return isSetTransactionIdTooOld();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof subscribe_result)
+        return this.equals((subscribe_result)that);
+      return false;
+    }
+
+    public boolean equals(subscribe_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_invalidClientId = true && this.isSetInvalidClientId();
+      boolean that_present_invalidClientId = true && that.isSetInvalidClientId();
+      if (this_present_invalidClientId || that_present_invalidClientId) {
+        if (!(this_present_invalidClientId && that_present_invalidClientId))
+          return false;
+        if (!this.invalidClientId.equals(that.invalidClientId))
+          return false;
+      }
+
+      boolean this_present_transactionIdTooOld = true && this.isSetTransactionIdTooOld();
+      boolean that_present_transactionIdTooOld = true && that.isSetTransactionIdTooOld();
+      if (this_present_transactionIdTooOld || that_present_transactionIdTooOld) {
+        if (!(this_present_transactionIdTooOld && that_present_transactionIdTooOld))
+          return false;
+        if (!this.transactionIdTooOld.equals(that.transactionIdTooOld))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(subscribe_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      subscribe_result typedOther = (subscribe_result)other;
+
+      lastComparison = Boolean.valueOf(isSetInvalidClientId()).compareTo(typedOther.isSetInvalidClientId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetInvalidClientId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.invalidClientId, typedOther.invalidClientId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetTransactionIdTooOld()).compareTo(typedOther.isSetTransactionIdTooOld());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTransactionIdTooOld()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.transactionIdTooOld, typedOther.transactionIdTooOld);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // INVALID_CLIENT_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.invalidClientId = new InvalidClientIdException();
+              this.invalidClientId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // TRANSACTION_ID_TOO_OLD
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.transactionIdTooOld = new TransactionIdTooOldException();
+              this.transactionIdTooOld.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetInvalidClientId()) {
+        oprot.writeFieldBegin(INVALID_CLIENT_ID_FIELD_DESC);
+        this.invalidClientId.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetTransactionIdTooOld()) {
+        oprot.writeFieldBegin(TRANSACTION_ID_TOO_OLD_FIELD_DESC);
+        this.transactionIdTooOld.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("subscribe_result(");
+      boolean first = true;
+
+      sb.append("invalidClientId:");
+      if (this.invalidClientId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.invalidClientId);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("transactionIdTooOld:");
+      if (this.transactionIdTooOld == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.transactionIdTooOld);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class unsubscribe_args implements org.apache.thrift.TBase<unsubscribe_args, unsubscribe_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("unsubscribe_args");
+
+    private static final org.apache.thrift.protocol.TField CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("clientId", org.apache.thrift.protocol.TType.I64, (short)1);
+    private static final org.apache.thrift.protocol.TField SUBSCRIBED_EVENT_FIELD_DESC = new org.apache.thrift.protocol.TField("subscribedEvent", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public long clientId; // required
+    public NamespaceEvent subscribedEvent; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      CLIENT_ID((short)1, "clientId"),
+      SUBSCRIBED_EVENT((short)2, "subscribedEvent");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // CLIENT_ID
+            return CLIENT_ID;
+          case 2: // SUBSCRIBED_EVENT
+            return SUBSCRIBED_EVENT;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __CLIENTID_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("clientId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.SUBSCRIBED_EVENT, new org.apache.thrift.meta_data.FieldMetaData("subscribedEvent", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NamespaceEvent.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(unsubscribe_args.class, metaDataMap);
+    }
+
+    public unsubscribe_args() {
+    }
+
+    public unsubscribe_args(
+      long clientId,
+      NamespaceEvent subscribedEvent)
+    {
+      this();
+      this.clientId = clientId;
+      setClientIdIsSet(true);
+      this.subscribedEvent = subscribedEvent;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public unsubscribe_args(unsubscribe_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.clientId = other.clientId;
+      if (other.isSetSubscribedEvent()) {
+        this.subscribedEvent = new NamespaceEvent(other.subscribedEvent);
+      }
+    }
+
+    public unsubscribe_args deepCopy() {
+      return new unsubscribe_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setClientIdIsSet(false);
+      this.clientId = 0;
+      this.subscribedEvent = null;
+    }
+
+    public long getClientId() {
+      return this.clientId;
+    }
+
+    public unsubscribe_args setClientId(long clientId) {
+      this.clientId = clientId;
+      setClientIdIsSet(true);
+      return this;
+    }
+
+    public void unsetClientId() {
+      __isset_bit_vector.clear(__CLIENTID_ISSET_ID);
+    }
+
+    /** Returns true if field clientId is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientId() {
+      return __isset_bit_vector.get(__CLIENTID_ISSET_ID);
+    }
+
+    public void setClientIdIsSet(boolean value) {
+      __isset_bit_vector.set(__CLIENTID_ISSET_ID, value);
+    }
+
+    public NamespaceEvent getSubscribedEvent() {
+      return this.subscribedEvent;
+    }
+
+    public unsubscribe_args setSubscribedEvent(NamespaceEvent subscribedEvent) {
+      this.subscribedEvent = subscribedEvent;
+      return this;
+    }
+
+    public void unsetSubscribedEvent() {
+      this.subscribedEvent = null;
+    }
+
+    /** Returns true if field subscribedEvent is set (has been assigned a value) and false otherwise */
+    public boolean isSetSubscribedEvent() {
+      return this.subscribedEvent != null;
+    }
+
+    public void setSubscribedEventIsSet(boolean value) {
+      if (!value) {
+        this.subscribedEvent = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case CLIENT_ID:
+        if (value == null) {
+          unsetClientId();
+        } else {
+          setClientId((Long)value);
+        }
+        break;
+
+      case SUBSCRIBED_EVENT:
+        if (value == null) {
+          unsetSubscribedEvent();
+        } else {
+          setSubscribedEvent((NamespaceEvent)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case CLIENT_ID:
+        return Long.valueOf(getClientId());
+
+      case SUBSCRIBED_EVENT:
+        return getSubscribedEvent();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case CLIENT_ID:
+        return isSetClientId();
+      case SUBSCRIBED_EVENT:
+        return isSetSubscribedEvent();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof unsubscribe_args)
+        return this.equals((unsubscribe_args)that);
+      return false;
+    }
+
+    public boolean equals(unsubscribe_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_clientId = true;
+      boolean that_present_clientId = true;
+      if (this_present_clientId || that_present_clientId) {
+        if (!(this_present_clientId && that_present_clientId))
+          return false;
+        if (this.clientId != that.clientId)
+          return false;
+      }
+
+      boolean this_present_subscribedEvent = true && this.isSetSubscribedEvent();
+      boolean that_present_subscribedEvent = true && that.isSetSubscribedEvent();
+      if (this_present_subscribedEvent || that_present_subscribedEvent) {
+        if (!(this_present_subscribedEvent && that_present_subscribedEvent))
+          return false;
+        if (!this.subscribedEvent.equals(that.subscribedEvent))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(unsubscribe_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      unsubscribe_args typedOther = (unsubscribe_args)other;
+
+      lastComparison = Boolean.valueOf(isSetClientId()).compareTo(typedOther.isSetClientId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientId, typedOther.clientId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetSubscribedEvent()).compareTo(typedOther.isSetSubscribedEvent());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSubscribedEvent()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.subscribedEvent, typedOther.subscribedEvent);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // CLIENT_ID
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.clientId = iprot.readI64();
+              setClientIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // SUBSCRIBED_EVENT
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.subscribedEvent = new NamespaceEvent();
+              this.subscribedEvent.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(CLIENT_ID_FIELD_DESC);
+      oprot.writeI64(this.clientId);
+      oprot.writeFieldEnd();
+      if (this.subscribedEvent != null) {
+        oprot.writeFieldBegin(SUBSCRIBED_EVENT_FIELD_DESC);
+        this.subscribedEvent.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("unsubscribe_args(");
+      boolean first = true;
+
+      sb.append("clientId:");
+      sb.append(this.clientId);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("subscribedEvent:");
+      if (this.subscribedEvent == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.subscribedEvent);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class unsubscribe_result implements org.apache.thrift.TBase<unsubscribe_result, unsubscribe_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("unsubscribe_result");
+
+    private static final org.apache.thrift.protocol.TField INVALID_CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("invalidClientId", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CLIENT_NOT_SUBSCRIBED_FIELD_DESC = new org.apache.thrift.protocol.TField("clientNotSubscribed", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public InvalidClientIdException invalidClientId; // required
+    public ClientNotSubscribedException clientNotSubscribed; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      INVALID_CLIENT_ID((short)1, "invalidClientId"),
+      CLIENT_NOT_SUBSCRIBED((short)2, "clientNotSubscribed");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // INVALID_CLIENT_ID
+            return INVALID_CLIENT_ID;
+          case 2: // CLIENT_NOT_SUBSCRIBED
+            return CLIENT_NOT_SUBSCRIBED;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.INVALID_CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("invalidClientId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.CLIENT_NOT_SUBSCRIBED, new org.apache.thrift.meta_data.FieldMetaData("clientNotSubscribed", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(unsubscribe_result.class, metaDataMap);
+    }
+
+    public unsubscribe_result() {
+    }
+
+    public unsubscribe_result(
+      InvalidClientIdException invalidClientId,
+      ClientNotSubscribedException clientNotSubscribed)
+    {
+      this();
+      this.invalidClientId = invalidClientId;
+      this.clientNotSubscribed = clientNotSubscribed;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public unsubscribe_result(unsubscribe_result other) {
+      if (other.isSetInvalidClientId()) {
+        this.invalidClientId = new InvalidClientIdException(other.invalidClientId);
+      }
+      if (other.isSetClientNotSubscribed()) {
+        this.clientNotSubscribed = new ClientNotSubscribedException(other.clientNotSubscribed);
+      }
+    }
+
+    public unsubscribe_result deepCopy() {
+      return new unsubscribe_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.invalidClientId = null;
+      this.clientNotSubscribed = null;
+    }
+
+    public InvalidClientIdException getInvalidClientId() {
+      return this.invalidClientId;
+    }
+
+    public unsubscribe_result setInvalidClientId(InvalidClientIdException invalidClientId) {
+      this.invalidClientId = invalidClientId;
+      return this;
+    }
+
+    public void unsetInvalidClientId() {
+      this.invalidClientId = null;
+    }
+
+    /** Returns true if field invalidClientId is set (has been assigned a value) and false otherwise */
+    public boolean isSetInvalidClientId() {
+      return this.invalidClientId != null;
+    }
+
+    public void setInvalidClientIdIsSet(boolean value) {
+      if (!value) {
+        this.invalidClientId = null;
+      }
+    }
+
+    public ClientNotSubscribedException getClientNotSubscribed() {
+      return this.clientNotSubscribed;
+    }
+
+    public unsubscribe_result setClientNotSubscribed(ClientNotSubscribedException clientNotSubscribed) {
+      this.clientNotSubscribed = clientNotSubscribed;
+      return this;
+    }
+
+    public void unsetClientNotSubscribed() {
+      this.clientNotSubscribed = null;
+    }
+
+    /** Returns true if field clientNotSubscribed is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientNotSubscribed() {
+      return this.clientNotSubscribed != null;
+    }
+
+    public void setClientNotSubscribedIsSet(boolean value) {
+      if (!value) {
+        this.clientNotSubscribed = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        if (value == null) {
+          unsetInvalidClientId();
+        } else {
+          setInvalidClientId((InvalidClientIdException)value);
+        }
+        break;
+
+      case CLIENT_NOT_SUBSCRIBED:
+        if (value == null) {
+          unsetClientNotSubscribed();
+        } else {
+          setClientNotSubscribed((ClientNotSubscribedException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        return getInvalidClientId();
+
+      case CLIENT_NOT_SUBSCRIBED:
+        return getClientNotSubscribed();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        return isSetInvalidClientId();
+      case CLIENT_NOT_SUBSCRIBED:
+        return isSetClientNotSubscribed();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof unsubscribe_result)
+        return this.equals((unsubscribe_result)that);
+      return false;
+    }
+
+    public boolean equals(unsubscribe_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_invalidClientId = true && this.isSetInvalidClientId();
+      boolean that_present_invalidClientId = true && that.isSetInvalidClientId();
+      if (this_present_invalidClientId || that_present_invalidClientId) {
+        if (!(this_present_invalidClientId && that_present_invalidClientId))
+          return false;
+        if (!this.invalidClientId.equals(that.invalidClientId))
+          return false;
+      }
+
+      boolean this_present_clientNotSubscribed = true && this.isSetClientNotSubscribed();
+      boolean that_present_clientNotSubscribed = true && that.isSetClientNotSubscribed();
+      if (this_present_clientNotSubscribed || that_present_clientNotSubscribed) {
+        if (!(this_present_clientNotSubscribed && that_present_clientNotSubscribed))
+          return false;
+        if (!this.clientNotSubscribed.equals(that.clientNotSubscribed))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(unsubscribe_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      unsubscribe_result typedOther = (unsubscribe_result)other;
+
+      lastComparison = Boolean.valueOf(isSetInvalidClientId()).compareTo(typedOther.isSetInvalidClientId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetInvalidClientId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.invalidClientId, typedOther.invalidClientId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientNotSubscribed()).compareTo(typedOther.isSetClientNotSubscribed());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientNotSubscribed()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientNotSubscribed, typedOther.clientNotSubscribed);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // INVALID_CLIENT_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.invalidClientId = new InvalidClientIdException();
+              this.invalidClientId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // CLIENT_NOT_SUBSCRIBED
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.clientNotSubscribed = new ClientNotSubscribedException();
+              this.clientNotSubscribed.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetInvalidClientId()) {
+        oprot.writeFieldBegin(INVALID_CLIENT_ID_FIELD_DESC);
+        this.invalidClientId.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetClientNotSubscribed()) {
+        oprot.writeFieldBegin(CLIENT_NOT_SUBSCRIBED_FIELD_DESC);
+        this.clientNotSubscribed.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("unsubscribe_result(");
+      boolean first = true;
+
+      sb.append("invalidClientId:");
+      if (this.invalidClientId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.invalidClientId);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("clientNotSubscribed:");
+      if (this.clientNotSubscribed == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.clientNotSubscribed);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class registerClient_args implements org.apache.thrift.TBase<registerClient_args, registerClient_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerClient_args");
+
+    private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)2);
+    private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.I64, (short)3);
+
+    public String host; // required
+    public int port; // required
+    public long token; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      HOST((short)1, "host"),
+      PORT((short)2, "port"),
+      TOKEN((short)3, "token");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // HOST
+            return HOST;
+          case 2: // PORT
+            return PORT;
+          case 3: // TOKEN
+            return TOKEN;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __PORT_ISSET_ID = 0;
+    private static final int __TOKEN_ISSET_ID = 1;
+    private BitSet __isset_bit_vector = new BitSet(2);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerClient_args.class, metaDataMap);
+    }
+
+    public registerClient_args() {
+    }
+
+    public registerClient_args(
+      String host,
+      int port,
+      long token)
+    {
+      this();
+      this.host = host;
+      this.port = port;
+      setPortIsSet(true);
+      this.token = token;
+      setTokenIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public registerClient_args(registerClient_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetHost()) {
+        this.host = other.host;
+      }
+      this.port = other.port;
+      this.token = other.token;
+    }
+
+    public registerClient_args deepCopy() {
+      return new registerClient_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.host = null;
+      setPortIsSet(false);
+      this.port = 0;
+      setTokenIsSet(false);
+      this.token = 0;
+    }
+
+    public String getHost() {
+      return this.host;
+    }
+
+    public registerClient_args setHost(String host) {
+      this.host = host;
+      return this;
+    }
+
+    public void unsetHost() {
+      this.host = null;
+    }
+
+    /** Returns true if field host is set (has been assigned a value) and false otherwise */
+    public boolean isSetHost() {
+      return this.host != null;
+    }
+
+    public void setHostIsSet(boolean value) {
+      if (!value) {
+        this.host = null;
+      }
+    }
+
+    public int getPort() {
+      return this.port;
+    }
+
+    public registerClient_args setPort(int port) {
+      this.port = port;
+      setPortIsSet(true);
+      return this;
+    }
+
+    public void unsetPort() {
+      __isset_bit_vector.clear(__PORT_ISSET_ID);
+    }
+
+    /** Returns true if field port is set (has been assigned a value) and false otherwise */
+    public boolean isSetPort() {
+      return __isset_bit_vector.get(__PORT_ISSET_ID);
+    }
+
+    public void setPortIsSet(boolean value) {
+      __isset_bit_vector.set(__PORT_ISSET_ID, value);
+    }
+
+    public long getToken() {
+      return this.token;
+    }
+
+    public registerClient_args setToken(long token) {
+      this.token = token;
+      setTokenIsSet(true);
+      return this;
+    }
+
+    public void unsetToken() {
+      __isset_bit_vector.clear(__TOKEN_ISSET_ID);
+    }
+
+    /** Returns true if field token is set (has been assigned a value) and false otherwise */
+    public boolean isSetToken() {
+      return __isset_bit_vector.get(__TOKEN_ISSET_ID);
+    }
+
+    public void setTokenIsSet(boolean value) {
+      __isset_bit_vector.set(__TOKEN_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case HOST:
+        if (value == null) {
+          unsetHost();
+        } else {
+          setHost((String)value);
+        }
+        break;
+
+      case PORT:
+        if (value == null) {
+          unsetPort();
+        } else {
+          setPort((Integer)value);
+        }
+        break;
+
+      case TOKEN:
+        if (value == null) {
+          unsetToken();
+        } else {
+          setToken((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case HOST:
+        return getHost();
+
+      case PORT:
+        return Integer.valueOf(getPort());
+
+      case TOKEN:
+        return Long.valueOf(getToken());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case HOST:
+        return isSetHost();
+      case PORT:
+        return isSetPort();
+      case TOKEN:
+        return isSetToken();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof registerClient_args)
+        return this.equals((registerClient_args)that);
+      return false;
+    }
+
+    public boolean equals(registerClient_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_host = true && this.isSetHost();
+      boolean that_present_host = true && that.isSetHost();
+      if (this_present_host || that_present_host) {
+        if (!(this_present_host && that_present_host))
+          return false;
+        if (!this.host.equals(that.host))
+          return false;
+      }
+
+      boolean this_present_port = true;
+      boolean that_present_port = true;
+      if (this_present_port || that_present_port) {
+        if (!(this_present_port && that_present_port))
+          return false;
+        if (this.port != that.port)
+          return false;
+      }
+
+      boolean this_present_token = true;
+      boolean that_present_token = true;
+      if (this_present_token || that_present_token) {
+        if (!(this_present_token && that_present_token))
+          return false;
+        if (this.token != that.token)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(registerClient_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      registerClient_args typedOther = (registerClient_args)other;
+
+      lastComparison = Boolean.valueOf(isSetHost()).compareTo(typedOther.isSetHost());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetHost()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPort()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetToken()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // HOST
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.host = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // PORT
+            if (field.type == org.apache.thrift.protocol.TType.I32) {
+              this.port = iprot.readI32();
+              setPortIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // TOKEN
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.token = iprot.readI64();
+              setTokenIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.host != null) {
+        oprot.writeFieldBegin(HOST_FIELD_DESC);
+        oprot.writeString(this.host);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(PORT_FIELD_DESC);
+      oprot.writeI32(this.port);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(TOKEN_FIELD_DESC);
+      oprot.writeI64(this.token);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("registerClient_args(");
+      boolean first = true;
+
+      sb.append("host:");
+      if (this.host == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.host);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("port:");
+      sb.append(this.port);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("token:");
+      sb.append(this.token);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class registerClient_result implements org.apache.thrift.TBase<registerClient_result, registerClient_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerClient_result");
+
+    private static final org.apache.thrift.protocol.TField RAMP_UP_FIELD_DESC = new org.apache.thrift.protocol.TField("rampUp", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CLIENT_CONNECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("clientConnection", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public RampUpException rampUp; // required
+    public ClientConnectionException clientConnection; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      RAMP_UP((short)1, "rampUp"),
+      CLIENT_CONNECTION((short)2, "clientConnection");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // RAMP_UP
+            return RAMP_UP;
+          case 2: // CLIENT_CONNECTION
+            return CLIENT_CONNECTION;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.RAMP_UP, new org.apache.thrift.meta_data.FieldMetaData("rampUp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.CLIENT_CONNECTION, new org.apache.thrift.meta_data.FieldMetaData("clientConnection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerClient_result.class, metaDataMap);
+    }
+
+    public registerClient_result() {
+    }
+
+    public registerClient_result(
+      RampUpException rampUp,
+      ClientConnectionException clientConnection)
+    {
+      this();
+      this.rampUp = rampUp;
+      this.clientConnection = clientConnection;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public registerClient_result(registerClient_result other) {
+      if (other.isSetRampUp()) {
+        this.rampUp = new RampUpException(other.rampUp);
+      }
+      if (other.isSetClientConnection()) {
+        this.clientConnection = new ClientConnectionException(other.clientConnection);
+      }
+    }
+
+    public registerClient_result deepCopy() {
+      return new registerClient_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.rampUp = null;
+      this.clientConnection = null;
+    }
+
+    public RampUpException getRampUp() {
+      return this.rampUp;
+    }
+
+    public registerClient_result setRampUp(RampUpException rampUp) {
+      this.rampUp = rampUp;
+      return this;
+    }
+
+    public void unsetRampUp() {
+      this.rampUp = null;
+    }
+
+    /** Returns true if field rampUp is set (has been assigned a value) and false otherwise */
+    public boolean isSetRampUp() {
+      return this.rampUp != null;
+    }
+
+    public void setRampUpIsSet(boolean value) {
+      if (!value) {
+        this.rampUp = null;
+      }
+    }
+
+    public ClientConnectionException getClientConnection() {
+      return this.clientConnection;
+    }
+
+    public registerClient_result setClientConnection(ClientConnectionException clientConnection) {
+      this.clientConnection = clientConnection;
+      return this;
+    }
+
+    public void unsetClientConnection() {
+      this.clientConnection = null;
+    }
+
+    /** Returns true if field clientConnection is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientConnection() {
+      return this.clientConnection != null;
+    }
+
+    public void setClientConnectionIsSet(boolean value) {
+      if (!value) {
+        this.clientConnection = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case RAMP_UP:
+        if (value == null) {
+          unsetRampUp();
+        } else {
+          setRampUp((RampUpException)value);
+        }
+        break;
+
+      case CLIENT_CONNECTION:
+        if (value == null) {
+          unsetClientConnection();
+        } else {
+          setClientConnection((ClientConnectionException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case RAMP_UP:
+        return getRampUp();
+
+      case CLIENT_CONNECTION:
+        return getClientConnection();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case RAMP_UP:
+        return isSetRampUp();
+      case CLIENT_CONNECTION:
+        return isSetClientConnection();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof registerClient_result)
+        return this.equals((registerClient_result)that);
+      return false;
+    }
+
+    public boolean equals(registerClient_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_rampUp = true && this.isSetRampUp();
+      boolean that_present_rampUp = true && that.isSetRampUp();
+      if (this_present_rampUp || that_present_rampUp) {
+        if (!(this_present_rampUp && that_present_rampUp))
+          return false;
+        if (!this.rampUp.equals(that.rampUp))
+          return false;
+      }
+
+      boolean this_present_clientConnection = true && this.isSetClientConnection();
+      boolean that_present_clientConnection = true && that.isSetClientConnection();
+      if (this_present_clientConnection || that_present_clientConnection) {
+        if (!(this_present_clientConnection && that_present_clientConnection))
+          return false;
+        if (!this.clientConnection.equals(that.clientConnection))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(registerClient_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      registerClient_result typedOther = (registerClient_result)other;
+
+      lastComparison = Boolean.valueOf(isSetRampUp()).compareTo(typedOther.isSetRampUp());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetRampUp()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rampUp, typedOther.rampUp);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientConnection()).compareTo(typedOther.isSetClientConnection());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientConnection()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientConnection, typedOther.clientConnection);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // RAMP_UP
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.rampUp = new RampUpException();
+              this.rampUp.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // CLIENT_CONNECTION
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.clientConnection = new ClientConnectionException();
+              this.clientConnection.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetRampUp()) {
+        oprot.writeFieldBegin(RAMP_UP_FIELD_DESC);
+        this.rampUp.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetClientConnection()) {
+        oprot.writeFieldBegin(CLIENT_CONNECTION_FIELD_DESC);
+        this.clientConnection.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("registerClient_result(");
+      boolean first = true;
+
+      sb.append("rampUp:");
+      if (this.rampUp == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.rampUp);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("clientConnection:");
+      if (this.clientConnection == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.clientConnection);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class unregisterClient_args implements org.apache.thrift.TBase<unregisterClient_args, unregisterClient_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("unregisterClient_args");
+
+    private static final org.apache.thrift.protocol.TField CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("clientId", org.apache.thrift.protocol.TType.I64, (short)1);
+
+    public long clientId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      CLIENT_ID((short)1, "clientId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // CLIENT_ID
+            return CLIENT_ID;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __CLIENTID_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("clientId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(unregisterClient_args.class, metaDataMap);
+    }
+
+    public unregisterClient_args() {
+    }
+
+    public unregisterClient_args(
+      long clientId)
+    {
+      this();
+      this.clientId = clientId;
+      setClientIdIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public unregisterClient_args(unregisterClient_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.clientId = other.clientId;
+    }
+
+    public unregisterClient_args deepCopy() {
+      return new unregisterClient_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setClientIdIsSet(false);
+      this.clientId = 0;
+    }
+
+    public long getClientId() {
+      return this.clientId;
+    }
+
+    public unregisterClient_args setClientId(long clientId) {
+      this.clientId = clientId;
+      setClientIdIsSet(true);
+      return this;
+    }
+
+    public void unsetClientId() {
+      __isset_bit_vector.clear(__CLIENTID_ISSET_ID);
+    }
+
+    /** Returns true if field clientId is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientId() {
+      return __isset_bit_vector.get(__CLIENTID_ISSET_ID);
+    }
+
+    public void setClientIdIsSet(boolean value) {
+      __isset_bit_vector.set(__CLIENTID_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case CLIENT_ID:
+        if (value == null) {
+          unsetClientId();
+        } else {
+          setClientId((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case CLIENT_ID:
+        return Long.valueOf(getClientId());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case CLIENT_ID:
+        return isSetClientId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof unregisterClient_args)
+        return this.equals((unregisterClient_args)that);
+      return false;
+    }
+
+    public boolean equals(unregisterClient_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_clientId = true;
+      boolean that_present_clientId = true;
+      if (this_present_clientId || that_present_clientId) {
+        if (!(this_present_clientId && that_present_clientId))
+          return false;
+        if (this.clientId != that.clientId)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(unregisterClient_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      unregisterClient_args typedOther = (unregisterClient_args)other;
+
+      lastComparison = Boolean.valueOf(isSetClientId()).compareTo(typedOther.isSetClientId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientId, typedOther.clientId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // CLIENT_ID
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.clientId = iprot.readI64();
+              setClientIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(CLIENT_ID_FIELD_DESC);
+      oprot.writeI64(this.clientId);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("unregisterClient_args(");
+      boolean first = true;
+
+      sb.append("clientId:");
+      sb.append(this.clientId);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class unregisterClient_result implements org.apache.thrift.TBase<unregisterClient_result, unregisterClient_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("unregisterClient_result");
+
+    private static final org.apache.thrift.protocol.TField INVALID_CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("invalidClientId", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public InvalidClientIdException invalidClientId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      INVALID_CLIENT_ID((short)1, "invalidClientId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // INVALID_CLIENT_ID
+            return INVALID_CLIENT_ID;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.INVALID_CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("invalidClientId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(unregisterClient_result.class, metaDataMap);
+    }
+
+    public unregisterClient_result() {
+    }
+
+    public unregisterClient_result(
+      InvalidClientIdException invalidClientId)
+    {
+      this();
+      this.invalidClientId = invalidClientId;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public unregisterClient_result(unregisterClient_result other) {
+      if (other.isSetInvalidClientId()) {
+        this.invalidClientId = new InvalidClientIdException(other.invalidClientId);
+      }
+    }
+
+    public unregisterClient_result deepCopy() {
+      return new unregisterClient_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.invalidClientId = null;
+    }
+
+    public InvalidClientIdException getInvalidClientId() {
+      return this.invalidClientId;
+    }
+
+    public unregisterClient_result setInvalidClientId(InvalidClientIdException invalidClientId) {
+      this.invalidClientId = invalidClientId;
+      return this;
+    }
+
+    public void unsetInvalidClientId() {
+      this.invalidClientId = null;
+    }
+
+    /** Returns true if field invalidClientId is set (has been assigned a value) and false otherwise */
+    public boolean isSetInvalidClientId() {
+      return this.invalidClientId != null;
+    }
+
+    public void setInvalidClientIdIsSet(boolean value) {
+      if (!value) {
+        this.invalidClientId = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        if (value == null) {
+          unsetInvalidClientId();
+        } else {
+          setInvalidClientId((InvalidClientIdException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        return getInvalidClientId();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case INVALID_CLIENT_ID:
+        return isSetInvalidClientId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof unregisterClient_result)
+        return this.equals((unregisterClient_result)that);
+      return false;
+    }
+
+    public boolean equals(unregisterClient_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_invalidClientId = true && this.isSetInvalidClientId();
+      boolean that_present_invalidClientId = true && that.isSetInvalidClientId();
+      if (this_present_invalidClientId || that_present_invalidClientId) {
+        if (!(this_present_invalidClientId && that_present_invalidClientId))
+          return false;
+        if (!this.invalidClientId.equals(that.invalidClientId))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(unregisterClient_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      unregisterClient_result typedOther = (unregisterClient_result)other;
+
+      lastComparison = Boolean.valueOf(isSetInvalidClientId()).compareTo(typedOther.isSetInvalidClientId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetInvalidClientId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.invalidClientId, typedOther.invalidClientId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // INVALID_CLIENT_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.invalidClientId = new InvalidClientIdException();
+              this.invalidClientId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetInvalidClientId()) {
+        oprot.writeFieldBegin(INVALID_CLIENT_ID_FIELD_DESC);
+        this.invalidClientId.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("unregisterClient_result(");
+      boolean first = true;
+
+      sb.append("invalidClientId:");
+      if (this.invalidClientId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.invalidClientId);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+}
diff --git a/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/TransactionIdTooOldException.java b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/TransactionIdTooOldException.java
new file mode 100644
index 00000000..55560616
--- /dev/null
+++ b/src/contrib/namespace-notifier/gen-java/org/apache/hadoop/hdfs/notifier/TransactionIdTooOldException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TransactionIdTooOldException extends Exception implements org.apache.thrift.TBase<TransactionIdTooOldException, TransactionIdTooOldException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransactionIdTooOldException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TransactionIdTooOldException.class, metaDataMap);
+  }
+
+  public TransactionIdTooOldException() {
+  }
+
+  public TransactionIdTooOldException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public TransactionIdTooOldException(TransactionIdTooOldException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public TransactionIdTooOldException deepCopy() {
+    return new TransactionIdTooOldException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public TransactionIdTooOldException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof TransactionIdTooOldException)
+      return this.equals((TransactionIdTooOldException)that);
+    return false;
+  }
+
+  public boolean equals(TransactionIdTooOldException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(TransactionIdTooOldException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    TransactionIdTooOldException typedOther = (TransactionIdTooOldException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("TransactionIdTooOldException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/namespace-notifier/if/namespace-notifier.thrift b/src/contrib/namespace-notifier/if/namespace-notifier.thrift
new file mode 100644
index 00000000..d8e35fc4
--- /dev/null
+++ b/src/contrib/namespace-notifier/if/namespace-notifier.thrift
@@ -0,0 +1,100 @@
+#!/usr/local/bin/thrift -java
+
+namespace java org.apache.hadoop.hdfs.notifier
+namespace php hdfsnotifier
+namespace py hdfsnotifier
+
+/**
+ * The notification sent from the server to the client when a namespace
+ * event occured.
+ */
+struct NamespaceNotification {
+  1: string path,
+  2: byte type,
+  3: i64 txId
+}
+
+/**
+ * Emitted when an operation in the HDFS namespace occured. If a client
+ * subscribed to the server for a particular event, a notification 
+ * (see NamespaceNotification) will be sent.
+ */
+struct NamespaceEvent {
+  1: string path,
+  2: byte type
+}
+
+// Raised by the server when receiving commands from an unknown client
+exception InvalidClientIdException {
+  1: string message
+}
+
+// Raised by the client when receiving commands/notifications from an
+// unknown server
+exception InvalidServerIdException {
+  1: string message
+}
+
+// Raised by the client when he receives the registerServer command from
+// another server than he was expecting.
+exception InvalidTokenException {
+  1: string message
+}
+
+// Raised by the server when the client wants to receive notifications
+// that are too old (they aren't buffered anymore by the server)
+exception TransactionIdTooOldException {
+  1: string message
+}
+
+// Raised by the server when he isn't ready to give notifications yet
+exception RampUpException {
+  1: string message
+}
+
+// Raised by the server when he failed to connect to the client
+exception ClientConnectionException {
+  1: string message
+}
+
+// Raised by the server when the client tries to unsubscribe, though
+// he didn't subscribed earlier
+exception ClientNotSubscribedException {
+  1: string message
+}
+
+
+service ClientHandler
+{
+  // Called by the server to raise a notification
+  void handleNotification(1:NamespaceNotification notification, 2:i64 serverId)
+      throws (1:InvalidServerIdException invalidServerId),
+
+  // Called periodically by the server to inform the client that he is
+  // still alive
+  void heartbeat(1:i64 serverId)
+      throws (1:InvalidServerIdException invalidServerId),
+
+  // Called by the server to associate the client with its id
+  void registerServer(1:i64 clientId, 2:i64 serverId, 3:i64 token)
+      throws (1:InvalidTokenException invalidToken),
+}
+
+
+service ServerHandler
+{
+  void subscribe(1:i64 clientId, 2:NamespaceEvent subscribedEvent, 3:i64 txId)
+      throws (1:InvalidClientIdException invalidClientId,
+              2:TransactionIdTooOldException transactionIdTooOld),
+
+  void unsubscribe(1:i64 clientId, 2:NamespaceEvent subscribedEvent)
+      throws (1:InvalidClientIdException invalidClientId,
+              2:ClientNotSubscribedException clientNotSubscribed),
+
+  void registerClient(1:string host, 2:i32 port, 3:i64 token)
+      throws (1:RampUpException rampUp,
+              2:ClientConnectionException clientConnection),
+
+  void unregisterClient(1:i64 clientId)
+      throws (1:InvalidClientIdException invalidClientId),
+}
diff --git a/src/contrib/namespace-notifier/ivy.xml b/src/contrib/namespace-notifier/ivy.xml
new file mode 100644
index 00000000..197c0232
--- /dev/null
+++ b/src/contrib/namespace-notifier/ivy.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<ivy-module version="1.0">
+  <info organisation="org.apache.hadoop" module="${ant.project.name}">
+    <license name="Apache 2.0"/>
+    <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
+    <description>
+        Apache Hadoop contrib
+    </description>
+  </info>
+  <configurations defaultconfmapping="default">
+    <!--these match the Maven configurations-->
+    <conf name="default" extends="master,runtime"/>
+    <conf name="master" description="contains the artifact but no dependencies"/>
+    <conf name="runtime" description="runtime but not the artifact" />
+
+    <conf name="common" visibility="private" 
+      extends="runtime"
+      description="artifacts needed to compile/test the application"/>
+    <conf name="test" visibility="private" extends="runtime"/>
+  </configurations>
+
+  <publications>
+    <!--get the artifact from our module name-->
+    <artifact conf="master"/>
+  </publications>
+  <dependencies>
+    <dependency org="commons-logging"
+      name="commons-logging"
+      rev="${commons-logging.version}"
+      conf="common->default"/>
+    <dependency org="com.google.guava"
+      name="guava"
+      rev="${guava.version}"
+      conf="common->master"/>
+    <dependency org="log4j"
+      name="log4j"
+      rev="${log4j.version}"
+      conf="common->master"/>
+    <dependency org="junit"
+      name="junit"
+      rev="${junit.version}"
+      conf="common->default"/>
+    </dependencies>
+  
+</ivy-module>
diff --git a/src/contrib/namespace-notifier/ivy/libraries.properties b/src/contrib/namespace-notifier/ivy/libraries.properties
new file mode 100644
index 00000000..0c66ce47
--- /dev/null
+++ b/src/contrib/namespace-notifier/ivy/libraries.properties
@@ -0,0 +1,8 @@
+
+commons-logging.version=1.0.4
+
+log4j.version=1.2.15
+
+slf4j-api.version=1.6.1
+
+slf4j-log4j12.version=1.6.1
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/ClientHandlerImpl.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/ClientHandlerImpl.java
new file mode 100644
index 00000000..883a074f
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/ClientHandlerImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.thrift.TException;
+
+public class ClientHandlerImpl implements ClientHandler.Iface {
+  public static final Log LOG = LogFactory.getLog(NamespaceNotifierClient.class);
+  
+  NamespaceNotifierClient client;
+  
+  public ClientHandlerImpl(NamespaceNotifierClient client) {
+    this.client = client;
+  }
+  
+  
+  @Override
+  public void handleNotification(NamespaceNotification notification,
+      long serverId) throws InvalidServerIdException, TException {
+    if (LOG.isDebugEnabled()) {
+      LOG.debug(client.listeningPort + ": Received " +
+          NotifierUtils.asString(notification) + " from " +
+          "server " + serverId);
+    }
+    
+    if (serverId != client.connectionManager.serverId) {
+      LOG.warn(client.listeningPort + ": Received notification, but not " +
+          "connected to server " + serverId +
+          ". Answering with InvalidServerIdException");
+      throw new InvalidServerIdException();
+    }
+    
+    String eventPath = NotifierUtils.getBasePath(notification);
+    NamespaceEventKey eventKey = new NamespaceEventKey(eventPath,
+        notification.type);
+    if (client.watchedEvents.get(eventKey) == notification.txId) {
+      LOG.warn(client.listeningPort + ": Received duplicate for txId=" +
+          notification.txId);
+    }
+    else {
+      try {
+        client.watcher.handleNamespaceNotification(notification);
+      } catch (Exception e) {
+        LOG.warn(client.listeningPort +
+            ": wather.handleNamespaceNotification failed", e);
+        throw new TException(e);
+      }
+      client.watchedEvents.put(eventKey, notification.txId);
+    }
+    
+    client.connectionManager.tracker.messageReceived();
+  }
+
+  
+  @Override
+  public void heartbeat(long serverId) throws InvalidServerIdException,
+      TException {
+    LOG.info(client.listeningPort + ": Received heartbeat from server " +
+        serverId);
+    if (serverId != client.connectionManager.serverId) {
+      LOG.warn(client.listeningPort + ": Not connected to server " + serverId +
+          ". Answering with InvalidServerIdException");
+      throw new InvalidServerIdException();
+    }
+    
+    client.connectionManager.tracker.messageReceived();
+  }
+  
+  
+  @Override
+  public void registerServer(long clientId, long serverId, long token)
+      throws InvalidTokenException, TException {
+    LOG.info(client.listeningPort + ": registerServer called with clientId=" +
+        clientId + " serverId=" + serverId + " token=" + token);
+    if (token != client.getCurrentConnectionToken()) {
+      LOG.warn(client.listeningPort + ": registerServer called with bad" +
+          " token. Expected: " + token);
+      throw new InvalidTokenException();
+    }
+    LOG.info(client.listeningPort + ": Token accepted. Saving client" +
+        " and server id ...");
+    client.connectionManager.id = clientId;
+    client.connectionManager.serverId = serverId;
+  }
+ 
+  
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/EventType.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/EventType.java
new file mode 100644
index 00000000..6d7251b0
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/EventType.java
@@ -0,0 +1,57 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public enum EventType {
+  // A file was added. Won't trigger for a directory. 
+  FILE_ADDED   ((byte)0),
+  // A file was closed. Won't trigger for a directory.
+  FILE_CLOSED  ((byte)1),
+  // A file or directory was deleted.
+  NODE_DELETED ((byte)2);
+  
+  // Caching the association between the byte value and the enum value
+  private static final Map<Byte, EventType> byteToEnum = 
+      new HashMap<Byte, EventType>();
+  
+  // The actual byte value for this instance
+  private byte byteValue;
+  
+  EventType(byte value) {
+    byteValue = value;
+  }
+
+  static {
+    // Initialize the mapping from byte to enum
+    for(EventType eventType : values())
+      byteToEnum.put(eventType.getByteValue(), eventType);
+  }
+
+  public byte getByteValue() {
+    return byteValue;
+  }
+  
+  public static EventType fromByteValue(byte byteValue) {
+    return byteToEnum.get(byteValue);
+  }
+  
+};
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NamespaceEventKey.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NamespaceEventKey.java
new file mode 100644
index 00000000..16ac4e71
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NamespaceEventKey.java
@@ -0,0 +1,76 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+/**
+ * Wrapper class over NamespaceEvent. It can be used as a key in a map or an
+ * entry in a set.
+ */
+public class NamespaceEventKey {
+  
+  public NamespaceEvent event;
+  
+  private int hashCodeValue;
+  
+  public NamespaceEventKey(NamespaceEvent event) {
+    this.event = event;
+    hashCodeValue = (int)event.getType() + event.getPath().hashCode();
+  }
+  
+  
+  public NamespaceEventKey(NamespaceNotification n) {
+    event = new NamespaceEvent(NotifierUtils.getBasePath(n), n.type);
+    hashCodeValue = (int)event.getType() + event.getPath().hashCode();
+  }
+  
+  
+  public NamespaceEventKey(String path, EventType type) {
+    event = new NamespaceEvent(path, type.getByteValue());
+    hashCodeValue = (int)event.getType() + event.getPath().hashCode();
+  }
+  
+  
+  public NamespaceEventKey(String path, byte type) {
+    event = new NamespaceEvent(path, type);
+    hashCodeValue = (int)event.getType() + event.getPath().hashCode();
+  }
+  
+  
+  public NamespaceEvent getEvent() {
+    return event;
+  }
+  
+  
+  @Override
+  public int hashCode() {
+    return hashCodeValue;
+  }
+  
+  
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof NamespaceEventKey)) {
+      return false;
+    }
+    
+    NamespaceEvent event2 = ((NamespaceEventKey)o).event;
+    return event2.getPath().equals(event.getPath()) &&
+        event2.getType() == event.getType();
+  }
+
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NamespaceNotifierClient.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NamespaceNotifierClient.java
new file mode 100644
index 00000000..16d064e2
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NamespaceNotifierClient.java
@@ -0,0 +1,1001 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotifierClient.NotConnectedToServerException;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotifierClient.ServerAlreadyKnownException;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotifierClient.ServerNotKnownException;
+import org.apache.hadoop.hdfs.notifier.EventType;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.server.TNonblockingServer;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TNonblockingServerSocket;
+import org.apache.thrift.transport.TNonblockingServerTransport;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.TTransportFactory;
+
+import com.google.common.collect.Maps;
+
+/**
+ * Used by the client to subscribe to the namespace notifier server. 
+ */
+public class NamespaceNotifierClient implements Runnable {
+  public static final Log LOG = LogFactory.getLog(NamespaceNotifierClient.class);
+  
+  // The object that will get our callbacks
+  Watcher watcher;
+  
+  String listeningHost;
+  int listeningPort;
+
+  // All the watches that this client has placed.
+  // Mapping event to the last transaction id received
+  ConcurrentMap<NamespaceEventKey, Long> watchedEvents;
+  
+  // When we should shutdown
+  volatile boolean shouldShutdown = false;
+  
+  // The thrift handler implementation
+  ClientHandler.Iface handler;
+  
+  TServer tserver;
+  
+  ConnectionManager connectionManager;
+  
+  Random generator;
+
+  
+  /**
+   * Constructor used when the Namespace Notification Server is running just
+   * on one machine.
+   * 
+   * @param watcher The notified component
+   * @param host The notification server hostname or IP address
+   * @param port The notification server listening port
+   * @param listeningPort the port on which this client should start the
+   *        thrift service.
+   * @throws TException when failing to connect to the server.
+   */
+  public NamespaceNotifierClient(Watcher watcher,
+      String host, int port, int listeningPort) throws TException {
+    this(watcher, Arrays.asList(host), port, listeningPort);
+  }
+
+
+  /**
+   * Constructor used when the Namespace Notification server is running on
+   * multiple machines, but on all machines it's listening on the same port
+   * number.
+   * 
+   * @param watcher The notified component
+   * @param hosts The notification servers hostnames or IP addresses
+   * @param port The notification servers listening port
+   * @param listeningPort the port on which this client should start the
+   *        thrift service.
+   * @throws TException when failing to connect to the server.
+   */
+  public NamespaceNotifierClient(Watcher watcher,
+      List<String> hosts, int port, int listeningPort)
+          throws TException {
+    this(watcher, hosts, Arrays.asList(port), listeningPort);
+  }
+
+
+  /**
+   * Constructor used when the Namespace Notification server is running on
+   * multiple machines and it's not listening on the same port number on all
+   * machines.
+   * 
+   * @param watcher The notified component
+   * @param hosts The notification servers hostnames or IP addresses
+   * @param ports The notification servers listening ports
+   * @param listeningPort the port on which this client should start the
+   *        thrift service.
+   * @throws TException when failing to connect to the server.
+   */
+  public NamespaceNotifierClient(Watcher watcher,
+      List<String> hosts, List<Integer> ports, int listeningPort)
+          throws TException {
+    this.watcher = watcher;
+    watchedEvents = new ConcurrentHashMap<NamespaceEventKey, Long>();
+    
+    try {
+       listeningHost = InetAddress.getLocalHost().getHostName();
+    } catch (UnknownHostException e) {
+      throw new TException(e);
+    }
+    this.listeningPort = listeningPort;
+    handler = new ClientHandlerImpl(this);
+    
+    // Ensure pseudo-random seed between clients
+    long seed = System.currentTimeMillis() + listeningPort +
+        listeningHost.hashCode();
+    if (LOG.isDebugEnabled()) {
+      LOG.debug(listeningPort + ": using seed " + seed);
+    }
+    generator = new Random(seed);
+    
+    // Setup the Thrift server
+    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();
+    TTransportFactory transportFactory = new TFramedTransport.Factory();
+    TNonblockingServerTransport serverTransport;
+    ClientHandler.Processor<ClientHandler.Iface> processor =
+        new ClientHandler.Processor<ClientHandler.Iface>(handler);
+    serverTransport = new TNonblockingServerSocket(listeningPort);
+    
+    TNonblockingServer.Args serverArgs =
+        new TNonblockingServer.Args(serverTransport);
+    serverArgs.processor(processor).transportFactory(transportFactory)
+        .protocolFactory(protocolFactory);
+    tserver = new TNonblockingServer(serverArgs);
+    
+    connectionManager = new ConnectionManager(hosts, ports, this);
+    LOG.info(listeningPort + ": Successfully initialized namespace" +
+        " notifier client"); 
+  }
+  
+  
+  /**
+   * Called by the ConnectionManager when the connection state changed.
+   * The connection lock is hold when calling this method, so no
+   * other methods from the ConnectionManager should be called here.
+   * 
+   * @param newState the new state
+   * @return when the new state is DISCONNECTED_HIDDEN or DISCONNECTED_VISIBLE,
+   *         then the return value is ignored. If the new state is CONNECTED,
+   *         then the return value shows if the NamespaceNotifierClient accepts
+   *         or not the new server. If it isn't accepted, the ConnectionManager
+   *         will try connecting to another server. 
+   */
+  boolean connectionStateChanged(int newState) {
+    switch (newState) {
+      case ConnectionManager.CONNECTED:
+        LOG.info(listeningPort + ": Switched to CONNECTED state.");
+        // Try to resubscribe all the watched events
+        try {
+          return resubscribe();
+        } catch (Exception e) {
+          LOG.error(listeningPort + ": Resubscribing failed", e);
+          return false;
+        }
+      case ConnectionManager.DISCONNECTED_VISIBLE:
+        LOG.info(listeningPort + ": Switched to DISCONNECTED_VISIBLE state");
+        for (NamespaceEventKey eventKey : watchedEvents.keySet())
+          watchedEvents.put(eventKey, -1L);
+        watcher.connectionFailed();
+        break;
+      case ConnectionManager.DISCONNECTED_HIDDEN:
+        LOG.info(listeningPort + ": Switched to DISCONNECTED_HIDDEN state.");
+    }
+
+    return true;
+  }
+  
+  
+  long getCurrentConnectionToken() {
+    return connectionManager.getConnectionToken();
+  }
+  
+  
+  /**
+   * Adds the specified server to the pool of known servers.
+   * @param host
+   * @param port
+   * @throws ServerAlreadyKnownException if the server is already in the pool
+   *         of known servers.
+   */
+  public void addServer(String host, int port)
+      throws ServerAlreadyKnownException {
+    connectionManager.addServer(host, port);
+  }
+  
+  
+  /**
+   * Removes the specified server from the pool of known servers.
+   * @param host
+   * @param port
+   * @throws ServerNotKnownException if the server isn't in the pool of
+   *         known servers.
+   */
+  public void removeServer(String host, int port)
+      throws ServerNotKnownException {
+    connectionManager.removeServer(host, port);
+  }
+  
+  
+  /**
+   * Sets the value of the timeout after which we will consider a server
+   * failed.
+   * @param timeout the value in milliseconds for the timeout after which
+   *        we will consider the server failed. Defaults to 50000 (50 seconds).
+   */
+  public void setServerTimeout(long timeout) {
+    connectionManager.setServerTimeout(timeout);
+  }
+  
+  
+  /**
+   * Sets the value of the time between consecutive connect retries. The
+   * connection is retried only after Watcher.connectionFailed was called.
+   * @param retryTime the retry time in milliseconds.
+   */
+  public void setConnectRetryTime(long retryTime) {
+    connectionManager.setConnectRetryTime(retryTime);
+  }
+  
+  
+  /**
+   * The watcher (given in the constructor) will be notified when an
+   * event of the given type and at the given path will happen. He will
+   * keep receiving notifications until the watch is removed with
+   * {@link #removeWatch(String, EventType)}.
+   * 
+   * The subscription is considered done if the method doesn't throw an
+   * exception (even if Watcher.connectionFailed is called before this
+   * method returns).
+   *
+   * @param path the path where the watch is placed. For the FILE_ADDED event
+   *        type, this represents the path of the directory under which the
+   *        file will be created.
+   * @param watchType the type of the event for which we want to receive the
+   *        notifications.
+   * @param transactionId the transaction id of the last received notification.
+   *        Notifications will from and excluding the notification with this
+   *        transaction id. If this is -1, then all notifications that
+   *        happened after this method returns will be received and some
+   *        of the notifications between the time the method was called
+   *        and the time the method returns may be received.
+   * @throws WatchAlreadyPlacedException if the watch already exists for this
+   *         path and type.
+   * @throws NotConnectedToServerException when the Watcher.connectionSuccessful
+   *         method was not called (the connection to the server isn't
+   *         established yet) at start-up or after a Watcher.connectionFailed
+   *         call. The Watcher.connectionFailed could of happened anytime
+   *         since the last Watcher.connectionSuccessful call until this
+   *         method returns.
+   * @throws TransactionIdTooOldException when the requested transaction id
+   *         is too old and not loosing notifications can't be guaranteed.
+   *         A solution would be a manual scanning and then calling the
+   *         method again with -1 as the transactionId parameter.
+   */
+  public void placeWatch(String path, EventType watchType,
+      long transactionId) throws TransactionIdTooOldException,
+      NotConnectedToServerException, InterruptedException,
+      WatchAlreadyPlacedException {
+    NamespaceEventKey eventKey = new NamespaceEventKey(path, watchType);
+    Object connectionLock = connectionManager.getConnectionLock();
+    
+    LOG.info(listeningPort + ": Placing watch: " +
+        NotifierUtils.asString(eventKey) + " ...");
+    if (watchedEvents.containsKey(eventKey)) {
+      LOG.warn(listeningPort + ": Watch already exists at " +
+          NotifierUtils.asString(eventKey));
+      throw new WatchAlreadyPlacedException();
+    }
+    
+    synchronized (connectionLock) {
+      connectionManager.waitForTransparentConnect();
+      
+      if (!subscribe(path, watchType, transactionId)) {
+        connectionManager.failConnection(true);
+        connectionManager.waitForTransparentConnect();
+        if (!subscribe(path, watchType, transactionId)) {
+          // Since we are failing visible to the client, then there isn't
+          // a need to request from a given txId
+          watchedEvents.put(eventKey, -1L);
+          connectionManager.failConnection(false);
+          return;
+        }
+      }
+      
+      watchedEvents.put(eventKey, transactionId);
+    }
+  }
+
+
+  /**
+   * Removes a previously placed watch for a particular event type from the 
+   * given path. If the watch is not actually present at that path before
+   * calling the method, nothing will happen.
+   * 
+   * To remove the watch for all event types at this path, use
+   * {@link #removeAllWatches(String)}.
+   * 
+   * @param path the path from which the watch is removed. For the FILE_ADDED event
+   *        type, this represents the path of the directory under which the
+   *        file will be created.
+   * @param watchType the type of the event for which don't want to receive
+   *        notifications from now on.
+   * @return true if successfully removed watch. false if the watch wasn't
+   *         placed before calling this method.
+   * @throws WatchNotPlacedException if the watch wasn't placed before calling
+   *         this method.
+   * @throws NotConnectedToServerException when the Watcher.connectionSuccessful
+   *         method was not called (the connection to the server isn't
+   *         established yet) at start-up or after a Watcher.connectionFailed
+   *         call. The Watcher.connectionFailed could of happened anytime
+   *         since the last Watcher.connectionSuccessfull call until this
+   *         method returns.
+   */
+  public void removeWatch(String path, EventType watchType)
+      throws NotConnectedToServerException, InterruptedException,
+      WatchNotPlacedException {
+    NamespaceEvent event = new NamespaceEvent(path, watchType.getByteValue());
+    NamespaceEventKey eventKey = new NamespaceEventKey(path, watchType);
+    Object connectionLock = connectionManager.getConnectionLock();
+    ServerHandler.Client server;
+    
+    LOG.info(listeningPort + ": removeWatch: Removing watch from " +
+        NotifierUtils.asString(eventKey) + " ...");
+    if (!watchedEvents.containsKey(eventKey)) {
+      LOG.warn(listeningPort + ": removeWatch: watch doesen't exist at " +
+          NotifierUtils.asString(eventKey) + " ...");
+      throw new WatchNotPlacedException();
+    }
+    
+    synchronized (connectionLock) {
+      connectionManager.waitForTransparentConnect();
+      server = connectionManager.getServer();
+      
+      try {
+        server.unsubscribe(connectionManager.getId(), event);
+      } catch (InvalidClientIdException e1) {
+        LOG.warn(listeningPort + ": removeWatch: server deleted us", e1);
+        connectionManager.failConnection(true);
+      } catch (ClientNotSubscribedException e2) {
+        LOG.error(listeningPort + ": removeWatch: event not subscribed", e2);
+      } catch (TException e3) {
+        LOG.error(listeningPort + ": removeWatch: failed communicating to" +
+            " server", e3);
+        connectionManager.failConnection(true);
+      }
+
+      watchedEvents.remove(eventKey);
+    }
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug(listeningPort + ": Unsubscribed from " +
+          NotifierUtils.asString(eventKey));
+    }
+  }
+
+
+  /**
+   * Tests if a watch is placed at the given path and of the given type.
+   * 
+   * @param path the path where we should test if a watch is placed. For the
+   *        FILE_ADDED event type, this represents the path of the directory
+   *        under which the file will be created.
+   * @param watchType the type of the event for which we test if a watch is
+   *        present.
+   * @return <code>true</code> if a watch is placed, <code>false</code>
+   *         otherwise.
+   */
+  public boolean haveWatch(String path, EventType watchType) {
+    return watchedEvents.containsKey(new NamespaceEventKey(path, watchType));
+  }
+  
+  
+  /**
+   * @return true if notifications were received for all subscribed events,
+   *         false otherwise.
+   */
+  boolean receivedNotificationsForAllEvents() {
+    return !watchedEvents.values().contains(-1L);
+  }
+  
+  
+  /**
+   * Called right after a reconnect to resubscribe to all events. Must be
+   * called with the connection lock acquired.
+   */
+  private boolean resubscribe() throws TransactionIdTooOldException,
+      InterruptedException {
+    for (NamespaceEventKey eventKey : watchedEvents.keySet()) {
+      NamespaceEvent event = eventKey.getEvent(); 
+      if (!subscribe(event.getPath(), EventType.fromByteValue(event.getType()),
+          watchedEvents.get(eventKey))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  
+  /**
+   * Should be called with the connection lock acquired and only in the
+   * <code>CONNECTED</code> state.
+   * @param path
+   * @param watchType
+   * @param transactionId
+   * @return true if connected, false otherwise. 
+   * @throws TransactionIdTooOldException
+   */
+  private boolean subscribe(String path, EventType watchType,
+      long transactionId)
+          throws TransactionIdTooOldException, InterruptedException {
+    ServerHandler.Client server = connectionManager.getServer();
+    NamespaceEvent event =  new NamespaceEvent(path, watchType.getByteValue());
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug(listeningPort + ": subscribe: Trying to subscribe for " +
+          NotifierUtils.asString(event) + " ... from txId " + transactionId);
+    }
+    
+    for (int retries = 0; retries < 3; retries ++) {
+      try {
+        server.subscribe(connectionManager.getId(), event, transactionId);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug(listeningPort + ": subscribe: successful");
+        }
+        return true;
+      } catch (TransactionIdTooOldException e) {
+        LOG.warn(listeningPort + ": Failed to subscribe [1]", e);
+        throw e;
+      } catch (InvalidClientIdException e) {
+        LOG.warn(listeningPort + ": Failed to subscribe [2]", e);
+      } catch (TException e) {
+        LOG.warn(listeningPort + ": Failed to subscribe [3]", e);
+        Thread.sleep(1000);
+      }
+    }
+    
+    return false;
+  }
+
+
+  @Override
+  public void run() {
+    LOG.info(listeningPort + ": Running ...");
+    new Thread(connectionManager).start();
+    LOG.info(listeningPort + ": Starting thrift server on port " + listeningPort);
+    tserver.serve();
+  }
+  
+  
+  public void shutdown() {
+    shouldShutdown = true;
+    ServerHandler.Client server = connectionManager.getServer();
+    connectionManager.shutdown();
+    
+    try {
+      server.unregisterClient(connectionManager.getId());
+    } catch (InvalidClientIdException e1) {
+      LOG.warn(listeningPort + ": Server deleted us before shutdown", e1);
+    } catch (TException e2) {
+      LOG.warn(listeningPort + ": Failed to unregister client gracefully", e2);
+    }
+    
+    tserver.stop();
+  }
+
+  
+  /**
+   * Raised when the client tries server related operations, but the
+   * Watcher.connectionSuccessful method was not called.
+   */
+  static public class NotConnectedToServerException extends Exception {
+    private static final long serialVersionUID = 1L;
+    
+    public NotConnectedToServerException(String arg) {
+      super(arg);
+    }
+    
+    public NotConnectedToServerException() {
+      super();
+    }
+  }
+  
+  
+  /**
+   * Called when the placeWatch method is called, but the watch is already
+   * present.
+   */
+  static public class WatchAlreadyPlacedException extends Exception {
+    private static final long serialVersionUID = 1L;
+    
+    public WatchAlreadyPlacedException(String arg) {
+      super(arg);
+    }
+    
+    public WatchAlreadyPlacedException() {
+      super();
+    }
+  }
+  
+  
+  /**
+   * Called when the removeWatch method is called, but the watch wasn't placed.
+   */
+  static public class WatchNotPlacedException extends Exception {
+    private static final long serialVersionUID = 1L;
+    
+    public WatchNotPlacedException(String arg) {
+      super(arg);
+    }
+    
+    public WatchNotPlacedException() {
+      super();
+    }
+  }
+  
+  
+  /**
+   * Called when the addServer method tries to add a server which is already
+   * stored in the internal data structures.
+   */
+  static public class ServerAlreadyKnownException extends Exception {
+    private static final long serialVersionUID = 1L;
+    
+    public ServerAlreadyKnownException(String arg) {
+      super(arg);
+    }
+    
+    public ServerAlreadyKnownException() {
+      super();
+    }
+  }
+  
+  
+  /**
+   * Called when the removeServer method tries to remove a server which is not
+   * stored in the internal data structures.
+   */
+  static public class ServerNotKnownException extends Exception {
+    private static final long serialVersionUID = 1L;
+    
+    public ServerNotKnownException(String arg) {
+      super(arg);
+    }
+    
+    public ServerNotKnownException() {
+      super();
+    }
+  }
+}
+
+class ConnectionManager implements Runnable {
+  public static final Log LOG = LogFactory.getLog(NamespaceNotifierClient.class);
+
+  static final int SOCKET_TIMEOUT = 35000;
+  static final long DEFAULT_SERVER_TIMEOUT = 50000;
+  static final int DEFAULT_CONNECT_RETRY_TIME = 1000;
+  
+  public static final int CONNECTED = 0;
+  public static final int DISCONNECTED_HIDDEN = 1;
+  public static final int DISCONNECTED_VISIBLE = 2;
+  
+  private int state = DISCONNECTED_VISIBLE;
+  
+  int listeningPort;
+  
+  // This lock is hold when doing operations that may modify the 
+  // connection state
+  private Object connectionLock = new Object();
+  
+  // Used to wait and notify of when we should start retrying the connection
+  // with the server.
+  private Object retryConnectionCondition = new Object();
+  
+  // Connection to notification servers information
+  private List<Map.Entry<String, Integer>> servers;
+  
+  // The server thrift object (if we are connected to a server)
+  private ServerHandler.Client server = null;
+  
+  private long connectionToken;
+  
+  // The id of the server we are currently connected to
+  volatile long serverId;
+  
+  // The id currently assigned to us by the server we are connected to.
+  volatile long id;
+
+  private volatile long serverTimeout = DEFAULT_SERVER_TIMEOUT;
+  
+  private volatile int connectRetryTime = DEFAULT_CONNECT_RETRY_TIME;
+
+  ServerTracker tracker;
+
+  NamespaceNotifierClient notifierClient;
+
+  
+  public ConnectionManager(List<String> hosts, List<Integer> ports,
+      NamespaceNotifierClient notifierClient) {
+    serverId = -1;
+    id = -1;
+    tracker = new ServerTracker();
+    this.notifierClient = notifierClient;
+    this.listeningPort = notifierClient.listeningPort;
+    
+    servers = new ArrayList<Map.Entry<String,Integer>>();
+    for (int i = 0; i < hosts.size(); i ++) {
+      String host = hosts.get(i);
+      int port = ports.get(ports.size() == 0 ? 0 : i);
+      servers.add(Maps.immutableEntry(host, port));
+    }
+    
+    // So clients try have different priority for servers, avoiding
+    // all the clients connecting to one server.
+    Collections.shuffle(servers, notifierClient.generator);
+  }
+  
+
+  private int getServerPosition(String host, int port) {
+    for (int i = 0; i < servers.size(); i ++) {
+      Map.Entry<String, Integer> serverEntry = servers.get(i);
+      if (serverEntry.getKey().equals(host) && serverEntry.getValue() == port) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+  
+  void addServer(String host, int port) 
+      throws ServerAlreadyKnownException {
+    if (getServerPosition(host, port) != -1) {
+      throw new ServerAlreadyKnownException("Already got " + host + ":" +
+          port);
+    }
+    
+    // Put in a random position to ensure load balancing across servers
+    int position = notifierClient.generator.nextInt(servers.size() + 1);
+    servers.add(position, Maps.immutableEntry(host, port));
+  }
+  
+  
+  void removeServer(String host, int port)
+      throws ServerNotKnownException {
+    int position = getServerPosition(host, port);
+    if (position == -1) {
+      throw new ServerNotKnownException("Unknown host " + host + ":" + port);
+    }
+    servers.remove(position);
+  }
+  
+  
+  void setServerTimeout(long timeout) {
+    serverTimeout = timeout;
+  }
+  
+  
+  void setConnectRetryTime(long retryTime) {
+    setConnectRetryTime(retryTime);
+  }
+  
+  
+  long getId() {
+    return id;
+  }
+  
+  
+  long getServerId() {
+    return serverId;
+  }
+  
+  
+  ServerHandler.Client getServer() {
+    return server;
+  }
+  
+  
+  /**
+   * Gets the current connection state.
+   * @param connectionLockHold if the connection lock returned by
+   *        getConnectionLock is being hold at the moment within
+   *        a synchronized block.
+   * @return the current state (CONNECTED, DISCONNECTED_HIDDEN or
+   *         DISCONNECTED_VISIBLE).
+   */
+  int getConnectionState(boolean connectionLockHold) {
+    if (connectionLockHold) {
+      return state;
+    }
+    synchronized (connectionLock) {
+      return state;
+    }
+  }
+  
+  
+  /**
+   * @return The most recently generated connection token.
+   */
+  long getConnectionToken() {
+    return connectionToken;
+  }
+  
+  
+  /**
+   * @return An object that is being hold with synchronized() when doing
+   *         operations that may change the connection state. Holding
+   *         this object thus guarantees that no connection state changes
+   *         will occur while doing so.
+   */
+  Object getConnectionLock() {
+    return connectionLock;
+  }
+  
+  
+  /**
+   * Must be called holding the connection lock returned by getConnectionLock.
+   * It waits until the current connection state is CONNECTED. If it ever
+   * gets to DISCONNECTED_VISIBLE it will raise an exception. If the current
+   * state is CONNECTED, then it will return without waiting.
+   * 
+   * @throws InterruptedException
+   * @throws NotConnectedToServerException when we got into a
+   *         DISCONNECTED_VISIBLE state.
+   */
+  void waitForTransparentConnect() throws InterruptedException,
+      NotConnectedToServerException {
+    if (state == DISCONNECTED_VISIBLE) {
+      LOG.warn(listeningPort + ": waitForTransparentConnect: got visible" +
+          " disconnected state");
+      throw new NotConnectedToServerException();
+    }
+    
+    // Wait until we are not hidden disconnected
+    while (state != CONNECTED) {
+      connectionLock.wait();
+      switch (state) {
+        case CONNECTED:
+          break;
+        case DISCONNECTED_HIDDEN:
+          continue;
+        case DISCONNECTED_VISIBLE:
+          LOG.warn(listeningPort + ": waitForTransparentConnect: got visible" +
+              " disconnected state");
+          throw new NotConnectedToServerException();
+      }
+    }
+  }
+  
+  
+  private boolean connect() {
+    LOG.info(listeningPort + ": Connecting ...");
+    
+    synchronized (connectionLock) {
+      // Ensure there are no potential lost messages.
+      if (state == DISCONNECTED_HIDDEN && 
+          !notifierClient.receivedNotificationsForAllEvents()) {
+        LOG.info(listeningPort + ": Didn't received notifications for" +
+            " all events");
+        failConnection(false);
+        return false;
+      } else {
+        LOG.info(listeningPort + ": Received notifications for all events.");
+      }
+      
+      for (Map.Entry<String, Integer> serverAddr : servers) {
+        String host = serverAddr.getKey();
+        int port = serverAddr.getValue();
+        LOG.info(listeningPort + ": Trying to connect to " + host + ":" +
+            port);
+        
+        ServerHandler.Client serverObj;
+        try {
+          serverObj = getServerConnection(host, port);
+        } catch (Exception e) {
+          LOG.error(listeningPort + ": Failed to connect to server at " +
+              host + ":" + port, e);
+          continue;
+        }
+        
+        // The server must answer with this token
+        connectionToken = notifierClient.generator.nextLong();
+        LOG.info(listeningPort + ": Generated token: " + connectionToken);
+          
+        try {
+          // Before this function returns, the server should make the
+          // registerServer call which if he answers with the correct token,
+          // it will set the serverId to his.
+          LOG.info(listeningPort + ": calling registerClient");
+          serverObj.registerClient(notifierClient.listeningHost,
+              notifierClient.listeningPort, connectionToken);
+          LOG.info(listeningPort + ": registerClient call successful");
+        } catch (RampUpException e1) {
+          LOG.info(listeningPort + ": Server " + host + ":" + port +
+              " in ramp up phase");
+          continue;
+        } catch (ClientConnectionException e2) {
+          LOG.error(listeningPort + ": The server failed to connect to us", e2);
+          continue;
+        } catch (Exception e) {
+          LOG.error(listeningPort + ": Server " + host + ":" + port +
+              " communication failure", e);
+          continue;
+        }
+        
+        if (serverId == -1) {
+          LOG.info(listeningPort + ": The server answered with a bad token." +
+              " trying next server ...");
+          continue;
+        }
+        LOG.info(listeningPort + ": The server answered with correct token.");
+        server = serverObj;
+        
+        state = CONNECTED;
+        if (!notifierClient.connectionStateChanged(state)) {
+          try {
+            server.unregisterClient(id);
+          } catch (Exception e) {}
+          failConnection(false);
+          return false;
+        }
+        tracker.messageReceived();
+        LOG.info(listeningPort + ": Connection status: SUCCESS");
+        return true;
+      }
+      
+    }
+    
+    LOG.info(listeningPort + ": Connection status: FAILED");
+    return false;
+  }
+
+
+  void failConnection(boolean hiddenToClient) {
+    LOG.info(listeningPort + ": Failing connection. Hidden to client=" +
+        hiddenToClient);
+    serverId = -1;
+    id = -1;
+    server = null;
+    if (hiddenToClient) {
+      state = DISCONNECTED_HIDDEN;
+    } else {
+      state = DISCONNECTED_VISIBLE;
+    }
+    notifierClient.connectionStateChanged(state);
+
+    synchronized (retryConnectionCondition) {
+      retryConnectionCondition.notify();
+    }
+  }  
+
+
+  @Override
+  public void run() {
+    // Initial connect
+    forceConnect();
+    new Thread(tracker).start();
+    
+    // Retry on failure
+    while (!notifierClient.shouldShutdown) {
+      synchronized (retryConnectionCondition) {
+        try {
+          retryConnectionCondition.wait();
+        } catch (InterruptedException e) {
+          if (notifierClient.shouldShutdown) {
+            break;
+          }
+          continue;
+        }
+      }
+      
+      if (getConnectionState(false) == DISCONNECTED_VISIBLE) {
+        notifierClient.watcher.connectionFailed();
+      }
+      
+      if (notifierClient.shouldShutdown) {
+        break;
+      }
+      
+      forceConnect();
+    }
+  }
+  
+  
+  void shutdown() {
+    synchronized (retryConnectionCondition) {
+      retryConnectionCondition.notify();
+    }
+  }
+  
+  
+  private void forceConnect() {
+    LOG.info(listeningPort + ": ConnectionChecker forcing connect ...");
+    while (true) {
+      LOG.info(listeningPort + ": forceConnect loop start ...");
+      try {
+        Thread.sleep(connectRetryTime);
+      } catch (InterruptedException e) {}
+      
+      LOG.info(listeningPort + ": forceConnect trying connect ...");
+      int prevState = getConnectionState(false);
+      if (connect()) {
+        if (prevState == DISCONNECTED_VISIBLE) {
+          notifierClient.watcher.connectionSuccesful();
+        }
+        break;
+      }
+      LOG.info(listeningPort + ": forceConnect done trying connect");
+    }
+    LOG.info(listeningPort + ": forceConnect done");
+  }
+  
+  
+  private ServerHandler.Client getServerConnection(String host, int port) 
+      throws TTransportException, IOException {
+    TTransport transport;
+    TProtocol protocol;
+    ServerHandler.Client serverObj;
+    
+    transport = new TFramedTransport(new TSocket(host, port, SOCKET_TIMEOUT));
+    protocol = new TBinaryProtocol(transport);
+    serverObj = new ServerHandler.Client(protocol);
+    transport.open();
+    
+    return serverObj;
+  }
+  
+  
+  class ServerTracker implements Runnable {
+    volatile long lastReceivedTimestamp = -1;
+    
+    /**
+     * Should be called when a message was received from the server.
+     */
+    public void messageReceived() {
+      lastReceivedTimestamp = System.currentTimeMillis();
+    }
+    
+    @Override
+    public void run() {
+      lastReceivedTimestamp = System.currentTimeMillis();
+      while (!notifierClient.shouldShutdown) {
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException e) {}
+        
+        synchronized (connectionLock) {
+          if (state != CONNECTED) {
+            continue;
+          }
+          
+          if (System.currentTimeMillis() > lastReceivedTimestamp + serverTimeout) {
+            LOG.info(listeningPort + ": ServerTracker: Server timeout." +
+                " Failing connection ...");
+            failConnection(true);
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NotifierUtils.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NotifierUtils.java
new file mode 100644
index 00000000..ab3383ae
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/NotifierUtils.java
@@ -0,0 +1,72 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+public class NotifierUtils {
+
+  public static String asString(NamespaceNotification n) {
+    return "[Notification: " + EventType.fromByteValue(n.type).name() + " " +
+        n.path + " " + n.txId + "]";
+  }
+  
+  
+  public static String asString(NamespaceEvent e) {
+    return "[Event: " + EventType.fromByteValue(e.type).name() + " " +
+        e.path + "]";
+  }
+  
+  
+  public static String asString(NamespaceEventKey e) {
+    return asString(e.event);
+  }
+  
+  
+  public static String getBasePath(NamespaceNotification notification) {
+    switch (EventType.fromByteValue(notification.getType())) {
+      case FILE_ADDED:
+        String basePath = notification.path.substring(0,
+            notification.path.lastIndexOf('/'));
+        if (basePath.trim().length() == 0) {
+          return "/";
+        }
+        return basePath;
+      case FILE_CLOSED:
+      case NODE_DELETED:
+        return notification.path;
+      default:
+        return null;
+    }
+  }
+
+  
+  public static String getAdditionalPath(NamespaceNotification notification) {
+    switch (EventType.fromByteValue(notification.getType())) {
+      case FILE_ADDED:
+        return notification.path.substring(
+            notification.path.lastIndexOf('/') + 1,
+            notification.path.length());
+      default:
+        return null;
+    }
+  }
+  
+  public static boolean compareNotifications(NamespaceNotification n1,
+      NamespaceNotification n2) {
+    return n1.type == n2.type && n1.path.equals(n2.path) && n1.txId == n2.txId;
+  }
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/Watcher.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/Watcher.java
new file mode 100644
index 00000000..ecd35eb1
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/Watcher.java
@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier;
+
+/**
+ * Must be implemented by the classes which want to receive namespace
+ * notifications.
+ */
+public interface Watcher {
+
+  /**
+   * Called when a notification was received.
+   * @param notification
+   */
+  public void handleNamespaceNotification(NamespaceNotification notification);
+  
+  
+  /**
+   * Called when the connection to the server failed and recovering the
+   * connection trough all the other servers failed.
+   */
+  public void connectionFailed();
+  
+  
+  /**
+   * Called when the connection to the server is established. This will be
+   * called on start-up and after a connectionFailed method call. You can only
+   * place watches after this method has been called given that connectionFailed
+   * was not called since then.
+   */
+  public void connectionSuccesful();
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ClientData.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ClientData.java
new file mode 100644
index 00000000..799739b4
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ClientData.java
@@ -0,0 +1,64 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.apache.hadoop.hdfs.notifier.ClientHandler;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+
+public class ClientData {
+  final String host;
+  final int port;
+  
+  // The asssigned id for this client
+  final long id;
+  
+  // The thrift handler for this client
+  final ClientHandler.Iface handler;
+  
+  // The time on which we sent the client the last notification
+  long lastSentTime = System.currentTimeMillis();
+  
+  // The time on which the client was marked as failed (or -1 if the
+  // client isn't marked as failed)
+  long markedAsFailedTime = -1;
+  
+  // The list with all the subscription sets in which this client appears
+  // for easier removal
+  List<Set<Long>> subscriptions = new LinkedList<Set<Long>>();
+  
+  // The queue with notifications for this client
+  ConcurrentLinkedQueue<NamespaceNotification> queue =
+      new ConcurrentLinkedQueue<NamespaceNotification>();
+  
+  ClientData(long id, ClientHandler.Iface handler, String host, int port) {
+    this.id = id;
+    this.handler = handler;
+    this.host = host;
+    this.port = port;
+  }
+  
+  @Override
+  public String toString() {
+    return "[id=" + id + ";host=" + host + ";port=" + port + "]";
+  }
+}
\ No newline at end of file
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ConfigurationException.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ConfigurationException.java
new file mode 100644
index 00000000..22d5e189
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ConfigurationException.java
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+/**
+ * Raised when invalid configurations are present.
+ */
+public class ConfigurationException extends Exception {
+  private static final long serialVersionUID = 1L;
+  
+  public ConfigurationException(String msg) {
+    super(msg);
+  }
+  
+  public ConfigurationException(Throwable t) {
+    super(t);
+  }
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerClientTracker.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerClientTracker.java
new file mode 100644
index 00000000..79257648
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerClientTracker.java
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+public interface IServerClientTracker extends Runnable {
+
+  public void setClientTimeout(long timeout);
+  
+  public void setHeartbeatTimeout(long timeout);
+  
+  public void handleFailedDispatch(long clientId, long failedTime);
+  
+  public void handleSuccessfulDispatch(long clientId, long sentTime);
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerCore.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerCore.java
new file mode 100644
index 00000000..7369608f
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerCore.java
@@ -0,0 +1,76 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.io.IOException;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.locks.Lock;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.notifier.ClientNotSubscribedException;
+import org.apache.hadoop.hdfs.notifier.InvalidClientIdException;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.ServerHandler;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+import org.apache.hadoop.hdfs.notifier.server.metrics.NamespaceNotifierMetrics;
+import org.apache.thrift.transport.TTransportException;
+
+public interface IServerCore extends Runnable {
+
+  public void init(IServerLogReader logReader, IServerHistory serverHistory,
+      IServerDispatcher dispatcher, ServerHandler.Iface handler);
+  
+  public NamespaceNotifierMetrics getMetrics();
+  
+  public void shutdown();
+  
+  public boolean shutdownPending();
+  
+  public Configuration getConfiguration();
+  
+  public void handleNotification(NamespaceNotification n);
+  
+  public long addClientAndConnect(String host, int port)
+      throws TTransportException, IOException;
+  
+  public void addClient(ClientData clientData);
+  
+  public boolean removeClient(long clientId);
+  
+  public boolean isRegistered(long clientId);
+  
+  public ClientData getClientData(long clientId);
+  
+  public Set<Long> getClientsForNotification(NamespaceNotification n);
+  
+  public Set<Long> getClients();
+  
+  public void subscribeClient(long clientId, NamespaceEvent event, long txId) 
+      throws TransactionIdTooOldException, InvalidClientIdException;
+  
+  public void unsubscribeClient(long clientId, NamespaceEvent event) 
+      throws ClientNotSubscribedException, InvalidClientIdException;
+  
+  public long getId();
+  
+  public Queue<NamespaceNotification> getClientNotificationQueue(long clientId);
+  
+  public IServerHistory getHistory();
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerDispatcher.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerDispatcher.java
new file mode 100644
index 00000000..142d021a
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerDispatcher.java
@@ -0,0 +1,25 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+public interface IServerDispatcher extends Runnable {
+
+  public void assignClient(long clientId);
+  
+  public void removeClient(long clientId);
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerHistory.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerHistory.java
new file mode 100644
index 00000000..3551fa7f
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerHistory.java
@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.Queue;
+
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+
+public interface IServerHistory extends Runnable {
+
+  public void setHistoryLength(long newHistoryLength);
+
+  public void setHistoryLimit(long newHistoryLimit);
+  
+  public boolean isRampUp();
+  
+  public void storeNotification(NamespaceNotification notification);
+  
+  public void addNotificationsToQueue(NamespaceEvent event, long txId,
+      Queue<NamespaceNotification> notifications)
+      throws TransactionIdTooOldException; 
+  
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerLogReader.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerLogReader.java
new file mode 100644
index 00000000..d1f89501
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/IServerLogReader.java
@@ -0,0 +1,28 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.io.IOException;
+
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+
+public interface IServerLogReader extends Runnable {
+
+  public NamespaceNotification getNamespaceNotification()
+      throws IOException;
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerCore.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerCore.java
new file mode 100644
index 00000000..00d07f4c
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerCore.java
@@ -0,0 +1,699 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.notifier.ClientHandler;
+import org.apache.hadoop.hdfs.notifier.ClientNotSubscribedException;
+import org.apache.hadoop.hdfs.notifier.EventType;
+import org.apache.hadoop.hdfs.notifier.InvalidClientIdException;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceEventKey;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.NotifierUtils;
+import org.apache.hadoop.hdfs.notifier.ServerHandler;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+import org.apache.hadoop.hdfs.notifier.server.metrics.NamespaceNotifierMetrics;
+import org.apache.hadoop.util.Daemon;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.server.TNonblockingServer;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TNonblockingServerSocket;
+import org.apache.thrift.transport.TNonblockingServerTransport;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.TTransportFactory;
+
+public class ServerCore implements IServerCore {
+  public static final Log LOG = LogFactory.getLog(ServerCore.class);
+   
+  public static final String DISPATCHER_COUNT = "notifier.dispatcher.count";
+  public static final String LISTENING_PORT = "notifier.thrift.port";
+  public static final String SERVER_ID = "notifier.server.id";
+  
+  // The timeout after which the core will stop trying to do a graceful
+  // shutdown and will interrupt the threads
+  private static final int SHUTDOWN_TIMEOUT = 5000;
+  
+  private static final int SOCKET_READ_TIMEOUT = 25000;
+  
+  // The number of dispatcher threads
+  private int dispatcherCount;
+
+  // The port on which the Thrift ServerHandler service is listening
+  private int listeningPort;
+
+  // For each event, we retain the list of clients which are subscribed
+  // for that event. If changes in subscriptions are done, a
+  // synchronized block should be used.
+  private Map<NamespaceEventKey, Set<Long>> subscriptions;
+  
+  // Data structures for each registered client
+  private ConcurrentMap<Long, ClientData> clientsData;
+  
+  // Used to generate the client id's
+  private Random clientIdsGenerator;
+  
+  // Stores the notifications over an configurable amount of time
+  private IServerHistory serverHistory;
+
+  // The dispatcher which sends the notifications/heartbeats and
+  // keeps track of the clients
+  private IServerDispatcher dispatcher;
+
+  // The handler for our Thrift service
+  private ServerHandler.Iface handler;
+  
+  // The reader of the edit log
+  private IServerLogReader logReader;
+  
+  // The server for our Thrift service
+  private TServer tserver;
+  
+  // Hadoop configuration
+  private Configuration conf;
+  
+  private long serverId;
+  
+  private volatile boolean shouldShutdown = false;
+  
+  AtomicLong numTotalSubscriptions = new AtomicLong(0);
+  
+  public NamespaceNotifierMetrics metrics;
+  
+  // A list with all the threads the server is running
+  List<Thread> threads = new ArrayList<Thread>();
+  
+
+  public ServerCore(Configuration configuration) throws ConfigurationException {
+    conf = configuration;
+    initDataStructures();
+  }
+  
+  public ServerCore() throws ConfigurationException {
+    conf = initConfiguration();
+    initDataStructures();
+  }
+  
+  
+  private void initDataStructures() {
+    clientsData = new ConcurrentHashMap<Long, ClientData>();
+    subscriptions = new HashMap<NamespaceEventKey, Set<Long>>();
+    clientIdsGenerator = new Random();
+    
+    metrics = new NamespaceNotifierMetrics(conf, serverId);
+  }
+  
+  
+  @Override
+  public void init(IServerLogReader logReader, IServerHistory serverHistory,
+      IServerDispatcher dispatcher, ServerHandler.Iface handler) {
+    this.serverHistory = serverHistory;
+    this.logReader = logReader;
+    this.dispatcher = dispatcher;
+    this.handler = handler;
+  }
+  
+  
+  @Override
+  public void run() {
+    LOG.info("Starting server ...");
+    LOG.info("Max heap size: " + Runtime.getRuntime().maxMemory());
+    
+    // Setup the Thrift server
+    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();
+    TTransportFactory transportFactory = new TFramedTransport.Factory();
+    TNonblockingServerTransport serverTransport;
+    ServerHandler.Processor<ServerHandler.Iface> processor =
+        new ServerHandler.Processor<ServerHandler.Iface>(handler);
+    try {
+      serverTransport = new TNonblockingServerSocket(listeningPort);
+    } catch (TTransportException e) {
+      LOG.error("Failed to setup the Thrift server.", e);
+      return;
+    }
+    TNonblockingServer.Args serverArgs =
+        new TNonblockingServer.Args(serverTransport);
+    serverArgs.processor(processor).transportFactory(transportFactory)
+        .protocolFactory(protocolFactory);
+    tserver = new TNonblockingServer(serverArgs);
+    
+    // Start the worker threads
+    threads.add(new Thread(serverHistory));
+    threads.add(new Thread(dispatcher));
+    threads.add(new Thread(logReader));
+    threads.add(new Thread(new ThriftServerRunnable()));
+    LOG.info("Starting thrift server on port " + listeningPort);
+    for (Thread t : threads) {
+      t.start();
+    }
+
+    try {
+      while (!shutdownPending()) {
+        // Read a notification
+        NamespaceNotification notification =
+            logReader.getNamespaceNotification();
+        if (notification != null) {
+          handleNotification(notification);
+          continue;
+        }
+      }
+    } catch (Exception e) {
+      LOG.error("Failed fetching transaction log data", e);
+    } finally {
+      shutdown();
+    }
+    
+    long shuttingDownStart = System.currentTimeMillis();
+    for (Thread t : threads) {
+      long remaining = SHUTDOWN_TIMEOUT + System.currentTimeMillis() -
+          shuttingDownStart;
+      try {
+        if (remaining > 0) {
+          t.join(remaining);
+        }
+      } catch (InterruptedException e) {
+        LOG.error("Interrupted when closing threads at the end");
+      }
+      if (t.isAlive()) {
+        t.interrupt();
+      }
+    }
+    LOG.info("Shutdown");
+  }
+
+
+  /**
+   * Called when the Namespace Notifier server should shutdown.
+   */
+  @Override
+  public void shutdown() {
+    LOG.info("Shutting down ...");
+    shouldShutdown = true;
+    tserver.stop();
+  }
+  
+  
+  @Override
+  public boolean shutdownPending() {
+    return shouldShutdown;
+  }
+
+  
+  private Configuration initConfiguration() throws ConfigurationException {
+    Configuration.addDefaultResource("namespace-notifier-server-default.xml");
+    Configuration.addDefaultResource("hdfs-default.xml");
+    Configuration conf = new Configuration();
+    conf.addResource("namespace-notifier-server-site.xml");
+    conf.addResource("hdfs-site.xml");
+    
+    dispatcherCount = conf.getInt(DISPATCHER_COUNT, -1);
+    listeningPort = conf.getInt(LISTENING_PORT, -1);
+    serverId = conf.getLong(SERVER_ID, -1);
+    LOG.info(dispatcherCount + " " + listeningPort + " " + serverId);
+
+    if (dispatcherCount == -1) {
+      throw new ConfigurationException("Invalid or missing dispatcherCount: " +
+          dispatcherCount);
+    }
+    if (listeningPort == -1) {
+      throw new ConfigurationException("Invalid or missing listeningPort: " +
+          listeningPort);
+    }
+    if (serverId == -1) {
+      throw new ConfigurationException("Invalid or missing serverId: " +
+          serverId);
+    }
+    return conf;
+  }
+
+
+  @Override
+  public Configuration getConfiguration() {
+    return conf;
+  }
+
+  
+  /**
+   * Adds the client to the internal data structures and connects to it.
+   * If the method throws an exception, then it is guaranteed it will also
+   * be removed from the internal structures before throwing the exception.
+   * 
+   * @param host the host on which the client is running
+   * @param port the port on which the client is running the Thrift service
+   * @return the client's id.
+   * @throws TTransportException when something went wrong when connecting to
+   *                             the client. 
+   */
+  @Override
+  public long addClientAndConnect(String host, int port)
+      throws TTransportException, IOException {
+    long clientId = getNewClientId();
+    LOG.info("Adding client with id=" + clientId + " host=" + host +
+        " port=" + port + " and connecting ...");
+    
+    ClientHandler.Client clientHandler;
+    try {
+      clientHandler = getClientConnection(host, port);
+      LOG.info("Succesfully connected to client " + clientId);
+    } catch (IOException e1) {
+      LOG.error("Failed to connect to client " + clientId, e1);
+      throw e1;
+    } catch (TTransportException e2) {
+      LOG.error("Failed to connect to client " + clientId, e2);
+      throw e2;
+    }
+    
+    // Save the client to the internal structures
+    ClientData clientData = new ClientData(clientId, clientHandler, host, port);
+    addClient(clientData);
+    LOG.info("Successfully added client " + clientId + " and connected."); 
+    return clientId;
+  }
+  
+  
+  /**
+   * Used to handle a generated notification:
+   * - sending the notifications to the clients which subscribed to the
+   *   associated event.
+   * - saving the notification in the history.
+   * @param n
+   */
+  @Override
+  public void handleNotification(NamespaceNotification n) {
+    int queuedCount = 0;
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Handling " + NotifierUtils.asString(n) + " ...");
+    }
+
+    // Add the notification to the queues
+    Set<Long> clientsForNotification = getClientsForNotification(n);
+    if (clientsForNotification != null) {
+      synchronized (clientsForNotification) {
+        for (Long clientId : clientsForNotification) {
+          ConcurrentLinkedQueue<NamespaceNotification> clientQueue =
+              clientsData.get(clientId).queue;
+          // Just test that the client wasn't removed meanwhile
+          if (clientQueue == null) {
+            continue;
+          }
+          clientQueue.add(n);
+          queuedCount ++;
+        }
+      }
+      
+      ServerDispatcher.queuedNotificationsCount.addAndGet(queuedCount);
+    }
+    
+    // Save it in history
+    serverHistory.storeNotification(n);
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Done handling " + NotifierUtils.asString(n));
+    }
+  }
+  
+  
+  /**
+   * Adds the client to the internal structures
+   * @param clientData the initialized client data object for this client
+   */
+  @Override
+  public void addClient(ClientData clientData) {
+    clientsData.put(clientData.id, clientData);
+    dispatcher.assignClient(clientData.id);
+    LOG.info("Succesfully added client " + clientData);
+    metrics.numRegisteredClients.set(clientsData.size());
+  }
+  
+  
+  /**
+   * Removes a client from the internal data structures. This also removes
+   * the client from all the events to which he subscribed.
+   * 
+   * @param clientId the client's id for the client we want to remove
+   * @return true if the client was present in the internal data structures,
+   *         false otherwise.
+   */
+  @Override
+  public boolean removeClient(long clientId) {
+    ClientData clientData = clientsData.get(clientId);
+    if (clientData == null) {
+      return false;
+    }
+    dispatcher.removeClient(clientId);
+    
+    // Iterate over all the sets in which this client figures as subscribed
+    // and remove it
+    synchronized (subscriptions) {
+      for (Set<Long> subscribedSet : clientData.subscriptions) {
+        synchronized (subscribedSet) {
+          subscribedSet.remove(clientId);
+        }
+      }
+    }
+
+    metrics.numTotalSubscriptions.set(numTotalSubscriptions.
+        getAndAdd(-clientData.subscriptions.size()));
+    
+    clientsData.remove(clientId);
+    LOG.info("Removed client " + clientData);
+    metrics.numRegisteredClients.set(clientsData.size());
+    return true;
+  }
+  
+  
+  /**
+   * Checks if the client with the given id is registered.
+   * @param clientId the id of the client
+   * @return true if registered, false otherwise.
+   */
+  @Override
+  public boolean isRegistered(long clientId) {
+    return clientsData.containsKey(clientId);
+  }
+  
+  
+  /**
+   * Gets the ClientData object for the given client id.
+   * 
+   * @param clientId
+   * @return the ClientData object or null if the clientId
+   *         is invalid.
+   */
+  @Override
+  public ClientData getClientData(long clientId) {
+    return clientsData.get(clientId);
+  }
+  
+  
+  /**
+   * Used to get the set of clients for which a notification should be sent.
+   * While iterating over this set, you should use synchronized() on it to
+   * avoid data inconsistency (or ordering problems).
+   * 
+   * @param n the notification for which we want to get the set of clients
+   * @return the set of clients or null if there are no clients subscribed
+   *         for this notification
+   */
+  @Override
+  public Set<Long> getClientsForNotification(NamespaceNotification n) {
+    String eventPath = NotifierUtils.getBasePath(n);
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("getClientsForNotification called for " +
+          NotifierUtils.asString(n) + ". Searching at path " + eventPath);
+    }
+    synchronized (subscriptions) {
+      return subscriptions.get(new NamespaceEventKey(eventPath, n.type));
+    }
+  }
+  
+  
+  /**
+   * @return the set of clients id's for all the clients that are currently
+   * subscribed to us. Warning: this set should not be modified directly.
+   */
+  @Override
+  public Set<Long> getClients() {
+    return clientsData.keySet();
+  }
+  
+  
+  @Override
+  public void subscribeClient(long clientId, NamespaceEvent event, long txId) 
+      throws TransactionIdTooOldException, InvalidClientIdException {
+    NamespaceEventKey eventKey = new NamespaceEventKey(event);
+    Set<Long> clientsForEvent;
+    ClientData clientData = clientsData.get(clientId);
+    
+    if (clientData == null) {
+      LOG.warn("subscribe client called with invalid id " + clientId);
+      throw new InvalidClientIdException();
+    }
+    
+    LOG.info("Subscribing client " + clientId + " to " +
+        NotifierUtils.asString(event) + " from txId " + txId);
+
+    synchronized (subscriptions) {
+      clientsForEvent = subscriptions.get(eventKey);
+      if (clientsForEvent == null) {
+        clientsForEvent = new HashSet<Long>();
+        subscriptions.put(eventKey, clientsForEvent);
+      }
+      synchronized (clientsForEvent) {
+        clientData.subscriptions.add(clientsForEvent);
+      }
+    }
+    
+    // It is needed to lock this set while queue'ing the notifications, or we
+    // may get ordering problems. This is out of the
+    // synchronized(subscriptions) block because it will block all the
+    // subscriptions and may induce serious latency (the queueNotifications
+    // operations can take a lot of time).
+    synchronized (clientsForEvent) {
+      queueNotifications(clientId, event, txId);
+      clientsForEvent.add(clientId);
+    }
+    LOG.info(clientId + " subscribed to " + NotifierUtils.asString(event) +
+        " from txId " + txId);
+    
+    metrics.numTotalSubscriptions.set(numTotalSubscriptions.incrementAndGet());
+  }
+
+  
+  @Override
+  public void unsubscribeClient(long clientId, NamespaceEvent event) 
+      throws ClientNotSubscribedException, InvalidClientIdException {
+    NamespaceEventKey eventKey = new NamespaceEventKey(event);
+    Set<Long> clientsForEvent;
+    ClientData clientData = clientsData.get(clientId);
+    
+    if (clientData == null) {
+      LOG.warn("subscribe client called with invalid id " + clientId);
+      throw new InvalidClientIdException();
+    }
+    
+    LOG.info("Unsubscribing client " + clientId + " from " +
+        NotifierUtils.asString(event));
+    
+    synchronized (subscriptions) {
+      clientsForEvent = subscriptions.get(eventKey);
+      if (clientsForEvent == null) {
+        throw new ClientNotSubscribedException();
+      }
+
+      synchronized (clientsForEvent) {
+        if (!clientsForEvent.contains(clientId)) {
+          throw new ClientNotSubscribedException();
+        }
+        clientsForEvent.remove(clientId);
+        clientData.subscriptions.remove(clientsForEvent);
+        
+        if (clientsForEvent.size() == 0) {
+          subscriptions.remove(eventKey);
+        }
+      }
+    }
+    LOG.info("Client " + clientId + " unsubsribed from " +
+        NotifierUtils.asString(event));
+    metrics.numTotalSubscriptions.set(numTotalSubscriptions.decrementAndGet());
+  }
+  
+  
+  /**
+   * @return the id of this server
+   */
+  @Override
+  public long getId() {
+    return serverId;
+  }
+
+
+  /**
+   * Gets the queue of notifications that should be sent to a client. It is
+   * important to send the notifications in this queue first before sending
+   * any other notification, or the order will be affected.
+   * 
+   * @param clientId the id of the client for which we want to get the queued
+   *                 notifications.
+   * @return the queue with the notifications for this client. The returned
+   *         queue is synchronized and no other synchronization mechanisms are
+   *         required. null if the client is not registered.
+   */
+  @Override
+  public Queue<NamespaceNotification> getClientNotificationQueue(long clientId) {
+    ClientData clientData = clientsData.get(clientId);
+    return (clientData == null) ? null : clientData.queue;
+  }
+  
+  
+  @Override
+  public IServerHistory getHistory() {
+    return serverHistory;
+  }
+
+  
+  /**
+   * Queues the notification for a client. The queued notifications will be sent
+   * asynchronously after this method returns to the specified client.
+   * 
+   * The queued notifications will be notifications for the given event and
+   * their associated transaction id is greater then the given transaction
+   * id (exclusive).
+   * 
+   * @param clientId the client to which the notifications should be sent
+   * @param event the subscribed event
+   * @param txId the transaction id from which we should send the
+   *             notifications (exclusive). If this is -1, then
+   *             nothing will be queued for this client.
+   * @throws TransactionIdTooOldException when the history has no records for
+   *         the given transaction id.
+   * @throws InvalidClientIdException when the client isn't registered
+   */
+  private void queueNotifications(long clientId, NamespaceEvent event, long txId)
+      throws TransactionIdTooOldException, InvalidClientIdException {
+    if (txId == -1) {
+      return;
+    }
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Queueing notifications for client " + clientId + " from txId " +
+          txId + " at [" + event.path + ", " +
+          EventType.fromByteValue(event.type) + "] ...");
+    }
+    
+    ClientData clientData = clientsData.get(clientId);
+    if (clientData == null) {
+      LOG.error("Missing the client data for client id: " + clientId);
+      throw new InvalidClientIdException("Missing the client data");
+    }
+    
+    // Store the notifications in the queue for this client
+    serverHistory.addNotificationsToQueue(event, txId, clientData.queue);
+  }
+
+
+  /**
+   * Generates a new client id which is not present in the current set of ids
+   * for the clients which are subscribed to this server.
+   * 
+   * @return A newly generated client id
+   */
+  private long getNewClientId() {
+    while (true) {
+      long clientId = Math.abs(clientIdsGenerator.nextLong());
+      if (!clientsData.containsKey(clientId)) {
+        return clientId;
+      }
+    }
+  }
+  
+  
+  private ClientHandler.Client getClientConnection(String host, int port)
+      throws TTransportException, IOException {
+    TTransport transport;
+    TProtocol protocol;
+    ClientHandler.Client clientObj;
+    
+    // TODO - make it user configurable
+    transport = new TFramedTransport(new TSocket(host, port, SOCKET_READ_TIMEOUT));    
+    protocol = new TBinaryProtocol(transport);
+    clientObj = new ClientHandler.Client(protocol);
+    transport.open();
+    
+    return clientObj;
+  }
+  
+  
+  @Override
+  public NamespaceNotifierMetrics getMetrics() {
+    return metrics;
+  }
+
+  
+  class ThriftServerRunnable implements Runnable {
+
+    @Override
+    public void run() {
+      try {
+        tserver.serve();
+      } catch (Exception e) {
+        LOG.error("Thrift server failed", e);
+      } finally {
+        shutdown();
+      }
+    }
+    
+  }
+  
+
+  public static void main(String[] args) {
+    IServerDispatcher dispatcher;
+    IServerLogReader logReader;
+    IServerHistory serverHistory;
+    IServerCore core;
+    ServerHandler.Iface handler;
+    Daemon coreDaemon = null;
+    
+    try {
+      core = new ServerCore();
+      
+      serverHistory = new ServerHistory(core, false); // TODO - enable ramp-up
+      logReader = new ServerLogReader(core);
+      dispatcher = new ServerDispatcher(core);
+      handler = new ServerHandlerImpl(core);
+      
+      core.init(logReader, serverHistory, dispatcher, handler);
+      
+      coreDaemon = new Daemon(core);
+      coreDaemon.start();
+      coreDaemon.join();
+      
+    } catch (ConfigurationException e) {
+      e.printStackTrace();
+      System.err.println("Invalid configurations.");
+    } catch (IOException e) {
+      e.printStackTrace();
+      System.err.println("Failed reading the transaction log");
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      System.err.println("Core interrupted");
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerDispatcher.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerDispatcher.java
new file mode 100644
index 00000000..c7668cb6
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerDispatcher.java
@@ -0,0 +1,508 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.hadoop.hdfs.notifier.InvalidServerIdException;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.NotifierUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ServerDispatcher implements IServerDispatcher, IServerClientTracker {
+  public static final Log LOG = LogFactory.getLog(ServerDispatcher.class);
+  public static final String CLIENT_TIMEOUT = "notifier.client.timeout";
+  public static final String HEARTBEAT_TIMEOUT = "notifier.heartbeat.timeout";
+  public static final String THREAD_POOLS_SIZE = "notifier.dispatcher.pool.size";
+  
+  // Used to send the notifications to the clients.
+  private ExecutorService workers;
+  
+  // Metric variables
+  public static AtomicLong queuedNotificationsCount = new AtomicLong(0);
+  
+  private final IServerCore core;
+  
+  // The value in milliseconds after which a client is considered down
+  private long clientTimeout;
+  
+  // The value in milliseconds after which we send the client a heartbeat
+  private long heartbeatTimeout;
+  
+  // For each client that failed recently, we keep the timestamp for when
+  // it failed. If that timestamp gets older then currentTime - clientTimeout,
+  // then the client is removed from this server.
+  //private Map<Long, Long> clientFailedTime = new HashMap<Long, Long>();
+  
+  // Mapping of each client to the last sent message
+  // private Map<Long, Long> clientLastSent = new HashMap<Long, Long>();
+  
+  // Mapping of each client for the Future objects which give the result
+  // for the sendNotifications computation
+  private Map<Long, Future<DispatchStatus>> clientsFuture =
+      new HashMap<Long, Future<DispatchStatus>>();
+  
+  // The value slept at each loop step
+  public long loopSleepTime = 10;
+  
+  // If a client fails to receive our notifications, then that notification
+  // will be placed in a queue for the server to dispatch later. This is the
+  // set of clients that the current dispatcher should handle.
+  Set<Long> assignedClients = new HashSet<Long>();
+  
+  Set<Long> newlyAssignedClients = new HashSet<Long>();
+  Set<Long> removedClients = new HashSet<Long>();
+  Object clientModificationsLock = new Object();
+
+  // The ID of this dispatcher thread
+  //private int id;
+  
+  public ServerDispatcher(IServerCore core)
+      throws ConfigurationException {
+    int workersCount;
+    this.core = core;
+    
+    clientTimeout = core.getConfiguration().getLong(CLIENT_TIMEOUT, -1);
+    heartbeatTimeout = core.getConfiguration().getLong(HEARTBEAT_TIMEOUT, -1);
+    workersCount = core.getConfiguration().getInt(THREAD_POOLS_SIZE, -1);
+    if (clientTimeout == -1) {
+      throw new ConfigurationException("Invalid or missing clientTimeout: " +
+          clientTimeout);
+    }
+    if (heartbeatTimeout == -1) {
+      throw new ConfigurationException("Invalid or missing heartbeatTimeout: " +
+          heartbeatTimeout);
+    }
+    if (workersCount == 0) {
+      throw new ConfigurationException("Invalid or missing " +
+          "dispatcherWorkersCount: " + workersCount);
+    }
+    LOG.info("Initialized " + workersCount + " workers");
+    workers = Executors.newFixedThreadPool(workersCount);
+  }
+  
+  
+  @Override
+  public void run() {
+    try {
+      LOG.info("Dispatcher starting ...");
+      while (!core.shutdownPending()) {
+        long stepStartTime = System.currentTimeMillis();
+
+        // Update the assigned clients
+        synchronized (clientModificationsLock) {
+          updateClients();
+        }
+        
+        // Send the notifications from the core's client queues
+        sendNotifications();
+
+        // Check if any clients timed out
+        checkClientTimeout();
+
+        // Updates the metrics
+        updateMetrics();
+        
+        // Sleeping at most loopSleepTime milliseconds
+        long currentTime = System.currentTimeMillis();
+        long sleepTime = stepStartTime + loopSleepTime - currentTime;
+        if (sleepTime > 0) {
+          Thread.sleep(sleepTime);
+        }
+      }
+    } catch (Exception e) {
+      LOG.error("Server Dispatcher died", e);
+    } finally {
+      workers.shutdown();
+      core.shutdown();
+    }
+  }
+
+  
+  private void updateMetrics() {
+    core.getMetrics().queuedNotifications.set(queuedNotificationsCount.get());
+  }
+  
+  /**
+   * Assigns a client to this dispatcher. If a notification fails to be sent
+   * to a client, then it will be placed in a queue and the assigned
+   * dispatcher for each client will try to re-send notifications from that
+   * queue.
+   * 
+   * @param clientId the id of the assigned client.
+   */
+  @Override
+  public void assignClient(long clientId) {
+    LOG.info("Assigning client " + clientId + " ...");
+    synchronized (clientModificationsLock) {
+      newlyAssignedClients.add(clientId);
+    }
+  }
+  
+  
+  /**
+   * Removes the client (it's not assigned anymore to this dispatcher).
+   * 
+   * @param clientId the id of the client to be removed.
+   */
+  @Override
+  public void removeClient(long clientId) {
+    LOG.info("Removing client " + clientId + " ...");
+    synchronized (clientModificationsLock) {
+      removedClients.add(clientId);
+    }
+  }
+  
+  
+  private void sendNotifications() {
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Sending notifications ...");
+    }
+    
+    List<Long> shuffledClients = new ArrayList<Long>(assignedClients);
+    Collections.shuffle(shuffledClients);
+    
+    for (Long clientId : shuffledClients) {
+      Future<DispatchStatus> clientFuture =
+          clientsFuture.get(clientId);
+      DispatchStatus status;
+
+      if (!shouldSendNotifications(clientId)) {
+        continue;
+      }
+
+      // Get the results of the last batch notification sending
+      // for this client.
+      if (clientFuture != null && clientFuture.isDone()) {
+        try {
+          status = clientFuture.get();
+        } catch (InterruptedException e) {
+          LOG.error("Got interrupted for client " + clientId, e);
+          core.shutdown();
+          return;
+        } catch (ExecutionException e) {
+          LOG.error("got exception in clientFuture.get() for client " +
+              clientId, e);
+          core.shutdown();
+          return;
+        }
+        
+        if (status.action == DispatchStatus.Action.DISPATCH_SUCCESSFUL) {
+          handleSuccessfulDispatch(clientId, status.time);
+        }
+        if (status.action == DispatchStatus.Action.DISPATCH_FAILED) {
+          handleFailedDispatch(clientId, status.time);
+        }
+      }
+      
+      // Submit a new batch notification sending callable for this client
+      if (clientFuture == null ||
+          (clientFuture != null && clientFuture.isDone())) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Submiting for client " + clientId);
+        }
+        try {
+          clientFuture = workers.submit(new NotificationsSender(clientId));
+        } catch (RejectedExecutionException e) {
+          LOG.warn("Failed to submit task", e);
+          continue;
+        }
+        clientsFuture.put(clientId, clientFuture);
+      }
+
+    }
+
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Done sending notifications.");
+    }
+  }
+  
+  
+  /**
+   * Used for a increasing (exponential) retry timer. If a client is marked
+   * as potentially failed, this function will compute if enough time passed
+   * since the last time we tried to send the specified client a notification. 
+   * @param clientId the client to which we want to send the notification
+   * @return true if we should send, false otherwise
+   */
+  private boolean shouldSendNotifications(long clientId) {
+    ClientData clientData = core.getClientData(clientId);
+    long prevDiffTime, curDiffTime;
+    if (clientData == null) {
+      return false;
+    }
+    
+    // If it's not marked as failed, we should send right away
+    if (clientData.markedAsFailedTime == -1) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Client " + clientId + " not failed.");
+      }
+      return true;
+    }
+    
+    prevDiffTime = clientData.lastSentTime - clientData.markedAsFailedTime;
+    curDiffTime = System.currentTimeMillis() - clientData.markedAsFailedTime;
+    if (curDiffTime > 2 * prevDiffTime) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Client " + clientData + " failed (returning true)");
+      }
+      return true;
+    }
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Client " + clientData + " failed (returning false)");
+    }
+    return false;
+  }
+  
+  
+  private DispatchStatus sendHeartbeat(ClientData clientData) {
+    long currentTime = System.currentTimeMillis();
+    DispatchStatus status = new DispatchStatus();
+    
+    status.time = currentTime;
+    if (currentTime - clientData.lastSentTime > heartbeatTimeout) {
+      try {
+        clientData.handler.heartbeat(core.getId());
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Successfully sent heartbeat to " + clientData);
+        }
+        core.getMetrics().heartbeats.inc();
+        status.action = DispatchStatus.Action.DISPATCH_SUCCESSFUL;
+      } catch (TTransportException e) {
+        LOG.warn("Failed to heartbeat " + clientData, e);
+        if (e.getType() != TTransportException.TIMED_OUT) {
+          core.removeClient(clientData.id);
+        }
+        status.action = DispatchStatus.Action.DISPATCH_FAILED;
+      } catch (InvalidServerIdException e) {
+        LOG.warn("Client removed this server " + clientData, e);
+        status.action = DispatchStatus.Action.DISPATCH_FAILED;
+      } catch (TException e) {
+        LOG.warn("Failed to heartbeat " + clientData, e);
+        core.removeClient(clientData.id);
+        status.action = DispatchStatus.Action.DISPATCH_FAILED;
+      } 
+    }
+    
+    return status;
+  }
+  
+  
+  private DispatchStatus sendNotification(ClientData clientData,
+      NamespaceNotification notification) {
+    DispatchStatus status = new DispatchStatus();
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Sending " + NotifierUtils.asString(notification) +
+          " to client " + clientData + " ...");
+    }
+    
+    status.time = System.currentTimeMillis();
+    try {
+      clientData.handler.handleNotification(notification, core.getId());
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Successfully sent " + NotifierUtils.asString(notification) +
+            " to " + clientData);
+      }
+      core.getMetrics().dispatchedNotifications.inc();
+      status.action = DispatchStatus.Action.DISPATCH_SUCCESSFUL;
+    } catch (TTransportException e) {
+      LOG.warn("Failed to send notification to " + clientData, e);
+      if (e.getType() != TTransportException.TIMED_OUT) {
+        core.removeClient(clientData.id);
+      }
+      status.action = DispatchStatus.Action.DISPATCH_FAILED;
+      core.getMetrics().failedNotifications.inc();
+    } catch (InvalidServerIdException e) {
+      LOG.warn("Client removed this server " + clientData, e);
+      status.action = DispatchStatus.Action.DISPATCH_FAILED;
+    } catch (TException e) {
+      LOG.warn("Failed to send notification to " + clientData, e);
+      core.removeClient(clientData.id);
+      status.action = DispatchStatus.Action.DISPATCH_FAILED;
+      core.getMetrics().failedNotifications.inc();
+    }
+    
+    return status;
+  }
+  
+  
+  /**
+   * Overrides the timeout after which a client is removed.
+   * @param timeout the new timeout after which a client is removed. The value
+   *        is given in milliseconds.
+   */
+  @Override
+  public void setClientTimeout(long timeout) {
+    clientTimeout = timeout;
+  }
+
+  
+  /**
+   * Overrides the timeout after which a heartbeat is sent to the client if
+   * no other messages were sent
+   * @param timeout the new timeout in milliseconds. 
+   */
+  @Override
+  public void setHeartbeatTimeout(long timeout) {
+    heartbeatTimeout = timeout;
+  }
+  
+  
+  /**
+   * Called each time a handleNotification or heartbeat Thrift
+   * call fails.
+   * @param clientId the id of the client on which the call failed.
+   * @param failedTime the time at which the call was made. If
+   *        this is -1, then nothing will be updated. 
+   */
+  @Override
+  public void handleFailedDispatch(long clientId, long failedTime) {
+    ClientData clientData = core.getClientData(clientId);
+    if (failedTime == -1 || clientData == null)
+      return;
+    
+    // We only add it and don't update it because we are interested in
+    // keeping track of the first moment it failed
+    if (clientData.markedAsFailedTime == -1) {
+      clientData.markedAsFailedTime = failedTime;
+      LOG.info("Marked client " + clientId + " as failed at " + failedTime);
+    }
+
+    clientData.lastSentTime = failedTime;
+  }
+  
+  
+  /**
+   * Called each time a handleNotification or heartbeat Thrift
+   * call is successful.
+   * @param clientId the id of the client on which the call was successful.
+   * @param sentTime the time at which the call was made. Nothing
+   *        happens if this is -1.
+   */
+  @Override
+  public void handleSuccessfulDispatch(long clientId, long sentTime) {
+    ClientData clientData = core.getClientData(clientId);
+    if (sentTime == -1 || clientData == null)
+      return;
+    
+    clientData.markedAsFailedTime = -1;
+    if (clientData.markedAsFailedTime != -1) {
+      LOG.info("Unmarking " + clientId + " at " + sentTime);
+    }
+    
+    clientData.lastSentTime = sentTime;
+  }
+  
+  
+  /**
+   * Must be called with the clientsModificationLock hold.
+   */
+  private void updateClients() {
+    assignedClients.addAll(newlyAssignedClients);
+    assignedClients.removeAll(removedClients);
+    
+    newlyAssignedClients.clear();
+    removedClients.clear();
+  }
+  
+  
+  private void checkClientTimeout() {
+    long currentTime = System.currentTimeMillis();
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Cleaning failed clients ...");
+    }
+
+    for (Long clientId : assignedClients) {
+      ClientData clientData = core.getClientData(clientId);
+      if (clientData == null || clientData.markedAsFailedTime == -1) {
+        continue;
+      }
+      
+      if (currentTime - clientData.markedAsFailedTime > clientTimeout) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Failed client detected " + clientData);
+        }
+        core.removeClient(clientId);
+        core.getMetrics().failedClients.inc();
+      }
+    }
+  }
+  
+  
+  /**
+   * Batch sends a group of notifications for a given client.
+   */
+  private class NotificationsSender implements Callable<DispatchStatus> {
+    long clientId;
+    
+    NotificationsSender(long clientId) {
+      this.clientId = clientId;
+    }
+    
+    @Override
+    public DispatchStatus call() throws Exception {
+      DispatchStatus status;
+      Queue<NamespaceNotification> queuedNotifications =
+          core.getClientNotificationQueue(clientId);
+      ClientData clientData = core.getClientData(clientId);
+      if (clientData == null || queuedNotifications == null) {
+        // Client removed meanwhile (or is being removed)
+        return new DispatchStatus();
+      }
+      
+      if (queuedNotifications.isEmpty()) {
+        status = sendHeartbeat(clientData);
+      } else {
+        status = sendNotification(clientData, queuedNotifications.peek());
+        if (status.action == DispatchStatus.Action.DISPATCH_SUCCESSFUL) {
+          queuedNotifications.poll();
+        }
+      }
+      return status;
+    }
+    
+  }
+  
+  private static class DispatchStatus {
+    enum Action {
+      NOTHING,
+      DISPATCH_SUCCESSFUL,
+      DISPATCH_FAILED
+    };
+    
+    Action action = Action.NOTHING;
+    long time = -1;
+  }
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerHandlerImpl.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerHandlerImpl.java
new file mode 100644
index 00000000..36490833
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerHandlerImpl.java
@@ -0,0 +1,108 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import org.apache.hadoop.hdfs.notifier.ClientConnectionException;
+import org.apache.hadoop.hdfs.notifier.ClientNotSubscribedException;
+import org.apache.hadoop.hdfs.notifier.InvalidClientIdException;
+import org.apache.hadoop.hdfs.notifier.InvalidTokenException;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.RampUpException;
+import org.apache.hadoop.hdfs.notifier.ServerHandler;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+import org.apache.thrift.TException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+public class ServerHandlerImpl implements ServerHandler.Iface {
+  public static final Log LOG = LogFactory.getLog(ServerHandlerImpl.class);
+
+  private IServerCore core;
+  
+  public ServerHandlerImpl(IServerCore core) {
+    this.core = core;
+  }
+  
+  @Override
+  public void subscribe(long clientId, NamespaceEvent subscribedEvent,
+      long txId) throws InvalidClientIdException, TransactionIdTooOldException,
+      TException {
+    core.getMetrics().subscribeCalls.inc();
+    if (!core.isRegistered(clientId)) {
+      throw new InvalidClientIdException("Invalid client id: " + clientId);
+    }
+    core.subscribeClient(clientId, subscribedEvent, txId);
+  }
+
+  @Override
+  public void unsubscribe(long clientId, NamespaceEvent subscribedEvent)
+      throws InvalidClientIdException, TException, ClientNotSubscribedException {
+    core.getMetrics().unsubscribeCalls.inc();
+    if (!core.isRegistered(clientId)) {
+      throw new InvalidClientIdException("Invalid client id: " + clientId);
+    }
+    
+    core.unsubscribeClient(clientId, subscribedEvent);
+  }
+
+
+  @Override
+  public void registerClient(String host, int port, long token)
+      throws RampUpException, TException, ClientConnectionException {
+    core.getMetrics().registerClientCalls.inc();
+    if (core.getHistory().isRampUp()) {
+      throw new RampUpException("Currently in ramp-up phase.");
+    }
+    
+    // Add the client to our internal data structures
+    ClientData clientData;
+    long clientId;
+    try {
+      clientId = core.addClientAndConnect(host, port);
+    } catch (Exception e) {
+      throw new ClientConnectionException("Failed to connect to client " 
+          + " on host " + host + " and port " + port);
+    }
+    clientData = core.getClientData(clientId);
+    
+    try {
+      clientData.handler.registerServer(clientId, core.getId(), token);
+    } catch (InvalidTokenException e) {
+      LOG.warn("Client rejected our token. clientId = " + clientId +
+          ". token = " + token, e);
+      
+      // Remove the client from our internal structures
+      core.removeClient(clientId);
+      
+      // Raise an exception here since the client rejected us
+      throw new ClientConnectionException("Token rejected");
+    }
+  }
+
+  @Override
+  public void unregisterClient(long clientId) throws InvalidClientIdException,
+      TException {
+    core.getMetrics().unregisterClientCalls.inc();
+    if (!core.removeClient(clientId)) {
+      LOG.warn("Invalid request to remove client with id: " + clientId);
+      throw new InvalidClientIdException("Invalid client id: " + clientId);
+    }
+  }
+
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerHistory.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerHistory.java
new file mode 100644
index 00000000..cf2c6557
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerHistory.java
@@ -0,0 +1,401 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.notifier.EventType;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.NotifierUtils;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+
+public class ServerHistory implements IServerHistory {
+  public static final Log LOG = LogFactory.getLog(ServerHistory.class);
+  
+  public int loopSleepTime = 100;
+  
+  // Configuration keys
+  public static final String HISTORY_LENGTH = "notifier.history.length";
+  public static final String HISTORY_LIMIT = "notifier.history.limit";
+  
+  // true if in the ramp-up phase
+  private volatile boolean rampUp = true;
+  
+  // The actual history. It's a 2-level tree:
+  // * On the top level the tree is split by the event's path
+  // * On the 2nd level the tree is split by the event's type
+  // The leaf nodes contain a list of transaction id's for the events
+  // that occurred in the last historyLength milliseconds.
+  ConcurrentMap<String, ConcurrentMap<Byte, List<HistoryTreeEntry>>> history;
+  
+  // Used for synchronization when parts of the history tree must be removed
+  Object historyLock = new Object();
+  
+  private IServerCore core;
+  
+  // The length in time over which the history is kept
+  private volatile long historyLength;
+  
+  // The number of queues in the history tree
+  volatile long historyQueuesCount = 0;
+  
+  // The physical limit of the number of items in the history
+  private volatile long historyLimit;
+  private volatile boolean historyLimitDisabled = false;
+  
+  // The number of stored notifications
+  AtomicLong notificationsCount = new AtomicLong(0);
+  
+  // The ordered by timestamp history tree entries
+  List<HistoryTreeEntry> orderedEntries = 
+      new LinkedList<ServerHistory.HistoryTreeEntry>();
+  
+  public ServerHistory(IServerCore core, boolean initialRampUp)
+      throws ConfigurationException {
+    this.core = core;
+    historyLength = core.getConfiguration().getLong(HISTORY_LENGTH, -1);
+    historyLimit = core.getConfiguration().getLong(HISTORY_LIMIT, -1);
+    history = new ConcurrentHashMap<String, 
+        ConcurrentMap<Byte,List<HistoryTreeEntry>>>();
+    rampUp = initialRampUp;
+    
+    if (historyLength == -1) {
+      LOG.error("Missing default configuration: historyLength");
+      throw new ConfigurationException("Missing historyLength");
+    }
+    if (historyLimit == -1) {
+      LOG.warn("Starting history without any physical limit ...");
+      historyLimitDisabled = true;
+    }
+  }
+  
+  @Override
+  public void setHistoryLength(long newHistoryLength) {
+    historyLength = newHistoryLength;
+  }
+  
+  
+  @Override
+  public void setHistoryLimit(long newHistoryLimit) {
+    if (newHistoryLimit > 0) {
+      historyLimitDisabled = false;
+    }
+    historyLimit = newHistoryLimit;
+  }
+  
+  @Override
+  public boolean isRampUp() {
+    return rampUp;
+  }
+
+  
+  private void checkRampUp(long startTime) {
+    boolean initialIsRampUp = rampUp;
+    
+    if (startTime + historyLength < System.currentTimeMillis()) {
+      rampUp = false;
+    }
+    
+    if (initialIsRampUp && !rampUp) {
+      LOG.info("Server went out of ramp up phase ...");
+    }
+  }
+  
+  
+  /**
+   * Does not guarantee any synchronization mechanisms. (historyLock must be
+   * hold when calling it).
+   * @param path 
+   * @return the number of notifications stored in the history at path
+   */
+  long getNotificationsCountForPath(String path) {
+    long count = 0;
+    if (!history.containsKey(path)) {
+      return 0;
+    }
+    for (Byte type : history.get(path).keySet()) {
+      count += history.get(path).get(type).size();
+    }
+    return count;
+  }
+
+
+  /**
+   * Checks if there are notifications in our tree which are older than
+   * historyLength. It removes does which are older.
+   */
+  private void cleanUpHistory() {
+    Set<String> toBeRemovedPaths = new HashSet<String>();
+    long oldestAllowedTimestamp = System.currentTimeMillis() - historyLength;
+    int trashedNotifications = 0;
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Checking old notifications to remove from history tree ...");
+    }
+    
+    synchronized (historyLock) {
+      int deletedElements = 0;
+
+      if (!historyLimitDisabled && notificationsCount.get() > historyLimit) {
+        LOG.warn("Reached physical limit. Number of stored notifications: " + 
+            notificationsCount + ". Clearing ...");
+      }
+      
+      // Delete items which are too old
+      for (HistoryTreeEntry entry : orderedEntries) {
+        if (entry.timestamp > oldestAllowedTimestamp &&
+            (historyLimitDisabled || notificationsCount.get() <= historyLimit)) {
+          // We stop removing items if the entry is new enough and
+          // if we haven't reached the physical limit (if enabled)
+          break;
+        }
+        
+        if (entry.timestamp > oldestAllowedTimestamp) {
+          // If we delete a notification because we don't have space left
+          trashedNotifications ++;
+        }
+        
+        // entry is the first element in the list which holds it
+        entry.backPointer.remove(0);
+        deletedElements ++;
+        notificationsCount.decrementAndGet();
+      }
+      orderedEntries.subList(0, deletedElements).clear();
+    }
+
+    // Clear lists for paths which don't have any elements left
+    for (String path : history.keySet()) {
+      synchronized (historyLock) {
+        // If we don't have any notifications left for this path, remove it
+        if (getNotificationsCountForPath(path) == 0) {
+          toBeRemovedPaths.add(path);
+        }
+      }
+    }
+    
+    // Remove the paths marked for removal
+    for (String path : toBeRemovedPaths) {
+      synchronized (historyLock) {
+        // Make sure no notifications were added meanwhile
+        if (getNotificationsCountForPath(path) > 0) {
+          continue;
+        }
+        historyQueuesCount -= history.get(path).size();
+        history.remove(path);
+      }
+    }
+    
+    core.getMetrics().trashedHistoryNotifications.inc(trashedNotifications);
+    core.getMetrics().historySize.set(notificationsCount.get());
+    core.getMetrics().historyQueues.set(historyQueuesCount);
+  }
+  
+  
+  /**
+   * Should be called when the server starts to start recording the history
+   * (the namespace operations from the edit log).
+   */
+  @Override
+  public void run() {
+    long startTime = System.currentTimeMillis();
+    
+    try {
+      LOG.info("Starting the history thread ...");
+      while (!core.shutdownPending()) {
+        checkRampUp(startTime);
+        cleanUpHistory();
+        Thread.sleep(loopSleepTime);
+      }
+      LOG.info("History thread shutdown.");
+    } catch (Exception e) {
+      LOG.error("ServerHistory died", e);
+    } finally {
+      core.shutdown();
+    }
+  }
+  
+
+  /**
+   * Called when we should store a notification in the our history.
+   * The timestamp used to store it is generated when this method is
+   * called.
+   * 
+   * It doesn't provide ordering if it is called with miss-ordered
+   * notifications (e.g. it's called once with a notification with
+   * the transaction id "i" and after some time with a notification
+   * with the transaction id "j", where j < i).
+   * 
+   * @param notification The notification to be stored.
+   */
+  @Override
+  public void storeNotification(NamespaceNotification notification) {
+    ConcurrentMap<Byte, List<HistoryTreeEntry>> typeMap;
+    List<HistoryTreeEntry> historyTreeEntryList;
+    String basePath = NotifierUtils.getBasePath(notification),
+        additionalPath = NotifierUtils.getAdditionalPath(notification);
+    
+    synchronized (historyLock) {
+      history.putIfAbsent(basePath,
+          new ConcurrentHashMap<Byte, List<HistoryTreeEntry>>());
+      typeMap = history.get(basePath);
+      
+      if (!typeMap.containsKey(notification.getType())) {
+        typeMap.put(notification.getType(), new LinkedList<HistoryTreeEntry>());
+        historyQueuesCount ++;
+      }
+      historyTreeEntryList = typeMap.get(notification.getType());
+      
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Storing into history: " + NotifierUtils.asString(notification) +
+            " with basePath='" + basePath + "' and additionalPath='" +
+            additionalPath +"'");
+      }
+      
+      // Store the notification
+      HistoryTreeEntry entry = new HistoryTreeEntry(System.currentTimeMillis(),
+          notification.getTxId(), additionalPath);
+      entry.backPointer = historyTreeEntryList;
+      historyTreeEntryList.add(entry);
+      orderedEntries.add(entry);
+    }
+
+    notificationsCount.incrementAndGet();
+    core.getMetrics().historySize.set(notificationsCount.get());
+    core.getMetrics().historyQueues.set(historyQueuesCount);
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Notification stored.");
+    }
+  }
+  
+  /**
+   * Checks what notifications are saved in history for the given event and
+   * adds those notifications in the given queue. Only the notifications
+   * which happened strictly after the edit log operations with the given
+   * transaction id are put in the queue.
+   * The notifications are put in the queue in the order of their
+   * transaction id.
+   * 
+   * @param event the event for which the notifications should be stored
+   *        in the queue.
+   * @param txId the given transaction id
+   * @param notifications the queue in which the notifications will be placed.
+   * 
+   * @throws TransactionIdTooOldException raised when we can't guarantee that
+   *         we got all notifications that happened after the given
+   *         transaction id.
+   */
+  @Override
+  public void addNotificationsToQueue(NamespaceEvent event, long txId,
+      Queue<NamespaceNotification> notifications)
+          throws TransactionIdTooOldException {
+    ConcurrentMap<Byte, List<HistoryTreeEntry>> typeMap;
+    List<HistoryTreeEntry> historyTreeEntryList;
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Got addNotificationsToQueue for: " +
+          NotifierUtils.asString(event) + " and txId: " + txId);
+    }
+    
+    synchronized (historyLock) {
+      typeMap = history.get(event.getPath());
+      if (typeMap == null) {
+        throw new TransactionIdTooOldException("No data in history for path " +
+            event.getPath());
+      }
+      
+      historyTreeEntryList = typeMap.get(event.getType());
+      if (historyTreeEntryList == null) {
+        throw new TransactionIdTooOldException("No data in history for type.");
+      }
+      
+      if (historyTreeEntryList.isEmpty()) {
+        throw new TransactionIdTooOldException("No events recently.");
+      }
+      if (historyTreeEntryList.get(0).transactionId > txId) {
+        throw new TransactionIdTooOldException("No data in history for txId.");
+      }
+ 
+      boolean foundTransaction = false;
+      for (HistoryTreeEntry entry : historyTreeEntryList) {
+        if (foundTransaction) {
+          String notificationPath = event.path;
+          if (entry.additionalPath != null && entry.additionalPath.length() > 0) {
+            if (event.path.trim().equals("/")) {
+              notificationPath += entry.additionalPath;
+            } else {
+              notificationPath += "/" + entry.additionalPath;
+            }
+          }
+          if (LOG.isDebugEnabled()) {
+            LOG.debug("addNotificationsToQueue - adding: [" + notificationPath + ", " +
+                EventType.fromByteValue(event.type).name() + "]" +
+                " and txId: " + entry.transactionId);
+          }
+          notifications.add(new NamespaceNotification(notificationPath,
+              event.type, entry.transactionId));
+        }
+        
+        if (entry.transactionId == txId) {
+          foundTransaction = true;
+        }
+      }
+      
+      if (!foundTransaction) {
+        // If we got here, there are 2 possibilities:
+        // * The client gave us a bad transaction id.
+        // * We missed one (or more) transaction(s)
+        LOG.error("Potential corrupt history. Got request for: " +
+            NotifierUtils.asString(event) + " and txId: " + txId);
+        throw new TransactionIdTooOldException(
+            "Potentially corrupt server history");
+      }
+    }
+  }
+
+  
+  private class HistoryTreeEntry {
+    // The time when the entry was added
+    long timestamp;
+    
+    // The Edit Log transaction id associated with this entry
+    long transactionId;
+    
+    // Additional path (if needed by the type)
+    String additionalPath;
+    
+    List<HistoryTreeEntry> backPointer; 
+    
+    public HistoryTreeEntry(long timestamp, long transactionId,
+        String additionalPath) {
+      this.timestamp = timestamp;
+      this.transactionId = transactionId;
+      this.additionalPath = additionalPath;
+    }
+  }
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerLogReader.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerLogReader.java
new file mode 100644
index 00000000..e23a6d7d
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/ServerLogReader.java
@@ -0,0 +1,506 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.notifier.EventType;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.NotifierUtils;
+import org.apache.hadoop.hdfs.server.namenode.EditLogFileInputStream;
+import org.apache.hadoop.hdfs.server.namenode.EditLogInputStream;
+import org.apache.hadoop.hdfs.server.namenode.EditLogFileInputStream.LogHeaderCorruptException;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.AddOp;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.CloseOp;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.DeleteOp;
+import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeFile;
+
+
+public class ServerLogReader implements IServerLogReader {
+  public static final Log LOG = LogFactory.getLog(ServerLogReader.class);
+
+  // Constants used in the edit log file loading
+  private static final int LOG_HEADER_CORRUPT_RETRY_MAX = 10;
+  private static final int IO_EXCEPTION_RETRY_MAX = 10;
+  private static final int LOG_HEADER_CORRUPT_BASE_SLEEP = 50;
+  private static final int IO_EXCEPTION_BASE_SLEEP = 500;
+  
+  private EditLogInputStream inputStream;  
+  private File editsFile, editsNewFile, fsTimeFile;
+  
+  private IServerCore core;
+  
+  // The current position in the edit log
+  private long editLogFilePosition;
+
+  // A separate thread which checks if the edits file roll process began
+  private EditsRollChecker editsRollChecker;
+  
+  // Set to true when it is detected that the NameNode closed the edits
+  // file we have opened. This means that there won't be any more operations
+  // written to the edits log.
+  private boolean curStreamFinished = false;
+  
+  // Set to true when we read all the operations from the current stream.
+  // Note: This can only be true when curStreamFinished is true.
+  private boolean curStreamConsumed = false;
+  
+  // Set to true when the most recent operation read from the input stream
+  // was null.
+  //private boolean previousReadIsNull = false;
+  
+  // Set to true if we did at least one null read after the input stream
+  // was finished.
+  private boolean readNullAfterStreamFinished = false;
+  
+  // true if the name of the file from which the current input stream is
+  // loaded is 'edits.new', false if 'edits'.
+  private boolean openedFromEditsNew = false;
+  
+  private AtomicLong rollImageCount = new AtomicLong(0);
+  
+  // Used to ensure the transaction id's we read are consecutive.
+  private long expectedTransactionId = -1;
+  
+  public ServerLogReader(IServerCore core, String editsDir) throws IOException {
+    this.core = core;
+    
+    editsFile = new File(editsDir, NameNodeFile.EDITS.getName());
+    editsNewFile = new File(editsDir, NameNodeFile.EDITS_NEW.getName());
+    fsTimeFile = new File(editsDir, NameNodeFile.TIME.getName());
+    
+    // Initial open
+    openEditLog();
+  }
+  
+  public ServerLogReader(IServerCore core) throws IOException {
+    this(core, core.getConfiguration().get("notifier.edits.dir"));
+  }
+  
+  @Override
+  public void run() {
+    editsRollChecker = new EditsRollChecker();
+    editsRollChecker.run();
+  }
+  
+
+  /**
+   * Reads from the edit log until it reaches an operation which can
+   * be considered a namespace notification (like FILE_ADDED, FILE_CLOSED
+   * or NODE_DELETED). 
+   * 
+   * @return the notification object or null if nothing is to be returned
+   *         at the moment.
+   * @throws IOException raised when a fatal error occurred.
+   */
+  public NamespaceNotification getNamespaceNotification()
+      throws IOException {
+    FSEditLogOp op = null;
+    NamespaceNotification notification = null;
+    
+    // Keep looping until we reach an operation that can be
+    // considered a notification.
+    while (true) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("edits.size=" + editsFile.length() + " editsNew.size=" +
+            editsNewFile.length());
+      }
+      try {
+        op = inputStream.readOp();
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("inputStream.readOP() returned " + op);
+        }
+      } catch (IOException e) {
+        LOG.warn("inputStream.readOp() failed", e);
+        tryReloadingEditLog();
+        return null;
+      } catch (Exception e2) {
+        LOG.error("Error reading log operation", e2);
+        throw new IOException(e2);
+      }
+      
+      // No operation to read at the moment from the transaction log
+      if (op == null) {
+        core.getMetrics().reachedEditLogEnd.inc();
+        handleNullRead();
+        trySwitchingEditLog();
+        return null;
+      } else {
+        core.getMetrics().readOperations.inc();
+        readNullAfterStreamFinished = false;
+      }
+      
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Read operation: " + op + " with txId=" +
+            op.getTransactionId());
+      }
+      
+      checkTransactionId(op);
+      updateStreamPosition();
+      
+      // Test if it can be considered a notification
+      notification = createNotification(op);
+      if (notification != null) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Emitting " + NotifierUtils.asString(notification));
+        }
+        core.getMetrics().readNotifications.inc();
+        return notification;
+      } 
+    }
+  }
+  
+  
+  /**
+   * Called after we read a null operation from the transaction log.
+   * @throws IOException when a fatal error occurred.
+   */
+  private void handleNullRead() throws IOException {
+    if (curStreamFinished && readNullAfterStreamFinished) {
+      // If we read a null operation after the NameNode closed
+      // the stream, then we surely reached the end of the file.
+      curStreamConsumed = true;
+    } else {
+      try {
+        // This affects how much we wait after we reached the end of the
+        // current stream.
+        Thread.sleep(100);
+      } catch (InterruptedException e) {
+        throw new IOException(e);
+      }
+    }
+    
+    if (curStreamFinished)
+      readNullAfterStreamFinished = true;
+    refreshStreamPosition();
+  }
+  
+  
+  /**
+   * Sets the current position of the input stream, after a
+   * transaction has been successfully consumed.
+   * @throws IOException if a fatal error occurred.
+   */
+  private void updateStreamPosition() throws IOException {
+    try {
+      editLogFilePosition = inputStream.getPosition();
+    } catch (IOException e) {
+      LOG.error("Failed to get edit log file position", e);
+      throw new IOException("updateStreamPosition failed");
+    }
+  }
+  
+  
+  /**
+   * Called to refresh the position in the current input stream
+   * to the last ACK'd one.
+   * @throws IOException if a fatal error occurred.
+   */
+  private void refreshStreamPosition() throws IOException {
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Refreshing the stream at position: " + editLogFilePosition);
+    }
+    inputStream.refresh(editLogFilePosition);
+  }
+  
+  
+  /**
+   * Tries to fully reload the edit log.
+   * 
+   * @throws IOException if a fatal error occurred.
+   */
+  private void tryReloadingEditLog() throws IOException {
+    LOG.info("Trying to reload the edit log ...");
+    // The roll image count is 1 after edits.new was renamed to edits
+    if (rollImageCount.get() == 1) {
+      try {
+        LOG.info("Trying to reload the edit log from " +
+            editsFile.getAbsolutePath());
+        openInputStream(editsFile);
+        LOG.info("Successfully reloaded the edit log from " +
+            editsFile.getAbsolutePath() + ". Trying to refresh position.");
+        refreshStreamPosition();
+        LOG.info("Successfully refreshed stream position");
+        return;
+      } catch (IOException e) {
+        LOG.warn("Failed to reload from " + editsFile.getAbsolutePath(), e);
+      }
+    }
+    
+    try {
+      LOG.info("Trying to reload the edit log from " +
+          editsNewFile.getAbsolutePath());
+      openInputStream(editsNewFile);
+      LOG.info("Successfully reloaded the edit log from " +
+          editsNewFile.getAbsolutePath() + ". Trying to refresh position.");
+      refreshStreamPosition();
+      LOG.info("Successfully refreshed stream position");
+      return;
+    } catch (IOException e) {
+      LOG.error("Failed to reload from " + editsFile.getAbsolutePath(), e);
+      throw e;
+    }
+  }
+  
+  
+  /**
+   * Tries to switch from the previous transaction file to the new one.
+   * It ensures that no notifications are missed. If there is a possibility
+   * that the current transaction log file has more notifications to be read,
+   * then it will keep the current stream intact.
+   * 
+   * @throws IOException if a fatal error occurred.
+   */
+  private void trySwitchingEditLog() throws IOException {
+    if (shouldSwitchEditLog()) {
+      curStreamFinished = true;
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Should switch edit log. rollImageCount=" + rollImageCount +
+            ". curStreamConsumed=" + curStreamConsumed);
+      }
+      
+      if (curStreamConsumed) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Reloading edit log ...");
+        }
+        openEditLog();
+        rollImageCount.decrementAndGet();
+      }
+    }
+  }
+  
+  
+  /**
+   * @return true if a new edit log was created and is used and we should
+   *         switch to it when we finish consuming the current edit log,
+   *         false otherwise.
+   */
+  private boolean shouldSwitchEditLog() {
+    // The rollImageCount is incremented each time edits.new is renamed to
+    // edits. Thus:
+    // * rollImageCount.get() == 1 && editsNewFile.exists()
+    //   This is triggered if edits.new was renamed to edits and a new
+    //   edits.new file was created meanwhile which is active.
+    //   > This usually happens if the rolling process is lengthy.
+    // * rollImageCount.get() == 2
+    //   This is triggered if edits.new was renamed to edits once and
+    //   a new edits.new file was created meanwhile which was itself
+    //   renamed to edits.
+    //   > This usually happens if the rolling process is short
+    // This first case usually happens if the rolling process is lengthy,
+    // while the second case mostly when it's very short. Lengthy and short
+    // in this case are relative to the polling time (currently 100ms).
+    return (rollImageCount.get() == 1 && editsNewFile.exists()) ||
+        rollImageCount.get() == 2;
+  }
+  
+  
+  /**
+   * Converts a Transaction Log operation into a NamespaceNotification
+   * object.
+   * @param op the Transaction Log operation.
+   * @return the NamespaceNotification object or null if the type of
+   *         the operation isn't supported to be transformed into a
+   *         NamespaceNotification.
+   */
+  private NamespaceNotification createNotification(FSEditLogOp op) {
+    switch (op.opCode) {
+      case OP_ADD:
+        return new NamespaceNotification(((AddOp)op).path,
+            EventType.FILE_ADDED.getByteValue(), op.getTransactionId());
+
+      case OP_CLOSE:
+        return new NamespaceNotification(((CloseOp)op).path,
+            EventType.FILE_CLOSED.getByteValue(), op.getTransactionId());
+        
+      case OP_DELETE:
+        return new NamespaceNotification(((DeleteOp)op).path,
+            EventType.NODE_DELETED.getByteValue(), op.getTransactionId());
+      default:
+        return null;
+    }
+  }
+  
+  
+  /**
+   * Asserts the read operation is the expected one.
+   * @param op the newly read operation
+   * @throws IOException if the transaction id doesn't match the expected
+   *         transaction id. The transaction id's should be consecutive.
+   */
+  private void checkTransactionId(FSEditLogOp op) throws IOException {
+    if (expectedTransactionId == -1) {
+      expectedTransactionId = op.getTransactionId() + 1;
+    } else {
+      if (op.getTransactionId() != expectedTransactionId) {
+        LOG.error("Read invalid txId=" + op.getTransactionId() +
+            " expectedTxId=" + expectedTransactionId);
+        throw new IOException("checkTransactionId failed");
+      }
+      expectedTransactionId ++;
+    }
+  }
+  
+  
+  /**
+   * Tries to load the edit log file: first from 'edits.new', and if it
+   * doesen't exist, from 'edits'.
+   * 
+   * @throws IOException If a fatal error occurred.
+   */
+  private void openEditLog() throws IOException {
+    if (editsNewFile.exists()) {
+      LOG.info("Trying to load edit log from 'edits.new'");
+      try {
+        openInputStream(editsNewFile);
+        openedFromEditsNew = true;
+        return;
+      } catch (IOException e) {
+        LOG.info("Failed to load from 'edits.new'. Trying from 'edits'", e);
+      }
+    }
+    
+    openInputStream(editsFile);
+    openedFromEditsNew = false;
+    LOG.info("Edit log loaded from 'edits'");
+  }
+  
+
+  /**
+   * Tries opening the input stream.
+   * @param txFile the file from which to load the input stream
+   * @throws IOException If the input stream couldn't be loaded. This error
+   *                     is fatal.
+   */
+  private void openInputStream(File txFile) throws IOException {
+    int ioExceptionRetryCount = 0, logHeaderCorruptRetryCount = 0;
+    
+    LOG.info("Trying to load the edit log from " + txFile.getAbsolutePath());
+    
+    do {
+      try {
+        inputStream = new EditLogFileInputStream(txFile);
+        editLogFilePosition = inputStream.getPosition();
+        curStreamConsumed = false;
+        curStreamFinished = false;
+        readNullAfterStreamFinished = false;
+        LOG.info("Successfully loaded the edits log from " +
+            txFile.getAbsolutePath());
+        break;
+        
+      } catch (LogHeaderCorruptException e1) {
+        if (logHeaderCorruptRetryCount == LOG_HEADER_CORRUPT_RETRY_MAX) {
+          LOG.error("Failed to load the edit log. No retries left.", e1);
+          throw new IOException("Could not load the edit log");
+        }
+        logHeaderCorruptRetryCount ++;
+        LOG.warn("Failed to load the edit log. Retry " +
+            logHeaderCorruptRetryCount + " ...", e1);
+        try {
+          Thread.sleep(ioExceptionRetryCount * LOG_HEADER_CORRUPT_BASE_SLEEP);
+        } catch (InterruptedException e) {
+          throw new IOException(e);
+        }
+        
+      } catch (IOException e2) {
+        if (ioExceptionRetryCount == IO_EXCEPTION_RETRY_MAX) {
+          LOG.error("Failed to load the edit log. No retries left.", e2);
+          throw new IOException("Could not load the edit log");
+        }
+        ioExceptionRetryCount ++;
+        LOG.warn("Failed to load the edit log. Retry " +
+            ioExceptionRetryCount + " ...", e2);
+        try {
+          Thread.sleep(ioExceptionRetryCount * IO_EXCEPTION_BASE_SLEEP);
+        } catch (InterruptedException e) {
+          throw new IOException(e);
+        }
+      }
+      
+    } while (true);
+  }
+  
+
+  private class EditsRollChecker implements Runnable {
+
+    long prevValue, currentValue;
+    
+    // Special values for the value read from fstime
+    private static final int INITIAL_STATE = -1;
+    private static final int FSTIME_MISSING = -2;
+    
+    @Override
+    public void run() {
+      try {
+        prevValue = INITIAL_STATE;
+        
+        if (!openedFromEditsNew) {
+          LOG.debug("Incrementing rollImageCount at start ...");
+          rollImageCount.incrementAndGet();
+        }
+      
+        while (!core.shutdownPending()) {
+          DataInputStream fsTimeInputStream;
+          try {
+            fsTimeInputStream = 
+                new DataInputStream(new FileInputStream(fsTimeFile));
+          } catch (FileNotFoundException e) {
+            prevValue = FSTIME_MISSING;
+            continue;
+          }
+          try {
+            currentValue = fsTimeInputStream.readLong();
+            fsTimeInputStream.close();
+            if (prevValue == INITIAL_STATE) {
+              prevValue = currentValue;
+              continue;
+            }
+          } catch (IOException e) {
+            try {
+              fsTimeInputStream.close();
+            } catch (IOException e2) {}
+            prevValue = FSTIME_MISSING;
+            continue;
+          }
+          
+          if (prevValue != currentValue) {
+            if (LOG.isDebugEnabled()) {
+              LOG.debug("Incrementing rollImageCount");
+            }
+            prevValue = currentValue;
+            rollImageCount.incrementAndGet();
+          }
+          
+          Thread.sleep(100);
+        }
+      } catch (Exception e) {
+        LOG.error("Unhandled exception", e);
+      } finally {
+        core.shutdown();
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/metrics/NamespaceNotifierActivityMBean.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/metrics/NamespaceNotifierActivityMBean.java
new file mode 100644
index 00000000..7dc8131e
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/metrics/NamespaceNotifierActivityMBean.java
@@ -0,0 +1,23 @@
+package org.apache.hadoop.hdfs.notifier.server.metrics;
+
+import javax.management.ObjectName;
+
+import org.apache.hadoop.metrics.util.MBeanUtil;
+import org.apache.hadoop.metrics.util.MetricsDynamicMBeanBase;
+import org.apache.hadoop.metrics.util.MetricsRegistry;
+
+public class NamespaceNotifierActivityMBean extends MetricsDynamicMBeanBase {
+  final private ObjectName mbeanName;
+
+  protected NamespaceNotifierActivityMBean(MetricsRegistry mr,
+      String serverId) {
+    super(mr, serverId);
+    mbeanName = MBeanUtil.registerMBean("NamespaceNotifier",
+        "NamespaceNotifierActivity", this);
+  }
+
+  public void shutdown() {
+    if (mbeanName != null)
+      MBeanUtil.unregisterMBean(mbeanName);
+  }
+}
diff --git a/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/metrics/NamespaceNotifierMetrics.java b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/metrics/NamespaceNotifierMetrics.java
new file mode 100644
index 00000000..708f21da
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/java/org/apache/hadoop/hdfs/notifier/server/metrics/NamespaceNotifierMetrics.java
@@ -0,0 +1,131 @@
+package org.apache.hadoop.hdfs.notifier.server.metrics;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.metrics.MetricsContext;
+import org.apache.hadoop.metrics.MetricsRecord;
+import org.apache.hadoop.metrics.MetricsUtil;
+import org.apache.hadoop.metrics.Updater;
+import org.apache.hadoop.metrics.jvm.JvmMetrics;
+import org.apache.hadoop.metrics.util.MetricsBase;
+import org.apache.hadoop.metrics.util.MetricsIntValue;
+import org.apache.hadoop.metrics.util.MetricsLongValue;
+import org.apache.hadoop.metrics.util.MetricsRegistry;
+import org.apache.hadoop.metrics.util.MetricsTimeVaryingLong;
+import org.apache.hadoop.metrics.util.MetricsTimeVaryingRate;
+
+public class NamespaceNotifierMetrics implements Updater {
+	public static final Log LOG = 
+	    LogFactory.getLog(NamespaceNotifierMetrics.class);
+  private MetricsRecord metricsRecord;
+  private NamespaceNotifierActivityMBean notifierActivityMBean;
+  public MetricsRegistry registry = new MetricsRegistry();
+  
+  // ServerCore metrics
+  public MetricsIntValue numRegisteredClients =
+      new MetricsIntValue("num_registered_clients", registry,
+          "The number of clients currently registered on the server.");
+  public MetricsLongValue numTotalSubscriptions =
+      new MetricsLongValue("num_total_subscriptions", registry,
+          "The current number of subscriptions done by all the clients");
+  public MetricsLongValue queuedNotifications =
+      new MetricsLongValue("queued_notifications", registry,
+          "The number of notifications which are currently queued to be sent");
+  
+  // ServerDispatcher metrics
+  public MetricsTimeVaryingLong failedClients =
+      new MetricsTimeVaryingLong("failed_clients", registry,
+          "The number of clients which are considered failed and removed.");
+  public MetricsTimeVaryingLong markedClients =
+      new MetricsTimeVaryingLong("marked_clients", registry,
+          "The number of clients for which the most recent try to send a " +
+          "notification failed.");
+  public MetricsTimeVaryingLong dispatchedNotifications =
+      new MetricsTimeVaryingLong("dispatched_notifications", registry,
+          "The number of notifications succesfully dispatched.");
+  public MetricsTimeVaryingLong failedNotifications =
+      new MetricsTimeVaryingLong("failed_notifications", registry,
+          "The number of notifications that failed to be dispatched");
+  public MetricsTimeVaryingLong heartbeats =
+      new MetricsTimeVaryingLong("heartbeats", registry,
+          "The number of heartbeats sent (should be low).");
+  public MetricsTimeVaryingRate dispatchNotificationRate =
+      new MetricsTimeVaryingRate("dispatch_notification_rate", registry,
+          "The rate with which the notifications are dispatched.");
+
+  // ServerHandlerImpl metrics
+  public MetricsTimeVaryingLong subscribeCalls =
+      new MetricsTimeVaryingLong("subscribe_calls", registry,
+          "The number of Thrift subscribe() calls");
+  public MetricsTimeVaryingLong unsubscribeCalls =
+      new MetricsTimeVaryingLong("unsubscribe_calls", registry,
+          "The number of Thrift unsubscribe() calls");
+  public MetricsTimeVaryingLong registerClientCalls =
+      new MetricsTimeVaryingLong("register_client_calls", registry,
+          "The number of Thrift registerClient() calls");
+  public MetricsTimeVaryingLong unregisterClientCalls =
+      new MetricsTimeVaryingLong("unregister_client_calls", registry,
+          "The number of Thrift unregisterClient() calls");
+  
+  // ServerHistory metrics
+  public MetricsLongValue historySize =
+      new MetricsLongValue("history_size", registry,
+          "The number of notifications stored in the server history");
+  public MetricsLongValue historyQueues =
+      new MetricsLongValue("history_queues", registry,
+          "The number of queues for each (path, type) tuple.");
+  public MetricsTimeVaryingLong trashedHistoryNotifications = 
+      new MetricsTimeVaryingLong("trashed_history_notifications", registry,
+      		"The number of notifications deleted from the history, though " +
+          "they didn't timed out");
+  
+  // ServerLogReader metrics
+  public MetricsTimeVaryingLong readOperations =
+      new MetricsTimeVaryingLong("read_operations", registry,
+          "The number of operations sucessfully read from the edit log");
+  public MetricsTimeVaryingLong readNotifications =
+      new MetricsTimeVaryingLong("read_notifications", registry,
+          "The notifications produced by the log reader.");
+  public MetricsTimeVaryingLong reachedEditLogEnd =
+      new MetricsTimeVaryingLong("reached_edit_log_end", registry,
+          "The number of times the reader reached the end of the edits log");
+ 
+  public NamespaceNotifierMetrics(Configuration conf, long serverId) {
+    String sessionId = conf.get("session.id"); 
+    JvmMetrics.init("NamespaceNotifier", sessionId);
+    
+    notifierActivityMBean = new NamespaceNotifierActivityMBean(registry,
+        "" + serverId);
+    
+    MetricsContext context = MetricsUtil.getContext("dfs");
+    metricsRecord = MetricsUtil.createRecord(context, "namespacenotifier");
+    metricsRecord.setTag("sessionId", sessionId);
+    context.registerUpdater(this);
+
+    LOG.info("Initializing NamespaceNotifierMetrics using context object:" +
+        context.getClass().getName() + " and record: " +
+        metricsRecord.getClass().getCanonicalName());
+  }
+  
+  
+  public void shutdown() {
+    if (notifierActivityMBean != null) 
+      notifierActivityMBean.shutdown();
+  }
+  
+  
+  public void doUpdates(MetricsContext unused) {
+    synchronized (this) {
+      for (MetricsBase m : registry.getMetricsList()) {
+        m.pushMetric(metricsRecord);
+      }
+    }
+    metricsRecord.update();
+  }
+  
+  
+  public void resetAllMinMax() {
+    dispatchNotificationRate.resetMinMax();
+  }
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyClientHandler.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyClientHandler.java
new file mode 100644
index 00000000..c94c96cc
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyClientHandler.java
@@ -0,0 +1,44 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import org.apache.hadoop.hdfs.notifier.ClientHandler;
+import org.apache.hadoop.hdfs.notifier.InvalidServerIdException;
+import org.apache.hadoop.hdfs.notifier.InvalidTokenException;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.thrift.TException;
+
+/**
+ * Inherited by dummy ClientHandler.Iface classes in tests to avoid the need
+ * of having to write empty method implementations.
+ */
+ class EmptyClientHandler implements ClientHandler.Iface {
+
+  @Override
+  public void handleNotification(NamespaceNotification notification,
+      long serverId) throws InvalidServerIdException, TException {}
+
+  @Override
+  public void heartbeat(long serverId) throws InvalidServerIdException,
+      TException {}
+
+  @Override
+  public void registerServer(long clientId, long serverId, long token)
+      throws InvalidTokenException, TException {}
+
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerClientTracker.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerClientTracker.java
new file mode 100644
index 00000000..9b279ed5
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerClientTracker.java
@@ -0,0 +1,20 @@
+package org.apache.hadoop.hdfs.notifier.server;
+
+public class EmptyServerClientTracker implements IServerClientTracker{
+
+  @Override
+  public void run() {}
+
+  @Override
+  public void setClientTimeout(long timeout) {}
+
+  @Override
+  public void setHeartbeatTimeout(long timeout) {}
+
+  @Override
+  public void handleFailedDispatch(long clientId, long lastFailed) {}
+
+  @Override
+  public void handleSuccessfulDispatch(long clientId, long lastSent) {}
+
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerCore.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerCore.java
new file mode 100644
index 00000000..b569e127
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerCore.java
@@ -0,0 +1,135 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.notifier.ClientNotSubscribedException;
+import org.apache.hadoop.hdfs.notifier.InvalidClientIdException;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+import org.apache.hadoop.hdfs.notifier.ServerHandler.Iface;
+import org.apache.hadoop.hdfs.notifier.server.metrics.NamespaceNotifierMetrics;
+import org.apache.thrift.transport.TTransportException;
+
+
+/**
+ * Inherited by dummy IServerCore classes in tests to avoid the need
+ * of having to write empty method implementations.
+ */
+class EmptyServerCore implements IServerCore {
+
+  AtomicBoolean shouldShutdown = new AtomicBoolean(false);
+  NamespaceNotifierMetrics metrics =
+      new NamespaceNotifierMetrics(new Configuration(), -1);
+  
+  @Override
+  public void run() {}
+
+  @Override
+  public void init(IServerLogReader logReader, IServerHistory serverHistory,
+      IServerDispatcher dispatcher, Iface handler) {}
+
+  @Override
+  public void shutdown() {
+    shouldShutdown.set(true);
+  }
+
+  @Override
+  public Configuration getConfiguration() {
+    return null;
+  }
+
+  @Override
+  public long addClientAndConnect(String host, int port)
+      throws TTransportException, IOException {
+    return 0;
+  }
+
+  @Override
+  public void handleNotification(NamespaceNotification n) {}
+
+  @Override
+  public void addClient(ClientData clientData) {}
+
+  @Override
+  public boolean removeClient(long clientId) {
+    return false;
+  }
+
+  @Override
+  public boolean isRegistered(long clientId) {
+    return false;
+  }
+
+  @Override
+  public ClientData getClientData(long clientId) {
+    return null;
+  }
+
+  @Override
+  public Set<Long> getClientsForNotification(NamespaceNotification n) {
+    return null;
+  }
+
+  @Override
+  public Set<Long> getClients() {
+    return null;
+  }
+
+  @Override
+  public void subscribeClient(long clientId, NamespaceEvent event, long txId)
+      throws TransactionIdTooOldException, InvalidClientIdException {}
+
+  @Override
+  public void unsubscribeClient(long clientId, NamespaceEvent event)
+      throws ClientNotSubscribedException {}
+
+  @Override
+  public long getId() {
+    return 0;
+  }
+
+  @Override
+  public Queue<NamespaceNotification> getClientNotificationQueue(long clientId) {
+    return null;
+  }
+
+  @Override
+  public IServerHistory getHistory() {
+    return null;
+  }
+  
+  @Override
+  public boolean shutdownPending() {
+    return shouldShutdown.get();
+  }
+
+  @Override
+  public NamespaceNotifierMetrics getMetrics() {
+    return metrics;
+  }
+
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerDispatcher.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerDispatcher.java
new file mode 100644
index 00000000..b9be2a29
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerDispatcher.java
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+public class EmptyServerDispatcher implements IServerDispatcher {
+
+  public void run() {}
+
+  @Override
+  public void assignClient(long clientId) {}
+
+  @Override
+  public void removeClient(long clientId) {}
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerHandler.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerHandler.java
new file mode 100644
index 00000000..d4ff7a5b
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerHandler.java
@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import org.apache.hadoop.hdfs.notifier.ClientConnectionException;
+import org.apache.hadoop.hdfs.notifier.ClientNotSubscribedException;
+import org.apache.hadoop.hdfs.notifier.InvalidClientIdException;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.RampUpException;
+import org.apache.hadoop.hdfs.notifier.ServerHandler;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+import org.apache.thrift.TException;
+
+public class EmptyServerHandler implements ServerHandler.Iface {
+
+  @Override
+  public void subscribe(long clientId, NamespaceEvent subscribedEvent, long txId)
+      throws InvalidClientIdException, TransactionIdTooOldException, TException {}
+
+  @Override
+  public void unsubscribe(long clientId, NamespaceEvent subscribedEvent)
+      throws InvalidClientIdException, ClientNotSubscribedException, TException {}
+
+  @Override
+  public void registerClient(String host, int port, long token)
+      throws RampUpException, ClientConnectionException, TException {}
+
+  @Override
+  public void unregisterClient(long clientId) throws InvalidClientIdException,
+      TException {}
+  
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerHistory.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerHistory.java
new file mode 100644
index 00000000..2d42c85d
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerHistory.java
@@ -0,0 +1,33 @@
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.Queue;
+
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+
+class EmptyServerHistory implements IServerHistory {
+
+  @Override
+  public void setHistoryLength(long newHistoryLength) {}
+
+  @Override
+  public void setHistoryLimit(long newHistoryLimit) {}
+  
+  @Override
+  public void run() {}
+
+  @Override
+  public boolean isRampUp() {
+    return false;
+  }
+
+  @Override
+  public void storeNotification(NamespaceNotification notification) {}
+
+  @Override
+  public void addNotificationsToQueue(NamespaceEvent event, long txId,
+      Queue<NamespaceNotification> notifications)
+      throws TransactionIdTooOldException {}
+
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerLogReader.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerLogReader.java
new file mode 100644
index 00000000..c7cdd0e8
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/EmptyServerLogReader.java
@@ -0,0 +1,34 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.io.IOException;
+
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+
+public class EmptyServerLogReader implements IServerLogReader {
+
+  @Override
+  public void run() {}
+  
+  public NamespaceNotification getNamespaceNotification()
+      throws IOException {
+    return null;
+  }
+
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerClientTracker.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerClientTracker.java
new file mode 100644
index 00000000..a787c86b
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerClientTracker.java
@@ -0,0 +1,277 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Queue;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.notifier.ClientHandler;
+import org.apache.hadoop.hdfs.notifier.InvalidServerIdException;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.thrift.TException;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestServerClientTracker {
+  static private Logger LOG = LoggerFactory.getLogger(TestServerClientTracker.class);
+
+  static Configuration conf;
+  
+  @BeforeClass
+  public static void initConf() {
+    Configuration.addDefaultResource("namespace-notifier-server-default.xml");
+    Configuration.addDefaultResource("hdfs-default.xml");
+    conf = new Configuration();
+    conf.addResource("namespace-notifier-server-site.xml");
+    conf.addResource("hdfs-site.xml");
+    conf.set(ServerDispatcher.THREAD_POOLS_SIZE, "5");
+  }
+
+  
+  @Test
+  public void testClientTimeoutBasic1() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher clientTracker = new ServerDispatcher(core);
+    DummyClientHandler clientHandler = new DummyClientHandler();
+    long clientId = 1000;
+    core.init(clientTracker);
+    
+    // Make the client fail so it doesen't respond to heartbeats
+    clientHandler.failingClient = true;
+    core.clients.put(clientId, new ClientData(clientId, clientHandler,
+        "host", 3000));
+    core.clientLocks.put(clientId, new ReentrantLock());
+    clientTracker.setClientTimeout(100);
+    clientTracker.setHeartbeatTimeout(1000);
+    clientTracker.loopSleepTime = 10;
+    clientTracker.assignClient(clientId);
+    new Thread(clientTracker).start();
+    Thread.sleep(200);
+    core.shutdown();
+    
+    Assert.assertFalse(core.removedClients.contains(clientId));
+  }
+  
+  
+  @Test
+  public void testClientTimeoutBasic2() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher clientTracker = new ServerDispatcher(core);
+    DummyClientHandler clientHandler = new DummyClientHandler();
+    long clientId = 1000;
+    core.init(clientTracker);
+    
+    // Make the client fail so it doesen't respond to heartbeats
+    clientHandler.failingClient = true;
+    core.clients.put(clientId, new ClientData(clientId, clientHandler,
+        "host", 3000));
+    core.clientLocks.put(clientId, new ReentrantLock());
+    clientTracker.setClientTimeout(100);
+    clientTracker.setHeartbeatTimeout(1000);
+    clientTracker.loopSleepTime = 10;
+    clientTracker.assignClient(clientId);
+    clientTracker.handleFailedDispatch(clientId, System.currentTimeMillis());
+    new Thread(clientTracker).start();
+    Thread.sleep(300);
+    core.shutdown();
+    
+    Assert.assertTrue(core.removedClients.contains(clientId));
+  }
+  
+  @Test
+  public void testClientTimeoutBasic3() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher clientTracker = new ServerDispatcher(core);
+    DummyClientHandler clientHandler = new DummyClientHandler();
+    long clientId = 1000;
+    core.init(clientTracker);
+    
+    clientHandler.failingClient = true;
+    core.clients.put(clientId, new ClientData(clientId, clientHandler,
+        "host", 3000));
+    core.clientLocks.put(clientId, new ReentrantLock());
+    clientTracker.setClientTimeout(100);
+    clientTracker.setHeartbeatTimeout(1000);
+    clientTracker.loopSleepTime = 10;
+    clientTracker.assignClient(clientId);
+    clientTracker.handleFailedDispatch(clientId, System.currentTimeMillis());
+    clientTracker.handleSuccessfulDispatch(clientId,
+        System.currentTimeMillis());
+    new Thread(clientTracker).start();
+    Thread.sleep(300);
+    core.shutdown();
+    
+    Assert.assertFalse(core.removedClients.contains(clientId));
+  }
+  
+  
+  @Test
+  public void testClientHeartbeatBasic1() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher clientTracker = new ServerDispatcher(core);
+    DummyClientHandler clientHandler = new DummyClientHandler();
+    long clientId = 1000;
+    core.init(clientTracker);
+
+    core.clients.put(clientId, new ClientData(clientId, clientHandler,
+        "host", 3000));
+    core.clientLocks.put(clientId, new ReentrantLock());
+    clientTracker.setClientTimeout(10000); // to avoid removing it
+    clientTracker.setHeartbeatTimeout(100);
+    clientTracker.loopSleepTime = 10;
+    clientTracker.assignClient(clientId);
+    new Thread(clientTracker).start();
+    Thread.sleep(350);
+    core.shutdown();
+
+    Assert.assertEquals(3, clientHandler.receivedHeartbeats.size());
+  }
+  
+  
+  @Test
+  public void testClientHeartbeatBasic2() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher clientTracker = new ServerDispatcher(core);
+    DummyClientHandler clientHandler = new DummyClientHandler();
+    long clientId = 1000;
+    core.init(clientTracker);
+
+    core.clients.put(clientId, new ClientData(clientId, clientHandler,
+        "host", 3000));
+    core.clientLocks.put(clientId, new ReentrantLock());
+    clientTracker.setClientTimeout(10000); // to avoid removing it
+    clientTracker.setHeartbeatTimeout(200);
+    clientTracker.loopSleepTime = 10;
+    clientTracker.assignClient(clientId);
+    new Thread(clientTracker).start();
+    Thread.sleep(80);
+    clientTracker.handleFailedDispatch(clientId, System.currentTimeMillis());
+    Thread.sleep(80);
+    clientTracker.handleSuccessfulDispatch(clientId, System.currentTimeMillis());
+    Thread.sleep(540);
+    core.shutdown();
+
+    Assert.assertEquals(2, clientHandler.receivedHeartbeats.size());
+  }
+  
+  
+  @Test
+  public void testClientHeartbeatBasic3() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher clientTracker = new ServerDispatcher(core);
+    DummyClientHandler clientHandler = new DummyClientHandler();
+    long clientId = 1000;
+    core.init(clientTracker);
+
+    core.clients.put(clientId, new ClientData(clientId, clientHandler,
+        "host", 3000));
+    core.clientLocks.put(clientId, new ReentrantLock());
+    clientTracker.setClientTimeout(10000); // to avoid removing it
+    clientTracker.setHeartbeatTimeout(200);
+    clientTracker.loopSleepTime = 10;
+    clientTracker.assignClient(clientId);
+    new Thread(clientTracker).start();
+    Thread.sleep(40);
+    clientTracker.handleSuccessfulDispatch(clientId, System.currentTimeMillis());
+    Thread.sleep(40);
+    clientTracker.handleFailedDispatch(clientId, System.currentTimeMillis());
+    Thread.sleep(200);
+    core.shutdown();
+
+    Assert.assertEquals(0, clientHandler.receivedHeartbeats.size());
+  }
+  
+  
+  class DummyServerCore extends EmptyServerCore {
+    
+    ConcurrentMap<Long, ClientData> clients =
+        new ConcurrentHashMap<Long, ClientData>();
+    ConcurrentMap<Long, Lock> clientLocks = 
+        new ConcurrentHashMap<Long, Lock>();
+    
+    Set<Long> removedClients = new HashSet<Long>();
+    ServerDispatcher clientTracker;
+    
+    public void init(ServerDispatcher clientTracker) {
+      this.clientTracker = clientTracker;
+    }
+    
+    @Override
+    public ClientData getClientData(long clientId) {
+      return clients.get(clientId);
+    }
+    
+    @Override
+    public Queue<NamespaceNotification> getClientNotificationQueue(long clientId) {
+      return clients.get(clientId).queue;
+    }
+    
+    @Override
+    public boolean removeClient(long clientId) {
+      synchronized (removedClients) {
+        removedClients.add(clientId);
+      }
+      clients.remove(clientId);
+      clientTracker.removeClient(clientId);
+      
+      return true;
+    }
+    
+    @Override
+    public Configuration getConfiguration() {
+      return conf;
+    }
+  }
+  
+  
+  private class DummyClientHandler extends EmptyClientHandler {
+    
+    public boolean failingClient = false;
+    public boolean clientRemovedUs = false;
+    
+    // A sorted list with the timestamp when the heartbeats were received
+    List<Long> receivedHeartbeats = new ArrayList<Long>();
+    
+    @Override
+    public void heartbeat(long serverId) throws InvalidServerIdException,
+        TException {
+      if (failingClient)
+        throw new TException();
+      if (clientRemovedUs)
+        throw new InvalidServerIdException();
+      
+      receivedHeartbeats.add(new Date().getTime());
+    }
+  
+  }
+ 
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerCore.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerCore.java
new file mode 100644
index 00000000..0dd31893
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerCore.java
@@ -0,0 +1,236 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.notifier.EventType;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestServerCore {
+  static private Logger LOG = LoggerFactory.getLogger(TestServerCore.class);
+
+  static Configuration conf;
+  
+  @BeforeClass
+  public static void initConf() {
+    Configuration.addDefaultResource("namespace-notifier-server-default.xml");
+    Configuration.addDefaultResource("hdfs-default.xml");
+    conf = new Configuration();
+    conf.addResource("namespace-notifier-server-site.xml");
+    conf.addResource("hdfs-site.xml");
+    conf.set(ServerCore.SERVER_ID, "42");
+  }
+  
+  @Test
+  public void testClientOperations() throws Exception {
+    ServerCore core = new ServerCore(conf);
+    core.init(new EmptyServerLogReader(), new EmptyServerHistory(),
+        new EmptyServerDispatcher(), new EmptyServerHandler());
+    long clientId = 1000;
+    EmptyClientHandler handler = new EmptyClientHandler();
+    
+    core.addClient(new ClientData(clientId, handler, "host", 3000));
+    Assert.assertTrue(core.isRegistered(clientId));
+    Assert.assertEquals(handler, core.getClientData(clientId).handler);
+    Assert.assertEquals(1, core.getClients().size());
+    core.removeClient(clientId);
+    Assert.assertFalse(core.isRegistered(clientId));
+    Assert.assertEquals(0, core.getClients().size());
+  }
+  
+
+  @Test
+  public void testSubscription() throws Exception {
+    ServerCore core = new ServerCore(conf);
+    core.init(new EmptyServerLogReader(), new TestSubscriptionHistory(),
+        new EmptyServerDispatcher(), new EmptyServerHandler());
+    long id1 = 1000, id2 = 2000;
+    EmptyClientHandler handler1 = new EmptyClientHandler(),
+        handler2 = new EmptyClientHandler();
+    NamespaceEvent event = new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue());
+    
+    core.addClient(new ClientData(id1, handler1, "host", 3000));
+    core.addClient(new ClientData(id2, handler2, "host", 3001));
+    
+    Set<Long> clientsForNotification;
+    core.subscribeClient(id1, event, -1);
+    clientsForNotification = core.getClientsForNotification(
+        new NamespaceNotification("/a/b", event.type, 10));
+    Assert.assertEquals(1, clientsForNotification.size());
+    Assert.assertTrue(clientsForNotification.contains(id1));
+    
+    core.subscribeClient(id2, event, -1);
+    clientsForNotification = core.getClientsForNotification(
+        new NamespaceNotification("/a/b", event.type, 10));
+    Assert.assertEquals(2, clientsForNotification.size());
+    Assert.assertTrue(clientsForNotification.contains(id1));
+    Assert.assertTrue(clientsForNotification.contains(id2));
+    
+    core.unsubscribeClient(id1, event);
+    clientsForNotification = core.getClientsForNotification(
+        new NamespaceNotification("/a/b", event.type, 10));
+    Assert.assertEquals(1, clientsForNotification.size());
+    Assert.assertTrue(clientsForNotification.contains(id2));
+    
+    core.unsubscribeClient(id2, event);
+    clientsForNotification = core.getClientsForNotification(
+        new NamespaceNotification("/a/b", event.type, 10));
+    if (clientsForNotification != null)
+      Assert.assertEquals(0, clientsForNotification.size());
+    
+    // Test that TransactionIdTooOldException is thrown
+    try {
+      core.subscribeClient(id1, event, -2);
+      // We should get a transaction id too old exception
+      Assert.fail();
+    } catch (TransactionIdTooOldException e) {}
+    
+    // Test that the notifications are queued correctly
+    core.subscribeClient(id1, event, -3);
+    Queue<NamespaceNotification> notificationQueue =
+        core.getClientNotificationQueue(id1);
+    Assert.assertEquals(2, notificationQueue.size());
+    Assert.assertEquals(20, notificationQueue.poll().txId);
+    Assert.assertEquals(30, notificationQueue.poll().txId);
+    core.unsubscribeClient(id1, event);
+    
+    core.removeClient(id1);
+    core.removeClient(id2);
+  }
+
+
+  class TestSubscriptionHistory extends EmptyServerHistory {
+
+    @Override
+    public void addNotificationsToQueue(NamespaceEvent event, long txId,
+        Queue<NamespaceNotification> notifications)
+        throws TransactionIdTooOldException {
+      // Using -2 to mark a transaction which is too old
+      if (txId == -2)
+        throw new TransactionIdTooOldException();
+      
+      // Using -3 to mark we should add these 2 notifications
+      if (txId == -3) {
+        notifications.add(new NamespaceNotification("/a/b",
+            EventType.FILE_ADDED.getByteValue(), 20));
+        notifications.add(new NamespaceNotification("/a/c",
+            EventType.FILE_ADDED.getByteValue(), 30));
+      }
+    }
+  }
+  
+  
+  @Test
+  public void testNotificationHandling() throws Exception {
+    ServerCore core = new ServerCore(conf);
+    TestNotificationHandlingHistory history = new TestNotificationHandlingHistory();
+    core.init(new EmptyServerLogReader(), history, new EmptyServerDispatcher(),
+        new EmptyServerHandler());
+    NamespaceEvent event1 = new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue());
+    NamespaceEvent event2 = new NamespaceEvent("/b",
+        EventType.FILE_ADDED.getByteValue());
+    NamespaceEvent event3 = new NamespaceEvent("/c",
+        EventType.FILE_ADDED.getByteValue());
+    long txIdCount = 10;
+    long id1 = 1000, id2 = 2000;
+    EmptyClientHandler handler1 = new EmptyClientHandler(),
+        handler2 = new EmptyClientHandler();
+    
+    core.addClient(new ClientData(id1, handler1, "host", 3000));
+    core.addClient(new ClientData(id2, handler2, "host", 3001));
+    core.subscribeClient(id1, event1, -1);
+    core.subscribeClient(id2, event2, -1);
+    core.subscribeClient(id1, event3, -1);
+    core.subscribeClient(id2, event3, -1);
+
+    String[] possiblePaths = {"/a/", "/b/", "/c/"};
+    Random generator = new Random();
+    Queue<NamespaceNotification> client1ExpectedQueue =
+        new LinkedList<NamespaceNotification>();
+    Queue<NamespaceNotification> client2ExpectedQueue =
+        new LinkedList<NamespaceNotification>();
+    Queue<NamespaceNotification> historyExpectedQueue =
+        new LinkedList<NamespaceNotification>();
+    for (long txId = 0; txId < txIdCount; txId ++) {
+      String basePath = possiblePaths[generator.nextInt(3)];
+      NamespaceNotification n = new NamespaceNotification(basePath + txId,
+          EventType.FILE_ADDED.getByteValue(), txId);
+      
+      historyExpectedQueue.add(n);
+      if (basePath.equals("/a/") || basePath.equals("/c/"))
+        client1ExpectedQueue.add(n);
+      if (basePath.equals("/b/") || basePath.equals("/c/"))
+        client2ExpectedQueue.add(n);
+      
+      core.handleNotification(n);
+    }
+    
+    Assert.assertEquals(historyExpectedQueue.size(),
+        history.notifications.size());
+    Assert.assertEquals(client1ExpectedQueue.size(),
+        core.getClientNotificationQueue(id1).size());
+    Assert.assertEquals(client2ExpectedQueue.size(),
+        core.getClientNotificationQueue(id2).size());
+
+    while (!historyExpectedQueue.isEmpty())
+      Assert.assertEquals(historyExpectedQueue.poll(),
+          history.notifications.poll());
+    while (!client1ExpectedQueue.isEmpty())
+      Assert.assertEquals(client1ExpectedQueue.poll(),
+          core.getClientNotificationQueue(id1).poll());
+    while (!client2ExpectedQueue.isEmpty())
+      Assert.assertEquals(client2ExpectedQueue.poll(),
+          core.getClientNotificationQueue(id2).poll());
+    
+    core.unsubscribeClient(id1, event1);
+    core.unsubscribeClient(id2, event2);
+    core.unsubscribeClient(id1, event3);
+    core.unsubscribeClient(id2, event3);
+    core.removeClient(id1);
+    core.removeClient(id2);
+  }
+  
+  class TestNotificationHandlingHistory extends EmptyServerHistory {
+    
+    ConcurrentLinkedQueue<NamespaceNotification> notifications =
+        new ConcurrentLinkedQueue<NamespaceNotification>();
+    
+    @Override
+    public void storeNotification(NamespaceNotification notification) {
+      notifications.add(notification);
+    }
+  }
+
+  
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerDispatcher.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerDispatcher.java
new file mode 100644
index 00000000..dcf6eb0e
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerDispatcher.java
@@ -0,0 +1,410 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.notifier.EventType;
+import org.apache.hadoop.hdfs.notifier.InvalidServerIdException;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceEventKey;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.thrift.TException;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestServerDispatcher {
+  static private Logger LOG = LoggerFactory.getLogger(TestServerDispatcher.class);
+
+  static Configuration conf;
+  
+  @BeforeClass
+  public static void initConf() {
+    Configuration.addDefaultResource("namespace-notifier-server-default.xml");
+    Configuration.addDefaultResource("hdfs-default.xml");
+    conf = new Configuration();
+    conf.addResource("namespace-notifier-server.xml");
+    conf.addResource("hdfs-site.xml");
+    conf.set(ServerDispatcher.THREAD_POOLS_SIZE, "5");
+  }
+  
+  @Test
+  public void testBasicDispatch() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher dispatcher = new ServerDispatcher(core);
+    long clientId = 1000;
+    DummyClientHandler handler = new DummyClientHandler();
+    NamespaceEvent event = new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue());
+    Set<Long> subscriptions = new HashSet<Long>();
+    Thread dispatcherThread = new Thread(dispatcher);
+    
+    // Add only one client with one subscription
+    subscriptions.add(clientId);
+    core.clientQueues.put(clientId,
+        new ConcurrentLinkedQueue<NamespaceNotification>());
+    core.subscriptions.put(new NamespaceEventKey(event), subscriptions);
+    core.clients.put(clientId, new ClientData(clientId, handler, "host", 3000));
+    dispatcher.loopSleepTime = 20;
+    dispatcher.assignClient(clientId);
+    
+    // Add a notification and wait for it to be delivered
+    dispatcherThread.start();
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/b",
+        EventType.FILE_ADDED.getByteValue(), 10));
+    Thread.sleep(250);
+    core.shutdown();
+    dispatcherThread.join();
+    
+    // Check what was received
+    NamespaceNotification n;
+    Assert.assertEquals(1, handler.notificationQueue.size());
+    n = handler.notificationQueue.element();
+    Assert.assertEquals("/a/b", n.path);
+    Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    Assert.assertEquals(10, n.txId);
+  }
+  
+  
+  @Test
+  public void testDispatchOrder() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher dispatcher = new ServerDispatcher(core);
+    long clientId = 1000;
+    DummyClientHandler handler = new DummyClientHandler();
+    NamespaceEvent event = new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue());
+    NamespaceEvent event2 = new NamespaceEvent("/a/c",
+        EventType.FILE_CLOSED.getByteValue());
+    Set<Long> subscriptions = new HashSet<Long>();
+    Thread dispatcherThread = new Thread(dispatcher);
+    
+    // Add only one client with one subscription
+    subscriptions.add(clientId);
+    core.clientQueues.put(clientId,
+        new ConcurrentLinkedQueue<NamespaceNotification>());
+    core.subscriptions.put(new NamespaceEventKey(event), subscriptions);
+    core.subscriptions.put(new NamespaceEventKey(event2), subscriptions);
+    core.clients.put(clientId, new ClientData(clientId, handler, "host", 3000));
+    dispatcher.loopSleepTime = 20;
+    dispatcher.assignClient(clientId);
+    
+    dispatcherThread.start();
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/a",
+        EventType.FILE_ADDED.getByteValue(), 10));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/b",
+        EventType.FILE_ADDED.getByteValue(), 20));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/c",
+        EventType.FILE_ADDED.getByteValue(), 30));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/c",
+        EventType.FILE_CLOSED.getByteValue(), 40));
+    Thread.sleep(250);
+    core.shutdown();
+    dispatcherThread.join();
+    
+    // Check what was received
+    NamespaceNotification n;
+    Assert.assertEquals(4, handler.notificationQueue.size());
+    
+    n = handler.notificationQueue.poll();
+    Assert.assertEquals("/a/a", n.path);
+    Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    Assert.assertEquals(10, n.txId);
+    n = handler.notificationQueue.poll();
+    Assert.assertEquals("/a/b", n.path);
+    Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    Assert.assertEquals(20, n.txId);
+    n = handler.notificationQueue.poll();
+    Assert.assertEquals("/a/c", n.path);
+    Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    Assert.assertEquals(30, n.txId);
+    n = handler.notificationQueue.poll();
+    Assert.assertEquals("/a/c", n.path);
+    Assert.assertEquals(EventType.FILE_CLOSED.getByteValue(), n.type);
+    Assert.assertEquals(40, n.txId);
+  }
+  
+  
+  @Test
+  public void testDispatchOrderClientFailing() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher dispatcher = new ServerDispatcher(core);
+    long clientId = 1000;
+    DummyClientHandler handler = new DummyClientHandler();
+    NamespaceEvent event = new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue());
+    NamespaceEvent event2 = new NamespaceEvent("/a/c",
+        EventType.FILE_CLOSED.getByteValue());
+    Set<Long> subscriptions = new HashSet<Long>();
+    Thread dispatcherThread = new Thread(dispatcher);
+    
+    // Add only one client with one subscription
+    subscriptions.add(clientId);
+    core.clientQueues.put(clientId,
+        new ConcurrentLinkedQueue<NamespaceNotification>());
+    core.subscriptions.put(new NamespaceEventKey(event), subscriptions);
+    core.subscriptions.put(new NamespaceEventKey(event2), subscriptions);
+    core.clients.put(clientId, new ClientData(clientId, handler, "host", 3000));
+    dispatcher.assignClient(clientId);
+    dispatcher.loopSleepTime = 20;
+    
+    handler.failChance = 0.8f;
+    handler.failChanceDec = 0.1f;
+    
+    dispatcherThread.start();
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/a",
+        EventType.FILE_ADDED.getByteValue(), 10));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/b",
+        EventType.FILE_ADDED.getByteValue(), 20));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/c",
+        EventType.FILE_ADDED.getByteValue(), 30));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/c",
+        EventType.FILE_CLOSED.getByteValue(), 40));
+    Thread.sleep(1000);
+    core.shutdown();
+    dispatcherThread.join();
+    
+    // Check what was received
+    NamespaceNotification n;
+    Assert.assertEquals(4, handler.notificationQueue.size());
+    
+    n = handler.notificationQueue.poll();
+    Assert.assertEquals("/a/a", n.path);
+    Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    Assert.assertEquals(10, n.txId);
+    n = handler.notificationQueue.poll();
+    Assert.assertEquals("/a/b", n.path);
+    Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    Assert.assertEquals(20, n.txId);
+    n = handler.notificationQueue.poll();
+    Assert.assertEquals("/a/c", n.path);
+    Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    Assert.assertEquals(30, n.txId);
+    n = handler.notificationQueue.poll();
+    Assert.assertEquals("/a/c", n.path);
+    Assert.assertEquals(EventType.FILE_CLOSED.getByteValue(), n.type);
+    Assert.assertEquals(40, n.txId);
+  }
+  
+  
+  @Test
+  public void testMultipleClients() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher dispatcher = new ServerDispatcher(core);
+    long client1Id = 1000, client2Id = 2000;
+    DummyClientHandler handler1 = new DummyClientHandler(),
+        handler2 = new DummyClientHandler();
+    NamespaceEvent event1 = new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue());
+    NamespaceEvent event2 = new NamespaceEvent("/b",
+        EventType.FILE_ADDED.getByteValue());
+    NamespaceEvent eventCommon = new NamespaceEvent("/c",
+        EventType.FILE_ADDED.getByteValue());
+    Set<Long> subscriptions = new HashSet<Long>();
+    Thread dispatcherThread = new Thread(dispatcher);
+    
+    // Add only one client with one subscription
+    subscriptions.add(client1Id);
+    subscriptions.add(client2Id);
+    core.clientQueues.put(client1Id,
+        new ConcurrentLinkedQueue<NamespaceNotification>());
+    core.clientQueues.put(client2Id,
+        new ConcurrentLinkedQueue<NamespaceNotification>());
+    core.subscriptions.put(new NamespaceEventKey(eventCommon), subscriptions);
+    subscriptions = new HashSet<Long>();
+    subscriptions.add(client1Id);
+    core.subscriptions.put(new NamespaceEventKey(event1), subscriptions);
+    subscriptions = new HashSet<Long>();
+    subscriptions.add(client2Id);
+    core.subscriptions.put(new NamespaceEventKey(event2), subscriptions);
+    core.clients.put(client1Id, new ClientData(client1Id, handler1, "host", 3000));
+    core.clients.put(client2Id, new ClientData(client2Id, handler2, "host", 3000));
+    dispatcher.assignClient(client1Id);
+    dispatcher.assignClient(client2Id);
+    dispatcher.loopSleepTime = 1;
+    
+    handler1.failChance = 0.8f;
+    handler1.failChanceDec = 0.2f;
+    handler2.failChance = 0.8f;
+    handler2.failChanceDec = 0.2f;
+    
+    dispatcherThread.start();
+    
+    Random generator = new Random();
+    String[] basePaths = {"a", "b", "c"};
+    Queue<Long> client1ExpectedTxIds = new LinkedList<Long>();
+    Queue<Long> client2ExpectedTxIds = new LinkedList<Long>();
+    for (long txId = 0; txId < 3000; txId ++) {
+      String basePath = basePaths[generator.nextInt(3)];
+      
+      if (basePath.equals("a") || basePath.equals("c")) {
+        core.clientQueues.get(client1Id).add(new NamespaceNotification("/" + basePath +
+            "/" + txId, EventType.FILE_ADDED.getByteValue(), txId));
+        client1ExpectedTxIds.add(txId);
+      }
+      if (basePath.equals("b") || basePath.equals("c")) {
+        core.clientQueues.get(client2Id).add(new NamespaceNotification("/" + basePath +
+            "/" + txId, EventType.FILE_ADDED.getByteValue(), txId));
+        client2ExpectedTxIds.add(txId);
+      }
+    }
+
+    Thread.sleep(2500);
+    core.shutdown();
+    dispatcherThread.join();
+    
+    // Check for client 1
+    Assert.assertEquals(client1ExpectedTxIds.size(),
+        handler1.notificationQueue.size());
+    while (!client1ExpectedTxIds.isEmpty()) {
+      Long expectedTxId = client1ExpectedTxIds.poll();
+      Long receivedTxId = handler1.notificationQueue.poll().txId;
+      Assert.assertEquals(expectedTxId, receivedTxId);
+    }
+    // Check for client 2
+    Assert.assertEquals(client2ExpectedTxIds.size(),
+        handler2.notificationQueue.size());
+    while (!client2ExpectedTxIds.isEmpty()) {
+      Long expectedTxId = client2ExpectedTxIds.poll();
+      Long receivedTxId = handler2.notificationQueue.poll().txId;
+      Assert.assertEquals(expectedTxId, receivedTxId);
+    }
+  }
+  
+  
+  @Test
+  public void testDispatchFailing() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerDispatcher dispatcher = new ServerDispatcher(core);
+    long clientId = 1000;
+    DummyClientHandler handler = new DummyClientHandler();
+    NamespaceEvent event = new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue());
+    NamespaceEvent event2 = new NamespaceEvent("/a/c",
+        EventType.FILE_CLOSED.getByteValue());
+    Set<Long> subscriptions = new HashSet<Long>();
+    Thread dispatcherThread = new Thread(dispatcher);
+    
+    // Add only one client with one subscription
+    subscriptions.add(clientId);
+    core.clientQueues.put(clientId,
+        new ConcurrentLinkedQueue<NamespaceNotification>());
+    core.subscriptions.put(new NamespaceEventKey(event), subscriptions);
+    core.subscriptions.put(new NamespaceEventKey(event2), subscriptions);
+    core.clients.put(clientId, new ClientData(clientId, handler, "host", 3000));
+    dispatcher.loopSleepTime = 20;
+    
+    handler.failChance = 1.0f;
+    handler.failChanceDec = 1.0f;
+    
+    dispatcherThread.start();
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/a",
+        EventType.FILE_ADDED.getByteValue(), 10));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/b",
+        EventType.FILE_ADDED.getByteValue(), 20));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/c",
+        EventType.FILE_ADDED.getByteValue(), 30));
+    core.clientQueues.get(clientId).add(new NamespaceNotification("/a/c",
+        EventType.FILE_CLOSED.getByteValue(), 40));
+    Thread.sleep(140);
+    core.shutdown();
+    dispatcherThread.join();
+    
+    // Since we didn't assigned the client to this dispatcher, we
+    // shouldn't receive any notifications
+    Assert.assertEquals(0, handler.notificationQueue.size());
+  }
+  
+  
+  class DummyServerCore extends EmptyServerCore {
+    
+    ConcurrentMap<Long, ClientData> clients =
+        new ConcurrentHashMap<Long, ClientData>();
+    ConcurrentMap<Long, ConcurrentLinkedQueue<NamespaceNotification>> clientQueues =
+        new ConcurrentHashMap<Long, ConcurrentLinkedQueue<NamespaceNotification>>();
+    ConcurrentMap<NamespaceEventKey, Set<Long>> subscriptions =
+        new ConcurrentHashMap<NamespaceEventKey, Set<Long>>();
+    
+    @Override
+    public ClientData getClientData(long clientId) {
+      return clients.get(clientId);
+    }
+    
+    public Queue<NamespaceNotification> getClientNotificationQueue(long clientId) {
+      return clientQueues.get(clientId);
+    }
+    
+    @Override
+    public Set<Long> getClientsForNotification(NamespaceNotification n) {
+      Set<Long> clients = subscriptions.get(new NamespaceEventKey(n));
+      if (clients == null)
+        return new HashSet<Long>();
+      return null;
+    }
+    
+    @Override
+    public IServerHistory getHistory() {
+      return new EmptyServerHistory();
+    }
+    
+    @Override
+    public Configuration getConfiguration() {
+      return conf;
+    }
+  }
+  
+  
+  class DummyClientHandler extends EmptyClientHandler {
+    
+    float failChance = 0.0f;
+    float failChanceDec = 0.0f;
+    Random generator = new Random();
+    
+    // The order in which we received the notifications
+    ConcurrentLinkedQueue<NamespaceNotification> notificationQueue =
+        new ConcurrentLinkedQueue<NamespaceNotification>();
+    
+    @Override
+    public void handleNotification(NamespaceNotification notification,
+        long serverId) throws InvalidServerIdException, TException {
+      float randomVal = generator.nextFloat();
+
+      if (randomVal < failChance) {
+        failChance -= failChanceDec;
+        throw new TException("Randomly generated exception");
+      }
+      else {
+        failChance -= failChanceDec;
+        notificationQueue.add(notification);
+      }
+    }
+  
+  }
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerHistory.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerHistory.java
new file mode 100644
index 00000000..e6600ca8
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerHistory.java
@@ -0,0 +1,282 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentMap;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.notifier.EventType;
+import org.apache.hadoop.hdfs.notifier.NamespaceEvent;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.notifier.TransactionIdTooOldException;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestServerHistory {
+  static private Logger LOG = LoggerFactory.getLogger(TestServerHistory.class);
+
+  static Configuration conf;
+  
+  @BeforeClass
+  public static void initConf() {
+    Configuration.addDefaultResource("namespace-notifier-server-default.xml");
+    Configuration.addDefaultResource("hdfs-default.xml");
+    conf = new Configuration();
+    conf.addResource("namespace-notifier-server-site.xml");
+    conf.addResource("hdfs-site.xml");
+    conf = new Configuration();
+  }
+  
+  
+  /**
+   * Check that the ramp up phase runs for the (at least) configured
+   * amount of time.
+   * @throws Exception
+   */
+  @Test
+  public void testRampUp() throws Exception {
+    DummyServerCore core = new DummyServerCore();
+    ServerHistory history = new ServerHistory(core, true);
+    long initialTime = new Date().getTime();
+    long historyLength = 100;
+    history.setHistoryLength(historyLength);
+    
+    new Thread(history).start();
+    while (history.isRampUp())
+      Thread.sleep(1);
+    core.shutdown();
+    Assert.assertTrue(System.currentTimeMillis() - initialTime > historyLength);
+  }
+
+  
+  @Test
+  public void testBasicQueueNotification() throws Exception {
+    // Starting without a ramp-up phase
+    DummyServerCore core = new DummyServerCore();
+    ServerHistory history = new ServerHistory(core, false);
+    long historyLength = 100;
+    history.setHistoryLength(historyLength);
+    Queue<NamespaceNotification> historyNotifications;
+    
+    new Thread(history).start();
+    
+    // Step 1 - test with FILE_ADDED
+    history.storeNotification(new NamespaceNotification("/a/b",
+        EventType.FILE_ADDED.getByteValue(), 10));
+    history.storeNotification(new NamespaceNotification("/a/c",
+        EventType.FILE_ADDED.getByteValue(), 11));
+    historyNotifications = new LinkedList<NamespaceNotification>();
+    history.addNotificationsToQueue(new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue()), 10, historyNotifications);
+    Assert.assertEquals(1, historyNotifications.size());
+    Assert.assertEquals(11, historyNotifications.peek().txId);
+    Assert.assertEquals("/a/c", historyNotifications.peek().path);
+    
+    // Step 2 - test with FILE_CLOSED
+    history.storeNotification(new NamespaceNotification("/a/b",
+        EventType.FILE_CLOSED.getByteValue(), 12));
+    history.storeNotification(new NamespaceNotification("/a/b",
+        EventType.FILE_CLOSED.getByteValue(), 13));
+    historyNotifications = new LinkedList<NamespaceNotification>();
+    history.addNotificationsToQueue(new NamespaceEvent("/a/b",
+        EventType.FILE_CLOSED.getByteValue()), 12, historyNotifications);
+    Assert.assertEquals(1, historyNotifications.size());
+    Assert.assertEquals(13, historyNotifications.peek().txId);
+    Assert.assertEquals("/a/b", historyNotifications.peek().path);
+    
+    core.shutdown();
+  }
+
+  @Test
+  public void testTransactionIdTooOldDoesentHappen() throws Exception {
+    // Starting without a ramp-up phase
+    DummyServerCore core = new DummyServerCore();
+    ServerHistory history = new ServerHistory(core, false);
+    long historyLength = 350;
+    history.setHistoryLength(historyLength);
+    Queue<NamespaceNotification> historyNotifications;
+    
+    new Thread(history).start();
+    
+    // Step 1 - test with FILE_ADDED
+    history.storeNotification(new NamespaceNotification("/a/b",
+        EventType.FILE_ADDED.getByteValue(), 10));
+    history.storeNotification(new NamespaceNotification("/a/c",
+        EventType.FILE_ADDED.getByteValue(), 11));
+    historyNotifications = new LinkedList<NamespaceNotification>();
+    try {
+      Thread.sleep(historyLength - 30);
+      history.addNotificationsToQueue(new NamespaceEvent("/a",
+          EventType.FILE_ADDED.getByteValue()), 10, historyNotifications);
+    } catch (TransactionIdTooOldException e) {
+      Assert.fail();
+    }
+    
+    core.shutdown();
+  }
+
+
+  @Test
+  public void testTransactionIdTooOldDoesHappen() throws Exception {
+    // Starting without a ramp-up phase
+    DummyServerCore core = new DummyServerCore();
+    ServerHistory history = new ServerHistory(core, false);
+    long historyLength = 100;
+    history.setHistoryLength(historyLength);
+    Queue<NamespaceNotification> historyNotifications;
+    history.loopSleepTime = 10;
+    
+    new Thread(history).start();
+    
+    // Step 1 - test with FILE_ADDED
+    history.storeNotification(new NamespaceNotification("/a/b",
+        EventType.FILE_ADDED.getByteValue(), 10));
+    history.storeNotification(new NamespaceNotification("/a/c",
+        EventType.FILE_ADDED.getByteValue(), 11));
+    historyNotifications = new LinkedList<NamespaceNotification>();
+    try {
+      Thread.sleep(historyLength + 50);
+      history.addNotificationsToQueue(new NamespaceEvent("/a",
+          EventType.FILE_ADDED.getByteValue()), 10, historyNotifications);
+      Assert.fail(); // should receive the exception
+    } catch (TransactionIdTooOldException e) {}
+    
+    core.shutdown();
+  }
+  
+  
+  @Test
+  public void testHistoryMemoryCleanup1() throws Exception {
+    // Starting without a ramp-up phase
+    DummyServerCore core = new DummyServerCore();
+    ServerHistory history = new ServerHistory(core, false);
+    long historyLength = 100;
+    history.setHistoryLength(historyLength);
+    history.loopSleepTime = 10;
+    
+    new Thread(history).start();
+    
+    history.storeNotification(new NamespaceNotification("/a/b",
+        EventType.FILE_ADDED.getByteValue(), 10));
+    history.storeNotification(new NamespaceNotification("/a/c",
+        EventType.FILE_ADDED.getByteValue(), 11));
+    Thread.sleep(historyLength + 50);
+    Assert.assertFalse(history.history.containsKey("/a"));
+    core.shutdown();
+  }
+  
+  
+  @Test
+  public void testHistoryMemoryCleanup2() throws Exception {
+    // Starting without a ramp-up phase
+    DummyServerCore core = new DummyServerCore();
+    ServerHistory history = new ServerHistory(core, false);
+    long historyLength = 10000;
+    history.setHistoryLength(historyLength);
+    history.setHistoryLimit(1000);
+    history.loopSleepTime = 10;
+    Thread historyThread = new Thread(history);
+    
+    historyThread.start();
+    
+    for (int i = 0; i < 1500; i ++) {
+      history.storeNotification(new NamespaceNotification("/a/b" + i,
+          EventType.FILE_ADDED.getByteValue(), i));
+    }
+    
+    Thread.sleep(500);
+    core.shutdown();
+    historyThread.join();
+    
+    Assert.assertEquals(1000, history.orderedEntries.size());
+    Assert.assertEquals(1000, history.notificationsCount.get());
+    
+    // Make sure the tree also is consistent
+    int count = 0;
+    for (String path : history.history.keySet()) {
+      if (!history.history.containsKey(path))
+        continue;
+      for (Byte type : history.history.get(path).keySet()) {
+        count += history.history.get(path).get(type).size();
+      }
+    }
+    Assert.assertEquals(1000, count);
+  }
+  
+
+  @Test
+  public void testQueueNotificationAdvanced() throws Exception {
+    // Starting without a ramp-up phase
+    DummyServerCore core = new DummyServerCore();
+    ServerHistory history = new ServerHistory(core, false);
+    long historyLength = 10000;
+    history.setHistoryLength(historyLength);
+    Queue<NamespaceNotification> historyNotifications;
+    long txCount = 1001;
+    
+    new Thread(history).start();
+    
+    for (long txId = 0; txId < txCount; txId ++) {
+      history.storeNotification(new NamespaceNotification("/a/" + txId,
+          EventType.FILE_ADDED.getByteValue(), txId));
+    }
+
+    // Part 1 - Get all notifications
+    historyNotifications = new LinkedList<NamespaceNotification>();
+    history.addNotificationsToQueue(new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue()), 0, historyNotifications);
+    Assert.assertEquals(1000, historyNotifications.size());
+    for (long txId = 1; txId < txCount; txId ++) {
+      NamespaceNotification n = historyNotifications.poll();
+      Assert.assertEquals(txId, n.txId);
+      Assert.assertEquals("/a/" + txId, n.path);
+      Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    }
+    
+    // Part 2 - Get half of the notifications
+    historyNotifications = new LinkedList<NamespaceNotification>();
+    history.addNotificationsToQueue(new NamespaceEvent("/a",
+        EventType.FILE_ADDED.getByteValue()), 500, historyNotifications);
+    Assert.assertEquals(500, historyNotifications.size());
+    for (long txId = 501; txId < txCount; txId ++) {
+      NamespaceNotification n = historyNotifications.poll();
+      Assert.assertEquals(txId, n.txId);
+      Assert.assertEquals("/a/" + txId, n.path);
+      Assert.assertEquals(EventType.FILE_ADDED.getByteValue(), n.type);
+    }
+    
+    core.shutdown();
+  }
+
+  
+  class DummyServerCore extends EmptyServerCore {
+
+    @Override
+    public Configuration getConfiguration() {
+      return conf;
+    }
+  }
+
+}
diff --git a/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerLogReader.java b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerLogReader.java
new file mode 100644
index 00000000..c3213f02
--- /dev/null
+++ b/src/contrib/namespace-notifier/src/test/org/apache/hadoop/hdfs/notifier/server/TestServerLogReader.java
@@ -0,0 +1,322 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.notifier.server;
+
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Random;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.permission.PermissionStatus;
+import org.apache.hadoop.hdfs.notifier.NamespaceNotification;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.server.namenode.EditLogFileOutputStream;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class TestServerLogReader {
+  static private Logger LOG = LoggerFactory.getLogger(TestServerLogReader.class);
+
+  static Configuration conf;
+  
+  @BeforeClass
+  public static void initConf() {
+    Configuration.addDefaultResource("namespace-notifier-server-default.xml");
+    Configuration.addDefaultResource("hdfs-default.xml");
+    conf = new Configuration();
+    conf.addResource("namespace-notifier-server-site.xml");
+    conf.addResource("hdfs-site.xml");
+    conf = new Configuration();
+  }
+  
+  /**
+   * Creates the edits directory.
+   * @return edits dir
+   */
+  private File createEditsDir() {
+    while (true) {
+      File editsDir = new File(System.getProperty("java.io.tmpdir"),
+          new BigInteger(128, new Random()).toString(32));
+      if (!editsDir.mkdir())
+        continue;
+      return editsDir;
+    }
+  }
+  
+  
+  private EditLogFileOutputStream initEdits(File editsDir) throws IOException {
+    File edits = new File(editsDir, "edits");
+    File fstime = new File(editsDir, "fstime");
+
+    if (!edits.createNewFile())
+      throw new IOException("Failed to create edits file");
+    EditLogFileOutputStream out = new EditLogFileOutputStream(edits, null);
+    out.create();
+    if (!fstime.createNewFile())
+      throw new IOException("Failed to create fstime file");
+    
+    return out;
+  }
+  
+
+  private EditLogFileOutputStream beginRoll(File editsDir,
+      EditLogFileOutputStream editsOutput)
+          throws IOException {
+    File editsNew = new File(editsDir, "edits.new");
+
+    editsOutput.close();
+    if (!editsNew.createNewFile())
+      throw new IOException("Failed to create edits.new file");
+    EditLogFileOutputStream out = new EditLogFileOutputStream(editsNew, null);
+    out.create();
+    Assert.assertTrue(editsNew.exists());
+
+    return out;
+  }
+  
+  private void endRoll(File editsDir) throws IOException {
+    File edits = new File(editsDir, "edits");
+    File editsNew = new File(editsDir, "edits.new");
+    File fstime = new File(editsDir, "fstime");
+    
+    Assert.assertTrue(editsNew.exists());
+    Assert.assertTrue(fstime.exists());
+    if (!editsNew.renameTo(edits)) {
+      edits.delete();
+      if (!editsNew.renameTo(edits))
+        throw new IOException();
+    }
+    
+    fstime.delete();
+    DataOutputStream fstimeOutput =
+        new DataOutputStream(new FileOutputStream(fstime));
+    fstimeOutput.writeLong(System.currentTimeMillis());
+    fstimeOutput.flush();
+    fstimeOutput.close();
+  }
+  
+  
+  private void writeOperation(EditLogFileOutputStream out,
+      long txId) throws IOException {
+    FSEditLogOp.AddOp op = new FSEditLogOp.AddOp();
+    op.setTransactionId(txId);
+    op.set("/a/b", (short)3, 100L, 100L, 100L, new Block[0],
+        PermissionStatus.createImmutable("x", "y", FsPermission.getDefault()),
+        "x", "y");
+    out.write(op);
+    LOG.info("Wrote operation " + txId);
+    out.setReadyToFlush();
+    out.flush();
+    LOG.info("Flushed operation " + txId);
+  }
+  
+  
+  @Test
+  public void testOneOperation() throws Exception {
+    File editsDir = createEditsDir();
+    DummyServerCore core = new DummyServerCore();
+    EditLogFileOutputStream out = initEdits(editsDir);
+    ServerLogReader logReader = new ServerLogReader(core,
+        editsDir.getAbsolutePath());
+    core.logReader = logReader;
+    Thread coreThread, logReaderThread;
+    
+    coreThread = new Thread(core);
+    logReaderThread = new Thread(logReader);
+    
+    logReaderThread.start();
+    coreThread.start();
+    writeOperation(out, 1000);
+    Thread.sleep(500);
+    core.shutdown();
+    logReaderThread.join();
+    coreThread.join();
+    
+    Assert.assertEquals(1, core.notifications.size());
+    Assert.assertEquals(1000, core.notifications.poll().txId);
+  }
+  
+  @Test
+  public void testMultipleOperations() throws Exception {
+    File editsDir = createEditsDir();
+    DummyServerCore core = new DummyServerCore();
+    EditLogFileOutputStream out = initEdits(editsDir);
+    ServerLogReader logReader = new ServerLogReader(core,
+        editsDir.getAbsolutePath());
+    core.logReader = logReader;
+    Thread coreThread, logReaderThread;
+    long txCount = 1000;
+    
+    coreThread = new Thread(core);
+    logReaderThread = new Thread(logReader);
+    
+    logReaderThread.start();
+    coreThread.start();
+    for (long txId = 0; txId < txCount; txId ++)
+      writeOperation(out, txId);
+    Thread.sleep(500);
+    core.shutdown();
+    logReaderThread.join();
+    coreThread.join();
+    
+    Assert.assertEquals(1000, core.notifications.size());
+    for (long txId = 0; txId < txCount; txId ++)
+      Assert.assertEquals(txId, core.notifications.poll().txId);
+  }
+  
+  @Test
+  public void testTwoOperationsRoll() throws Exception {
+    File editsDir = createEditsDir();
+    DummyServerCore core = new DummyServerCore();
+    EditLogFileOutputStream out = initEdits(editsDir);
+    ServerLogReader logReader = new ServerLogReader(core,
+        editsDir.getAbsolutePath());
+    core.logReader = logReader;
+    Thread coreThread, logReaderThread;
+
+    coreThread = new Thread(core);
+    logReaderThread = new Thread(logReader);
+    
+    coreThread.start();
+    Thread.sleep(1000);
+    logReaderThread.start();
+    writeOperation(out, 1000);
+    out = beginRoll(editsDir, out);
+    writeOperation(out, 1001);
+    Thread.sleep(500);
+    endRoll(editsDir);
+    Thread.sleep(500);
+    core.shutdown();
+    logReaderThread.join();
+    coreThread.join();
+    
+    Assert.assertEquals(2, core.notifications.size());
+    Assert.assertEquals(1000, core.notifications.poll().txId);
+    Assert.assertEquals(1001, core.notifications.poll().txId);
+  }
+  
+  private void testMultipleOperationsRoll(long txPerNormalPhase,
+      long txPerRollPhase, long txCount) throws Exception {
+    File editsDir = createEditsDir();
+    DummyServerCore core = new DummyServerCore();
+    EditLogFileOutputStream out = initEdits(editsDir);
+    ServerLogReader logReader = new ServerLogReader(core,
+        editsDir.getAbsolutePath());
+    core.logReader = logReader;
+    Thread coreThread, logReaderThread;
+    boolean rollPhase = false;
+    
+    coreThread = new Thread(core);
+    logReaderThread = new Thread(logReader);
+    
+    logReaderThread.start();
+    coreThread.start();
+    Thread.sleep(1000);
+    
+    long count = 0;
+    for (long txId = 0; txId < txCount; txId ++) {
+      if (rollPhase) {
+        count --;
+        if (count == 0) {
+          rollPhase = false;
+          count = txPerNormalPhase;
+          endRoll(editsDir);
+        }
+      } else {
+        count --;
+        if (count == 0) {
+          rollPhase = true;
+          count = txPerRollPhase;
+          beginRoll(editsDir, out);
+        }
+      }
+      
+      writeOperation(out, txId);
+      Thread.sleep(2);
+    }
+    
+    Thread.sleep(1000);
+    core.shutdown();
+    logReaderThread.join();
+    coreThread.join();
+    
+    Assert.assertEquals(txCount, core.notifications.size());
+    for (long txId = 0; txId < txCount; txId ++)
+      Assert.assertEquals(txId, core.notifications.poll().txId);
+  }
+  
+  @Test
+  public void testMultipleOperationsBigRoll() throws Exception {
+    testMultipleOperationsRoll(3, 1000, 10000);
+  }
+  
+  @Test
+  public void testMultipleOperationsNormalRoll() throws Exception {
+    testMultipleOperationsRoll(1000, 1000, 10000);
+  }
+  
+  @Test
+  public void testMultipleOperationsSmallRoll() throws Exception {
+    testMultipleOperationsRoll(1000, 3, 10000);
+  }
+  
+  class DummyServerCore extends EmptyServerCore {
+
+    ConcurrentLinkedQueue<NamespaceNotification> notifications = 
+        new ConcurrentLinkedQueue<NamespaceNotification>();
+
+    IServerLogReader logReader;
+    
+    @Override
+    public void handleNotification(NamespaceNotification n) {
+      notifications.add(n);
+    }
+    
+    @Override
+    public void run() {
+      try {
+        while (!shutdownPending()) {
+          NamespaceNotification n = logReader.getNamespaceNotification();
+          if (n != null)
+            handleNotification(n);
+        }
+      } catch (IOException e) {
+        LOG.error("DummyServerCore failed reading notifications", e);
+      } finally {
+        shutdown();
+      }
+    }
+    
+    @Override
+    public Configuration getConfiguration() {
+      return conf;
+    }
+  }
+  
+}
diff --git a/src/contrib/raid/build.xml b/src/contrib/raid/build.xml
index c8abf89b..a23cdb6f 100644
--- a/src/contrib/raid/build.xml
+++ b/src/contrib/raid/build.xml
@@ -57,6 +57,10 @@ to call at top-level: ant deploy-contrib compile-core-test
      deprecation="${javac.deprecation}">
      <classpath refid="contrib-classpath"/>
     </javac>
+
+    <copy todir="${build.classes}">
+     <fileset dir="${src.dir}" includes="raid-default.xml"/>
+    </copy>
   </target>
 
   <target name="jar" depends="compile" unless="skip.contrib">
diff --git a/src/contrib/raid/conf/raid.xml b/src/contrib/raid/conf/raid.xml
index 3cf2dc66..81267a99 100644
--- a/src/contrib/raid/conf/raid.xml
+++ b/src/contrib/raid/conf/raid.xml
@@ -1,13 +1,6 @@
    <configuration>
     <srcPath prefix="hdfs://dfs1.xxx.com:8000/user/dhruba/">
       <policy name = "dhruba">
-        <property>
-          <name>srcReplication</name>
-          <value>3</value>
-          <description> pick files for RAID only if their replication factor is
-                        greater than or equal to this value.
-          </description>
-        </property>
         <property>
           <name>targetReplication</name>
           <value>2</value>
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/hdfs/DistributedRaidFileSystem.java b/src/contrib/raid/src/java/org/apache/hadoop/hdfs/DistributedRaidFileSystem.java
index d0995527..632e3843 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/hdfs/DistributedRaidFileSystem.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/hdfs/DistributedRaidFileSystem.java
@@ -17,19 +17,12 @@
  */
 package org.apache.hadoop.hdfs;
 
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.EOFException;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.net.URI;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Random;
-import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockMissingException;
@@ -38,21 +31,15 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FilterFileSystem;
 import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FSInputStream;
-import org.apache.hadoop.fs.BlockMissingException;
-import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.fs.RemoteIterator;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.raid.Codec;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
-import org.apache.hadoop.raid.Decoder;
 import org.apache.hadoop.raid.Decoder.DecoderInputStream;
 import org.apache.hadoop.raid.ParityFilePair;
 import org.apache.hadoop.raid.RaidNode;
@@ -82,6 +69,9 @@ public class DistributedRaidFileSystem extends FilterFileSystem {
    */
   public void initialize(URI name, Configuration conf) throws IOException {
     this.conf = conf;
+    
+    // init the codec from conf.
+    Codec.initializeCodecs(conf);
 
     Class<?> clazz = conf.getClass("fs.raid.underlyingfs.impl",
         DistributedFileSystem.class);
@@ -213,29 +203,78 @@ public boolean undelete(Path f, String userName) throws IOException {
     return true;
   }
 
+  /**
+   * search the Har-ed parity files
+   */
+  private boolean searchHarDir(FileStatus stat) 
+      throws IOException {
+    if (!stat.isDir()) {
+      return false;
+    }
+    String pattern = stat.getPath().toString() + "/*" + RaidNode.HAR_SUFFIX 
+        + "*";
+    FileStatus[] stats = globStatus(new Path(pattern));
+    if (stats != null && stats.length > 0) {
+      return true;
+    }
+      
+    stats = fs.listStatus(stat.getPath());
+   
+    // search deeper.
+    for (FileStatus status : stats) {
+      if (searchHarDir(status)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
   @Override
   public boolean rename(Path src, Path dst) throws IOException {
-    boolean renameParityFile = false;
-    Path srcParityPath = null;
-    Path destParityPath = null;
+    List<Path> srcParityList = new ArrayList<Path>();
+    List<Path> destParityList = new ArrayList<Path>();
     
-    for (Codec codec: Codec.getCodecs()) {
+    for (Codec codec : Codec.getCodecs()) {
       Path parityPath = new Path(codec.parityDirectory, makeRelative(src));
       if (fs.exists(parityPath)) {
-        renameParityFile = true;
-        srcParityPath = parityPath;
-        destParityPath = new Path(codec.parityDirectory, makeRelative(dst));
-        break;
+        
+        // check the HAR for directory
+        FileStatus stat = fs.getFileStatus(parityPath);
+        if (stat.isDir()) {
+          
+          // search for the har directory.
+          if (searchHarDir(stat)) {  
+            // HAR Path exists
+            throw new IOException("We can not rename the directory because " +
+                " there exists a HAR dir in the parity path. src = " + src);
+          }
+        }
+        
+        // we will rename the parity paths as well.
+        srcParityList.add(parityPath);
+        destParityList.add(new Path(codec.parityDirectory, makeRelative(dst)));
+      } else {
+        // check the HAR for file
+        ParityFilePair parityInHar = 
+            ParityFilePair.getParityFile(codec, src, conf);
+        if (null != parityInHar) {
+          // this means we have the parity file in HAR
+          // will throw an exception.
+          throw new IOException("We can not rename the file whose parity file" +
+              " is in HAR. src = " + src);
+        }
       }
     }
   
-  // rename the file
+    // rename the file
     if (!fs.rename(src, dst)) {
       return false;
     }
     
     // rename the parity file
-    if (renameParityFile) {
+    for (int i=0; i<srcParityList.size(); i++) {
+      Path srcParityPath = srcParityList.get(i);
+      Path destParityPath = destParityList.get(i);
       if (!fs.exists(destParityPath.getParent())) {
         fs.mkdirs(destParityPath.getParent());
       }
@@ -300,6 +339,8 @@ private static class ExtFsInputStream extends FSInputStream {
       private final long blockSize;
       private final int buffersize;
       private final Configuration conf;
+      private Configuration innerConf;
+      private List<ParityFilePair> parityFilePairs;
 
       ExtFsInputStream(Configuration conf, DistributedRaidFileSystem lfs,
           Path path, long fileSize, long blockSize, int buffersize)
@@ -327,6 +368,23 @@ private static class ExtFsInputStream extends FSInputStream {
         this.conf = conf;
         this.lfs = lfs;
         
+        // Initialize the "inner" conf, and cache this for all future uses.
+        //Make sure we use DFS and not DistributedRaidFileSystem for unRaid.
+        this.innerConf = new Configuration(conf);
+        Class<?> clazz = conf.getClass("fs.raid.underlyingfs.impl",
+            DistributedFileSystem.class);
+        this.innerConf.set("fs.hdfs.impl", clazz.getName());
+        // Disable caching so that a previously cached RaidDfs is not used.
+        this.innerConf.setBoolean("fs.hdfs.impl.disable.cache", true);
+        
+        // load the parity files
+        this.parityFilePairs = new ArrayList<ParityFilePair>();
+        for (Codec codec : Codec.getCodecs()) {
+          ParityFilePair ppair = ParityFilePair.getParityFile(codec, 
+              this.path, this.innerConf);
+          this.parityFilePairs.add(ppair);
+        }
+        
         // Open a stream to the first block.
         openCurrentStream();
       }
@@ -463,7 +521,7 @@ public synchronized int read(byte[] b, int offset, int len)
         nextLocation = 0;
         return value;
       }
-
+      
       @Override
       public synchronized int read(long position, byte[] b, int offset, int len) 
           throws IOException {
@@ -473,6 +531,7 @@ public synchronized int read(long position, byte[] b, int offset, int len)
           if (currentOffset >= fileSize) {
             return -1;
           }
+          
           openCurrentStream();
           int limit = Math.min(blockAvailable(), len);
           int value;
@@ -616,29 +675,25 @@ private DecoderInputStream getAlternateInputStream(IOException curexp,
             long offset, 
             final long readLimit) 
             throws IOException{
+        
+        // Start offset of block.
+        long corruptOffset = (offset / blockSize) * blockSize;
+        
+       
+        long fileLen = this.lfs.getFileStatus(path).getLen();
+        long limit = Math.min(readLimit, 
+            blockSize - (offset - corruptOffset));
+        limit = Math.min(limit, fileLen);
+        
         while (nextLocation < Codec.getCodecs().size()) {
           
           try {
             int idx = nextLocation++;
             Codec codec = Codec.getCodecs().get(idx);
             
-            // Start offset of block.
-            long corruptOffset = (offset / blockSize) * blockSize;
-            //Make sure we use DFS and not DistributedRaidFileSystem for unRaid.
-            Configuration clientConf = new Configuration(conf);
-            Class<?> clazz = conf.getClass("fs.raid.underlyingfs.impl",
-                DistributedFileSystem.class);
-            clientConf.set("fs.hdfs.impl", clazz.getName());
-            // Disable caching so that a previously cached RaidDfs is not used.
-            clientConf.setBoolean("fs.hdfs.impl.disable.cache", true);
-           
-            long fileLen = this.lfs.getFileStatus(path).getLen();
-            long limit = Math.min(readLimit, 
-                blockSize - (offset - corruptOffset));
-            limit = Math.min(limit, fileLen);
             DecoderInputStream recoveryStream = 
-                RaidNode.unRaidCorruptInputStream(clientConf, path,
-                codec, offset, limit);
+                RaidNode.unRaidCorruptInputStream(innerConf, path, 
+                codec, parityFilePairs.get(idx), blockSize, offset, limit);
             
             if (null != recoveryStream) {
               return recoveryStream;
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyRaid.java b/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyRaid.java
index 52946411..aaff33e4 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyRaid.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyRaid.java
@@ -97,6 +97,9 @@ public DatanodeDescriptor[] chooseTarget(String srcPath, int numOfReplicas,
       List<Node> exlcNodes, long blocksize) {
     try {
       FileInfo info = getFileInfo(srcPath);
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("FileType:" + srcPath + " " + info.type.name());
+      }
       if (info.type == FileType.NOT_RAID) {
         return super.chooseTarget(
             srcPath, numOfReplicas, writer, chosenNodes, exlcNodes, blocksize);
@@ -272,16 +275,19 @@ List<LocatedBlock> getCompanionBlocks(String path, FileInfo info, Block block)
       case TEMP_PARITY:
         return getCompanionBlocksForParityBlock(
             getSourceFile(path, codec.tmpParityDirectory),
-            path, codec.parityLength, codec.stripeLength, block);
+            path, codec.parityLength, codec.stripeLength, block,
+            codec.isDirRaid);
       case PARITY:
         return getCompanionBlocksForParityBlock(
             getSourceFile(path, codec.parityDirectory),
-            path, codec.parityLength, codec.stripeLength, block);
+            path, codec.parityLength, codec.stripeLength, block, 
+            codec.isDirRaid);
       case SOURCE:
         return getCompanionBlocksForSourceBlock(
             path,
-            getParityFile(codec.parityDirectory, path),
-            codec.parityLength, codec.stripeLength, block);
+            getParityFile(codec, path),
+            codec.parityLength, codec.stripeLength, block,
+            codec.isDirRaid);
     }
     return Collections.emptyList();
   }
@@ -294,88 +300,239 @@ private List<LocatedBlock> getCompanionBlocksForHarParityBlock(
     // location is not easy to obtain
     List<LocatedBlock> parityBlocks = cachedLocatedBlocks.get(parity);
     List<LocatedBlock> result = new ArrayList<LocatedBlock>();
-    synchronized (parityBlocks) {
-      int start = Math.max(0, blockIndex - parityLength + 1);
-      int end = Math.min(parityBlocks.size(), blockIndex + parityLength);
-      result.addAll(parityBlocks.subList(start, end));
-    }
+    int start = Math.max(0, blockIndex - parityLength + 1);
+    int end = Math.min(parityBlocks.size(), blockIndex + parityLength);
+    result.addAll(parityBlocks.subList(start, end));
     return result;
   }
+  
+  
+  /**
+   * Check if we will do the directory raid on the file.
+   * 
+   * @param fileBlocks, all the blocks of the file.
+   * @return
+   */
+  private boolean canDoDirectoryRaid(List<LocatedBlock> fileBlocks) {
+    long minFileSize = conf.getLong(RaidNode.MINIMUM_RAIDABLE_FILESIZE_KEY,
+        RaidNode.MINIMUM_RAIDABLE_FILESIZE);
+    long fileSize = 0;
+    for (LocatedBlock block : fileBlocks) {
+      fileSize += block.getBlock().getNumBytes();
+      if (fileSize >= minFileSize) {
+        return true;
+      }
+    }
+    return false;
+  }
 
   private List<LocatedBlock> getCompanionBlocksForParityBlock(
-      String src, String parity, int parityLength, int stripeLength, Block block)
+      String src, String parity, int parityLength, int stripeLength, 
+      Block block, boolean isDirRaid)
       throws IOException {
     int blockIndex = getBlockIndex(parity, block);
     List<LocatedBlock> result = new ArrayList<LocatedBlock>();
     List<LocatedBlock> parityBlocks = cachedLocatedBlocks.get(parity);
     int stripeIndex = blockIndex / parityLength;
-    synchronized (parityBlocks) {
-      int parityStart = stripeIndex * parityLength;
-      int parityEnd = Math.min(parityStart + parityLength,
-                               parityBlocks.size());
-      // for parity, always consider the neighbor blocks as companion blocks
-      if (parityStart < parityBlocks.size()) {
-        result.addAll(parityBlocks.subList(parityStart, parityEnd));
-      }
+    int parityStart = stripeIndex * parityLength;
+    int parityEnd = Math.min(parityStart + parityLength,
+        parityBlocks.size());
+    // for parity, always consider the neighbor blocks as companion blocks
+    if (parityStart < parityBlocks.size()) {
+      result.addAll(parityBlocks.subList(parityStart, parityEnd));
     }
-
+    
     if (src == null) {
       return result;
     }
-    List<LocatedBlock> sourceBlocks = cachedLocatedBlocks.get(src);
-    synchronized (sourceBlocks) {
-      int sourceStart = stripeIndex * stripeLength;
-      int sourceEnd = Math.min(sourceStart + stripeLength,
-                               sourceBlocks.size());
-      if (sourceStart < sourceBlocks.size()) {
-        result.addAll(sourceBlocks.subList(sourceStart, sourceEnd));
+    
+    // get the source blocks.
+    List<LocatedBlock> sourceBlocks;
+    int sourceStart = stripeIndex * stripeLength;
+    int sourceEnd = sourceStart + stripeLength;
+    
+    if (!isDirRaid) { 
+      sourceBlocks = cachedLocatedBlocks.get(src);
+    } else {
+      sourceBlocks = new ArrayList<LocatedBlock>();
+      INode inode = namesystem.dir.getInode(src);
+      INodeDirectory srcNode;
+      if (inode.isDirectory()) {
+        srcNode = (INodeDirectory) inode;
+      } else {
+        throw new IOException(
+            "The source should be a directory in Dir-Raiding: " + src);
       }
+      
+      boolean found = false;
+      // look for the stripe 
+      for (INode child : srcNode.getChildren()) {
+        if (child.isDirectory()) {
+          throw new IOException("The source is not a leaf directory: " + src
+              + ", contains a subdirectory: " + child.getLocalName());
+        }
+        
+        List<LocatedBlock> childBlocks = 
+            cachedLocatedBlocks.get(src + "/" + child.getLocalName());
+        
+        // check if we will do dir-raid on this file
+        if (!canDoDirectoryRaid(childBlocks)) {
+          continue;
+        }
+        
+        if (childBlocks.size() < sourceStart && !found) {
+          sourceStart -= childBlocks.size();
+          sourceEnd -= childBlocks.size();
+          continue;
+        } else {
+          found = true;
+          sourceBlocks.addAll(childBlocks);
+          if (sourceEnd <= sourceBlocks.size()) {
+            break;
+          }
+        }
+      }
+    } 
+    
+    sourceEnd = Math.min(sourceEnd,
+        sourceBlocks.size());
+    if (sourceStart < sourceBlocks.size()) {
+      result.addAll(sourceBlocks.subList(sourceStart, sourceEnd));
     }
+      
     return result;
   }
 
   private List<LocatedBlock> getCompanionBlocksForSourceBlock(
-      String src, String parity, int parityLength, int stripeLength, Block block)
+      String src, String parity, int parityLength, int stripeLength, 
+      Block block, boolean isDirRaid)
       throws IOException {
     int blockIndex = getBlockIndex(src, block);
     List<LocatedBlock> result = new ArrayList<LocatedBlock>();
-    List<LocatedBlock> sourceBlocks = cachedLocatedBlocks.get(src);
-    int stripeIndex = blockIndex / stripeLength;
-    synchronized (sourceBlocks) {
-      int sourceStart = stripeIndex * stripeLength;
-      int sourceEnd = Math.min(sourceStart + stripeLength,
-                               sourceBlocks.size());
-      if (sourceStart < sourceBlocks.size()) {
-        result.addAll(sourceBlocks.subList(sourceStart, sourceEnd));
+    List<LocatedBlock> sourceBlocks; 
+    
+    int stripeIndex = 0;
+    int sourceStart = 0;
+    int sourceEnd = 0;
+    
+    if (!isDirRaid) {
+      sourceBlocks = cachedLocatedBlocks.get(src);
+      stripeIndex = blockIndex / stripeLength;
+      sourceStart = stripeIndex * stripeLength;
+      sourceEnd = Math.min(sourceStart + stripeLength, sourceBlocks.size());
+    } else {
+      // cache the candidate blocks.
+      LocatedBlock[] tmpStripe = new LocatedBlock[stripeLength];
+      int curIdx = 0;
+      boolean found = false;
+      
+      sourceBlocks = new ArrayList<LocatedBlock>();
+      INodeDirectory srcNode = namesystem.dir.getInode(src).getParent();
+      String srcPath = new Path(src).getParent().toString();
+      
+      // look for the stripe
+      for (INode child : srcNode.getChildren()) {
+        if (child.isDirectory()) {
+          throw new IOException("The raided-directory is not a leaf directory: "
+              + srcPath + 
+              ", contains a subdirectory: " + child.getLocalName());
+        }
+        
+        String childName = srcPath + "/" + child.getLocalName();
+        List<LocatedBlock> childBlocks = cachedLocatedBlocks.get(childName);
+        
+        // check if we will do dir-raid on this file
+        if (!canDoDirectoryRaid(childBlocks)) {
+          continue;
+        }
+        
+        if (found) {
+          if (sourceEnd <= sourceBlocks.size()) {
+            break;
+          }
+          sourceBlocks.addAll(childBlocks);
+        } else {
+          int childBlockSize = childBlocks.size();
+          
+          /** 
+           * If we find the target file, we will addAll the
+           * cached blocks and the child blocks. 
+           * And update the metrics like stripeIndex, sourceStart and sourceEnd.
+           * 
+           */
+          if (childName.equals(src)) {
+            found = true;
+            for (int i=0; i<curIdx; i++) {
+              sourceBlocks.add(tmpStripe[i]);
+            }
+            sourceBlocks.addAll(childBlocks);
+            blockIndex += curIdx;
+            
+            stripeIndex += blockIndex / stripeLength;
+            sourceStart = (blockIndex / stripeLength) * stripeLength;
+            sourceEnd = sourceStart + stripeLength;
+          } else {
+            /**
+             * If not find the target file, we will keep the current stripe
+             * in the temp stripe cache.
+             */
+            /**
+             * the childBlockSize is small, and we can fill them into 
+             * current temp stripe cache.
+             */
+            if (curIdx + childBlockSize < stripeLength) {
+              for (int i=0; i<childBlockSize; i++) {
+                tmpStripe[curIdx++] = childBlocks.get(i);
+              }
+            } else {
+              /**
+               * The childBlockSize is not small, We need to calculate 
+               * the place in the stripe cache, and copy the current stripe 
+               * into the temp stripe cache.
+               */
+              stripeIndex += (curIdx + childBlockSize) / stripeLength;
+              int childStart = ((curIdx + childBlockSize) / stripeLength) 
+                  * stripeLength - curIdx;
+              curIdx = 0;
+              for (; childStart<childBlockSize;) {
+                tmpStripe[curIdx++] = childBlocks.get(childStart++);
+              }
+              curIdx %= stripeLength;
+            }
+          }
+        }
       }
+      sourceEnd = Math.min(sourceEnd, sourceBlocks.size());
+    } 
+    
+    if (sourceStart < sourceBlocks.size()) {
+      result.addAll(sourceBlocks.subList(sourceStart, sourceEnd));
     }
-    if (parity == null) {
+      if (parity == null) {
       return result;
     }
+    
+    // get the parity blocks.
     List<LocatedBlock> parityBlocks = cachedLocatedBlocks.get(parity);
-    synchronized (parityBlocks) {
-      int parityStart = stripeIndex * parityLength;
-      int parityEnd = Math.min(parityStart + parityLength,
-                               parityBlocks.size());
-      if (parityStart < parityBlocks.size()) {
-        result.addAll(parityBlocks.subList(parityStart, parityEnd));
-      }
+    int parityStart = stripeIndex * parityLength;
+    int parityEnd = Math.min(parityStart + parityLength,
+        parityBlocks.size());
+    if (parityStart < parityBlocks.size()) {
+      result.addAll(parityBlocks.subList(parityStart, parityEnd));
     }
     return result;
   }
 
   private int getBlockIndex(String file, Block block) throws IOException {
     List<LocatedBlock> blocks = cachedLocatedBlocks.get(file);
-    synchronized (blocks) {
-      // null indicates that this block is currently added. Return size()
-      // as the index in this case
-	    if (block == null) {
-	      return blocks.size();
-	    }
-      for (int i = 0; i < blocks.size(); i++) {
-        if (blocks.get(i).getBlock().equals(block)) {
-          return i;
-        }
+    // null indicates that this block is currently added. Return size()
+    // as the index in this case
+    if (block == null) {
+      return blocks.size();
+    }
+    for (int i = 0; i < blocks.size(); i++) {
+      if (blocks.get(i).getBlock().equals(block)) {
+        return i;
       }
     }
     throw new IOException("Cannot locate " + block + " in file " + file);
@@ -446,9 +603,9 @@ public List<LocatedBlock> getDirectly(String file) throws IOException {
           namesystem.getBlockLocationsInternal(inode, 0, Long.MAX_VALUE,
                                        Integer.MAX_VALUE).getLocatedBlocks();
       if (result == null) {
-        result = new ArrayList<LocatedBlock>();
+        return Collections.emptyList(); 
       }
-      return result;
+      return Collections.unmodifiableList(result);
     }
   }
 
@@ -520,12 +677,19 @@ String getSourceFile(String parity, String prefix) throws IOException {
 
   /**
    * Get path for the parity file. Returns null if it does not exists
-   * @param parityPrefix usuall "/raid/" or "/raidrs/"
+   * @param codec the codec of the parity file.
    * @return the toUri path of the parity file
    */
-  private String getParityFile(String parityPrefix, String src)
+  private String getParityFile(Codec codec, String src)
       throws IOException {
-    String parity = parityPrefix + src;
+    String parity;
+    if (codec.isDirRaid) {
+      String parent = new Path(src).getParent().toString();
+      parity = codec.parityDirectory + parent;
+    } else {
+      parity = codec.parityDirectory + src;
+    }
+    
     if (namesystem.dir.getInode(parity) == null) {
       return null;
     }
@@ -572,7 +736,7 @@ protected FileInfo getFileInfo(String path) throws IOException {
       if (path.startsWith(c.parityDirectory + Path.SEPARATOR)) {
         return new FileInfo(FileType.PARITY, c);
       }
-      String parity = getParityFile(c.parityDirectory, path);
+      String parity = getParityFile(c, path);
       if (parity != null) {
         return new FileInfo(FileType.SOURCE, c);
       }
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockIntegrityMonitor.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockIntegrityMonitor.java
index 6069b00b..07c221f5 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockIntegrityMonitor.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockIntegrityMonitor.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import org.apache.hadoop.conf.Configuration;
@@ -93,6 +94,7 @@ public static BlockIntegrityMonitor createBlockIntegrityMonitor(
   private long numFileCopyFailures = 0;
   private long numBlockFixSimulationFailures = 0;
   private long numBlockFixSimulationSuccess = 0;
+  private long numFilesToFixDropped = 0;
   
   public volatile boolean running = true;
 
@@ -181,6 +183,7 @@ protected synchronized void incrFileFixFailures(long incr) {
     numFileFixFailures += incr;
   }
   
+   
   /**
    * Returns the number of corrupt files that have been fixed by this
    * integrity monitor.
@@ -254,37 +257,38 @@ protected synchronized void incrFilesCopied(long incr) {
     numFilesCopied += incr;
   }
 
-  static boolean isSourceFile(String p, String[] destPrefixes) {
-    for (String destPrefix: destPrefixes) {
-      if (p.startsWith(destPrefix)) {
+  static boolean isSourceFile(String p) {
+    for (Codec codec: Codec.getCodecs()) {
+      if (p.startsWith(codec.getParityPrefix())) {
         return false;
       }
     }
     return true;
   }
 
-  String[] destPrefixes() throws IOException {
-    List<String> prefixes = new ArrayList<String>();
-    for (Codec codec: Codec.getCodecs()) {
-      prefixes.add(codec.getParityPrefix());
-    }
-    return prefixes.toArray(new String[0]);
-  }
-
-  static boolean doesParityDirExist(
-      FileSystem parityFs, String path, String[] destPrefixes)
+  static boolean doesParityDirExist(FileSystem parityFs, String path)
       throws IOException {
     // Check if it is impossible to have a parity file. We check if the
     // parent directory of the lost file exists under a parity path.
     // If the directory does not exist, the parity file cannot exist.
-    String parentUriPath = new Path(path).getParent().toUri().getPath();
-    // Remove leading '/', if any.
-    if (parentUriPath.startsWith(Path.SEPARATOR)) {
-      parentUriPath = parentUriPath.substring(1);
-    }
+    Path fileRaidParent = new Path(path).getParent();
+    Path dirRaidParent = (fileRaidParent != null)? fileRaidParent.getParent(): null;
     boolean parityCanExist = false;
-    for (String destPrefix: destPrefixes) {
-      Path parityDir = new Path(destPrefix, parentUriPath);
+    for (Codec codec: Codec.getCodecs()) {
+      Path parityDir = null;
+      if (codec.isDirRaid) {
+        if (dirRaidParent == null) 
+          continue;
+        parityDir = (dirRaidParent.depth() == 0)?
+          new Path(codec.getParityPrefix()):
+          new Path(codec.getParityPrefix(),
+              RaidNode.makeRelative(dirRaidParent));
+      } else {
+        parityDir = (fileRaidParent.depth() == 0)?
+          new Path(codec.getParityPrefix()):
+          new Path(codec.getParityPrefix(),
+              RaidNode.makeRelative(fileRaidParent));
+      }
       if (parityFs.exists(parityDir)) {
         parityCanExist = true;
         break;
@@ -296,11 +300,10 @@ static boolean doesParityDirExist(
   void filterUnreconstructableSourceFiles(FileSystem parityFs, 
       Iterator<String> it)
       throws IOException {
-    String[] destPrefixes = destPrefixes();
     while (it.hasNext()) {
       String p = it.next();
-      if (isSourceFile(p, destPrefixes) &&
-          !doesParityDirExist(parityFs, p, destPrefixes)) {
+      if (isSourceFile(p) &&
+          !doesParityDirExist(parityFs, p)) {
           it.remove();
       }
     }
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockReconstructor.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockReconstructor.java
index a52fef88..146f1a60 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockReconstructor.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockReconstructor.java
@@ -74,7 +74,7 @@ boolean isParityFile(String pathStr, Codec c) {
     }
     return pathStr.startsWith(c.getParityPrefix());
   }
-
+  
   /**
    * Fix a file, report progess.
    *
@@ -95,7 +95,8 @@ boolean reconstructFile(Path srcPath, Context context)
     // Reconstruct parity file
     for (Codec codec : Codec.getCodecs()) {
       if (isParityFile(srcPath, codec)) {
-        return processParityFile(srcPath, new Encoder(getConf(), codec), progress);
+        return processParityFile(srcPath, 
+            new Decoder(getConf(), codec), context);
       }
     }
 
@@ -226,10 +227,16 @@ boolean processFile(Path srcPath, ParityFilePair parityPair,
    * @return true if file was reconstructed, false if no reconstruction 
    * was necessary or possible.
    */
-  boolean processParityFile(Path parityPath, Encoder encoder, 
-      Progressable progress)
-  throws IOException {
+  boolean processParityFile(Path parityPath, Decoder decoder, 
+      Context context)
+  throws IOException, InterruptedException {
     LOG.info("Processing parity file " + parityPath);
+    
+    Progressable progress = context;
+    if (progress == null) {
+      progress = RaidUtils.NULL_PROGRESSABLE;
+    }
+    
     Path srcPath = sourcePathFromParityPath(parityPath);
     if (srcPath == null) {
       LOG.warn("Could not get regular file corresponding to parity file " +  
@@ -238,10 +245,10 @@ boolean processParityFile(Path parityPath, Encoder encoder,
     }
 
     DistributedFileSystem parityFs = getDFS(parityPath);
+    DistributedFileSystem srcFs = getDFS(srcPath);
     FileStatus parityStat = parityFs.getFileStatus(parityPath);
     long blockSize = parityStat.getBlockSize();
-    FileStatus srcStat = getDFS(srcPath).getFileStatus(srcPath);
-    long srcFileSize = srcStat.getLen();
+    FileStatus srcStat = srcFs.getFileStatus(srcPath);
 
     // Check timestamp.
     if (srcStat.getModificationTime() != parityStat.getModificationTime()) {
@@ -271,9 +278,8 @@ boolean processParityFile(Path parityPath, Encoder encoder,
       localBlockFile.deleteOnExit();
 
       try {
-        encoder.recoverParityBlockToFile(parityFs, srcPath, srcFileSize,
-            blockSize, parityPath, 
-            lostBlockOffset, localBlockFile, progress);
+        decoder.recoverParityBlockToFile(srcFs, srcPath, parityFs, parityPath, 
+            blockSize, lostBlockOffset, localBlockFile, context);
         
         // Now that we have recovered the parity file block locally, send it.
         String datanode = chooseDatanode(lb.getLocations());
@@ -412,7 +418,7 @@ private void processParityHarPartBlock(FileSystem dfs, Path partFile,
         LOG.info(partFile + ":" + offset + " maps to " +
             parityFile + ":" + lostOffsetInParity +
             " and will be recovered from " + srcFile);
-        encoder.recoverParityBlockToStream(dfs, srcFile, srcStat.getLen(),
+        encoder.recoverParityBlockToStream(dfs, srcStat,
             srcStat.getBlockSize(), parityFile,
             lostOffsetInParity, out, progress);
         // Finished recovery of one parity block. Since a parity block has the
@@ -568,7 +574,7 @@ private void computeMetadataAndSendReconstructedBlock(String datanode,
    */
   private void sendReconstructedBlock(String datanode,
       final InputStream blockContents,
-      DataInputStream metadataIn,
+      final DataInputStream metadataIn,
       Block block, long blockSize,
       int dataTransferVersion, int namespaceId,
       Progressable progress) 
@@ -604,15 +610,20 @@ private void sendReconstructedBlock(String datanode,
         new BlockSender(namespaceId, block, blockSize, 0, blockSize,
             corruptChecksumOk, chunkOffsetOK, verifyChecksum,
             transferToAllowed,
-            metadataIn, new BlockSender.InputStreamFactory() {
+            new BlockSender.InputStreamFactory() {
           @Override
           public InputStream createStream(long offset) 
-          throws IOException {
+              throws IOException {
             // we are passing 0 as the offset above,
             // so we can safely ignore
             // the offset passed
             return blockContents;
           }
+          @Override
+          public DataInputStream getChecksumStream()
+              throws IOException {
+            return metadataIn;
+          }
         });
 
       // Header info
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockReconstructor.java.orig b/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockReconstructor.java.orig
new file mode 100644
index 00000000..86827d3a
--- /dev/null
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockReconstructor.java.orig
@@ -0,0 +1,774 @@
+package org.apache.hadoop.raid;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.channels.SocketChannel;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlockWithMetaInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
+import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlocks;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.datanode.BlockSender;
+import org.apache.hadoop.hdfs.server.datanode.FSDataset;
+import org.apache.hadoop.mapreduce.Counters;
+import org.apache.hadoop.mapreduce.Mapper.Context;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.Progressable;
+
+/**
+ * this class implements the actual reconstructing functionality
+ * we keep this in a separate class so that 
+ * the distributed block fixer can use it
+ */ 
+abstract class BlockReconstructor extends Configured {
+
+  public static final Log LOG = LogFactory.getLog(BlockReconstructor.class);
+
+  BlockReconstructor(Configuration conf) throws IOException {
+    super(conf);
+  }
+
+  /**
+   * Is the path a parity file of a given Codec?
+   */
+  boolean isParityFile(Path p, Codec c) {
+    return isParityFile(p.toUri().getPath(), c);
+  }
+
+  boolean isParityFile(String pathStr, Codec c) {
+    if (pathStr.contains(RaidNode.HAR_SUFFIX)) {
+      return false;
+    }
+    return pathStr.startsWith(c.getParityPrefix());
+  }
+  
+  /**
+   * Fix a file, report progess.
+   *
+   * @return true if file was reconstructed, false if no reconstruction 
+   * was necessary or possible.
+   */
+  boolean reconstructFile(Path srcPath, Context context)
+      throws IOException, InterruptedException {
+    Progressable progress = context;
+    if (progress == null) {
+      progress = RaidUtils.NULL_PROGRESSABLE;
+    }
+
+    if (RaidNode.isParityHarPartFile(srcPath)) {
+      return processParityHarPartFile(srcPath, progress);
+    }
+
+    // Reconstruct parity file
+    for (Codec codec : Codec.getCodecs()) {
+      if (isParityFile(srcPath, codec)) {
+        return processParityFile(srcPath, 
+            new Decoder(getConf(), codec), context);
+      }
+    }
+
+    // Reconstruct source file
+    for (Codec codec : Codec.getCodecs()) {
+      ParityFilePair ppair = ParityFilePair.getParityFile(
+          codec, srcPath, getConf());
+      if (ppair != null) {
+        Decoder decoder = new Decoder(getConf(), codec);
+        return processFile(srcPath, ppair, decoder, context);
+      }
+    }
+
+    // there was nothing to do
+    LOG.warn("Could not find parity file for source file "
+        + srcPath + ", ignoring...");
+    return false;    
+  }
+
+  /**
+   * Sorts source files ahead of parity files.
+   */
+  void sortLostFiles(List<String> files) {
+    // TODO: We should first fix the files that lose more blocks
+    Comparator<String> comp = new Comparator<String>() {
+      public int compare(String p1, String p2) {
+        Codec c1 = null;
+        Codec c2 = null;
+        for (Codec codec : Codec.getCodecs()) {
+          if (isParityFile(p1, codec)) {
+            c1 = codec;
+          } else if (isParityFile(p2, codec)) {
+            c2 = codec;
+          }
+        }
+        if (c1 == null && c2 == null) {
+          return 0; // both are source files
+        }
+        if (c1 == null && c2 != null) {
+          return -1; // only p1 is a source file
+        }
+        if (c2 == null && c1 != null) {
+          return 1; // only p2 is a source file
+        }
+        return c2.priority - c1.priority; // descending order
+      }
+    };
+    Collections.sort(files, comp);
+  }
+
+  /**
+   * Returns a DistributedFileSystem hosting the path supplied.
+   */
+  protected DistributedFileSystem getDFS(Path p) throws IOException {
+    return (DistributedFileSystem) p.getFileSystem(getConf());
+  }
+
+  /**
+   * Reads through a source file reconstructing lost blocks on the way.
+   * @param srcPath Path identifying the lost file.
+   * @throws IOException
+   * @return true if file was reconstructed, false if no reconstruction 
+   * was necessary or possible.
+   */
+  boolean processFile(Path srcPath, ParityFilePair parityPair,
+      Decoder decoder, Context context) throws IOException,
+      InterruptedException {
+    LOG.info("Processing file " + srcPath);
+    Progressable progress = context;
+    if (progress == null) {
+      progress = RaidUtils.NULL_PROGRESSABLE;
+    }
+
+    DistributedFileSystem srcFs = getDFS(srcPath);
+    FileStatus srcStat = srcFs.getFileStatus(srcPath);
+    long blockSize = srcStat.getBlockSize();
+    long srcFileSize = srcStat.getLen();
+    String uriPath = srcPath.toUri().getPath();
+
+    int numBlocksReconstructed = 0;
+    List<LocatedBlockWithMetaInfo> lostBlocks = lostBlocksInFile(srcFs, uriPath, srcStat);
+    if (lostBlocks.size() == 0) {
+      LOG.warn("Couldn't find any lost blocks in file " + srcPath + 
+          ", ignoring...");
+      return false;
+    }
+    for (LocatedBlockWithMetaInfo lb: lostBlocks) {
+      Block lostBlock = lb.getBlock();
+      long lostBlockOffset = lb.getStartOffset();
+
+      LOG.info("Found lost block " + lostBlock +
+          ", offset " + lostBlockOffset);
+
+      final long blockContentsSize =
+        Math.min(blockSize, srcFileSize - lostBlockOffset);
+      File localBlockFile =
+        File.createTempFile(lostBlock.getBlockName(), ".tmp");
+      localBlockFile.deleteOnExit();
+
+      try {
+        decoder.recoverBlockToFile(srcFs, srcPath, parityPair.getFileSystem(),
+            parityPair.getPath(), blockSize,
+            lostBlockOffset, localBlockFile,
+            blockContentsSize, context);
+
+        // Now that we have recovered the file block locally, send it.
+        String datanode = chooseDatanode(lb.getLocations());
+        computeMetadataAndSendReconstructedBlock(datanode, localBlockFile,
+            lostBlock, blockContentsSize,
+            lb.getDataProtocolVersion(), lb.getNamespaceID(), progress);
+        
+        numBlocksReconstructed++;
+
+      } finally {
+        localBlockFile.delete();
+      }
+      progress.progress();
+    }
+    
+    LOG.info("Reconstructed " + numBlocksReconstructed + " blocks in " + srcPath);
+    return true;
+  }
+
+  /**
+   * Reads through a parity file, reconstructing lost blocks on the way.
+   * This function uses the corresponding source file to regenerate parity
+   * file blocks.
+   * @return true if file was reconstructed, false if no reconstruction 
+   * was necessary or possible.
+   */
+  boolean processParityFile(Path parityPath, Decoder decoder, 
+      Context context)
+  throws IOException, InterruptedException {
+    LOG.info("Processing parity file " + parityPath);
+    
+    Progressable progress = context;
+    if (progress == null) {
+      progress = RaidUtils.NULL_PROGRESSABLE;
+    }
+    
+    Path srcPath = sourcePathFromParityPath(parityPath);
+    if (srcPath == null) {
+      LOG.warn("Could not get regular file corresponding to parity file " +  
+          parityPath + ", ignoring...");
+      return false;
+    }
+
+    DistributedFileSystem parityFs = getDFS(parityPath);
+    DistributedFileSystem srcFs = getDFS(srcPath);
+    FileStatus parityStat = parityFs.getFileStatus(parityPath);
+    long blockSize = parityStat.getBlockSize();
+    FileStatus srcStat = srcFs.getFileStatus(srcPath);
+
+    // Check timestamp.
+    if (srcStat.getModificationTime() != parityStat.getModificationTime()) {
+      LOG.warn("Mismatching timestamp for " + srcPath + " and " + parityPath + 
+          ", ignoring...");
+      return false;
+    }
+
+    String uriPath = parityPath.toUri().getPath();
+    int numBlocksReconstructed = 0;
+    List<LocatedBlockWithMetaInfo> lostBlocks = 
+      lostBlocksInFile(parityFs, uriPath, parityStat);
+    if (lostBlocks.size() == 0) {
+      LOG.warn("Couldn't find any lost blocks in parity file " + parityPath + 
+          ", ignoring...");
+      return false;
+    }
+    for (LocatedBlockWithMetaInfo lb: lostBlocks) {
+      Block lostBlock = lb.getBlock();
+      long lostBlockOffset = lb.getStartOffset();
+
+      LOG.info("Found lost block " + lostBlock +
+          ", offset " + lostBlockOffset);
+
+      File localBlockFile =
+        File.createTempFile(lostBlock.getBlockName(), ".tmp");
+      localBlockFile.deleteOnExit();
+
+      try {
+        decoder.recoverParityBlockToFile(srcFs, srcPath, parityFs, parityPath, 
+            blockSize, lostBlockOffset, localBlockFile, context);
+        
+        // Now that we have recovered the parity file block locally, send it.
+        String datanode = chooseDatanode(lb.getLocations());
+        computeMetadataAndSendReconstructedBlock(
+            datanode, localBlockFile, 
+            lostBlock, blockSize,
+            lb.getDataProtocolVersion(), lb.getNamespaceID(),
+            progress);
+
+        numBlocksReconstructed++;
+      } finally {
+        localBlockFile.delete();
+      }
+      progress.progress();
+    }
+    
+    LOG.info("Reconstructed " + numBlocksReconstructed + " blocks in " + parityPath);
+    return true;
+  }
+
+  /**
+   * Reads through a parity HAR part file, reconstructing lost blocks on the way.
+   * A HAR block can contain many file blocks, as long as the HAR part file
+   * block size is a multiple of the file block size.
+   * @return true if file was reconstructed, false if no reconstruction 
+   * was necessary or possible.
+   */
+  boolean processParityHarPartFile(Path partFile,
+      Progressable progress)
+  throws IOException {
+    LOG.info("Processing parity HAR file " + partFile);
+    // Get some basic information.
+    DistributedFileSystem dfs = getDFS(partFile);
+    FileStatus partFileStat = dfs.getFileStatus(partFile);
+    long partFileBlockSize = partFileStat.getBlockSize();
+    LOG.info(partFile + " has block size " + partFileBlockSize);
+
+    // Find the path to the index file.
+    // Parity file HARs are only one level deep, so the index files is at the
+    // same level as the part file.
+    // Parses through the HAR index file.
+    HarIndex harIndex = HarIndex.getHarIndex(dfs, partFile);
+    String uriPath = partFile.toUri().getPath();
+    int numBlocksReconstructed = 0;
+    List<LocatedBlockWithMetaInfo> lostBlocks = lostBlocksInFile(dfs, uriPath, 
+        partFileStat);
+    if (lostBlocks.size() == 0) {
+      LOG.warn("Couldn't find any lost blocks in HAR file " + partFile + 
+          ", ignoring...");
+      return false;
+    }
+    for (LocatedBlockWithMetaInfo lb: lostBlocks) {
+      Block lostBlock = lb.getBlock();
+      long lostBlockOffset = lb.getStartOffset();
+
+      File localBlockFile =
+        File.createTempFile(lostBlock.getBlockName(), ".tmp");
+      localBlockFile.deleteOnExit();
+
+      try {
+        processParityHarPartBlock(dfs, partFile, lostBlock, 
+            lostBlockOffset, partFileStat, harIndex,
+            localBlockFile, progress);
+        
+        // Now that we have recovered the part file block locally, send it.
+        String datanode = chooseDatanode(lb.getLocations());
+        computeMetadataAndSendReconstructedBlock(datanode, localBlockFile,
+            lostBlock, 
+            localBlockFile.length(),
+            lb.getDataProtocolVersion(), lb.getNamespaceID(),
+            progress);
+        
+        numBlocksReconstructed++;
+      } finally {
+        localBlockFile.delete();
+      }
+      progress.progress();
+    }
+    
+    LOG.info("Reconstructed " + numBlocksReconstructed + " blocks in " + partFile);
+    return true;
+  }
+
+  /**
+   * This reconstructs a single part file block by recovering in sequence each
+   * parity block in the part file block.
+   */
+  private void processParityHarPartBlock(FileSystem dfs, Path partFile,
+      Block block, 
+      long blockOffset,
+      FileStatus partFileStat,
+      HarIndex harIndex,
+      File localBlockFile,
+      Progressable progress)
+  throws IOException {
+    String partName = partFile.toUri().getPath(); // Temporarily.
+    partName = partName.substring(1 + partName.lastIndexOf(Path.SEPARATOR));
+
+    OutputStream out = new FileOutputStream(localBlockFile);
+
+    try {
+      // A HAR part file block could map to several parity files. We need to
+      // use all of them to recover this block.
+      final long blockEnd = Math.min(blockOffset + 
+          partFileStat.getBlockSize(),
+          partFileStat.getLen());
+      for (long offset = blockOffset; offset < blockEnd; ) {
+        HarIndex.IndexEntry entry = harIndex.findEntry(partName, offset);
+        if (entry == null) {
+          String msg = "Lost index file has no matching index entry for " +
+          partName + ":" + offset;
+          LOG.warn(msg);
+          throw new IOException(msg);
+        }
+        Path parityFile = new Path(entry.fileName);
+        Encoder encoder = null;
+        for (Codec codec : Codec.getCodecs()) {
+          if (isParityFile(parityFile, codec)) {
+            encoder = new Encoder(getConf(), codec);
+          }
+        }
+        if (encoder == null) {
+          String msg = "Could not figure out codec correctly for " + parityFile;
+          LOG.warn(msg);
+          throw new IOException(msg);
+        }
+        Path srcFile = sourcePathFromParityPath(parityFile);
+        FileStatus srcStat = dfs.getFileStatus(srcFile);
+        if (srcStat.getModificationTime() != entry.mtime) {
+          String msg = "Modification times of " + parityFile + " and " +
+          srcFile + " do not match.";
+          LOG.warn(msg);
+          throw new IOException(msg);
+        }
+        long lostOffsetInParity = offset - entry.startOffset;
+        LOG.info(partFile + ":" + offset + " maps to " +
+            parityFile + ":" + lostOffsetInParity +
+            " and will be recovered from " + srcFile);
+        encoder.recoverParityBlockToStream(dfs, srcStat,
+            srcStat.getBlockSize(), parityFile,
+            lostOffsetInParity, out, progress);
+        // Finished recovery of one parity block. Since a parity block has the
+        // same size as a source block, we can move offset by source block 
+        // size.
+        offset += srcStat.getBlockSize();
+        LOG.info("Recovered " + srcStat.getBlockSize() + " part file bytes ");
+        if (offset > blockEnd) {
+          String msg =
+            "Recovered block spills across part file blocks. Cannot continue";
+          throw new IOException(msg);
+        }
+        progress.progress();
+      }
+    } finally {
+      out.close();
+    }
+  }
+
+  /**
+   * Choose a datanode (hostname:portnumber). The datanode is chosen at
+   * random from the live datanodes.
+   * @param locationsToAvoid locations to avoid.
+   * @return A string in the format name:port.
+   * @throws IOException
+   */
+  private String chooseDatanode(DatanodeInfo[] locationsToAvoid)
+  throws IOException {
+    DistributedFileSystem dfs = getDFS(new Path("/"));
+    DatanodeInfo[] live =
+      dfs.getClient().datanodeReport(DatanodeReportType.LIVE);
+    LOG.info("Choosing a datanode from " + live.length +
+        " live nodes while avoiding " + locationsToAvoid.length);
+    Random rand = new Random();
+    String chosen = null;
+    int maxAttempts = 1000;
+    for (int i = 0; i < maxAttempts && chosen == null; i++) {
+      int idx = rand.nextInt(live.length);
+      chosen = live[idx].name;
+      for (DatanodeInfo avoid: locationsToAvoid) {
+        if (chosen.equals(avoid.name)) {
+          LOG.info("Avoiding " + avoid.name);
+          chosen = null;
+          break;
+        }
+      }
+    }
+    if (chosen == null) {
+      throw new IOException("Could not choose datanode");
+    }
+    LOG.info("Choosing datanode " + chosen);
+    return chosen;
+  }
+
+  /**
+   * Reads data from the data stream provided and computes metadata.
+   */
+  DataInputStream computeMetadata(Configuration conf, InputStream dataStream)
+  throws IOException {
+    ByteArrayOutputStream mdOutBase = new ByteArrayOutputStream(1024*1024);
+    DataOutputStream mdOut = new DataOutputStream(mdOutBase);
+
+    // First, write out the version.
+    mdOut.writeShort(FSDataset.METADATA_VERSION);
+
+    // Create a summer and write out its header.
+    int bytesPerChecksum = conf.getInt("io.bytes.per.checksum", 512);
+    DataChecksum sum =
+      DataChecksum.newDataChecksum(DataChecksum.CHECKSUM_CRC32,
+          bytesPerChecksum);
+    sum.writeHeader(mdOut);
+
+    // Buffer to read in a chunk of data.
+    byte[] buf = new byte[bytesPerChecksum];
+    // Buffer to store the checksum bytes.
+    byte[] chk = new byte[sum.getChecksumSize()];
+
+    // Read data till we reach the end of the input stream.
+    int bytesSinceFlush = 0;
+    while (true) {
+      // Read some bytes.
+      int bytesRead = dataStream.read(buf, bytesSinceFlush, 
+          bytesPerChecksum - bytesSinceFlush);
+      if (bytesRead == -1) {
+        if (bytesSinceFlush > 0) {
+          boolean reset = true;
+          sum.writeValue(chk, 0, reset); // This also resets the sum.
+          // Write the checksum to the stream.
+          mdOut.write(chk, 0, chk.length);
+          bytesSinceFlush = 0;
+        }
+        break;
+      }
+      // Update the checksum.
+      sum.update(buf, bytesSinceFlush, bytesRead);
+      bytesSinceFlush += bytesRead;
+
+      // Flush the checksum if necessary.
+      if (bytesSinceFlush == bytesPerChecksum) {
+        boolean reset = true;
+        sum.writeValue(chk, 0, reset); // This also resets the sum.
+        // Write the checksum to the stream.
+        mdOut.write(chk, 0, chk.length);
+        bytesSinceFlush = 0;
+      }
+    }
+
+    byte[] mdBytes = mdOutBase.toByteArray();
+    return new DataInputStream(new ByteArrayInputStream(mdBytes));
+  }
+
+  private void computeMetadataAndSendReconstructedBlock(String datanode,
+      File localBlockFile,
+      Block block, long blockSize,
+      int dataTransferVersion,
+      int namespaceId,
+      Progressable progress)
+  throws IOException {
+
+    LOG.info("Computing metdata");
+    InputStream blockContents = null;
+    DataInputStream blockMetadata = null;
+    try {
+      blockContents = new FileInputStream(localBlockFile);
+      blockMetadata = computeMetadata(getConf(), blockContents);
+      blockContents.close();
+      progress.progress();
+      // Reopen
+      blockContents = new FileInputStream(localBlockFile);
+      sendReconstructedBlock(datanode, blockContents, blockMetadata, block, 
+          blockSize, dataTransferVersion, namespaceId, progress);
+    } finally {
+      if (blockContents != null) {
+        blockContents.close();
+        blockContents = null;
+      }
+      if (blockMetadata != null) {
+        blockMetadata.close();
+        blockMetadata = null;
+      }
+    }
+  }
+
+  /**
+   * Send a generated block to a datanode.
+   * @param datanode Chosen datanode name in host:port form.
+   * @param blockContents Stream with the block contents.
+   * @param block Block object identifying the block to be sent.
+   * @param blockSize size of the block.
+   * @param dataTransferVersion the data transfer version
+   * @param namespaceId namespace id the block belongs to
+   * @throws IOException
+   */
+  private void sendReconstructedBlock(String datanode,
+      final InputStream blockContents,
+      DataInputStream metadataIn,
+      Block block, long blockSize,
+      int dataTransferVersion, int namespaceId,
+      Progressable progress) 
+  throws IOException {
+    InetSocketAddress target = NetUtils.createSocketAddr(datanode);
+    Socket sock = SocketChannel.open().socket();
+
+    int readTimeout =
+      getConf().getInt(BlockIntegrityMonitor.BLOCKFIX_READ_TIMEOUT, 
+          HdfsConstants.READ_TIMEOUT);
+    NetUtils.connect(sock, target, readTimeout);
+    sock.setSoTimeout(readTimeout);
+
+    int writeTimeout = getConf().getInt(BlockIntegrityMonitor.BLOCKFIX_WRITE_TIMEOUT,
+        HdfsConstants.WRITE_TIMEOUT);
+
+    OutputStream baseStream = NetUtils.getOutputStream(sock, writeTimeout);
+    DataOutputStream out =
+      new DataOutputStream(new BufferedOutputStream(baseStream, 
+          FSConstants.
+          SMALL_BUFFER_SIZE));
+
+    boolean corruptChecksumOk = false;
+    boolean chunkOffsetOK = false;
+    boolean verifyChecksum = true;
+    boolean transferToAllowed = false;
+
+    try {
+      LOG.info("Sending block " + block +
+          " from " + sock.getLocalSocketAddress().toString() +
+          " to " + sock.getRemoteSocketAddress().toString());
+      BlockSender blockSender = 
+        new BlockSender(namespaceId, block, blockSize, 0, blockSize,
+            corruptChecksumOk, chunkOffsetOK, verifyChecksum,
+            transferToAllowed,
+            metadataIn, new BlockSender.InputStreamFactory() {
+          @Override
+          public InputStream createStream(long offset) 
+          throws IOException {
+            // we are passing 0 as the offset above,
+            // so we can safely ignore
+            // the offset passed
+            return blockContents;
+          }
+        });
+
+      // Header info
+      out.writeShort(dataTransferVersion);
+      out.writeByte(DataTransferProtocol.OP_WRITE_BLOCK);
+      if (dataTransferVersion >= DataTransferProtocol.FEDERATION_VERSION) {
+        out.writeInt(namespaceId);
+      }
+      out.writeLong(block.getBlockId());
+      out.writeLong(block.getGenerationStamp());
+      out.writeInt(0);           // no pipelining
+      out.writeBoolean(false);   // not part of recovery
+      Text.writeString(out, ""); // client
+      out.writeBoolean(true); // sending src node information
+      DatanodeInfo srcNode = new DatanodeInfo();
+      srcNode.write(out); // Write src node DatanodeInfo
+      // write targets
+      out.writeInt(0); // num targets
+      // send data & checksum
+      blockSender.sendBlock(out, baseStream, null, progress);
+
+      LOG.info("Sent block " + block + " to " + datanode);
+    } finally {
+      sock.close();
+      out.close();
+    }
+  }
+
+  /**
+   * returns the source file corresponding to a parity file
+   */
+  Path sourcePathFromParityPath(Path parityPath) {
+    String parityPathStr = parityPath.toUri().getPath();
+    for (Codec codec : Codec.getCodecs()) {
+      String prefix = codec.getParityPrefix();
+      if (parityPathStr.startsWith(prefix)) {
+        // Remove the prefix to get the source file.
+        String src = parityPathStr.replaceFirst(prefix, "/");
+        return new Path(src);
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the lost blocks in a file.
+   */
+  abstract List<LocatedBlockWithMetaInfo> lostBlocksInFile(
+      DistributedFileSystem fs,
+      String uriPath, FileStatus stat)
+      throws IOException;
+
+  
+  /**
+   * This class implements corrupt block fixing functionality.
+   */
+  public static class CorruptBlockReconstructor extends BlockReconstructor {
+    
+    public CorruptBlockReconstructor(Configuration conf) throws IOException {
+      super(conf);
+    }
+
+    
+    List<LocatedBlockWithMetaInfo> lostBlocksInFile(DistributedFileSystem fs,
+                                        String uriPath, 
+                                        FileStatus stat)
+        throws IOException {
+      
+      List<LocatedBlockWithMetaInfo> corrupt =
+        new LinkedList<LocatedBlockWithMetaInfo>();
+      VersionedLocatedBlocks locatedBlocks;
+      int namespaceId = 0;
+      int methodFingerprint = 0;
+      if (DFSClient.isMetaInfoSuppoted(fs.getClient().namenodeProtocolProxy)) {
+        LocatedBlocksWithMetaInfo lbksm = fs.getClient().namenode.
+                  openAndFetchMetaInfo(uriPath, 0, stat.getLen());
+        namespaceId = lbksm.getNamespaceID();
+        locatedBlocks = lbksm;
+        methodFingerprint = lbksm.getMethodFingerPrint();
+        fs.getClient().getNewNameNodeIfNeeded(methodFingerprint);
+      } else {
+        locatedBlocks = fs.getClient().namenode.open(uriPath, 0, stat.getLen());
+      }
+      final int dataTransferVersion = locatedBlocks.getDataProtocolVersion();
+      for (LocatedBlock b: locatedBlocks.getLocatedBlocks()) {
+        if (b.isCorrupt() ||
+            (b.getLocations().length == 0 && b.getBlockSize() > 0)) {
+          corrupt.add(new LocatedBlockWithMetaInfo(b.getBlock(),
+              b.getLocations(), b.getStartOffset(),
+              dataTransferVersion, namespaceId, methodFingerprint));
+        }
+      }
+      return corrupt;
+    }
+  }
+  
+  /**
+   * This class implements decommissioning block copying functionality.
+   */
+  public static class DecommissioningBlockReconstructor extends BlockReconstructor {
+
+    public DecommissioningBlockReconstructor(Configuration conf) throws IOException {
+      super(conf);
+    }
+
+    List<LocatedBlockWithMetaInfo> lostBlocksInFile(DistributedFileSystem fs,
+                                           String uriPath,
+                                           FileStatus stat)
+        throws IOException {
+
+      List<LocatedBlockWithMetaInfo> decommissioning = 
+        new LinkedList<LocatedBlockWithMetaInfo>();
+      VersionedLocatedBlocks locatedBlocks;
+      int namespaceId = 0;
+      int methodFingerprint = 0;
+      if (DFSClient.isMetaInfoSuppoted(fs.getClient().namenodeProtocolProxy)) {
+        LocatedBlocksWithMetaInfo lbksm = fs.getClient().namenode.
+                  openAndFetchMetaInfo(uriPath, 0, stat.getLen());
+        namespaceId = lbksm.getNamespaceID();
+        locatedBlocks = lbksm;
+        methodFingerprint = lbksm.getMethodFingerPrint();
+        fs.getClient().getNewNameNodeIfNeeded(methodFingerprint);
+      } else {
+        locatedBlocks = fs.getClient().namenode.open(uriPath, 0, stat.getLen());
+      }
+      final int dataTransferVersion = locatedBlocks.getDataProtocolVersion();
+
+
+      for (LocatedBlock b : locatedBlocks.getLocatedBlocks()) {
+        if (b.isCorrupt() ||
+            (b.getLocations().length == 0 && b.getBlockSize() > 0)) {
+          // If corrupt, this block is the responsibility of the CorruptBlockReconstructor
+          continue;
+        }
+
+        // Copy this block iff all good copies are being decommissioned
+        boolean allDecommissioning = true;
+        for (DatanodeInfo i : b.getLocations()) {
+          allDecommissioning &= i.isDecommissionInProgress();
+        }
+        if (allDecommissioning) {
+          decommissioning.add(new LocatedBlockWithMetaInfo(b.getBlock(),
+              b.getLocations(), b.getStartOffset(),
+              dataTransferVersion, namespaceId, methodFingerprint));
+        }
+      }
+      return decommissioning;
+    }
+
+  }
+
+
+}
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/Codec.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/Codec.java
index e9b41d88..acb08bf8 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/Codec.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/Codec.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.raid;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.lang.IllegalArgumentException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44,7 +45,7 @@
  * 3. Parity directory location
  * 4. Codec priority
  */
-public class Codec {
+public class Codec implements Serializable {
 
   public static final Log LOG = LogFactory.getLog(Codec.class);
   
@@ -53,7 +54,7 @@ public class Codec {
   /**
    * Used by ErasureCode.init() to get Code specific extra parameters.
    */
-  public final JSONObject json;
+  public final String jsonStr;
 
   /**
    * id of the codec. Used by policy in raid.xml
@@ -139,6 +140,8 @@ public static Codec getCodec(String id) {
     try {
       Configuration.addDefaultResource("hdfs-default.xml");
       Configuration.addDefaultResource("hdfs-site.xml");
+      Configuration.addDefaultResource("raid-default.xml");
+      Configuration.addDefaultResource("raid-site.xml");
       initializeCodecs(new Configuration());
     } catch (Exception e) {
       LOG.fatal("Fail initialize Raid codecs", e);
@@ -152,32 +155,35 @@ public static void initializeCodecs(Configuration conf) throws IOException {
       if (source == null) {
         codecs = Collections.emptyList();
         idToCodec = Collections.emptyMap();
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("None Codec is specified");
+        }
         return;
       }
       JSONArray jsonArray = new JSONArray(source);
-      codecs = new ArrayList<Codec>();
-      idToCodec = new HashMap<String, Codec>();
+      List<Codec> localCodecs = new ArrayList<Codec>();
+      Map<String, Codec> localIdToCodec = new HashMap<String, Codec>();
       for (int i = 0; i < jsonArray.length(); ++i) {
         Codec codec = new Codec(jsonArray.getJSONObject(i));
-        idToCodec.put(codec.id, codec);
-        codecs.add(codec);
+        localIdToCodec.put(codec.id, codec);
+        localCodecs.add(codec);
       }
-      Collections.sort(codecs, new Comparator<Codec>() {
+      Collections.sort(localCodecs, new Comparator<Codec>() {
         @Override
         public int compare(Codec c1, Codec c2) {
           // Higher priority on top
           return c2.priority - c1.priority;
         }
       });
-      codecs = Collections.unmodifiableList(codecs);
-      idToCodec = Collections.unmodifiableMap(idToCodec);
+      codecs = Collections.unmodifiableList(localCodecs);
+      idToCodec = Collections.unmodifiableMap(localIdToCodec);
     } catch (JSONException e) {
       throw new IOException(e);
     }
   }
 
   private Codec(JSONObject json) throws JSONException {
-    this.json = json;
+    this.jsonStr = json.toString();
     this.id = json.getString("id");
     this.parityLength = json.getInt("parity_length");
     this.stripeLength = json.getInt("stripe_length");
@@ -235,10 +241,10 @@ public ErasureCode createErasureCode(Configuration conf) {
 
   @Override
   public String toString() {
-    if (json == null) {
+    if (jsonStr == null) {
       return "Test codec " + id;
     } else {
-      return json.toString();
+      return jsonStr;
     }
   }
   
@@ -287,7 +293,7 @@ static void clearCodecs() {
                 String tmpHarDirectory,
                 boolean isDirRaid,
                 boolean simulateBlockFix) {
-    this.json = null;
+    this.jsonStr = null;
     this.id = id;
     this.parityLength = parityLength;
     this.stripeLength = stripeLength;
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/ConfigManager.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/ConfigManager.java
index 470c2480..ff2901bf 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/ConfigManager.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/ConfigManager.java
@@ -80,6 +80,8 @@ class ConfigManager {
   private int maxJobsPerPolicy; // Max no. of jobs running simultaneously for
                                 // a job.
   private int maxFilesPerJob; // Max no. of files raided by a job.
+  // the url of the read reconstruction metrics
+  private String readReconstructionMetricsUrl;
 
   // Reload the configuration
   private boolean doReload;
@@ -104,6 +106,8 @@ public ConfigManager(Configuration conf) throws IOException, SAXException,
                                         DISTRAID_MAX_JOBS);
     this.maxFilesPerJob = conf.getInt("raid.distraid.max.files",
                                       DISTRAID_MAX_FILES);
+    this.readReconstructionMetricsUrl = conf.get(
+                                "raid.read.reconstruction.metrics.url", "");
     if (configFileName == null) {
       String msg = "No raid.config.file given in conf - " +
                    "the Hadoop Raid utility cannot run. Aborting....";
@@ -323,6 +327,10 @@ public synchronized int getMaxJobsPerPolicy() {
   public synchronized int getMaxFilesPerJob() {
     return maxFilesPerJob;
   }
+  
+  public synchronized String getReadReconstructionMetricsUrl() {
+    return readReconstructionMetricsUrl;
+  }
 
   /**
    * Get a collection of all policies
@@ -381,4 +389,18 @@ public void run() {
       }
     }
   }
+  
+  /**
+   * Find the PolicyInfo corresponding to a given policy name
+   * @param policyName the name of a policy
+   * @return PolicyInfo if there is a matched policy; null otherwise
+   */
+  PolicyInfo getPolicy(String policyName) {
+    for (PolicyInfo policy : allPolicies) {
+      if (policyName.equals(policy.getName())) {
+        return policy;
+      }
+    }
+    return null;
+  }
 }
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/Decoder.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/Decoder.java
index 7b3800a1..d11fbdc3 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/Decoder.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/Decoder.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.raid;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,6 +45,7 @@
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.util.Progressable;
 import org.apache.hadoop.raid.DistBlockIntegrityMonitor.Counter;
+import org.apache.hadoop.raid.RaidNode.LOGTYPES;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -56,6 +58,7 @@
 public class Decoder {
   public static final Log LOG = LogFactory.getLog(
                                   "org.apache.hadoop.raid.Decoder");
+  private final Log DECODER_METRICS_LOG = LogFactory.getLog("RaidMetrics");
   public static final int DEFAULT_PARALLELISM = 4;
   protected Configuration conf;
   protected int parallelism;
@@ -108,6 +111,17 @@ private void configureBuffers(long blockSize) {
       allocateBuffers();
     }
   }
+  
+  public void recoverParityBlockToFile(
+      FileSystem srcFs, Path srcPath, FileSystem parityFs, Path parityPath,
+      long blockSize, long blockOffset, File localBlockFile, 
+      Context context) throws IOException, InterruptedException {
+    OutputStream out = new FileOutputStream(localBlockFile);
+    fixErasedBlock(srcFs, srcPath, parityFs, parityPath,
+        false, blockSize, blockOffset, blockSize, false, out, context, false);
+    out.close();
+  }
+  
 
   /**
    * Recovers a corrupt block to local file.
@@ -131,7 +145,7 @@ public void recoverBlockToFile(
     long blockSize, long blockOffset, File localBlockFile, long limit,
     Context context) throws IOException, InterruptedException {
     OutputStream out = new FileOutputStream(localBlockFile);
-    fixErasedBlock(srcFs, srcPath, parityFs, parityPath,
+    fixErasedBlock(srcFs, srcPath, parityFs, parityPath, true,
                   blockSize, blockOffset, limit, false, out, context,
                   false);
     out.close();
@@ -182,6 +196,7 @@ DecoderInputStream generateAlternateStream(FileSystem srcFs, Path srcFile,
    */
   void fixErasedBlock(
       FileSystem srcFs, Path srcFile, FileSystem parityFs, Path parityFile,
+      boolean fixSource,
       long blockSize, long errorOffset, long limit, boolean partial,
       OutputStream out, Context context, boolean skipVerify)
           throws IOException, InterruptedException {
@@ -211,12 +226,12 @@ void fixErasedBlock(
       if (!skipVerify) {
         newCRC = new CRC32();
         newLen = this.fixErasedBlockImpl(srcFs, srcFile, parityFs,
-            parityFile, blockSize, errorOffset, limit, partial, null,
+            parityFile, fixSource, blockSize, errorOffset, limit, partial, null,
             reporter, newCRC);
       }
       CRC32 oldCRC = skipVerify ? null: new CRC32();
       long oldLen = decoder.fixErasedBlockImpl(srcFs, srcFile, parityFs,
-          parityFile, blockSize, errorOffset, limit, partial, out,
+          parityFile, fixSource, blockSize, errorOffset, limit, partial, out,
           reporter, oldCRC);
       
       if (!skipVerify) {
@@ -224,20 +239,29 @@ void fixErasedBlock(
             newLen != oldLen) {
           LOG.error(" New code " + codec.id +
                     " produces different data from old code " + oldId +
-                    " during fixing " + srcFile + " (offset=" + errorOffset +
+                    " during fixing " + 
+                    (fixSource ? srcFile.toString() : parityFile.toString())
+                    + " (offset=" + errorOffset +
                     ", limit=" + limit + ")" +
                     " checksum:" + newCRC.getValue() + ", " + oldCRC.getValue() +
                     " len:" + newLen + ", " + oldLen);
           if (context != null) {
             context.getCounter(Counter.BLOCK_FIX_SIMULATION_FAILED).increment(1L);
-            String outkey = srcFile.toUri().getPath();
+            String outkey;
+            if (fixSource) {
+              outkey = srcFile.toString();
+            } else {
+              outkey = parityFile.toString();
+            }
             String outval = "simulation_failed";
             context.write(new Text(outkey), new Text(outval));
           }
         } else {
           LOG.info(" New code " + codec.id +
                    " produces the same data with old code " + oldId +
-                   " during fixing " + srcFile + " (offset=" + errorOffset +
+                   " during fixing " + 
+                   (fixSource ? srcFile.toString() : parityFile.toString())
+                   + " (offset=" + errorOffset +
                    ", limit=" + limit + ")"
                    );
           if (context != null) {
@@ -246,23 +270,32 @@ void fixErasedBlock(
         }
       }
     } else {
-      fixErasedBlockImpl(srcFs, srcFile, parityFs, parityFile, blockSize,
+      fixErasedBlockImpl(srcFs, srcFile, parityFs, parityFile, fixSource, blockSize,
           errorOffset, limit, partial, out, reporter, null);
    }
   }
 
   long fixErasedBlockImpl(FileSystem srcFs, Path srcFile, FileSystem parityFs,
-      Path parityFile, long blockSize, long errorOffset, long limit, boolean
+      Path parityFile, boolean fixSource,
+      long blockSize, long errorOffset, long limit, boolean
       partial, OutputStream out, Progressable reporter, CRC32 crc)
           throws IOException {
-
+    
+    long startTime = System.currentTimeMillis();
     if (crc != null) {
       crc.reset();
     }
     int blockIdx = (int) (errorOffset/blockSize);
-    LocationPair lp = StripeReader.getBlockLocation(codec, srcFs,
-        srcFile, blockIdx, conf);
-    int erasedLocationToFix = codec.parityLength + lp.getBlockIdxInStripe(); 
+    LocationPair lp = null;
+    int erasedLocationToFix;
+    if (fixSource) {
+      lp = StripeReader.getBlockLocation(codec, srcFs,
+          srcFile, blockIdx, conf);
+      erasedLocationToFix = codec.parityLength + lp.getBlockIdxInStripe(); 
+    } else {
+      lp = StripeReader.getParityBlockLocation(codec, blockIdx);
+      erasedLocationToFix = lp.getBlockIdxInStripe();
+    }
 
     FileStatus srcStat = srcFs.getFileStatus(srcFile);
     FileStatus parityStat = parityFs.getFileStatus(parityFile);
@@ -293,8 +326,7 @@ long fixErasedBlockImpl(FileSystem srcFs, Path srcFile, FileSystem parityFs,
           if (parallelReader == null) {
             long offsetInBlock = written + startOffsetInBlock;
             StripeReader sReader = StripeReader.getStripeReader(codec,
-                conf, blockSize, srcFs, lp.getStripeIdx(), srcFile,
-                srcStat.getLen());
+                conf, blockSize, srcFs, lp.getStripeIdx(), srcStat);
             inputs = sReader.buildInputs(srcFs, srcFile,
                 srcStat, parityFs, parityFile, parityStat,
                 lp.getStripeIdx(), offsetInBlock, erasedLocations,
@@ -316,8 +348,9 @@ long fixErasedBlockImpl(FileSystem srcFs, Path srcFile, FileSystem parityFs,
           
           code.decodeBulk(readResult.readBufs, writeBufs, locationsToFix);
           
-          for (int i = 0; i < inputs.length; i++) {
-            numReadBytes += readResult.numRead[i];
+          // get the number of bytes read through hdfs.
+          for (int readNum : readResult.numRead) {
+            numReadBytes += readNum;
           }
 
           int toWrite = (int)Math.min((long)bufSize, limit - written);
@@ -334,6 +367,10 @@ long fixErasedBlockImpl(FileSystem srcFs, Path srcFile, FileSystem parityFs,
           }
         } catch (IOException e) {
           if (e instanceof TooManyErasedLocations) {
+            logRaidReconstructionMetrics("FAILURE", 0, codec,
+                System.currentTimeMillis() - startTime, 
+                erasedLocations.size(), numReadBytes, srcFile, errorOffset,
+                LOGTYPES.OFFLINE_RECONSTRUCTION, srcFs);
             throw e;
           }
           // Re-create inputs from the new erased locations.
@@ -344,6 +381,10 @@ long fixErasedBlockImpl(FileSystem srcFs, Path srcFile, FileSystem parityFs,
           RaidUtils.closeStreams(inputs);
         }
       }
+      logRaidReconstructionMetrics("SUCCESS", written, codec,
+          System.currentTimeMillis() - startTime, 
+          erasedLocations.size(), numReadBytes, srcFile, errorOffset,
+          LOGTYPES.OFFLINE_RECONSTRUCTION, srcFs);
       return written; 
     } finally {
       numMissingBlocksInStripe = erasedLocations.size();
@@ -391,6 +432,31 @@ ParallelStreamReader.ReadResult readFromInputs(
     return readResult;
   }
   
+  public void logRaidReconstructionMetrics(
+      String result, long bytes, Codec codec, long delay, 
+      int numMissingBlocks, long numReadBytes, Path
+      srcFile, long errorOffset, LOGTYPES type, FileSystem fs) {
+
+    try {
+      JSONObject json = new JSONObject();
+      json.put("result", result);
+      json.put("constructedbytes", bytes);
+      json.put("code", codec.id);
+      json.put("delay", delay);
+      json.put("missingblocks", numMissingBlocks);
+      json.put("readbytes", numReadBytes);
+      json.put("file", srcFile.toString());
+      json.put("offset", errorOffset);
+      json.put("type", type.name());
+      json.put("cluster", fs.getUri().getAuthority());
+      DECODER_METRICS_LOG.info(json.toString());
+
+    } catch(JSONException e) {
+      LOG.warn("Exception when logging the Raid metrics: " + e.getMessage(), 
+               e);
+    }
+  }
+  
   public class DecoderInputStream extends InputStream {
     
     private long limit;
@@ -398,7 +464,7 @@ public class DecoderInputStream extends InputStream {
     private byte[] buffer;
     private long bufferLen;
     private int position;
-    private long numRead = 0;
+    private long streamOffset = 0;
     
     private final Progressable reporter;
     private InputStream[] inputs;
@@ -418,7 +484,6 @@ public class DecoderInputStream extends InputStream {
     private LocationPair locationPair;
     
     private long currentOffset;
-    private final Log DECODER_METRICS_LOG = LogFactory.getLog("RaidMetrics");
     private long dfsNumRead = 0;
 
     private final Set<Integer> locationsToNotRead = new HashSet<Integer>();
@@ -456,11 +521,17 @@ public long getCurrentOffset() {
     }
     
     public long getAvailable() {
-      return limit - numRead;
+      return limit - streamOffset;
     }
     
-    private void checkBuffer() throws IOException {
-      if (numRead >= limit) {
+    /**
+     * Will init the required objects, start the parallel reader, and 
+     * put the decoding result in buffer in this method.
+     * 
+     * @throws IOException
+     */
+    private void init() throws IOException {
+      if (streamOffset >= limit) {
         buffer = null;
         return;
       }
@@ -475,13 +546,11 @@ private void checkBuffer() throws IOException {
 
       if (null == parallelReader) {
         
-        long offsetInBlock = numRead + startOffsetInBlock;
-        
+        long offsetInBlock = streamOffset + startOffsetInBlock;
         FileStatus srcStat = srcFs.getFileStatus(srcFile);
         FileStatus parityStat = parityFs.getFileStatus(parityFile);
         StripeReader sReader = StripeReader.getStripeReader(codec, conf, 
-            blockSize, srcFs, locationPair.getStripeIdx(), 
-            srcFile, srcStat.getLen());
+            blockSize, srcFs, locationPair.getStripeIdx(), srcStat);
         
         inputs = sReader.buildInputs(srcFs, srcFile, srcStat,
             parityFs, parityFile, parityStat,
@@ -494,7 +563,8 @@ private void checkBuffer() throws IOException {
         }
 
         assert(parallelReader == null);
-        parallelReader = new ParallelStreamReader(reporter, inputs, bufSize,
+        parallelReader = new ParallelStreamReader(reporter, inputs, 
+            (int)Math.min(bufSize, limit),
             parallelism, boundedBufferCapacity, limit);
         parallelReader.start();
       }
@@ -516,23 +586,23 @@ private void checkBuffer() throws IOException {
         for (int i=0; i<locationsToFix.length; i++) {
           if (locationsToFix[i] == erasedLocationToFix) {
             buffer = writeBufs[i];
-            bufferLen = Math.min(bufSize, limit - numRead);
+            bufferLen = Math.min(bufSize, limit - streamOffset);
             position = 0;
             break;
           }
         }
       }
     }
-
-    @Override
-    public int read() throws IOException {
-      while (numRead <= limit) {
+    
+    /**
+     * make sure we have the correct decoding data in the buffer.
+     * 
+     * @throws IOException
+     */
+    private void checkBuffer() throws IOException {
+      while (streamOffset <= limit) {
         try {
-          checkBuffer();
-          if (null == parallelReader) {
-            return -1;
-          }
-          
+          init();
           break;
         } catch (IOException e) {
           if (e instanceof TooManyErasedLocations) {
@@ -543,16 +613,24 @@ public int read() throws IOException {
             parallelReader.shutdown();
             parallelReader = null;
           }
-          RaidUtils.closeStreams(inputs);
+          if (inputs != null) {
+            RaidUtils.closeStreams(inputs);
+          }
         }
       }
+    }
+
+    @Override
+    public int read() throws IOException {
+      
+      checkBuffer();
       if (null == buffer) {
         return -1;
       }
 
       int result = buffer[position] & 0xff;
       position ++;
-      numRead ++;
+      streamOffset ++;
       currentOffset ++;
 
       return result;
@@ -576,65 +654,58 @@ public int read(byte[] b, int off, int len) throws IOException {
       } else if (len == 0) {
         return 0;
       }
+      
+      int numRead = 0;
+      while (numRead < len) {
+        try {
+          checkBuffer();
+        } catch(IOException e) {
+          long delay = System.currentTimeMillis() - startTime;
+          logRaidReconstructionMetrics("FAILURE", 0, codec, delay, 
+              erasedLocations.size(), dfsNumRead, srcFile, errorOffset,
+              LOGTYPES.ONLINE_RECONSTRUCTION, srcFs);
+          throw e;
+        }
 
-      int c = -1;
-      try {
-        c = read();
-      } catch(IOException e) {
-        long delay = System.currentTimeMillis() - startTime;
-        logRaidReconstructionMetrics("FAILURE", 0, codec, delay, 
-            erasedLocations.size(), dfsNumRead);
-        throw e;
-      }
-      if (c == -1) {
-        return -1;
-      }
-      b[off] = (byte)c;
-      int i = 1;
-      try {
-        for (; i < len ; i++) {
-          c = read();
-          if (c == -1) {
-            break;
+        if (null == buffer) {
+          if (numRead > 0) {
+            logRaidReconstructionMetrics("SUCCESS", (int)numRead, codec, 
+                System.currentTimeMillis() - startTime, 
+                erasedLocations.size(), dfsNumRead, srcFile, errorOffset,
+                LOGTYPES.ONLINE_RECONSTRUCTION, srcFs);
+            return (int)numRead;
           }
-          b[off + i] = (byte)c;
+          return -1;
         }
-      } catch (IOException ee) {
+        
+        int numBytesToCopy = (int) Math.min(bufferLen - position, 
+            len - numRead);
+        System.arraycopy(buffer, position, b, off, numBytesToCopy);
+        position += numBytesToCopy;
+        currentOffset += numBytesToCopy;
+        streamOffset += numBytesToCopy;
+        off += numBytesToCopy;
+        numRead += numBytesToCopy;
       }
-      
-      long delay = System.currentTimeMillis() - startTime;
-      logRaidReconstructionMetrics("SUCCESS", i, codec, delay, 
-          erasedLocations.size(), dfsNumRead);
-      return i;
-    }
-    
-    private void logRaidReconstructionMetrics(
-        String result, long bytes, Codec codec, long delay, 
-        int numMissingBlocks, long numReadBytes) {
-
-      try {
-        JSONObject json = new JSONObject();
-        json.put("result", result);
-        json.put("constructedbytes", bytes);
-        json.put("code", codec.id);
-        json.put("delay", delay);
-        json.put("missingblocks", numMissingBlocks);
-        json.put("readbytes", numReadBytes);
-        DECODER_METRICS_LOG.info(json.toString());
-
-      } catch(JSONException e) {
-        LOG.warn("Exception when logging the Raid metrics: " + e.getMessage(), 
-                 e);
+
+      if (numRead > 0) {
+        logRaidReconstructionMetrics("SUCCESS", numRead, codec, 
+            System.currentTimeMillis() - startTime, 
+            erasedLocations.size(), dfsNumRead, srcFile, errorOffset,
+            LOGTYPES.ONLINE_RECONSTRUCTION, srcFs);
       }
+      return (int)numRead;
     }
-
+    
     @Override
     public void close() throws IOException {
       if (parallelReader != null) {
         parallelReader.shutdown();
         parallelReader = null;
       }
-      RaidUtils.closeStreams(inputs);
+      if (inputs != null) {
+        RaidUtils.closeStreams(inputs);
+      }
       super.close();
     }
   }  
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryStatistics.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryStatistics.java
new file mode 100644
index 00000000..def7cbaf
--- /dev/null
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryStatistics.java
@@ -0,0 +1,77 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.raid;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.raid.Statistics.Counters;
+import org.apache.hadoop.raid.protocol.PolicyInfo;
+
+public class DirectoryStatistics extends Statistics {
+
+  public DirectoryStatistics(Codec codec, Configuration conf) {
+    super(codec, conf);
+  }
+  
+  /**
+   * Collect the statistics of a source directory. Return true if the file 
+   * should be raided but not.
+   * @throws IOException 
+   */
+  public boolean addSourceFile(FileSystem fs, PolicyInfo info, FileStatus src,
+      RaidState.Checker checker, long now, int targetReplication) 
+          throws IOException {
+    
+    List<FileStatus> lfs = RaidNode.listDirectoryRaidFileStatus(
+                    fs.getConf(), fs, src.getPath()); 
+    if (lfs == null) {
+      return false;
+    }
+    RaidState state = checker.check(info, src, now, true, lfs);
+    Counters counters = stateToSourceCounters.get(state);
+    counters.inc(lfs);
+    if (state == RaidState.RAIDED) {
+      long paritySize = computeParitySize(lfs, targetReplication);
+      estimatedParitySize += paritySize;
+      estimatedDoneParitySize += paritySize;
+      estimatedDoneSourceSize += DirectoryStripeReader.getDirPhysicalSize(lfs);
+      return false;
+    }
+    if (state == RaidState.NOT_RAIDED_BUT_SHOULD) {
+      estimatedDoneParitySize += computeParitySize(lfs, targetReplication);
+      estimatedDoneSourceSize += DirectoryStripeReader.getDirPhysicalSize(lfs);
+      return true;
+    }
+    return false;
+  } 
+  
+  private long computeParitySize(List<FileStatus> lfs, int targetReplication) {
+    long numBlocks = DirectoryStripeReader.getBlockNum(lfs);
+    long parityBlockSize = DirectoryStripeReader.getParityBlockSize(
+        new Configuration(), lfs);
+    long parityBlocks = 
+        RaidNode.numStripes(numBlocks, stripeLength) * parityLength;
+    return parityBlocks * targetReplication * parityBlockSize;
+  }
+}
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryStripeReader.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryStripeReader.java
index 527d937e..a8303604 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryStripeReader.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryStripeReader.java
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileStatus;
@@ -83,12 +84,58 @@ public static long getParityBlockSize(Configuration conf,
   
   public static long getBlockNum(List<FileStatus> lfs) {
     long blockNum = 0L;
+    if (lfs == null) 
+      return blockNum;
     for (FileStatus fsStat: lfs) {
       blockNum += RaidNode.getNumBlocks(fsStat);
     }
     return blockNum;
   }
   
+  /**
+   * Get the total logical size in the directory
+   * @param lfs the Files under the directory
+   * @return
+   */
+  public static long getDirLogicalSize(List<FileStatus> lfs) {
+    long totalSize = 0L;
+    if (null == lfs) {
+      return totalSize;
+    }
+    
+    for (FileStatus fsStat : lfs) {
+      totalSize += fsStat.getLen();
+    }
+    return totalSize;
+  }
+  
+  /**
+   * Get the total physical size in the directory
+   * @param lfs the Files under the directory
+   * @return
+   */
+  public static long getDirPhysicalSize(List<FileStatus> lfs) {
+    long totalSize = 0L;
+    if (null == lfs) {
+      return totalSize;
+    }
+    
+    for (FileStatus fsStat : lfs) {
+      totalSize += fsStat.getLen() * fsStat.getReplication();
+    }
+    return totalSize;
+  }
+  
+  public static short getReplication(List<FileStatus> lfs) {
+    short maxRepl = 0;
+    for (FileStatus fsStat: lfs) {
+      if (fsStat.getReplication() > maxRepl) {
+        maxRepl = fsStat.getReplication();
+      }
+    }
+    return maxRepl;
+  }
+  
   public DirectoryStripeReader(Configuration conf, Codec codec,
       FileSystem fs, long stripeStartIdx,
       Path srcDir, List<FileStatus> lfs) 
@@ -154,6 +201,36 @@ public InputStream[] getNextStripeInputs() throws IOException {
     }
   }
   
+  public BlockLocation[] getNextStripeBlockLocations() throws IOException {
+    BlockLocation[] blocks = new BlockLocation[codec.stripeLength];
+    int startOffset = (int)curStripeIdx * codec.stripeLength;
+    int curFileIdx = this.stripeBlocks.get(startOffset).fileIdx;
+    FileStatus curFile = lfs.get(curFileIdx);
+    BlockLocation[] curBlocks = 
+        fs.getFileBlockLocations(curFile, 0, curFile.getLen());
+    for (int i = 0; i < codec.stripeLength; i++) {
+      if (startOffset + i < this.stripeBlocks.size()) {
+        BlockInfo bi = this.stripeBlocks.get(startOffset + i);
+        if (bi.fileIdx != curFileIdx) {
+          curFileIdx = bi.fileIdx;
+          curFile = lfs.get(curFileIdx);
+          curBlocks = 
+              fs.getFileBlockLocations(curFile, 0, curFile.getLen());
+        }
+        blocks[i] = curBlocks[bi.blockId];
+      } else {
+        // We have no src data at this offset.
+        blocks[i] = null; 
+      }
+    }
+    curStripeIdx++;
+    return blocks;
+  }
+  
+  public long getCurStripeIdx() {
+    return curStripeIdx;
+  }
+  
   @Override
   public InputStream buildOneInput(
       int locationIndex, long offsetInBlock,
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryTraversal.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryTraversal.java
index 7e85353b..ef126871 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryTraversal.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/DirectoryTraversal.java
@@ -84,12 +84,21 @@ public DirectoryTraversal(Collection<Path> roots, FileSystem fs,
   public DirectoryTraversal(String friendlyName, Collection<Path> roots,
       FileSystem fs, Filter filter, int numThreads, boolean doShuffle)
       throws IOException {
-    this(friendlyName, roots, fs, filter, numThreads, doShuffle, false);
+    this(friendlyName, roots, fs, filter, numThreads, doShuffle, false,
+        false);
+  }
+  
+  public DirectoryTraversal(String friendlyName, Collection<Path> roots,
+      FileSystem fs, Filter filter, int numThreads, boolean doShuffle, 
+      boolean allowUseStandby)
+      throws IOException {
+    this(friendlyName, roots, fs, filter, numThreads, doShuffle, 
+        allowUseStandby, false);
   }
 
   public DirectoryTraversal(String friendlyName, Collection<Path> roots,
       FileSystem fs, Filter filter, int numThreads, boolean doShuffle,
-      boolean allowUseStandby)
+      boolean allowUseStandby, boolean checkLeafDir)
       throws IOException {
     this.output = new ArrayBlockingQueue<FileStatus>(OUTPUT_QUEUE_SIZE);
     this.directories = new LinkedBlockingDeque<Path>();
@@ -124,7 +133,11 @@ public DirectoryTraversal(String friendlyName, Collection<Path> roots,
       return;
     }
     for (int i = 0; i < processors.length; ++i) {
-      processors[i] = new Processor();
+      if (checkLeafDir) {
+        processors[i] = new LeafDirectoryProcessor();
+      } else {
+        processors[i] = new Processor();
+      }
       processors[i].setName(friendlyName + i);
     }
     for (int i = 0; i < processors.length; ++i) {
@@ -164,6 +177,42 @@ private void interruptProcessors() {
       }
     }
   }
+  
+  private class LeafDirectoryProcessor extends Processor {
+    @Override
+    protected void filterDirectory(Path dir, List<Path> subDirs,
+        List<FileStatus> filtered) throws IOException {
+      subDirs.clear();
+      filtered.clear();
+      if (dir == null) {
+        return;
+      }
+      FileStatus[] elements;
+      if (avatarFs != null) {
+        elements = avatarFs.listStatus(dir, true);
+      } else {
+        elements = fs.listStatus(dir);
+      }
+      cache.clear();
+      if (elements != null) {
+        boolean isLeafDir = true;
+        for (FileStatus element : elements) {
+          if (element.isDir()) {
+            subDirs.add(element.getPath());
+            isLeafDir = false;
+          }
+        }
+        if (isLeafDir && elements.length > 0) {
+          FileStatus dirStat = avatarFs != null?
+              avatarFs.getFileStatus(dir): 
+              fs.getFileStatus(dir);
+          if (filter.check(dirStat)) {
+            filtered.add(dirStat);
+          }
+        }
+      }
+    }
+  }
 
   private class Processor extends Thread {
     /* This cache is used to reduce the number of RPC calls, instead of running listLocatedStatus for each file, 
@@ -171,7 +220,7 @@ private class Processor extends Thread {
      * files under the same directory, only few RPC call is needed to get LocatedFileStatus of these files.
      * Please check PlacementMonitor.getLocatedFileStatus for more details.  
      */
-    private HashMap<String, LocatedFileStatus> cache;
+    protected HashMap<String, LocatedFileStatus> cache;
     @Override
     public void run() {
       this.cache = PlacementMonitor.locatedFileStatusCache.get();
@@ -218,7 +267,7 @@ public void run() {
       }
     }
 
-    private void filterDirectory(Path dir, List<Path> subDirs,
+    protected void filterDirectory(Path dir, List<Path> subDirs,
         List<FileStatus> filtered) throws IOException {
       subDirs.clear();
       filtered.clear();
@@ -289,7 +338,7 @@ public boolean check(FileStatus f) throws IOException {
 
   public static DirectoryTraversal directoryRetriever(
       List<Path> roots, FileSystem fs, int numThreads, boolean doShuffle,
-      boolean allowUseStandby)
+      boolean allowUseStandby, boolean checkLeafDir)
       throws IOException {
     Filter filter = new Filter() {
       @Override
@@ -298,7 +347,14 @@ public boolean check(FileStatus f) throws IOException {
       }
     };
     return new DirectoryTraversal("Directory Retriever ", roots, fs, filter,
-      numThreads, doShuffle, allowUseStandby);
+      numThreads, doShuffle, allowUseStandby, checkLeafDir);
+  }
+  
+  public static DirectoryTraversal directoryRetriever(
+      List<Path> roots, FileSystem fs, int numThreads, boolean doShuffle,
+      boolean allowUseStandby) throws IOException {
+    return directoryRetriever(roots, fs, numThreads, 
+              doShuffle, allowUseStandby, false);
   }
 
   public static DirectoryTraversal directoryRetriever(
@@ -326,6 +382,33 @@ public boolean check(FileStatus f) throws IOException {
     };
     FileSystem fs = new Path(Path.SEPARATOR).getFileSystem(conf);
     return new DirectoryTraversal("Raid File Retriever ", roots, fs, filter,
-      numThreads, doShuffle, allowStandby);
+      numThreads, doShuffle, allowStandby, false);
+  }
+  
+  public static DirectoryTraversal raidLeafDirectoryRetriever(
+      final PolicyInfo info, List<Path> roots, Collection<PolicyInfo> allInfos,
+      final Configuration conf, int numThreads, boolean doShuffle,
+      boolean allowStandby)
+      throws IOException {
+    final RaidState.Checker checker = new RaidState.Checker(allInfos, conf);
+    final FileSystem fs = FileSystem.get(conf);
+    Filter filter = new Filter() {
+      @Override
+      public boolean check(FileStatus f) throws IOException {
+        long now = RaidNode.now();
+        if (!f.isDir()) {
+          return false;
+        }
+        List<FileStatus> lfs = RaidNode.listDirectoryRaidFileStatus(conf,
+            fs, f.getPath());
+        RaidState state = checker.check(info, f, now, false, lfs);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug(f.getPath() + " : " + state);
+        }
+        return state == RaidState.NOT_RAIDED_BUT_SHOULD;
+      }
+    };
+    return new DirectoryTraversal("Raid File Retriever ", roots, fs, filter,
+      numThreads, doShuffle, allowStandby, true);
   }
 }
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/DistBlockIntegrityMonitor.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/DistBlockIntegrityMonitor.java
index a8393ff6..92639580 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/DistBlockIntegrityMonitor.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/DistBlockIntegrityMonitor.java
@@ -68,6 +68,8 @@
 import org.apache.hadoop.raid.DistBlockIntegrityMonitor.Worker.LostFileInfo;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.ToolRunner;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 /**
  * distributed block integrity monitor, uses parity to reconstruct lost files
@@ -127,6 +129,8 @@ public class DistBlockIntegrityMonitor extends BlockIntegrityMonitor {
   public static final String SIMULATION_FAILED_FILE = "simulation_failed";
  
   protected static final Log LOG = LogFactory.getLog(DistBlockIntegrityMonitor.class);
+  
+  private static final String CORRUPT_FILE_DETECT_TIME = "corrupt_detect_time";
 
   // number of files to reconstruct in a task
   private long filesPerTask;
@@ -213,6 +217,8 @@ public abstract class Worker implements Runnable {
     private long jobCounter = 0;
     private volatile int numJobsRunning = 0;
     
+    protected long numFilesDropped = 0;
+    
     volatile BlockIntegrityMonitor.Status lastStatus = null;
     long recentNumFilesSucceeded = 0;
     long recentNumFilesFailed = 0;
@@ -268,20 +274,20 @@ public void run() {
     void checkAndReconstructBlocks()
     throws IOException, InterruptedException, ClassNotFoundException {
       checkJobs();
-
       if (jobIndex.size() >= maxPendingJobs) {
         LOG.info("Waiting for " + jobIndex.size() + " pending jobs");
         return;
       }
 
       Map<String, Integer> lostFiles = getLostFiles();
+      long detectTime = System.currentTimeMillis();
       FileSystem fs = new Path("/").getFileSystem(getConf());
       Map<String, Priority> filePriorities =
         computePriorities(fs, lostFiles);
 
       LOG.info("Found " + filePriorities.size() + " new lost files");
 
-      startJobs(filePriorities);
+      startJobs(filePriorities, detectTime);
     }
 
     /**
@@ -465,6 +471,7 @@ private HashMap<String, String> getFailedFiles(Job job) throws IOException {
           Text key = new Text();
           Text value = new Text();
           while (reader.next(key, value)) {
+            LOG.info("key: " + key.toString() + " , value: " + value.toString());
             failedFiles.put(key.toString(), value.toString());
           }
           reader.close();
@@ -489,10 +496,10 @@ private void purgeFileIndex() {
     }
 
     // Start jobs for all the lost files.
-    private void startJobs(Map<String, Priority> filePriorities)
+    private void startJobs(Map<String, Priority> filePriorities, long detectTime)
     throws IOException, InterruptedException, ClassNotFoundException {
       String startTimeStr = dateFormat.format(new Date());
-
+      long numFilesSubmitted = 0;
       for (Priority pri : Priority.values()) {
         Set<String> jobFiles = new HashSet<String>();
         for (Map.Entry<String, Priority> entry: filePriorities.entrySet()) {
@@ -506,26 +513,37 @@ private void startJobs(Map<String, Priority> filePriorities)
             String jobName = JOB_NAME_PREFIX + "." + jobCounter +
             "." + pri + "-pri" + "." + startTimeStr;
             jobCounter++;
-            startJob(jobName, jobFiles, pri);
+            startJob(jobName, jobFiles, pri, detectTime);
+            numFilesSubmitted += jobFiles.size();
             jobFiles.clear();
-            if (jobIndex.size() > maxPendingJobs) return;
+            if (jobIndex.size() >= maxPendingJobs) {
+              this.numFilesDropped = filePriorities.size() - numFilesSubmitted;
+              LOG.debug("Submitted a job with max number of files allowed. Num files dropped is " + this.numFilesDropped);
+              return;
+            }
           }
         }
         if (jobFiles.size() > 0) {
           String jobName = JOB_NAME_PREFIX + "." + jobCounter +
           "." + pri + "-pri" + "." + startTimeStr;
           jobCounter++;
-          startJob(jobName, jobFiles, pri);
+          startJob(jobName, jobFiles, pri, detectTime);
+          numFilesSubmitted += jobFiles.size();
           jobFiles.clear();
-          if (jobIndex.size() > maxPendingJobs) return;
+          if (jobIndex.size() >= maxPendingJobs) {
+            this.numFilesDropped = filePriorities.size() - numFilesSubmitted;
+            LOG.debug("Submitted a job with less than max allowed files. Num files dropped is " + this.numFilesDropped);
+            return;
+          }
         }
       }
+      this.numFilesDropped = filePriorities.size() - numFilesSubmitted;
     }
 
     /**
      * creates and submits a job, updates file index and job index
      */
-    private void startJob(String jobName, Set<String> lostFiles, Priority priority)
+    private void startJob(String jobName, Set<String> lostFiles, Priority priority, long detectTime)
     throws IOException, InterruptedException, ClassNotFoundException {
       Path inDir = new Path(JOB_NAME_PREFIX + "/in/" + jobName);
       Path outDir = new Path(JOB_NAME_PREFIX + "/out/" + jobName);
@@ -536,6 +554,7 @@ private void startJob(String jobName, Set<String> lostFiles, Priority priority)
       Configuration jobConf = new Configuration(getConf());
       RaidUtils.parseAndSetOptions(jobConf, priority.configOption);
       Job job = new Job(jobConf, jobName);
+      job.getConfiguration().set(CORRUPT_FILE_DETECT_TIME, Long.toString(detectTime));
       configureJob(job, this.RECONSTRUCTOR_CLASS);
       job.setJarByClass(getClass());
       job.setMapperClass(ReconstructionMapper.class);
@@ -547,6 +566,7 @@ private void startJob(String jobName, Set<String> lostFiles, Priority priority)
 
       ReconstructionInputFormat.setInputPaths(job, inDir);
       SequenceFileOutputFormat.setOutputPath(job, outDir);
+      
 
       submitJob(job, filesInJob, priority);
       List<LostFileInfo> fileInfos =
@@ -753,23 +773,32 @@ public class CorruptFileCounter implements Runnable {
     public String[] corruptMonitorDirs = null;
     private TreeMap<String, Long> counterMap = 
         new TreeMap<String, Long>();
+    private long filesWithMissingBlksCnt = 0;
+    private long[] numStrpWithMissingBlksRS = 
+        new long[Codec.getCodec("rs").stripeLength+Codec.getCodec("rs").parityLength];
     private Object counterMapLock = new Object();
-    
+
     public CorruptFileCounter() {
       this.corruptMonitorDirs = getCorruptMonitorDirs(getConf());
     }
-    
+
     public void run() {
       RaidNodeMetrics.getInstance(
           RaidNodeMetrics.DEFAULT_NAMESPACE_ID).initCorruptFilesMetrics(getConf());
       while (running) {
         TreeMap<String, Long> newCounterMap = new TreeMap<String, Long>();
+        long newfilesWithMissingBlksCnt = 0;
+        long incfilesWithMissingBlks = 0;
+        long[] newNumStrpWithMissingBlks = 
+            new long[Codec.getCodec("rs").stripeLength+Codec.getCodec("rs").parityLength];
+        long[] incNumStrpWithMissingBlks = 
+            new long[Codec.getCodec("rs").stripeLength+Codec.getCodec("rs").parityLength];
         for (String srcDir: corruptMonitorDirs) {
           try {
             ByteArrayOutputStream bout = new ByteArrayOutputStream();
             PrintStream ps = new PrintStream(bout, true);
             RaidShell shell = new RaidShell(getConf(), ps);
-            int res = ToolRunner.run(shell, new String[]{"-fsck", srcDir, "-count"});
+            int res = ToolRunner.run(shell, new String[]{"-fsck", srcDir, "-count", "-retNumStrpsMissingBlksRS"});
             shell.close();
             ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
             BufferedReader reader = new BufferedReader(new InputStreamReader(bin));
@@ -780,6 +809,28 @@ public void run() {
             Long corruptCount = Long.parseLong(line);
             LOG.info("The number of corrupt files under " + srcDir + " is " + corruptCount);
             newCounterMap.put(srcDir, corruptCount);
+            line = reader.readLine();
+            if (line == null) {
+              throw new IOException("Raidfsck did not print number of files with missing blocks");
+            }
+            //Add filesWithMissingBlks and numStrpWithMissingBlks only for "/" dir to avoid duplicates
+            if (srcDir.equals("/")) {
+              incfilesWithMissingBlks = Long.parseLong(line);
+              LOG.info("The number of files with missing blocks under " + srcDir + " is " + incfilesWithMissingBlks);
+              // fsck with '-count' prints this number in line2 
+              newfilesWithMissingBlksCnt += incfilesWithMissingBlks; 
+              // read the array for num stripes with missing blocks
+
+              for(int i = 0; i < incNumStrpWithMissingBlks.length; i++){
+                line = reader.readLine();
+                if (line == null) {
+                  throw new IOException("Raidfsck did not print the array for number stripes with missing blocks for index " + i);
+                }
+                incNumStrpWithMissingBlks[i] = Long.parseLong(line);
+                LOG.info("The number of stripes with missing blocks at index"+ i + "under" + srcDir + " is " + incNumStrpWithMissingBlks[i]);
+                newNumStrpWithMissingBlks[i] += incNumStrpWithMissingBlks[i];
+              }
+            }
             reader.close();
             bin.close();
           } catch (Exception e) {
@@ -788,6 +839,8 @@ public void run() {
         }
         synchronized(counterMapLock) {
           this.counterMap = newCounterMap;
+          this.filesWithMissingBlksCnt = newfilesWithMissingBlksCnt;
+          this.numStrpWithMissingBlksRS = newNumStrpWithMissingBlks;
         }
         updateRaidNodeMetrics();
 
@@ -798,16 +851,29 @@ public void run() {
         }
       }
     }
-    
+
     public Map<String, Long> getCounterMap() {
       synchronized (counterMapLock) {
         return counterMap;
       }
     }
-    
+
+    public long getFilesWithMissingBlksCnt(){
+      synchronized (counterMapLock) {
+        return filesWithMissingBlksCnt;
+      }
+    }
+
+    public long[] getNumStrpWithMissingBlksRS(){
+      synchronized (counterMapLock) {
+        return numStrpWithMissingBlksRS;
+      }
+    }
+
     protected void updateRaidNodeMetrics() {
       RaidNodeMetrics rnm = RaidNodeMetrics.getInstance(
           RaidNodeMetrics.DEFAULT_NAMESPACE_ID);
+
       synchronized(counterMapLock) {
         for (String dir : corruptMonitorDirs) {
           if (this.counterMap.containsKey(dir)) {
@@ -816,23 +882,34 @@ protected void updateRaidNodeMetrics() {
             rnm.corruptFiles.get(dir).set(-1L);
           }
         }
+        rnm.numFilesWithMissingBlks.set(this.filesWithMissingBlksCnt);
+        rnm.numStrpsOneMissingBlk.set(this.numStrpWithMissingBlksRS[0]);
+        rnm.numStrpsTwoMissingBlk.set(this.numStrpWithMissingBlksRS[1]);
+        rnm.numStrpsThreeMissingBlk.set(this.numStrpWithMissingBlksRS[2]);
+        rnm.numStrpsFourMissingBlk.set(this.numStrpWithMissingBlksRS[3]);
+
+        long tmp_sum = 0;
+        for (int idx=4; idx < this.numStrpWithMissingBlksRS.length;idx++) {
+          tmp_sum += this.numStrpWithMissingBlksRS[idx];
+        }   
+        rnm.numStrpsFiveMoreMissingBlk.set(tmp_sum);     
       }
     }
   }
-  
+
   public class CorruptionWorker extends Worker {
-    
+
     public CorruptionWorker() {
       super(LogFactory.getLog(CorruptionWorker.class), 
-            CorruptBlockReconstructor.class, 
-            "blockfixer");
+          CorruptBlockReconstructor.class, 
+          "blockfixer");
     }
 
     @Override
     protected Map<String, Integer> getLostFiles() throws IOException {
       return DistBlockIntegrityMonitor.this.getLostFiles(LIST_CORRUPT_FILE_PATTERN, 
-                    new String[]{"-list-corruptfileblocks", "-limit", 
-                      new Integer(lostFilesLimit).toString()});
+          new String[]{"-list-corruptfileblocks", "-limit", 
+          new Integer(lostFilesLimit).toString()});
     }
 
     @Override
@@ -841,12 +918,11 @@ Map<String, Priority> computePriorities(
         FileSystem fs, Map<String, Integer> corruptFiles) throws IOException {
 
       Map<String, Priority> fileToPriority = new HashMap<String, Priority>();
-      String[] parityDestPrefixes = destPrefixes();
       Set<String> srcDirsToWatchOutFor = new HashSet<String>();
       // Loop over parity files once.
       for (Iterator<String> it = corruptFiles.keySet().iterator(); it.hasNext(); ) {
         String p = it.next();
-        if (BlockIntegrityMonitor.isSourceFile(p, parityDestPrefixes)) {
+        if (BlockIntegrityMonitor.isSourceFile(p)) {
           continue;
         }
         // Find the parent of the parity file.
@@ -870,12 +946,12 @@ Map<String, Priority> computePriorities(
       // Loop over src files now.
       for (Iterator<String> it = corruptFiles.keySet().iterator(); it.hasNext(); ) {
         String p = it.next();
-        if (BlockIntegrityMonitor.isSourceFile(p, parityDestPrefixes)) {
+        if (BlockIntegrityMonitor.isSourceFile(p)) {
           FileStatus stat = fs.getFileStatus(new Path(p));
           if (stat.getReplication() >= notRaidedReplication) {
             continue;
           }
-          if (BlockIntegrityMonitor.doesParityDirExist(fs, p, parityDestPrefixes)) {
+          if (BlockIntegrityMonitor.doesParityDirExist(fs, p)) {
             int numCorrupt = corruptFiles.get(p);
             Priority priority = Priority.LOW;
             if (stat.getReplication() > 1) {
@@ -905,19 +981,20 @@ Map<String, Priority> computePriorities(
       }
       return fileToPriority;
     }
-    
+
     @Override
     protected void updateRaidNodeMetrics() {
       RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).corruptFilesHighPri.set(lastStatus.highPriorityFiles);
       RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).corruptFilesLowPri.set(lastStatus.lowPriorityFiles);
       RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).numFilesToFix.set(this.fileIndex.size());
-      
+      RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).numFilesToFixDropped.set(this.numFilesDropped);
+
       // Flush statistics out to the RaidNode
       incrFilesFixed(this.recentNumFilesSucceeded);
       incrFileFixFailures(this.recentNumFilesFailed);
       incrNumBlockFixSimulationFailures(this.recentNumBlockFixSimulationFailed);
       incrNumBlockFixSimulationSuccess(this.recentNumBlockFixSimulationSucceeded);
-      
+
       RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).blockFixSlotSeconds.inc(this.recentSlotSeconds);
       this.recentNumFilesSucceeded = 0;
       this.recentNumFilesFailed = 0;
@@ -925,17 +1002,17 @@ protected void updateRaidNodeMetrics() {
       this.recentNumBlockFixSimulationFailed = 0;
       this.recentNumBlockFixSimulationSucceeded = 0;
     }
-    
+
   }
-  
+
   public class DecommissioningWorker extends Worker {
 
     DecommissioningWorker() {
       super(LogFactory.getLog(DecommissioningWorker.class), 
-            BlockReconstructor.DecommissioningBlockReconstructor.class, 
-            "blockcopier");
+          BlockReconstructor.DecommissioningBlockReconstructor.class, 
+          "blockcopier");
     }
-    
+
 
     /**
      * gets a list of decommissioning files from the namenode
@@ -944,27 +1021,27 @@ public class DecommissioningWorker extends Worker {
      */
     protected Map<String, Integer> getLostFiles() throws IOException {
       return DistBlockIntegrityMonitor.this.getLostFiles(LIST_DECOMMISSION_FILE_PATTERN,
-                              new String[]{"-list-corruptfileblocks",
-                                "-list-decommissioningblocks",
-                                "-limit",
-                                new Integer(lostFilesLimit).toString()});
+          new String[]{"-list-corruptfileblocks",
+          "-list-decommissioningblocks",
+          "-limit",
+          new Integer(lostFilesLimit).toString()});
     }
 
     Map<String, Priority> computePriorities(
         FileSystem fs, Map<String, Integer> decommissioningFiles)
-        throws IOException {
+            throws IOException {
 
       Map<String, Priority> fileToPriority =
           new HashMap<String, Priority>(decommissioningFiles.size());
 
       for (String file : decommissioningFiles.keySet()) {
-        
+
         // Replication == 1. Assume Reed Solomon parity exists.
         // Files with more than 4 blocks being decommissioned get a bump.
         // Otherwise, copying jobs have the lowest priority. 
         Priority priority = ((decommissioningFiles.get(file) > Codec.getCodec("rs").parityLength) ? 
-                                  Priority.LOW : Priority.LOWEST);
-        
+            Priority.LOW : Priority.LOWEST);
+
         LostFileInfo fileInfo = fileIndex.get(file);
         if (fileInfo == null || priority.higherThan(fileInfo.getHighestPriority())) {
           fileToPriority.put(file, priority);
@@ -978,13 +1055,13 @@ protected void updateRaidNodeMetrics() {
       RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).decomFilesLowPri.set(lastStatus.highPriorityFiles);
       RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).decomFilesLowestPri.set(lastStatus.lowPriorityFiles);
       RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).numFilesToCopy.set(fileIndex.size());
-      
+
       incrFilesCopied(recentNumFilesSucceeded);
       incrFileCopyFailures(recentNumFilesFailed);
       incrNumBlockFixSimulationFailures(this.recentNumBlockFixSimulationFailed);
       incrNumBlockFixSimulationSuccess(this.recentNumBlockFixSimulationSucceeded);
       RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID).blockCopySlotSeconds.inc(recentSlotSeconds);
-      
+
       // Reset temporary values now that they've been flushed
       recentNumFilesSucceeded = 0;
       recentNumFilesFailed = 0;
@@ -1023,10 +1100,10 @@ protected Map<String, Integer> getLostFiles(
       lostFiles.put(fileName, numLost);
     }
     LOG.info("FSCK returned " + lostFiles.size() + " files with args " +
-      Arrays.toString(dfsckArgs));
+        Arrays.toString(dfsckArgs));
     RaidUtils.filterTrash(getConf(), lostFiles.keySet().iterator());
     LOG.info("getLostFiles returning " + lostFiles.size() + " files with args " +
-      Arrays.toString(dfsckArgs));
+        Arrays.toString(dfsckArgs));
     return lostFiles;
   }
 
@@ -1044,23 +1121,23 @@ private BufferedReader getLostFileReader(String[] dfsckArgs)
     ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
     return new BufferedReader(new InputStreamReader(bin));
   }
-  
+
   public void configureJob(Job job, 
-        Class<? extends BlockReconstructor> reconstructorClass) {
-    
+      Class<? extends BlockReconstructor> reconstructorClass) {
+
     ((JobConf)job.getConfiguration()).setUser(RaidNode.JOBUSER);
     ((JobConf)job.getConfiguration()).setClass(
         ReconstructionMapper.RECONSTRUCTOR_CLASS_TAG, 
         reconstructorClass,
         BlockReconstructor.class);
   }
-  
+
   void submitJob(Job job, List<String> filesInJob, Priority priority, 
-                 Map<Job, List<LostFileInfo>> jobIndex)
-  throws IOException, InterruptedException, ClassNotFoundException {
+      Map<Job, List<LostFileInfo>> jobIndex)
+          throws IOException, InterruptedException, ClassNotFoundException {
     job.submit();
     LOG.info("Job " + job.getID() + "(" + job.getJobName() +
-    ") started");
+        ") started");
     jobIndex.put(job, null);
   }
 
@@ -1073,11 +1150,11 @@ public int jobsRunning() {
   }
 
   static class ReconstructionInputFormat
-    extends SequenceFileInputFormat<LongWritable, Text> {
+  extends SequenceFileInputFormat<LongWritable, Text> {
 
     protected static final Log LOG = 
-      LogFactory.getLog(ReconstructionMapper.class);
-    
+        LogFactory.getLog(ReconstructionMapper.class);
+
     /**
      * splits the input files into tasks handled by a single node
      * we have to read the input files to do this based on a number of 
@@ -1085,7 +1162,7 @@ static class ReconstructionInputFormat
      */
     @Override
     public List <InputSplit> getSplits(JobContext job) 
-      throws IOException {
+        throws IOException {
       long filesPerTask = DistBlockIntegrityMonitor.getFilesPerTask(job.getConfiguration());
 
       Path[] inPaths = getInputPaths(job);
@@ -1095,7 +1172,7 @@ public List <InputSplit> getSplits(JobContext job)
       long fileCounter = 0;
 
       for (Path inPath: inPaths) {
-        
+
         FileSystem fs = inPath.getFileSystem(job.getConfiguration());      
 
         if (!fs.getFileStatus(inPath).isDir()) {
@@ -1106,17 +1183,17 @@ public List <InputSplit> getSplits(JobContext job)
 
         for (FileStatus inFileStatus: inFiles) {
           Path inFile = inFileStatus.getPath();
-          
+
           if (!inFileStatus.isDir() &&
               (inFile.getName().equals(job.getJobName() + IN_FILE_SUFFIX))) {
 
             fileCounter++;
             SequenceFile.Reader inFileReader = 
-              new SequenceFile.Reader(fs, inFile, job.getConfiguration());
-            
+                new SequenceFile.Reader(fs, inFile, job.getConfiguration());
+
             long startPos = inFileReader.getPosition();
             long counter = 0;
-            
+
             // create an input split every filesPerTask items in the sequence
             LongWritable key = new LongWritable();
             Text value = new Text();
@@ -1124,20 +1201,20 @@ public List <InputSplit> getSplits(JobContext job)
               while (inFileReader.next(key, value)) {
                 if (counter % filesPerTask == filesPerTask - 1L) {
                   splits.add(new FileSplit(inFile, startPos, 
-                                           inFileReader.getPosition() - 
-                                           startPos,
-                                           null));
+                      inFileReader.getPosition() - 
+                      startPos,
+                      null));
                   startPos = inFileReader.getPosition();
                 }
                 counter++;
               }
-              
+
               // create input split for remaining items if necessary
               // this includes the case where no splits were created by the loop
               if (startPos != inFileReader.getPosition()) {
                 splits.add(new FileSplit(inFile, startPos,
-                                         inFileReader.getPosition() - startPos,
-                                         null));
+                    inFileReader.getPosition() - startPos,
+                    null));
               }
             } finally {
               inFileReader.close();
@@ -1147,8 +1224,8 @@ public List <InputSplit> getSplits(JobContext job)
       }
 
       LOG.info("created " + splits.size() + " input splits from " +
-               fileCounter + " files");
-      
+          fileCounter + " files");
+
       return splits;
     }
 
@@ -1165,29 +1242,32 @@ public boolean isSplitable (JobContext job, Path file) {
    * Mapper for reconstructing stripes with lost blocks
    */
   static class ReconstructionMapper
-    extends Mapper<LongWritable, Text, Text, Text> {
+  extends Mapper<LongWritable, Text, Text, Text> {
 
     protected static final Log LOG = 
-      LogFactory.getLog(ReconstructionMapper.class);
-    
+        LogFactory.getLog(ReconstructionMapper.class);
+    protected static final Log FILEFIX_WAITTIME_METRICS_LOG = 
+        LogFactory.getLog("RaidMetrics");
+
     public static final String RECONSTRUCTOR_CLASS_TAG =
-      "hdfs.blockintegrity.reconstructor";
-    
+        "hdfs.blockintegrity.reconstructor";
+
     private BlockReconstructor reconstructor;
+    private long detectTimeInput;
+
 
-    
     @Override
     protected void setup(Context context) 
         throws IOException, InterruptedException {
-      
+
       super.setup(context);
-      
+
       Configuration conf = context.getConfiguration();
 
       Codec.initializeCodecs(conf);
-      
+
       Class<? extends BlockReconstructor> reconstructorClass = 
-        context.getConfiguration().getClass(RECONSTRUCTOR_CLASS_TAG, 
+          context.getConfiguration().getClass(RECONSTRUCTOR_CLASS_TAG, 
                                             null, 
                                             BlockReconstructor.class);
       
@@ -1208,7 +1288,9 @@ protected void setup(Context context)
       } catch (Exception ex) {
         throw new IOException("Could not instantiate a block reconstructor " +
                           "based on class " + reconstructorClass, ex);
-      }  
+      }
+      
+      detectTimeInput = Long.parseLong(conf.get("corrupt_detect_time"));
     }
 
     /**
@@ -1220,8 +1302,10 @@ public void map(LongWritable key, Text fileText, Context context)
 
       String fileStr = fileText.toString();
       LOG.info("reconstructing " + fileStr);
-
       Path file = new Path(fileStr);
+      long waitTime = System.currentTimeMillis() - detectTimeInput;
+      logWaitTimeMetrics(waitTime, getMaxPendingJobs(context.getConfiguration()), 
+          getFilesPerTask(context.getConfiguration()),"FILE_FIX_WAITTIME");
 
       try {
         boolean reconstructed = reconstructor.reconstructFile(file, context);
@@ -1239,9 +1323,23 @@ public void map(LongWritable key, Text fileText, Context context)
         String outval = "failed";
         context.write(new Text(outkey), new Text(outval));
       }
-
       context.progress();
     }
+    
+    private void logWaitTimeMetrics (
+        long waitTime, long maxPendingJobsLimit, long filesPerTaskLimit, String type) {
+      
+      try {
+        JSONObject json = new JSONObject();
+        json.put("fileFixWaitTime", waitTime);
+        json.put("maxPendingJobs", maxPendingJobsLimit);
+        json.put("maxFilesPerTask", filesPerTaskLimit);
+        json.put("type",type); 
+        FILEFIX_WAITTIME_METRICS_LOG.info(json.toString());
+      } catch(JSONException e) {
+        LOG.warn("Exception when logging the File_Fix_WaitTime metric : " + e.getMessage(), e);
+      }
+    }
   }
 
   /**
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaid.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaid.java
index 7eee2290..3c13e8e1 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaid.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaid.java
@@ -290,6 +290,16 @@ public boolean startDistRaid() throws IOException {
     return false;
   }
 
+  /**
+   * Get the URL of the current running job
+   * @return the tracking URL
+   */
+  public String getJobTrackingURL() {
+    if (runningJob == null)
+      return null;
+    return runningJob.getTrackingURL();
+  }
+  
    /** Checks if the map-reduce job has completed.
     *
     * @return true if the job completed, false otherwise.
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaidNode.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaidNode.java
index 758fbec2..f56b5651 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaidNode.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaidNode.java
@@ -85,6 +85,11 @@ public void stop() {
    */
   @Override
   void raidFiles(PolicyInfo info, List<FileStatus> paths) throws IOException {
+    raidFiles(conf, jobMonitor, info, paths);
+  }
+
+  final static void raidFiles(Configuration conf, JobMonitor jobMonitor,
+      PolicyInfo info, List<FileStatus> paths) throws IOException {
     // We already checked that no job for this policy is running
     // So we can start a new job.
     DistRaid dr = new DistRaid(conf);
@@ -93,9 +98,8 @@ void raidFiles(PolicyInfo info, List<FileStatus> paths) throws IOException {
     boolean started = dr.startDistRaid();
     if (started) {
       jobMonitor.monitorJob(info.getName(), dr);
-    }
+    }    
   }
-
   /**
    * {@inheritDocs}
    */
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/Encoder.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/Encoder.java
index 98f7b0f6..a86db167 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/Encoder.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/Encoder.java
@@ -182,21 +182,21 @@ public void encodeFile(
    * null outputs for the blocks to be discarded.
    *
    * @param fs The filesystem in which both srcFile and parityFile reside.
-   * @param srcFile The source file.
-   * @param srcSize The size of the source file.
-   * @param blockSize The block size for the source/parity files.
+   * @param srcStat The FileStatus of source file.
+   * @param blockSize The block size for the parity files.
    * @param corruptOffset The location of corruption in the parity file.
    * @param localBlockFile The destination for the reovered block.
    * @param progress A reporter for progress.
    */
   public void recoverParityBlockToFile(
     FileSystem fs,
-    Path srcFile, long srcSize, long blockSize,
+    FileStatus srcStat,
+    long blockSize, 
     Path parityFile, long corruptOffset,
     File localBlockFile, Progressable progress) throws IOException {
     OutputStream out = new FileOutputStream(localBlockFile);
     try {
-      recoverParityBlockToStream(fs, srcFile, srcSize, blockSize, parityFile,
+      recoverParityBlockToStream(fs, srcStat, blockSize, parityFile,
         corruptOffset, out, progress);
     } finally {
       out.close();
@@ -211,19 +211,18 @@ public void recoverParityBlockToFile(
    * null outputs for the blocks to be discarded.
    *
    * @param fs The filesystem in which both srcFile and parityFile reside.
-   * @param srcFile The source file.
-   * @param srcSize The size of the source file.
-   * @param blockSize The block size for the source/parity files.
+   * @param srcStat fileStatus of The source file.
+   * @param blockSize The block size for the parity files.
    * @param corruptOffset The location of corruption in the parity file.
    * @param out The destination for the reovered block.
    * @param progress A reporter for progress.
    */
   public void recoverParityBlockToStream(
-    FileSystem fs,
-    Path srcFile, long srcSize, long blockSize,
+    FileSystem fs, FileStatus srcStat, long blockSize,
     Path parityFile, long corruptOffset,
     OutputStream out, Progressable progress) throws IOException {
     LOG.info("Recovering parity block" + parityFile + ":" + corruptOffset);
+    Path srcFile = srcStat.getPath();
     // Get the start offset of the corrupt block.
     corruptOffset = (corruptOffset / blockSize) * blockSize;
     // Output streams to each block in the parity file stripe.
@@ -244,7 +243,7 @@ public void recoverParityBlockToStream(
     // Get the stripe index and start offset of stripe.
     long stripeIdx = corruptOffset / (codec.parityLength * blockSize);
     StripeReader sReader = StripeReader.getStripeReader(codec, conf, 
-        blockSize, fs, stripeIdx, srcFile, srcSize);
+        blockSize, fs, stripeIdx, srcStat);
     // Get input streams to each block in the source file stripe.
     assert sReader.hasNext() == true;
     InputStream[] blocks = sReader.getNextStripeInputs();
@@ -330,7 +329,8 @@ void encodeStripe(
     configureBuffers(blockSize);
     int boundedBufferCapacity = 1;
     ParallelStreamReader parallelReader = new ParallelStreamReader(
-      reporter, blocks, bufSize, parallelism, boundedBufferCapacity, blockSize);
+      reporter, blocks, bufSize, 
+      parallelism, boundedBufferCapacity, blockSize);
     parallelReader.start();
     try {
       for (long encoded = 0; encoded < blockSize; encoded += bufSize) {
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/ErasureCode.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/ErasureCode.java
index e1610e81..32532e70 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/ErasureCode.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/ErasureCode.java
@@ -70,7 +70,7 @@ public List<Integer> locationsToReadForDecode(List<Integer> erasedLocations)
     List<Integer> locationsToRead = new ArrayList<Integer>(stripeSize());
     int limit = stripeSize() + paritySize();
     // Loop through all possible locations in the stripe.
-    for (int loc = 0; loc < limit; loc++) {
+    for (int loc = limit - 1; loc >= 0; loc--) {
       // Is the location good.
       if (erasedLocations.indexOf(loc) == -1) {
         locationsToRead.add(loc);
@@ -108,6 +108,10 @@ public List<Integer> locationsToReadForDecode(List<Integer> erasedLocations)
 
   public abstract int symbolSize();
 
+  /**
+   * This method would be overridden in the subclass, 
+   * so that the subclass will have its own encodeBulk behavior. 
+   */
   public void encodeBulk(byte[][] inputs, byte[][] outputs) {
     final int stripeSize = stripeSize();
     final int paritySize = paritySize();
@@ -130,6 +134,10 @@ public void encodeBulk(byte[][] inputs, byte[][] outputs) {
     }
   }
 
+  /**
+   * This method would be overridden in the subclass, 
+   * so that the subclass will have its own decodeBulk behavior. 
+   */
   public void decodeBulk(byte[][] readBufs, byte[][] writeBufs,
       int[] erasedLocations) {
     int[] tmpInput = new int[readBufs.length];
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/ExpandedPolicy.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/ExpandedPolicy.java
index 43feea11..4fe8a316 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/ExpandedPolicy.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/ExpandedPolicy.java
@@ -47,6 +47,11 @@ boolean match(FileStatus f, long mtime, long now,
       boolean skipParityCheck, Configuration conf) throws IOException {
     String pathStr = normalizePath(f.getPath());
     if (pathStr.startsWith(srcPrefix)) {
+      
+      if (f.isDir() != codec.isDirRaid) {
+        return false;
+      }
+      
       if (now - mtime > modTimePeriod) {
         return true;
       }
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/GaloisField.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/GaloisField.java
index 44a40f5c..ae3387ce 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/GaloisField.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/GaloisField.java
@@ -220,6 +220,33 @@ public void solveVandermondeSystem(int[] x, int[] y, int len) {
       }
     }
   }
+  
+  /**
+   * A "bulk" version of the solveVandermondeSystem
+   */
+  public void solveVandermondeSystem(int[] x, byte[][] y, 
+                                     int len, int dataLen) {
+    assert(x.length <= len && y.length <= len);
+    for (int i = 0; i < len - 1; i++) {
+      for (int j = len - 1; j > i; j--) {
+        for (int k = 0; k < dataLen; k++) {
+          y[j][k] = (byte)(y[j][k] ^ mulTable[x[i]][y[j - 1][k] & 0x000000FF]);
+        }
+      }
+    }
+    for (int i = len - 1; i >= 0; i--) {
+      for (int j = i + 1; j < len; j++) {
+        for (int k = 0; k < dataLen; k++) {
+          y[j][k] = (byte)(divTable[y[j][k] & 0x000000FF][x[j] ^ x[j - i - 1]]);
+        }
+      }
+      for (int j = i; j < len - 1; j++) {
+        for (int k = 0; k < dataLen; k++) {
+          y[j][k] = (byte)(y[j][k] ^ y[j + 1][k]);
+        }
+      }
+    }
+  }
 
   /**
    * Compute the multiplication of two polynomials. The index in the
@@ -260,6 +287,22 @@ public void remainder(int[] dividend, int[] divisor) {
       }
     }
   }
+  
+  /**
+   * The "bulk" version of the remainder.
+   * Warning: This function will modify the "dividend" inputs.
+   */
+  public void remainder(byte[][] dividend, int[] divisor) {
+    for (int i = dividend.length - divisor.length; i >= 0; i--) {
+      for (int j = 0; j < divisor.length; j++) {
+        for (int k = 0; k < dividend[i].length; k++) {
+          int ratio = 
+              divTable[dividend[i + divisor.length - 1][k] & 0x00FF][divisor[divisor.length - 1]];
+          dividend[j + i][k] = (byte)((dividend[j + i][k] & 0x00FF) ^ mulTable[ratio][divisor[j]]);
+        }
+      }
+    }
+  }
 
   /**
    * Compute the sum of two polynomials. The index in the
@@ -299,6 +342,26 @@ public int substitute(int[] p, int x) {
     }
     return result;
   }
+  
+  /**
+   * A "bulk" version of the substitute.
+   * Tends to be 2X faster than the "int" substitute in a loop.
+   * 
+   * @param p input polynomial
+   * @param q store the return result
+   * @param x input field
+   */
+  public void substitute(byte[][] p, byte[] q, int x) {
+    int y = 1;
+    for (int i = 0; i < p.length; i++) {
+      byte[] pi = p[i];
+      for (int j = 0; j < pi.length; j++) {
+        int pij = pi[j] & 0x000000FF;
+        q[j] = (byte)(q[j] ^ mulTable[pij][y]);
+      }
+      y = mulTable[x][y];
+    }
+  }
 
   /**
    * Perform Gaussian elimination on the given matrix. This matrix has to be a
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/JobMonitor.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/JobMonitor.java
index cd153d93..c2ba48c0 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/JobMonitor.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/JobMonitor.java
@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import java.text.SimpleDateFormat; 
+import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -201,6 +202,13 @@ public List<DistRaid> getRunningJobs() {
     }
     return list;
   }
+  
+  // for test
+  public Map<String, Counters> getRaidProgress() {
+    synchronized (raidProgress) {
+      return Collections.unmodifiableMap(this.raidProgress);
+    }
+  }
 
   public void monitorJob(String key, DistRaid job) {
     addJob(jobs, key, job);
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/MissingParityFiles.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/MissingParityFiles.java
index 21616f97..3872d77e 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/MissingParityFiles.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/MissingParityFiles.java
@@ -122,7 +122,7 @@ public boolean check(FileStatus f) throws IOException {
     public boolean isParityFile(Path filePath) {
       String pathStr = filePath.toUri().getPath();
       for (Codec c : Codec.getCodecs()) {
-        if (pathStr.startsWith(c.parityDirectory)) {
+        if (pathStr.startsWith(c.getParityPrefix())) {
           return true;
         }
       }
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/ParallelStreamReader.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/ParallelStreamReader.java
index 67f8871e..9f9bf212 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/ParallelStreamReader.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/ParallelStreamReader.java
@@ -22,6 +22,7 @@
 import java.io.InputStream;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executors;
@@ -35,6 +36,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.DFSClient.DFSDataInputStream;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.util.Progressable;
 import org.apache.hadoop.util.StringUtils;
 
@@ -104,6 +106,7 @@ IOException getException() {
    * @param numThreads Number of threads to use for parallelism.
    * @param boundedBuffer The queue to place the results in.
    */
+  
   public ParallelStreamReader(
       Progressable reporter,
       InputStream[] streams,
@@ -118,11 +121,14 @@ public ParallelStreamReader(
       this.streams[i] = streams[i];
       if (this.streams[i] instanceof DFSDataInputStream) {
         DFSDataInputStream stream = (DFSDataInputStream)this.streams[i];
-        if (stream.getAllBlocks().size() == 0) {
+        // in directory raiding, the block size for each input stream 
+        // might be different, so we need to determine the endOffset of
+        // each stream by their own block size.
+        List<LocatedBlock> blocks = stream.getAllBlocks();
+        if (blocks.size() == 0) {
           this.endOffsets[i] = Long.MAX_VALUE;
         } else {
-          this.endOffsets[i] = stream.getPos() + 
-            stream.getAllBlocks().get(0).getBlockSize();
+          this.endOffsets[i] = stream.getPos() + blocks.get(0).getBlockSize();
         }
       } else {
         this.endOffsets[i] = Long.MAX_VALUE;
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/ParityFilePair.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/ParityFilePair.java
index 457c2a63..5db3c42c 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/ParityFilePair.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/ParityFilePair.java
@@ -139,7 +139,7 @@ static boolean verifyParity(FileStatus src, FileStatus parity,
     long expectedSize = 0;
     if (codec.isDirRaid) {
       FileSystem srcFs = src.getPath().getFileSystem(conf);
-      List<FileStatus> lfs = RaidNode.getDirectoryBlockLocations(conf, srcFs, 
+      List<FileStatus> lfs = RaidNode.listDirectoryRaidFileStatus(conf, srcFs, 
           src.getPath());
       if (lfs == null) {
         return false;
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/PlacementMonitor.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/PlacementMonitor.java
index 2ffd7ed8..1cba8a1e 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/PlacementMonitor.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/PlacementMonitor.java
@@ -76,13 +76,17 @@ protected HashMap<String, LocatedFileStatus> initialValue() {
   
   RaidNodeMetrics metrics;
   BlockMover blockMover;
+  int blockMoveMinRepl = DEFAULT_BLOCK_MOVE_MIN_REPLICATION;
 
   final static String NUM_MOVING_THREADS_KEY = "hdfs.raid.block.move.threads";
   final static String SIMULATE_KEY = "hdfs.raid.block.move.simulate";
   final static String BLOCK_MOVE_QUEUE_LENGTH_KEY = "hdfs.raid.block.move.queue.length";
+  final static String BLOCK_MOVE_MIN_REPLICATION_KEY =
+      "hdfs.raid.block.move.min.replication";
   final static int DEFAULT_NUM_MOVING_THREADS = 10;
   final static int DEFAULT_BLOCK_MOVE_QUEUE_LENGTH = 30000;
   final static int ALWAYS_SUBMIT_PRIORITY = 3;
+  final static int DEFAULT_BLOCK_MOVE_MIN_REPLICATION = 1;
 
   PlacementMonitor(Configuration conf) throws IOException {
     this.conf = conf;
@@ -91,6 +95,8 @@ protected HashMap<String, LocatedFileStatus> initialValue() {
         NUM_MOVING_THREADS_KEY, DEFAULT_NUM_MOVING_THREADS);
     int maxMovingQueueSize = conf.getInt(
         BLOCK_MOVE_QUEUE_LENGTH_KEY, DEFAULT_BLOCK_MOVE_QUEUE_LENGTH);
+    this.blockMoveMinRepl = conf.getInt(BLOCK_MOVE_MIN_REPLICATION_KEY,
+        DEFAULT_BLOCK_MOVE_MIN_REPLICATION);
 
     boolean simulate = conf.getBoolean(SIMULATE_KEY, true);
     blockMover = new BlockMover(
@@ -127,8 +133,8 @@ public int getMovingQueueSize() {
   public void checkFile(FileSystem srcFs, FileStatus srcFile,
             FileSystem parityFs, Path partFile, HarIndex.IndexEntry entry,
             Codec codec) throws IOException {
-    if (srcFile.getReplication() > 1) {
-      // We only check placement for the file with one replica
+    if (srcFile.getReplication() > blockMoveMinRepl) {
+      // We only check placement for the file with 0..blockMoveMinRepl replicas.
       return;
     }
     if (srcFs.getUri().equals(parityFs.getUri())) {
@@ -150,15 +156,26 @@ public void checkFile(FileSystem srcFs, FileStatus srcFile,
                         FileSystem parityFs, FileStatus parityFile,
                         Codec codec)
       throws IOException {
-    if (srcFile.getReplication() > 1) {
-      // We only check placement for the file with one replica
+    
+    if (!codec.isDirRaid) {
+      if (srcFile.getReplication() > blockMoveMinRepl) {
+        // We only check placement for the file with 0..blockMoveMinRepl replicas.
+        return;
+      }
+    } 
+    List<BlockInfo> srcLstBI = getBlockInfos(srcFs, srcFile);
+    if (srcLstBI.size() == 0) 
       return;
+    if (codec.isDirRaid) {
+      if (srcLstBI.get(0).blockLocation.getHosts().length > blockMoveMinRepl) {
+        return;
+      }
     }
     if (srcFs.equals(parityFs)) {
       BlockAndDatanodeResolver resolver = new BlockAndDatanodeResolver(
           srcFile.getPath(), srcFs, parityFile.getPath(), parityFs);
       checkBlockLocations(
-          getBlockInfos(srcFs, srcFile),
+          srcLstBI,
           getBlockInfos(parityFs, parityFile),
           codec, srcFile, resolver);
     } else {
@@ -214,8 +231,25 @@ String[] getNames() {
 
   List<BlockInfo> getBlockInfos(
     FileSystem fs, FileStatus stat) throws IOException {
-    return getBlockInfos(
-      fs, stat.getPath(), 0, stat.getLen());
+    if (stat.isDir()) {
+      return getDirBlockInfos(fs, stat.getPath());
+    } else {
+      return getBlockInfos(
+        fs, stat.getPath(), 0, stat.getLen());
+    }
+  }
+  
+  List<BlockInfo> getDirBlockInfos(FileSystem fs, Path dirPath)
+      throws IOException {
+    List<LocatedFileStatus> lfs = RaidNode.listDirectoryRaidLocatedFileStatus(conf,
+        fs, dirPath);
+    List<BlockInfo> result = new ArrayList<BlockInfo>();
+    for (LocatedFileStatus stat: lfs) {
+      for (BlockLocation loc : stat.getBlockLocations()) {
+        result.add(new BlockInfo(loc, stat.getPath()));
+      }
+    }
+    return result;
   }
 
   List<BlockInfo> getBlockInfos(
@@ -242,10 +276,11 @@ void checkBlockLocations(List<BlockInfo> srcBlocks,
     }
     int stripeLength = codec.stripeLength;
     int parityLength = codec.parityLength;
-    int numBlocks = (int)Math.ceil(1D * srcFile.getLen() /
-                                   srcFile.getBlockSize());
-    int numStripes = (int)Math.ceil(1D * (numBlocks) / stripeLength);
-
+    int numBlocks = 0;
+    int numStripes = 0;
+    numBlocks = srcBlocks.size();
+    numStripes = (int)RaidNode.numStripes(numBlocks, stripeLength);
+    
     Map<String, Integer> nodeToNumBlocks = new HashMap<String, Integer>();
     Set<String> nodesInThisStripe = new HashSet<String>();
 
@@ -339,6 +374,11 @@ private static void updateBlockPlacementHistogram(
   private void submitBlockMoves(Map<String, Integer> nodeToNumBlocks,
       List<BlockInfo> stripeBlocks, Set<String> excludedNodes,
       BlockAndDatanodeResolver resolver) throws IOException {
+    // Initialize resolver
+    for (BlockInfo block: stripeBlocks) {
+      resolver.initialize(block.file, resolver.srcFs);
+    }
+   
     // For all the nodes that has more than 2 blocks, find and move the blocks
     // so that there are only one block left on this node.
     for (String node : nodeToNumBlocks.keySet()) {
@@ -363,8 +403,10 @@ private void submitBlockMoves(Map<String, Integer> nodeToNumBlocks,
             for (String name : excludedNodes) {
               excludedDatanodes.add(resolver.getDatanodeInfo(name));
             }
-            blockMover.move(lb, datanode, excludedDatanodes, priority,
-                lb.getDataProtocolVersion(), lb.getNamespaceID());
+            if (lb != null) {
+              blockMover.move(lb, datanode, excludedDatanodes, priority,
+                  lb.getDataProtocolVersion(), lb.getNamespaceID());
+            }
             break;
           }
         }
@@ -485,15 +527,16 @@ static class BlockAndDatanodeResolver {
     final FileSystem parityFs;
 
     private boolean inited = false;
-    private Map<String, DatanodeInfo> nameToDatanodeInfo = null;
+    private Map<String, DatanodeInfo> nameToDatanodeInfo = 
+        new HashMap<String, DatanodeInfo>();
     private Map<Path, Map<Long, LocatedBlockWithMetaInfo>>
-      pathAndOffsetToLocatedBlock = null;
-
+      pathAndOffsetToLocatedBlock =
+        new HashMap<Path, Map<Long, LocatedBlockWithMetaInfo>>();
     // For test
     BlockAndDatanodeResolver() {
       this.src = null;
       this.srcFs = null;
-      this.parity =null;
+      this.parity = null;
       this.parityFs = null;
     }
 
@@ -506,7 +549,8 @@ static class BlockAndDatanodeResolver {
     }
 
     public LocatedBlockWithMetaInfo getLocatedBlock(BlockInfo blk) throws IOException {
-      checkInitialized();
+      checkParityInitialized();
+      initialize(blk.file, srcFs);
       Map<Long, LocatedBlockWithMetaInfo> offsetToLocatedBlock =
           pathAndOffsetToLocatedBlock.get(blk.file);
       if (offsetToLocatedBlock != null) {
@@ -523,29 +567,27 @@ public LocatedBlockWithMetaInfo getLocatedBlock(BlockInfo blk) throws IOExceptio
     }
 
     public DatanodeInfo getDatanodeInfo(String name) throws IOException {
-      checkInitialized();
+      checkParityInitialized();
       return nameToDatanodeInfo.get(name);
     }
 
-    private void checkInitialized() throws IOException{
+    private void checkParityInitialized() throws IOException{
       if (inited) {
         return;
       }
-      initialize();
+      initialize(parity, parityFs);
       inited = true;
     }
-    private void initialize() throws IOException {
-      pathAndOffsetToLocatedBlock =
-          new HashMap<Path, Map<Long, LocatedBlockWithMetaInfo>>();
-      VersionedLocatedBlocks srcLbs = getLocatedBlocks(src, srcFs);
-      VersionedLocatedBlocks parityLbs = getLocatedBlocks(parity, parityFs);
-      pathAndOffsetToLocatedBlock.put(
-          src, createOffsetToLocatedBlockMap(srcLbs));
+    
+    public void initialize(Path path, FileSystem fs) throws IOException {
+      if (pathAndOffsetToLocatedBlock.containsKey(path)) {
+        return;
+      }
+      VersionedLocatedBlocks pathLbs = getLocatedBlocks(path, fs);
       pathAndOffsetToLocatedBlock.put(
-          parity, createOffsetToLocatedBlockMap(parityLbs));
+          path, createOffsetToLocatedBlockMap(pathLbs));
 
-      nameToDatanodeInfo = new HashMap<String, DatanodeInfo>();
-      for (LocatedBlocks lbs : Arrays.asList(srcLbs, parityLbs)) {
+      for (LocatedBlocks lbs : Arrays.asList(pathLbs)) {
         for (LocatedBlock lb : lbs.getLocatedBlocks()) {
           for (DatanodeInfo dn : lb.getLocations()) {
             nameToDatanodeInfo.put(dn.getName(), dn);
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/PurgeMonitor.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/PurgeMonitor.java
index 0289d91b..bba8938e 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/PurgeMonitor.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/PurgeMonitor.java
@@ -40,6 +40,9 @@
  */
 public class PurgeMonitor implements Runnable {
   public static final Log LOG = LogFactory.getLog(PurgeMonitor.class);
+  public static final long PURGE_MONITOR_SLEEP_TIME_DEFAULT = 10000L;
+  public static final String PURGE_MONITOR_SLEEP_TIME_KEY =
+      "hdfs.raid.purge.monitor.sleep";
 
   volatile boolean running = true;
 
@@ -47,6 +50,7 @@ public class PurgeMonitor implements Runnable {
   private PlacementMonitor placementMonitor;
   private int directoryTraversalThreads;
   private boolean directoryTraversalShuffle;
+  private long purgeMonitorSleepTime = PURGE_MONITOR_SLEEP_TIME_DEFAULT;
 
   AtomicLong entriesProcessed;
 
@@ -57,6 +61,9 @@ public PurgeMonitor(Configuration conf, PlacementMonitor placementMonitor) {
         conf.getBoolean(RaidNode.RAID_DIRECTORYTRAVERSAL_SHUFFLE, true);
     this.directoryTraversalThreads =
         conf.getInt(RaidNode.RAID_DIRECTORYTRAVERSAL_THREADS, 4);
+    this.purgeMonitorSleepTime = 
+        conf.getLong(PURGE_MONITOR_SLEEP_TIME_KEY,
+            PURGE_MONITOR_SLEEP_TIME_DEFAULT);
     this.entriesProcessed = new AtomicLong(0);
   }
 
@@ -113,7 +120,7 @@ private void purgeDirectories(FileSystem fs, Path root) throws IOException {
   void doPurge() throws IOException, InterruptedException {
     entriesProcessed.set(0);
     while (running) {
-      Thread.sleep(10 * 1000L);
+      Thread.sleep(purgeMonitorSleepTime);
 
       placementMonitor.startCheckingFiles();
       try {
@@ -158,18 +165,20 @@ void purgeCode(Codec codec) throws IOException {
       performDelete(parityFs, obsolete.getPath(), false);
     }
 
-    DirectoryTraversal obsoleteParityHarRetriever =
-      new DirectoryTraversal(
-        "Purge HAR ",
-        Collections.singletonList(parityPath),
-        parityFs,
-        new PurgeHarFilter(conf, codec, srcFs, parityFs,
-          parityPath.toUri().getPath(), placementMonitor, entriesProcessed),
-        directoryTraversalThreads,
-        directoryTraversalShuffle);
-    while ((obsolete = obsoleteParityHarRetriever.next()) !=
-              DirectoryTraversal.FINISH_TOKEN) {
-      performDelete(parityFs, obsolete.getPath(), true);
+    if (!codec.isDirRaid) {
+      DirectoryTraversal obsoleteParityHarRetriever =
+        new DirectoryTraversal(
+          "Purge HAR ",
+          Collections.singletonList(parityPath),
+          parityFs,
+          new PurgeHarFilter(conf, codec, srcFs, parityFs,
+             parityPath.toUri().getPath(), placementMonitor, entriesProcessed),
+          directoryTraversalThreads,
+          directoryTraversalShuffle);
+      while ((obsolete = obsoleteParityHarRetriever.next()) !=
+                DirectoryTraversal.FINISH_TOKEN) {
+        performDelete(parityFs, obsolete.getPath(), true);
+      }
     }
   }
 
@@ -319,7 +328,9 @@ public boolean check(FileStatus f) throws IOException {
   private static boolean existsBetterParityFile(
       Codec codec, Path srcPath, Configuration conf) throws IOException {
     for (Codec c : Codec.getCodecs()) {
-      if (c.priority > codec.priority) {
+      // We don't want to purge a good parity file because of a potentially
+      // bad code
+      if (c.priority > codec.priority && !c.simulateBlockFix) {
         ParityFilePair ppair = ParityFilePair.getParityFile(
             c, srcPath, conf);
         if (ppair != null) {
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNode.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNode.java
index dbcc0332..6934ffae 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNode.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNode.java
@@ -81,8 +81,16 @@ public abstract class RaidNode implements RaidProtocol {
     Configuration.addDefaultResource("hdfs-site.xml");
     Configuration.addDefaultResource("mapred-default.xml");
     Configuration.addDefaultResource("mapred-site.xml");
+    Configuration.addDefaultResource("raid-default.xml");
+    Configuration.addDefaultResource("raid-site.xml");
   }
+  public static enum LOGTYPES {
+    ONLINE_RECONSTRUCTION,
+    OFFLINE_RECONSTRUCTION,
+    ENCODING
+  };
   public static final Log LOG = LogFactory.getLog(RaidNode.class);
+  public static final Log ENCODER_METRICS_LOG = LogFactory.getLog("RaidMetrics"); 
   public static final long SLEEP_TIME = 10000L; // 10 seconds
   public static final String TRIGGER_MONITOR_SLEEP_TIME_KEY = 
       "hdfs.raid.trigger.monitor.sleep.time";
@@ -480,6 +488,16 @@ public Map<String, Long> getCorruptFileCounterMap() {
     return ((CorruptFileCounter)blockIntegrityMonitor.
         getCorruptFileCounter()).getCounterMap();
   }
+  
+  public long getNumFilesWithMissingBlks() {
+    return ((CorruptFileCounter)blockIntegrityMonitor.
+        getCorruptFileCounter()).getFilesWithMissingBlksCnt();
+  }
+  
+  public long[] getNumStrpWithMissingBlksRS(){
+    return ((CorruptFileCounter)blockIntegrityMonitor.
+        getCorruptFileCounter()).getNumStrpWithMissingBlksRS();
+  }
 
   public String getHostName() {
     return this.infoBindAddress;
@@ -634,10 +652,17 @@ private List<FileStatus> selectFiles(
       } else {
         LOG.info("Start new traversal for policy " + policyName);
         scanState.startTime = now();
-        traversal = DirectoryTraversal.raidFileRetriever(
-            info, info.getSrcPathExpanded(), allPolicies, conf,
-            directoryTraversalThreads, directoryTraversalShuffle,
-            true);
+        if (!Codec.getCodec(info.getCodecId()).isDirRaid) {
+          traversal = DirectoryTraversal.raidFileRetriever(
+              info, info.getSrcPathExpanded(), allPolicies, conf,
+              directoryTraversalThreads, directoryTraversalShuffle,
+              true);
+        } else {
+          traversal = DirectoryTraversal.raidLeafDirectoryRetriever(
+              info, info.getSrcPathExpanded(), allPolicies, conf,
+              directoryTraversalThreads, directoryTraversalShuffle,
+              true);
+        }
         scanState.setTraversal(traversal);
       }
 
@@ -676,6 +701,7 @@ private List<FileStatus> readFileList(PolicyInfo info) throws IOException {
         }
       }
 
+      Codec codec = Codec.getCodec(info.getCodecId());
       String l = null;
       try {
         while ((l = scanState.fileListReader.readLine()) != null) {
@@ -686,8 +712,28 @@ private List<FileStatus> readFileList(PolicyInfo info) throws IOException {
           try {
             stat = ParityFilePair.FileStatusCache.get(fs, p);
           } catch (FileNotFoundException e) {
+            LOG.warn("Path " + p  + " does not exist", e);
+          }
+          if (stat == null) {
+            continue;
           }
-          if (stat != null && stat.getReplication() > targetReplication) {
+          short repl = 0;
+          if (codec.isDirRaid) {
+            if (!stat.isDir()) {
+              continue;
+            }
+            List<FileStatus> lfs = RaidNode.listDirectoryRaidFileStatus(conf, fs, p);
+            if (lfs == null) {
+              continue;
+            }
+            repl = DirectoryStripeReader.getReplication(lfs);
+          } else {
+            repl = stat.getReplication();
+          }
+          if (repl > targetReplication) {
+            list.add(stat);
+          } else if (repl == targetReplication &&
+                     !ParityFilePair.parityExists(stat, codec, conf)) {
             list.add(stat);
           }
           if (list.size() >= selectLimit) {
@@ -767,10 +813,10 @@ private void doProcess() throws IOException, InterruptedException {
               " " + filteredPaths.size() + " files");
           try {
             raidFiles(info, filteredPaths);
-          } catch (Exception e) {
+          } catch (Throwable e) {
             LOG.info("Exception while invoking action on policy " + info.getName() +
                 " srcPath " + info.getSrcPath() + 
-                " exception " + StringUtils.stringifyException(e));
+                " exception " + StringUtils.stringifyException(e), e);
             continue;
           }
         }
@@ -842,7 +888,7 @@ void doRaid(Configuration conf, PolicyInfo info, List<FileStatus> paths)
 
 
   /**
-   * RAID an individual file
+   * RAID an individual file/directory
    */
   static public boolean doRaid(Configuration conf, PolicyInfo info,
       FileStatus src, Statistics statistics, 
@@ -862,7 +908,7 @@ static public boolean doRaid(Configuration conf, PolicyInfo info,
           reporter, doSimulate, targetRepl, metaRepl);
   }
   
-  public static List<FileStatus> getDirectoryBlockLocations(Configuration conf,
+  public static List<FileStatus> listDirectoryRaidFileStatus(Configuration conf,
       FileSystem srcFs, Path p) throws IOException {
     long minFileSize = conf.getLong(MINIMUM_RAIDABLE_FILESIZE_KEY,
         MINIMUM_RAIDABLE_FILESIZE);
@@ -883,16 +929,61 @@ public static List<FileStatus> getDirectoryBlockLocations(Configuration conf,
     return lfs;
   }
   
+  public static List<LocatedFileStatus> listDirectoryRaidLocatedFileStatus(
+      Configuration conf, FileSystem srcFs, Path p) throws IOException {
+    long minFileSize = conf.getLong(MINIMUM_RAIDABLE_FILESIZE_KEY,
+        MINIMUM_RAIDABLE_FILESIZE);
+    List<LocatedFileStatus> lfs = new ArrayList<LocatedFileStatus>();
+    RemoteIterator<LocatedFileStatus> iter = srcFs.listLocatedStatus(p);
+    while (iter.hasNext()) {
+      LocatedFileStatus stat = iter.next();
+      if (stat.isDir()) {
+        return null;
+      }
+      // We don't raid too small files
+      if (stat.getLen() < minFileSize) {
+        continue;
+      }
+      lfs.add(stat);
+    }
+    if (lfs.size() == 0)
+      return null;
+    return lfs;
+  }
+  
   public static boolean doRaid(Configuration conf, FileStatus stat,
       Path destPath, Codec codec, Statistics statistics,
       Progressable reporter, boolean doSimulate, int targetRepl, int metaRepl)
         throws IOException {
-    if (codec.isDirRaid) {
-      return doDirRaid(conf, stat, destPath, codec, statistics, reporter,
-          doSimulate, targetRepl, metaRepl);
-    } else {
-      return doFileRaid(conf, stat, destPath, codec, statistics, reporter,
-          doSimulate, targetRepl, metaRepl);
+    long startTime = System.currentTimeMillis();
+    boolean success = false;
+    try {
+      if (codec.isDirRaid) {
+        success = doDirRaid(conf, stat, destPath, codec, statistics, reporter,
+            doSimulate, targetRepl, metaRepl);
+      } else {
+        success = doFileRaid(conf, stat, destPath, codec, statistics, reporter,
+            doSimulate, targetRepl, metaRepl);
+      }
+      return success;
+    } catch (IOException ioe) {
+      throw ioe;
+    } finally {
+      long delay = System.currentTimeMillis() - startTime;
+      long savingBytes = statistics.processedSize - 
+          statistics.remainingSize - statistics.metaSize;
+      FileSystem srcFs = stat.getPath().getFileSystem(conf);
+      if (success) {
+        logRaidEncodingMetrics("SUCCESS", codec,
+            delay, statistics.processedSize, statistics.numProcessedBlocks,
+            statistics.numMetaBlocks, statistics.metaSize, 
+            savingBytes, stat.getPath(), LOGTYPES.ENCODING, srcFs);
+      } else {
+        logRaidEncodingMetrics("FAILURE", codec, delay,
+            statistics.processedSize, statistics.numProcessedBlocks,
+            statistics.numMetaBlocks, statistics.metaSize, 
+            savingBytes, stat.getPath(), LOGTYPES.ENCODING, srcFs);
+      }
     }
   }
   
@@ -913,7 +1004,7 @@ public static boolean doDirRaid(Configuration conf, FileStatus stat,
         throws IOException {
     Path p = stat.getPath();
     FileSystem srcFs = p.getFileSystem(conf);
-    List<FileStatus> lfs = RaidNode.getDirectoryBlockLocations(conf, srcFs, p);
+    List<FileStatus> lfs = RaidNode.listDirectoryRaidFileStatus(conf, srcFs, p);
     if (lfs == null) {
       return false;
     }
@@ -1049,7 +1140,7 @@ static private void generateParityFile(Configuration conf, FileStatus stat,
                                       throws IOException {
     Path inpath = stat.getPath();
     Path outpath =  getOriginalParityFile(destPathPrefix, inpath);
-    FileSystem outFs = outpath.getFileSystem(conf);
+    FileSystem outFs = inFs;
 
     // If the parity file is already upto-date and source replication is set
     // then nothing to do.
@@ -1118,23 +1209,23 @@ static private void generateParityFile(Configuration conf, FileStatus stat,
 
   
   public static DecoderInputStream unRaidCorruptInputStream(Configuration conf,
-              Path srcPath, Codec codec, long corruptOffset,
+              Path srcPath, Codec codec, ParityFilePair parityFilePair, 
+              long blockSize,
+              long corruptOffset,
               long limit) 
               throws IOException {
- // Test if parity file exists
-    ParityFilePair ppair = ParityFilePair.getParityFile(codec, srcPath, conf);
-    if (ppair == null) {
+    // Test if parity file exists
+    if (parityFilePair == null) {
       LOG.warn("Could not find " + codec.id + " parity file for " + srcPath);
       return null;
     }
     
     FileSystem srcFs = srcPath.getFileSystem(conf);
-    FileStatus stat = srcFs.getFileStatus(srcPath);
     Decoder decoder = new Decoder(conf, codec);
     
     return decoder.generateAlternateStream(srcFs, srcPath, 
-        ppair.getFileSystem(), ppair.getPath(), 
-        stat.getBlockSize(), corruptOffset, limit, null);
+        parityFilePair.getFileSystem(), parityFilePair.getPath(), 
+        blockSize, corruptOffset, limit, null);
   }
   
   private void doHar() throws IOException, InterruptedException {
@@ -1152,6 +1243,10 @@ private void doHar() throws IOException, InterruptedException {
 
       // fetch all categories
       for (Codec codec : Codec.getCodecs()) {
+        if (codec.isDirRaid) {
+          // Disable har for directory raid
+          continue;
+        }
         try {
           String tmpHarPath = codec.tmpHarDirectory;
           int harThresold = conf.getInt(RAID_PARITY_HAR_THRESHOLD_DAYS_KEY,
@@ -1417,10 +1512,39 @@ public static String getJobID(Configuration conf) {
     return conf.get("mapred.job.id", 
         "localRaid" + df.format(new Date())); 
   }
+  
+  public String getReadReconstructionMetricsUrl() {
+    return configMgr.getReadReconstructionMetricsUrl();
+  }
+  
+  static public void logRaidEncodingMetrics(
+      String result, Codec codec, long delay, 
+      long numReadBytes, long numReadBlocks,
+      long metaBlocks, long metaBytes, 
+      long savingBytes, Path srcPath, LOGTYPES type,
+      FileSystem fs) {
+    try {
+      JSONObject json = new JSONObject();
+      json.put("result", result);
+      json.put("code", codec.id);
+      json.put("delay", delay);
+      json.put("readbytes", numReadBytes);
+      json.put("readblocks", numReadBlocks);
+      json.put("metablocks", metaBlocks);
+      json.put("metabytes", metaBytes);
+      json.put("savingbytes", savingBytes);
+      json.put("path", srcPath.toString());
+      json.put("type", type.name());
+      json.put("cluster", fs.getUri().getAuthority());
+      ENCODER_METRICS_LOG.info(json.toString());
+    } catch(JSONException e) {
+      LOG.warn("Exception when logging the Raid metrics: " + e.getMessage(), 
+               e);
+    }
+  }
 
   public static void main(String argv[]) throws Exception {
     try {
-      Configuration.addDefaultResource("raid-site.xml");
       StringUtils.startupShutdownMessage(RaidNode.class, argv, LOG);
       RaidNode raid = createRaidNode(argv, null);
       if (raid != null) {
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNodeMetrics.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNodeMetrics.java
index 409ffeeb..04860b9d 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNodeMetrics.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNodeMetrics.java
@@ -42,7 +42,7 @@ public class RaidNodeMetrics implements Updater {
   public static final int DEFAULT_NAMESPACE_ID = 0;
   static long metricsResetInterval = 86400 * 1000; // 1 day.
   private static ConcurrentMap<Integer, RaidNodeMetrics> instances = new ConcurrentHashMap<Integer, RaidNodeMetrics>(); 
-
+  
   // Number of files currently raided.
   public static final String filesRaidedMetric = "files_raided";
   // Number of files fixed by block fixer.
@@ -89,6 +89,17 @@ public class RaidNodeMetrics implements Updater {
   public static final String decomFilesLowestPriMetric = "decom_files_lowest_pri";
   // Monitor number of misplaced blocks in a stripe
   public static final int MAX_MONITORED_MISPLACED_BLOCKS = 5;
+  //Number of files which have at least one block missing
+  public static final String filesWithMissingBlksMetric = "files_with_missing_blks";
+  //Number of stripes using "rs" codec with certain number of blocks missing
+  public static final String NumStrpsOneMissingBlkMetric = "stripes_with_one_missingBlk";
+  public static final String NumStrpsTwoMissingBlkMetric = "stripes_with_two_missingBlk";
+  public static final String NumStrpsThreeMissingBlkMetric = "stripes_with_three_missingBlk";
+  public static final String NumStrpsFourMissingBlkMetric = "stripes_with_four_missingBlk";
+  public static final String NumStrpsFiveMoreMissingBlkMetric = "stripes_with_fiveOrMore_missingBlk";
+  public static final String NumFilesToFixDroppedMetric = "files_to_fix_dropped";
+
+
   
   MetricsContext context;
   private MetricsRecord metricsRecord;
@@ -128,7 +139,21 @@ public class RaidNodeMetrics implements Updater {
   MetricsTimeVaryingLong blockMoveSkipped =
     new MetricsTimeVaryingLong(blockMoveSkippedMetric, registry);
   Map<String, Map<Integer, MetricsLongValue>> codecToMisplacedBlocks;
-
+  MetricsLongValue numFilesWithMissingBlks =
+      new MetricsLongValue(filesWithMissingBlksMetric, registry);
+  MetricsLongValue numStrpsOneMissingBlk = 
+      new MetricsLongValue(NumStrpsOneMissingBlkMetric, registry);
+  MetricsLongValue numStrpsTwoMissingBlk = 
+      new MetricsLongValue(NumStrpsTwoMissingBlkMetric, registry);
+  MetricsLongValue numStrpsThreeMissingBlk = 
+      new MetricsLongValue(NumStrpsThreeMissingBlkMetric, registry);
+  MetricsLongValue numStrpsFourMissingBlk = 
+      new MetricsLongValue(NumStrpsFourMissingBlkMetric, registry);
+  MetricsLongValue numStrpsFiveMoreMissingBlk = 
+      new MetricsLongValue(NumStrpsFiveMoreMissingBlkMetric, registry);
+  MetricsLongValue numFilesToFixDropped = 
+      new MetricsLongValue(NumFilesToFixDroppedMetric, registry);
+  
   Map<String, Map<RaidState, MetricsLongValue>> sourceFiles;
   Map<String, Map<RaidState, MetricsLongValue>> sourceBlocks;
   Map<String, Map<RaidState, MetricsLongValue>> sourceBytes;
@@ -167,6 +192,10 @@ public static RaidNodeMetrics getInstance(int namespaceId) {
     }
     return metric;
   }
+  
+  public static void clearInstances() {
+    instances.clear();
+  }
 
   private RaidNodeMetrics() {
     // Create a record for raid metrics
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidShell.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidShell.java
index 2eb606e3..166863b0 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidShell.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidShell.java
@@ -20,23 +20,23 @@
 
 import java.io.IOException;
 import java.io.FileNotFoundException;
+import java.io.InterruptedIOException;
 import java.io.PrintStream;
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.LinkedHashMap;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
 import javax.security.auth.login.LoginException;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.hadoop.ipc.*;
 import org.apache.commons.logging.Log;
@@ -62,10 +62,12 @@
 import org.apache.hadoop.hdfs.DistributedRaidFileSystem;
 import org.apache.hadoop.hdfs.DFSUtil;
 
+import org.apache.hadoop.raid.StripeReader.LocationPair;
 import org.apache.hadoop.raid.protocol.PolicyInfo;
 import org.apache.hadoop.raid.protocol.RaidProtocol;
+import org.xml.sax.SAXException;
 
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.*;
 
 /**
  * A {@link RaidShell} that allows browsing configured raid policies.
@@ -74,6 +76,8 @@ public class RaidShell extends Configured implements Tool {
   static {
     Configuration.addDefaultResource("hdfs-default.xml");
     Configuration.addDefaultResource("hdfs-site.xml");
+    Configuration.addDefaultResource("raid-default.xml");
+    Configuration.addDefaultResource("raid-site.xml");
   }
   public static final Log LOG = LogFactory.getLog( "org.apache.hadoop.RaidShell");
   public RaidProtocol raidnode;
@@ -82,8 +86,12 @@ public class RaidShell extends Configured implements Tool {
   volatile boolean clientRunning = true;
   private Configuration conf;
   AtomicInteger corruptCounter = new AtomicInteger();
+  AtomicLongArray numStrpMissingBlks = 
+      new AtomicLongArray(Codec.getCodec("rs").stripeLength+Codec.getCodec("rs").parityLength);
   private final PrintStream out;
 
+  final static private String DistRaidCommand = "-distRaid";
+  
   /**
    * Start RaidShell.
    * <p>
@@ -202,8 +210,11 @@ private static void printUsage(String cmd) {
     } else if ("-raidFile".equals(cmd)) {
       System.err.println(
         "Usage: java RaidShell -raidFile <path-to-file> <path-to-raidDir> <XOR|RS>");
+    } else if (DistRaidCommand.equals(cmd)) {
+      System.err.println("Usage: java RaidShell " + DistRaidCommand 
+                       + " <raid_policy_name> <path1> ... <pathn>");
     } else if ("-fsck".equals(cmd)) {
-      System.err.println("Usage: java RaidShell [-fsck [path [-threads numthreads] [-count]]]");
+      System.err.println("Usage: java RaidShell [-fsck [path [-threads numthreads] [-count]] [-retNumStrpsMissingBlksRS]]]");
     } else if ("-usefulHar".equals(cmd)) {
       System.err.println("Usage: java RaidShell [-usefulHar <XOR|RS> [path-to-raid-har]]");
     } else if ("-checkFile".equals(cmd)) {
@@ -221,7 +232,9 @@ private static void printUsage(String cmd) {
       System.err.println("           [-recover srcPath1 corruptOffset]");
       System.err.println("           [-recoverBlocks path1 path2...]");
       System.err.println("           [-raidFile <path-to-file> <path-to-raidDir> <XOR|RS>");
-      System.err.println("           [-fsck [path [-threads numthreads] [-count]]]");
+      System.err.println("           [" + DistRaidCommand 
+                                        + " <raid_policy_name> <path1> ... <pathn>]");
+      System.err.println("           [-fsck [path [-threads numthreads] [-count]] [-retNumStrpsMissingBlksRS]]");
       System.err.println("           [-usefulHar <XOR|RS> [path-to-raid-har]]");
       System.err.println("           [-checkFile path]");
       System.err.println("           [-purgeParity path <XOR|RS>]");
@@ -263,6 +276,11 @@ public int run(String argv[]) throws Exception {
         printUsage(cmd);
         return exitCode;
       }
+    } else if (DistRaidCommand.equals(cmd)) {
+      if (argv.length < 3) {
+        printUsage(cmd);
+        return exitCode;
+      }
     }
 
     try {
@@ -280,6 +298,10 @@ public int run(String argv[]) throws Exception {
         initializeLocal(conf);
         raidFile(argv, i);
         exitCode = 0;
+      } else if (DistRaidCommand.equals(cmd)) {
+        initializeLocal(conf);
+        distRaid(argv, i);
+        exitCode = 0;
       } else if ("-fsck".equals(cmd)) {
         fsck(cmd, argv, i);
         exitCode = 0;
@@ -422,6 +444,120 @@ public void recoverBlocks(String[] args, int startIndex)
     }
   }
 
+  /**
+   * Submit a map/reduce job to raid the input paths
+   * @param args all input parameters
+   * @param startIndex staring index of arguments: policy_name path1, ..., pathn
+   * @return 0 if successful
+   * @throws IOException if any error occurs
+   * @throws ParserConfigurationException 
+   * @throws ClassNotFoundException 
+   * @throws RaidConfigurationException 
+   * @throws SAXException 
+   */
+  private int distRaid(String[] args, int startIndex) throws IOException,
+    SAXException, RaidConfigurationException,
+    ClassNotFoundException, ParserConfigurationException {
+    // find the matched raid policy
+    String policyName = args[startIndex++];
+    ConfigManager configManager = new ConfigManager(conf);
+    PolicyInfo policy = configManager.getPolicy(policyName);
+    if (policy == null) {
+      System.err.println ("Invalid policy: " + policyName);
+      return -1;
+    }
+    Codec codec = Codec.getCodec(policy.getCodecId());
+    if (codec == null) {
+      System.err.println("Policy " + policyName
+          + " with invalid codec " + policy.getCodecId());
+    }
+
+    // find the matched paths to raid
+    FileSystem fs = FileSystem.get(conf);
+    List<FileStatus> pathsToRaid = new ArrayList<FileStatus>();
+    List<Path> policySrcPaths = policy.getSrcPathExpanded();
+    for (int i = startIndex; i< args.length; i++) {
+      boolean invalidPathToRaid = true;
+      Path pathToRaid = new Path(args[i]).makeQualified(fs);
+      String pathToRaidStr = pathToRaid.toString();
+      if (!pathToRaidStr.endsWith(Path.SEPARATOR)) {
+        pathToRaidStr = pathToRaidStr.concat(Path.SEPARATOR);
+      }
+      for (Path srcPath : policySrcPaths) {
+        String srcStr = srcPath.toString();
+        if (!srcStr.endsWith(Path.SEPARATOR)) {
+          srcStr = srcStr.concat(Path.SEPARATOR);
+        }
+        if (pathToRaidStr.startsWith(srcStr)) {
+          if (codec.isDirRaid) {
+            FileUtil.listStatusForLeafDir(
+                fs, fs.getFileStatus(pathToRaid), pathsToRaid);
+          } else {
+            FileUtil.listStatusHelper(fs, pathToRaid, 
+                Integer.MAX_VALUE, pathsToRaid);
+          }
+          invalidPathToRaid = false;
+          break;
+        }
+      }
+      if (invalidPathToRaid) {
+        System.err.println("Path " + pathToRaidStr + 
+          " does not support by the given policy " + policyName);
+      }
+    }
+    
+    // Check if files are valid
+    List<FileStatus> validPaths = new ArrayList<FileStatus>();
+    List<PolicyInfo> policyInfos = new ArrayList<PolicyInfo>(1);
+    policyInfos.add(policy);
+    RaidState.Checker checker = new RaidState.Checker(
+        policyInfos, conf);
+    long now = System.currentTimeMillis();
+    for (FileStatus fileStatus : pathsToRaid) {
+      FileStatus[] dirStats = null;
+      if (codec.isDirRaid) {
+        dirStats = fs.listStatus(fileStatus.getPath());
+      }
+      RaidState stat = checker.check(
+          policy, fileStatus, now, false, 
+          dirStats == null ? null : Arrays.asList(dirStats));
+      if (stat == RaidState.NOT_RAIDED_BUT_SHOULD) {
+        validPaths.add(fileStatus);
+      } else {
+        System.err.println("Path " + fileStatus.getPath() + 
+            " is not qualified for raiding: " + stat);
+      }
+    }
+    if (validPaths.isEmpty()) {
+      System.err.println("No file can be raided");
+      return 0;
+    }
+    DistRaid dr = new DistRaid(conf);
+    //add paths for distributed raiding
+    dr.addRaidPaths(policy, validPaths);
+    
+    if (dr.startDistRaid()) {
+      System.out.println("Job started: " + dr.getJobTrackingURL());
+      System.out.print("Job in progress ");
+      while (!dr.checkComplete()) {
+        try {
+          System.out.print(".");
+          Thread.sleep(1000);
+        } catch (InterruptedException e) {
+          throw new InterruptedIOException("Got interrupted.");
+        }
+      }
+      if (dr.successful()) {
+        System.out.println("/nFiles are successfully raided.");
+        return 0;
+      } else {
+        System.err.println("/nRaid job failed.");
+        return -1;
+      }
+    }
+    return -1;
+  }
+  
   public void raidFile(String[] args, int startIndex) throws IOException {
     Path file = new Path(args[startIndex]);
     Path destPath = new Path(args[startIndex + 1]);
@@ -436,72 +572,163 @@ public void raidFile(String[] args, int startIndex) throws IOException {
     RaidNode.doRaid(conf, stat, destPath, codec, new RaidNode.Statistics(),
         RaidUtils.NULL_PROGRESSABLE, doSimulate, targetRepl, metaRepl);
   }
+  
+  void collectFileCorruptBlocksInStripe(final DistributedFileSystem dfs, 
+      final RaidInfo raidInfo, final Path filePath, 
+      final HashMap<Integer, Integer> corruptBlocksPerStripe)
+          throws IOException {
+    // read conf
+    final int stripeBlocks = raidInfo.codec.stripeLength;
+
+    // figure out which blocks are missing/corrupted
+    final FileStatus fileStatus = dfs.getFileStatus(filePath);
+    final long blockSize = fileStatus.getBlockSize();
+    final long fileLength = fileStatus.getLen();
+    final long fileLengthInBlocks = RaidNode.numBlocks(fileStatus); 
+    final long fileStripes = RaidNode.numStripes(fileLengthInBlocks,
+        stripeBlocks);
+    final BlockLocation[] fileBlocks = 
+      dfs.getFileBlockLocations(fileStatus, 0, fileLength);
+    
+    // figure out which stripes these corrupted blocks belong to
+    for (BlockLocation fileBlock: fileBlocks) {
+      int blockNo = (int) (fileBlock.getOffset() / blockSize);
+      final int stripe = blockNo / stripeBlocks;
+      if (this.isBlockCorrupt(fileBlock)) {
+        this.incCorruptBlocksPerStripe(corruptBlocksPerStripe, stripe);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("file " + filePath.toString() + " corrupt in block " + 
+                   blockNo + "/" + fileLengthInBlocks + ", stripe " + stripe +
+                   "/" + fileStripes);
+        }
+      } else {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("file " + filePath.toString() + " OK in block " + blockNo +
+                   "/" + fileLengthInBlocks + ", stripe " + stripe + "/" +
+                   fileStripes);
+        }
+      }
+    }
+    checkParityBlocks(filePath, corruptBlocksPerStripe, blockSize, 0, fileStripes,
+                      fileStripes, raidInfo);
+  }
+    
+  void collectDirectoryCorruptBlocksInStripe(final DistributedFileSystem dfs, 
+      final RaidInfo raidInfo, final Path filePath, 
+      HashMap<Integer, Integer> corruptBlocksPerStripe)
+          throws IOException {
+    final int stripeSize = raidInfo.codec.stripeLength;
+    final FileStatus fileStatus = dfs.getFileStatus(filePath);
+    final BlockLocation[] fileBlocks = 
+      dfs.getFileBlockLocations(fileStatus, 0, fileStatus.getLen());
+    LocationPair lp = StripeReader.getBlockLocation(raidInfo.codec, dfs,
+        filePath, 0, conf);
+    int startBlockIdx = lp.getStripeIdx() * stripeSize +
+        lp.getBlockIdxInStripe();
+    int startStripeIdx = lp.getStripeIdx();
+    int endStripeIdx = (startBlockIdx + fileBlocks.length) / stripeSize;
+    long blockSize = DirectoryStripeReader.getParityBlockSize(conf,
+        lp.getListFileStatus());
+    long numBlocks = DirectoryStripeReader.getBlockNum(lp.getListFileStatus());
+    HashMap<Integer, Integer> allCorruptBlocksPerStripe = 
+        new HashMap<Integer, Integer>();
+    checkParityBlocks(filePath, allCorruptBlocksPerStripe, blockSize,
+        startStripeIdx, endStripeIdx,
+        RaidNode.numStripes(numBlocks, stripeSize), raidInfo);
+    DirectoryStripeReader sReader = (DirectoryStripeReader)
+        StripeReader.getStripeReader(raidInfo.codec,
+        conf, blockSize, dfs, lp.getStripeIdx(), fileStatus);
+    // Get the corrupt block information for all stripes related to the file
+    while (sReader.getCurStripeIdx() <= endStripeIdx) {
+      int stripe = (int)sReader.getCurStripeIdx();
+      BlockLocation[] bls = sReader.getNextStripeBlockLocations();
+      for (BlockLocation bl : bls) {
+        if (this.isBlockCorrupt(bl)) {
+          this.incCorruptBlocksPerStripe(allCorruptBlocksPerStripe,
+                                         stripe);
+        }
+      }
+    }
+    // figure out which stripes these corrupted blocks belong to
+    for (BlockLocation fileBlock: fileBlocks) {
+      int blockNo = startBlockIdx + (int) (fileBlock.getOffset() /
+          fileStatus.getBlockSize());
+      final int stripe = blockNo / stripeSize;
+      if (this.isBlockCorrupt(fileBlock)) {
+        corruptBlocksPerStripe.put(stripe, allCorruptBlocksPerStripe.get(stripe));
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("file " + filePath.toString() + " corrupt in block " + 
+                   blockNo + ", stripe " + stripe);
+        }
+      } else {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("file " + filePath.toString() + " OK in block " +
+                   blockNo + ", stripe " + stripe);
+        }
+      }
+    }
+  }
 
   /**
    * checks whether a file has more than the allowable number of
    * corrupt blocks and must therefore be considered corrupt
    */
+  
   protected boolean isFileCorrupt(final DistributedFileSystem dfs, 
-                                final Path filePath) 
+      final Path filePath) 
+    throws IOException {
+    return isFileCorrupt(dfs, filePath, false); 
+  }
+  
+  /**
+   * 
+   * @param dfs
+   * @param filePath
+   * @param CntMissingBlksPerStrp
+   * @return
+   * @throws IOException
+   */
+  protected boolean isFileCorrupt(final DistributedFileSystem dfs, 
+                                final Path filePath, 
+                                final boolean CntMissingBlksPerStrp) 
     throws IOException {
     try {
       // corruptBlocksPerStripe: 
       // map stripe # -> # of corrupt blocks in that stripe (data + parity)
       HashMap<Integer, Integer> corruptBlocksPerStripe =
         new LinkedHashMap<Integer, Integer>();
-
+      boolean fileCorrupt = false;
       RaidInfo raidInfo = getFileRaidInfo(filePath);
-
-      // read conf
-      final int stripeBlocks = raidInfo.codec.stripeLength;
-
-      // figure out which blocks are missing/corrupted
-      final FileStatus fileStatus = dfs.getFileStatus(filePath);
-      final long blockSize = fileStatus.getBlockSize();
-      final long fileLength = fileStatus.getLen();
-      final long fileLengthInBlocks = (fileLength / blockSize) +
-        (((fileLength % blockSize) == 0) ? 0L : 1L);
-      final long fileStripes = (fileLengthInBlocks / stripeBlocks) +
-        (((fileLengthInBlocks % stripeBlocks) == 0) ? 0L : 1L);
-      final BlockLocation[] fileBlocks = 
-        dfs.getFileBlockLocations(fileStatus, 0, fileLength);
-      
-      // figure out which stripes these corrupted blocks belong to
-      for (BlockLocation fileBlock: fileBlocks) {
-        int blockNo = (int) (fileBlock.getOffset() / blockSize);
-        final int stripe = (int) (blockNo / stripeBlocks);
-        if (fileBlock.isCorrupt() || 
-            (fileBlock.getNames().length == 0 && fileBlock.getLength() > 0)) {
-          if (corruptBlocksPerStripe.get(stripe) == null) {
-            corruptBlocksPerStripe.put(stripe, 1);
-          } else {
-            corruptBlocksPerStripe.put(stripe, corruptBlocksPerStripe.
-                                       get(stripe) + 1);
-          }
-          LOG.debug("file " + filePath.toString() + " corrupt in block " + 
-                   blockNo + "/" + fileLengthInBlocks + ", stripe " + stripe +
-                   "/" + fileStripes);
-        } else {
-          LOG.debug("file " + filePath.toString() + " OK in block " + blockNo +
-                   "/" + fileLengthInBlocks + ", stripe " + stripe + "/" +
-                   fileStripes);
-        }
+      if (raidInfo.codec == null) {
+        // Couldn't find out the parity file, so the file is corrupt
+        return true;
       }
 
-      // now check parity blocks
-      if (raidInfo.codec != null) {
-        checkParityBlocks(filePath, corruptBlocksPerStripe, blockSize,
-                          fileStripes, raidInfo);
+      if (raidInfo.codec.isDirRaid) {
+        collectDirectoryCorruptBlocksInStripe(dfs, raidInfo, filePath,
+            corruptBlocksPerStripe);
+      } else {
+        collectFileCorruptBlocksInStripe(dfs, raidInfo, filePath,
+            corruptBlocksPerStripe);
       }
 
       final int maxCorruptBlocksPerStripe = raidInfo.parityBlocksPerStripe;
 
       for (int corruptBlocksInStripe: corruptBlocksPerStripe.values()) {
-        if (corruptBlocksInStripe > maxCorruptBlocksPerStripe) {
-          return true;
+        //detect if the file has any stripes which cannot be fixed by Raid
+        LOG.debug("file " + filePath.toString() +
+                  " has corrupt blocks per Stripe value " +
+                  corruptBlocksInStripe);
+        if (!fileCorrupt) {
+          if (corruptBlocksInStripe > maxCorruptBlocksPerStripe) {
+            fileCorrupt = true;
+          }
+        }
+        if(raidInfo.codec.id.equals("rs") & CntMissingBlksPerStrp) {
+          incrStrpMissingBlks(corruptBlocksInStripe-1);
         }
       }
-      return false;
+      return fileCorrupt;
     } catch (SocketException e) {
       // Re-throw network-related exceptions.
       throw e;
@@ -552,7 +779,7 @@ private RaidInfo getFileRaidInfo(final Path filePath)
    */
   private BlockLocation[] getParityBlocks(final Path filePath,
                                           final long blockSize,
-                                          final long fileStripes,
+                                          final long numStripes,
                                           final RaidInfo raidInfo) 
     throws IOException {
 
@@ -566,10 +793,10 @@ private BlockLocation[] getParityBlocks(final Path filePath,
       getFileStatus(new Path(parityPathStr));
     long parityFileLength = parityFileStatus.getLen();
 
-    if (parityFileLength != fileStripes * raidInfo.parityBlocksPerStripe *
+    if (parityFileLength != numStripes * raidInfo.parityBlocksPerStripe *
         blockSize) {
       throw new IOException("expected parity file of length" + 
-                            (fileStripes * raidInfo.parityBlocksPerStripe *
+                            (numStripes * raidInfo.parityBlocksPerStripe *
                              blockSize) +
                             " but got parity file of length " + 
                             parityFileLength);
@@ -603,20 +830,20 @@ private void checkParityBlocks(final Path filePath,
                                  final HashMap<Integer, Integer>
                                  corruptBlocksPerStripe,
                                  final long blockSize,
-                                 final long fileStripes,
+                                 final long startStripeIdx,
+                                 final long endStripeIdx,
+                                 final long numStripes,
                                  final RaidInfo raidInfo)
     throws IOException {
 
     // get the blocks of the parity file
     // because of har, multiple blocks may be returned as one container block
     BlockLocation[] containerBlocks = getParityBlocks(filePath, blockSize,
-                                                      fileStripes, raidInfo);
+        numStripes, raidInfo);
 
     long parityStripeLength = blockSize *
       ((long) raidInfo.parityBlocksPerStripe);
 
-    long parityFileLength = parityStripeLength * fileStripes;
-
     long parityBlocksFound = 0L;
 
     for (BlockLocation cb: containerBlocks) {
@@ -624,7 +851,6 @@ private void checkParityBlocks(final Path filePath,
         throw new IOException("container block size is not " +
                               "multiple of parity block size");
       }
-      int blocksInContainer = (int) (cb.getLength() / blockSize);
       LOG.debug("found container with offset " + cb.getOffset() +
                ", length " + cb.getLength());
 
@@ -639,35 +865,31 @@ private void checkParityBlocks(final Path filePath,
           // before the beginning of the parity file
           continue;
         }
-        if (stripe >= fileStripes) {
+        if (stripe >= numStripes) {
           // past the end of the parity file
           break;
         }
 
         parityBlocksFound++;
+        
+        if (stripe < startStripeIdx || stripe > endStripeIdx) {
+          continue;
+        }
 
-        if (cb.isCorrupt() ||
-            (cb.getNames().length == 0 && cb.getLength() > 0)) {
-          LOG.debug("parity file for " + filePath.toString() + 
+        if (this.isBlockCorrupt(cb)) {
+          LOG.info("parity file for " + filePath.toString() + 
                    " corrupt in block " + block +
-                   ", stripe " + stripe + "/" + fileStripes);
-          
-          if (corruptBlocksPerStripe.get(stripe) == null) {
-            corruptBlocksPerStripe.put(stripe, 1);
-          } else {
-            corruptBlocksPerStripe.put(stripe, 
-                                       corruptBlocksPerStripe.get(stripe) +
-                                       1);
-          }
+                   ", stripe " + stripe + "/" + numStripes);
+          this.incCorruptBlocksPerStripe(corruptBlocksPerStripe, stripe);
         } else {
           LOG.debug("parity file for " + filePath.toString() + 
                    " OK in block " + block +
-                   ", stripe " + stripe + "/" + fileStripes);
+                   ", stripe " + stripe + "/" + numStripes);
         }
       }
     }
 
-    long parityBlocksExpected = raidInfo.parityBlocksPerStripe * fileStripes;
+    long parityBlocksExpected = raidInfo.parityBlocksPerStripe * numStripes;
     if (parityBlocksFound != parityBlocksExpected ) {
       throw new IOException("expected " + parityBlocksExpected + 
                             " parity blocks but got " + parityBlocksFound);
@@ -677,7 +899,10 @@ private void checkParityBlocks(final Path filePath,
 
   /**
    * checks the raided file system, prints a list of corrupt files to
-   * this.out and returns the number of corrupt files
+   * this.out and returns the number of corrupt files.
+   * Also prints out the total number of files with at least one missing block.
+   * When called with '-retNumStrpsMissingBlksRS', also prints out number of stripes
+   * with certain number of blocks missing for files using the 'RS' codec. 
    */
   public void fsck(String cmd, String[] args, int startIndex) throws IOException {
     final int numFsckArgs = args.length - startIndex;
@@ -685,6 +910,7 @@ public void fsck(String cmd, String[] args, int startIndex) throws IOException {
     String path = "/";
     boolean argsOk = false;
     boolean countOnly = false;
+    boolean MissingBlksPerStrpCnt = false;
     if (numFsckArgs >= 1) {
       argsOk = true;
       path = args[startIndex];
@@ -694,6 +920,8 @@ public void fsck(String cmd, String[] args, int startIndex) throws IOException {
         numThreads = Integer.parseInt(args[++i]);
       } else if (args[i].equals("-count")) {
         countOnly = true;
+      } else if (args[i].equals("-retNumStrpsMissingBlksRS")) {
+        MissingBlksPerStrpCnt = true;
       }
     }
     if (!argsOk) {
@@ -732,7 +960,7 @@ public void fsck(String cmd, String[] args, int startIndex) throws IOException {
       // ignore it
       boolean matched = false;
       for (Codec c : Codec.getCodecs()) {
-        if (f.startsWith(c.parityDirectory)) {
+        if (f.startsWith(c.getParityPrefix())) {
           matched = true;
         }
       }
@@ -742,6 +970,13 @@ public void fsck(String cmd, String[] args, int startIndex) throws IOException {
     }
     // filter files marked for deletion
     RaidUtils.filterTrash(conf, corruptFileCandidates);
+    
+    //clear numStrpMissingBlks if missing blocks per stripe is to be counted
+    if (MissingBlksPerStrpCnt) {
+      for (int i = 0; i < numStrpMissingBlks.length(); i++) {
+        numStrpMissingBlks.set(i, 0);
+      }
+    }
     System.err.println(
       "Processing " + corruptFileCandidates.size() + " possibly corrupt files using " +
       numThreads + " threads");
@@ -750,11 +985,14 @@ public void fsck(String cmd, String[] args, int startIndex) throws IOException {
       executor = Executors.newFixedThreadPool(numThreads);
     }
     final boolean finalCountOnly = countOnly;
+    final boolean finalMissingBlksPerStrpCnt = MissingBlksPerStrpCnt;
     for (final String corruptFileCandidate: corruptFileCandidates) {
       Runnable work = new Runnable() {
         public void run() {
+          boolean corrupt = false;
           try {
-            if (isFileCorrupt(dfs, new Path(corruptFileCandidate))) {
+            corrupt = isFileCorrupt(dfs, new Path(corruptFileCandidate),finalMissingBlksPerStrpCnt);
+            if (corrupt) {
               incrCorruptCount();
               if (!finalCountOnly) {
                 out.println(corruptFileCandidate);
@@ -779,9 +1017,25 @@ public void run() {
       }
     }
     if (countOnly) {
+      //Number of corrupt files (which cannot be fixed by Raid)
       out.println(getCorruptCount());
-      System.err.println("Nubmer of corrupt files:" + getCorruptCount());
+      LOG.info("Nubmer of corrupt files:" + getCorruptCount());
+      //Number of files with at least one missing block
+      out.println(corruptFileCandidates.size()); 
+      LOG.info("Number of files with at least one block missing/corrupt: "+corruptFileCandidates.size());
     }
+    
+    /*Number of stripes with missing blocks array:
+     * index 0: Number of stripes found with one block missing in this fsck
+     * index 1: Number of stripes found with two block missing in this fsck
+     * and so on
+     */
+    if (MissingBlksPerStrpCnt)
+      for (int j = 0; j < numStrpMissingBlks.length() ; j++) {
+        long temp = numStrpMissingBlks.get(j);
+        out.println(temp); 
+        LOG.info("Number of stripes with missing blocks at index "+ j + " is " + temp);
+      }
   }
 
   // For testing.
@@ -793,6 +1047,14 @@ private void incrCorruptCount() {
   int getCorruptCount() {
     return corruptCounter.get();
   }
+    
+  private void incrStrpMissingBlks(int index){
+    numStrpMissingBlks.incrementAndGet(index);
+  }
+  
+  long getStrpMissingBlks(int index){
+    return numStrpMissingBlks.get(index);
+  }
 
   void usefulHar(String[] args, int startIndex) throws IOException {
     if (args.length - startIndex < 2) {
@@ -925,6 +1187,24 @@ public void checkParity(String cmd, String[] args, int startIndex)
       }
     }
   }
+  
+  private boolean isBlockCorrupt(BlockLocation fileBlock)
+      throws IOException {
+    if (fileBlock == null)
+      // empty block
+      return false;
+    return fileBlock.isCorrupt() || 
+        (fileBlock.getNames().length == 0 && fileBlock.getLength() > 0);
+  }
+  
+  private void incCorruptBlocksPerStripe(HashMap<Integer, Integer>
+      corruptBlocksPerStripe, int stripe) {
+    Integer value = corruptBlocksPerStripe.get(stripe);
+    if (value == null) {
+      value = 0;
+    } 
+    corruptBlocksPerStripe.put(stripe, value + 1);
+  }
 
   /**
    * main() has some simple utility methods
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidState.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidState.java
index e9f9e08d..5604a04a 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidState.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidState.java
@@ -88,6 +88,7 @@ public static class Checker {
     public static final ThreadLocalDateFormat dateFormat =
       new ThreadLocalDateFormat("yyyy-MM-dd");
     private List<String> excludePatterns = new ArrayList<String>();
+    private List<FileStatus> lfs = null;
 
     public Checker(Collection<PolicyInfo> allInfos, Configuration conf)
         throws IOException {
@@ -109,6 +110,11 @@ public Checker(Collection<PolicyInfo> allInfos, Configuration conf)
         }
       }
     }
+    
+    public RaidState check(PolicyInfo info, FileStatus file, long now,
+        boolean skipParityCheck) throws IOException {
+      return check(info, file, now, skipParityCheck, null);
+    }
 
     /**
      * Check the state of a raid source file against a policy
@@ -117,11 +123,13 @@ public Checker(Collection<PolicyInfo> allInfos, Configuration conf)
      * @param now The system millisecond time
      * @param skipParityCheck Skip checking the existence of parity. Checking
      *                        parity is very time-consuming for HAR parity file
+     * @param lfs The list of FileStatus of files under the directory, only used
+     *        by directory raid.
      * @return The state of the raid file
      * @throws IOException
      */
     public RaidState check(PolicyInfo info, FileStatus file, long now,
-        boolean skipParityCheck) throws IOException {
+        boolean skipParityCheck, List<FileStatus> lfs) throws IOException {
       ExpandedPolicy matched = null;
       long mtime = -1;
       String uriPath = file.getPath().toUri().getPath();
@@ -153,11 +161,22 @@ public RaidState check(PolicyInfo info, FileStatus file, long now,
         return NOT_RAIDED_NO_POLICY;
       }
       
-      if (computeNumBlocks(file) <= TOO_SMALL_NOT_RAID_NUM_BLOCKS) {
+      if (file.isDir() != matched.codec.isDirRaid) {
+        return NOT_RAIDED_NO_POLICY;
+      }
+
+      long blockNum = matched.codec.isDirRaid?
+          DirectoryStripeReader.getBlockNum(lfs):
+          computeNumBlocks(file);
+
+      if (blockNum <= TOO_SMALL_NOT_RAID_NUM_BLOCKS) {
         return NOT_RAIDED_TOO_SMALL;
       }
       
-      if (file.getReplication() == matched.targetReplication) {
+      long repl = matched.codec.isDirRaid?
+          DirectoryStripeReader.getReplication(lfs):
+          file.getReplication();
+      if (repl == matched.targetReplication) {
         if (skipParityCheck || 
             ParityFilePair.parityExists(file, matched.codec, conf)) {
           return RAIDED;
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidUtils.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidUtils.java
index 965d8f2b..53b6be73 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidUtils.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidUtils.java
@@ -81,7 +81,7 @@ public static int readTillEnd(InputStream in, byte[] buf, boolean eofOK,
           readLen = available;
         }
       }
-      int nread = in.read(buf, numRead, readLen);
+      int nread = readLen > 0? in.read(buf, numRead, readLen): 0;
       if (nread < 0) {
         if (eofOK) {
           // EOF hit, fill with zeros
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/ReedSolomonCode.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/ReedSolomonCode.java
index 32a5b9d7..e57c5378 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/ReedSolomonCode.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/ReedSolomonCode.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.raid;
 
+import java.util.Arrays;
 import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -93,6 +94,34 @@ public void encode(int[] message, int[] parity) {
       parity[i] = dataBuff[i];
     }
   }
+  
+  /**
+   * This function (actually, the GF.remainder() function) will modify
+   * the "inputs" parameter.
+   */
+  @Override
+  public void encodeBulk(byte[][] inputs, byte[][] outputs) {
+    final int stripeSize = stripeSize();
+    final int paritySize = paritySize();
+    assert (stripeSize == inputs.length);
+    assert (paritySize == outputs.length);
+    
+    for (int i = 0; i < outputs.length; i++) {
+      Arrays.fill(outputs[i], (byte)0);
+    }
+    
+    byte[][] data = new byte[stripeSize + paritySize][];
+
+    for (int i = 0; i < paritySize; i++) {
+      data[i] = outputs[i];
+    }
+    for (int i = 0; i < stripeSize; i++) {
+      data[i + paritySize] = inputs[i];
+    }
+    
+    // Compute the remainder
+    GF.remainder(data, generatingPolynomial);
+  }
 
   @Override
   public void decode(int[] data, int[] erasedLocation, int[] erasedValue) {
@@ -109,6 +138,26 @@ public void decode(int[] data, int[] erasedLocation, int[] erasedValue) {
     }
     GF.solveVandermondeSystem(errSignature, erasedValue, erasedLocation.length);
   }
+  
+  @Override
+  public void decodeBulk(byte[][] readBufs, byte[][] writeBufs, 
+                               int[] erasedLocation) {
+    if (erasedLocation.length == 0) {
+      return;
+    }
+    
+    // cleanup the write buffer
+    for (int i = 0; i < writeBufs.length; i++) {
+      Arrays.fill(writeBufs[i], (byte)0);
+    }
+    
+    for (int i = 0; i < erasedLocation.length; i++) {
+      errSignature[i] = primitivePower[erasedLocation[i]];
+      GF.substitute(readBufs, writeBufs[i], primitivePower[i]);
+    }
+    GF.solveVandermondeSystem(errSignature, writeBufs, erasedLocation.length, 
+        readBufs[0].length);
+  }
 
   @Override
   public int stripeSize() {
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/ReedSolomonDecoder.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/ReedSolomonDecoder.java
index 5e114927..f407ff58 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/ReedSolomonDecoder.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/ReedSolomonDecoder.java
@@ -66,7 +66,7 @@ public ReedSolomonDecoder(
   @Override
   protected long fixErasedBlockImpl(
       FileSystem fs, Path srcFile,
-      FileSystem parityFs, Path parityFile,
+      FileSystem parityFs, Path parityFile, boolean fixSource,
        long blockSize, long errorOffset, long limit,  boolean
        partial, OutputStream out, Progressable reporter, CRC32 crc)
            throws IOException {
@@ -75,9 +75,16 @@ protected long fixErasedBlockImpl(
     }
     FSDataInputStream[] inputs = new FSDataInputStream[stripeSize + paritySize];
     int[] erasedLocations = buildInputs(fs, srcFile, parityFs, parityFile, 
-                                        errorOffset, inputs);
-    int blockIdxInStripe = ((int)(errorOffset/blockSize)) % stripeSize;
-    int erasedLocationToFix = paritySize + blockIdxInStripe;
+                                        fixSource, errorOffset, inputs);
+    int erasedLocationToFix;
+    if (fixSource) {
+      int blockIdxInStripe = ((int)(errorOffset/blockSize)) % stripeSize;
+      erasedLocationToFix = paritySize + blockIdxInStripe;
+    } else {
+      // generate the idx for parity fixing.
+      int blockIdxInStripe = ((int)(errorOffset/blockSize)) % paritySize;
+      erasedLocationToFix = blockIdxInStripe;
+    }
 
     // Allows network reads to go on while decode is going on.
     int boundedBufferCapacity = 2;
@@ -101,30 +108,51 @@ protected long fixErasedBlockImpl(
 
   protected int[] buildInputs(FileSystem fs, Path srcFile, 
                               FileSystem parityFs, Path parityFile,
+                              boolean fixSource,
                               long errorOffset, FSDataInputStream[] inputs)
       throws IOException {
     LOG.info("Building inputs to recover block starting at " + errorOffset);
     try {
       FileStatus srcStat = fs.getFileStatus(srcFile);
+      FileStatus parityStat = fs.getFileStatus(parityFile);
       long blockSize = srcStat.getBlockSize();
       long blockIdx = (int)(errorOffset / blockSize);
-      long stripeIdx = blockIdx / stripeSize;
+      long stripeIdx;
+      if (fixSource) {
+        stripeIdx = blockIdx / stripeSize;
+      } else {
+        stripeIdx = blockIdx / paritySize;
+      }
+
       LOG.info("FileSize = " + srcStat.getLen() + ", blockSize = " + blockSize +
                ", blockIdx = " + blockIdx + ", stripeIdx = " + stripeIdx);
       ArrayList<Integer> erasedLocations = new ArrayList<Integer>();
       // First open streams to the parity blocks.
       for (int i = 0; i < paritySize; i++) {
         long offset = blockSize * (stripeIdx * paritySize + i);
-        FSDataInputStream in = parityFs.open(
-          parityFile, conf.getInt("io.file.buffer.size", 64 * 1024));
-        in.seek(offset);
-        LOG.info("Adding " + parityFile + ":" + offset + " as input " + i);
-        inputs[i] = in;
+        if ((!fixSource) && offset == errorOffset) {
+          LOG.info(parityFile + ":" + offset + 
+              " is known to have error, adding zeros as input " + i);
+          inputs[i] = new FSDataInputStream(new RaidUtils.ZeroInputStream(
+                offset + blockSize));
+          erasedLocations.add(i);
+        } else if (offset > parityStat.getLen()) {
+          LOG.info(parityFile + ":" + offset +
+                   " is past file size, adding zeros as input " + i);
+          inputs[i] = new FSDataInputStream(new RaidUtils.ZeroInputStream(
+              offset + blockSize));
+        } else {
+          FSDataInputStream in = parityFs.open(
+              parityFile, conf.getInt("io.file.buffer.size", 64 * 1024));
+          in.seek(offset);
+          LOG.info("Adding " + parityFile + ":" + offset + " as input " + i);
+          inputs[i] = in;
+        }
       }
       // Now open streams to the data blocks.
       for (int i = paritySize; i < paritySize + stripeSize; i++) {
         long offset = blockSize * (stripeIdx * stripeSize + i - paritySize);
-        if (offset == errorOffset) {
+        if (fixSource && offset == errorOffset) {
           LOG.info(srcFile + ":" + offset +
               " is known to have error, adding zeros as input " + i);
           inputs[i] = new FSDataInputStream(new RaidUtils.ZeroInputStream(
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/Statistics.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/Statistics.java
index 479ad4dd..02025127 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/Statistics.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/Statistics.java
@@ -19,12 +19,15 @@
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.raid.protocol.PolicyInfo;
 import org.apache.hadoop.util.StringUtils;
@@ -34,18 +37,20 @@
  */
 public class Statistics implements Serializable {
 
-  final private String codecId;
-  final private int parityLength;
-  final private int stripeLength;
-  private long estimatedParitySize = 0L;
-  private long estimatedDoneParitySize = 0L;
-  private long estimatedDoneSourceSize = 0L;
+  final protected String codecId;
+  final protected Codec codec;
+  final protected int parityLength;
+  final protected int stripeLength;
+  protected long estimatedParitySize = 0L;
+  protected long estimatedDoneParitySize = 0L;
+  protected long estimatedDoneSourceSize = 0L;
 
-  private Map<RaidState, Counters> stateToSourceCounters;
-  private Counters parityCounters;
-  private Map<Integer, Counters> numBlocksToRaidedCounters;
+  protected Map<RaidState, Counters> stateToSourceCounters;
+  protected Counters parityCounters;
+  protected Map<Integer, Counters> numBlocksToRaidedCounters;
 
   public Statistics(Codec codec, Configuration conf) {
+    this.codec = codec;
     this.codecId = codec.id;
     this.stripeLength = codec.stripeLength;
     this.parityLength = codec.parityLength;
@@ -59,6 +64,7 @@ public Statistics(Codec codec, Configuration conf) {
   }
 
   public static class Counters implements Serializable {
+    private long numDirs = 0L;
     private long numFiles = 0L;
     private long numBlocks = 0L;
     private long numBytes = 0L;
@@ -70,6 +76,22 @@ private void inc(FileStatus status) {
       numLogical += status.getLen();
       numBytes += status.getLen() * status.getReplication();
     }
+    
+    /**
+     * Increment counters for directory
+     * @param lfs List of FileStatus for files under the direcotry
+     */
+    protected void inc(List<FileStatus> lfs) {
+      numDirs += 1;
+      numFiles += lfs.size();
+      numBlocks += DirectoryStripeReader.getBlockNum(lfs);
+      numLogical += DirectoryStripeReader.getDirLogicalSize(lfs);
+      numBytes += DirectoryStripeReader.getDirPhysicalSize(lfs);
+    }
+    
+    public long getNumDirs() {
+      return numDirs;
+    }
 
     public long getNumFiles() {
       return numFiles;
@@ -92,7 +114,8 @@ public boolean equals(Object obj) {
         return false;
       }
       Counters counters = (Counters) obj;
-      return (numFiles == counters.numFiles &&
+      return (numDirs == counters.numDirs &&
+              numFiles == counters.numFiles &&
               numBlocks == counters.numBlocks &&
               numBytes == counters.numBytes &&
               numLogical == counters.numLogical);
@@ -100,6 +123,7 @@ public boolean equals(Object obj) {
     @Override
     public int hashCode() {
       int hash = 7;
+      hash = 37 * hash + (int) (numDirs ^ (numDirs >>> 32));
       hash = 37 * hash + (int) (numFiles ^ (numFiles >>> 32));
       hash = 37 * hash + (int) (numBlocks ^ (numBlocks >>> 32));
       hash = 37 * hash + (int) (numBytes ^ (numBytes >>> 32));
@@ -108,17 +132,21 @@ public int hashCode() {
     }
     @Override
     public String toString() {
-      return "files:" + numFiles + " blocks:" + numBlocks +
-          " bytes:" + numBytes + " logical:" + numLogical;
+      return "dirs: " + numDirs + " files:" + numFiles + " blocks:"
+          + numBlocks + " bytes:" + numBytes + " logical:" + numLogical;
     }
-    public String htmlRow() {
-      return td(StringUtils.humanReadableInt(numFiles)) +
+    public String htmlRow(Codec codec) {
+      String dirColumn = !codec.isDirRaid? "": 
+        td(StringUtils.humanReadableInt(numDirs));
+      return dirColumn + td(StringUtils.humanReadableInt(numFiles)) +
              td(StringUtils.humanReadableInt(numBlocks)) +
              td(StringUtils.byteDesc(numBytes)) +
              td(StringUtils.byteDesc(numLogical));
     }
-    public static String htmlRowHeader() {
-      return td("Files") + td("Blocks") +
+    public static String htmlRowHeader(Codec codec) {
+      String dirHeader = !codec.isDirRaid? "":
+        td("Dirs");
+      return dirHeader + td("Files") + td("Blocks") +
         td("Bytes") + td("Logical");
     }
   }
@@ -127,7 +155,7 @@ public static String htmlRowHeader() {
    * Collect the statistics of a source file. Return true if the file should be
    * raided but not.
    */
-  public boolean addSourceFile(PolicyInfo info, FileStatus src,
+  public boolean addSourceFile(FileSystem fs, PolicyInfo info, FileStatus src,
       RaidState.Checker checker, long now, int targetReplication)
       throws IOException {
     RaidState state = checker.check(info, src, now, true);
@@ -169,11 +197,11 @@ private long computeParitySize(FileStatus src, int targetReplication) {
       (long)Math.ceil(((double)numBlocks) / stripeLength) * parityLength;
     return parityBlocks * targetReplication * src.getBlockSize();
   }
-
+  
   private static int computeNumBlocks(FileStatus status) {
     return (int)Math.ceil(((double)(status.getLen())) / status.getBlockSize());
   }
-
+  
   public Counters getSourceCounters(RaidState state) {
     return stateToSourceCounters.get(state);
   }
@@ -296,12 +324,12 @@ public String htmlTable() {
         RaidState.NOT_RAIDED_TOO_SMALL, RaidState.NOT_RAIDED_BUT_SHOULD};
 
     StringBuilder sb = new StringBuilder();
-    sb.append(tr(td("STATE") + Counters.htmlRowHeader()));
+    sb.append(tr(td("STATE") + Counters.htmlRowHeader(codec)));
     for (RaidState state : statesToShow) {
       Counters counters = stateToSourceCounters.get(state);
-      sb.append(tr(td(state.toString()) + counters.htmlRow()));
+      sb.append(tr(td(state.toString()) + counters.htmlRow(codec)));
     }
-    sb.append(tr(td("PARITY") + parityCounters.htmlRow()));
+    sb.append(tr(td("PARITY") + parityCounters.htmlRow(codec)));
     return table(sb.toString());
   }
 
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/StatisticsCollector.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/StatisticsCollector.java
index 8bcea904..a2d0b8bc 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/StatisticsCollector.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/StatisticsCollector.java
@@ -301,7 +301,7 @@ void collect(Collection<PolicyInfo> allPolicies) throws IOException {
     for (Codec codec : Codec.getCodecs()) {
       Statistics stats = codeToRaidStatistics.get(codec.id);
       Path parityPath = new Path(codec.parityDirectory);
-      collectParityStatistics(parityPath, stats);
+      collectParityStatistics(codec, parityPath, stats);
     }
     lastRaidStatistics = codeToRaidStatistics;
     populateMetrics(codeToRaidStatistics);
@@ -315,7 +315,11 @@ private Map<String, Statistics> createEmptyStatistics() {
     Map<String, Statistics> m =
         new HashMap<String, Statistics>();
     for (Codec codec : Codec.getCodecs()) {
-      m.put(codec.id, new Statistics(codec, conf));
+      if (codec.isDirRaid) {
+        m.put(codec.id, new DirectoryStatistics(codec, conf));
+      } else {
+        m.put(codec.id, new Statistics(codec, conf));
+      }
     }
     return m;
   }
@@ -330,23 +334,32 @@ private void collectSourceStatistics(
     for (PolicyInfo info : allPolicyInfos) {
       LOG.info("Collecting statistics for policy:" + info.getName() + ".");
       String code = info.getCodecId();
+      Codec codec = Codec.getCodec(code);
       Statistics statistics = codeToRaidStatistics.get(code);
-      DirectoryTraversal retriever =
-          DirectoryTraversal.fileRetriever(
+      DirectoryTraversal retriever;
+      
+      if (codec.isDirRaid) {
+        // leaf directory retriever
+        retriever = DirectoryTraversal.directoryRetriever(
+            info.getSrcPathExpanded(), fs, numThreads, false, true, true);
+      } else {
+        retriever = DirectoryTraversal.fileRetriever(
               info.getSrcPathExpanded(), fs, numThreads, false, true);
+      }
       int targetReplication =
           Integer.parseInt(info.getProperty("targetReplication"));
       FileStatus file;
       List<FileStatus> filesToRaid = new ArrayList<FileStatus>();
       while ((file = retriever.next()) != DirectoryTraversal.FINISH_TOKEN) {
         boolean shouldBeRaided =
-          statistics.addSourceFile(info, file, checker, now, targetReplication);
+          statistics.addSourceFile(fs, info, file, checker, now, 
+              targetReplication);
         if (shouldBeRaided &&
             filesToRaid.size() < MAX_FILES_TO_RAID_QUEUE_SIZE) {
           filesToRaid.add(file);
         }
         filesToRaid = submitRaidJobsWhenPossible(info, filesToRaid, false);
-        incFileScanned();
+        incFileScanned(file);
       }
       filesToRaid = submitRaidJobsWhenPossible(info, filesToRaid, true);
       if (!filesToRaid.isEmpty()) {
@@ -391,16 +404,16 @@ private List<FileStatus> submitRaidJobsWhenPossible(PolicyInfo info,
     return filesToRaid;
   }
 
-  private void collectParityStatistics(Path parityLocation,
+  private void collectParityStatistics(Codec codec, Path parityLocation,
       Statistics statistics) throws IOException {
     LOG.info("Collecting parity statistics in " + parityLocation + ".");
     DirectoryTraversal retriever =
-        DirectoryTraversal.fileRetriever(
+            DirectoryTraversal.fileRetriever(
             Arrays.asList(parityLocation), fs, numThreads, false, true);
     FileStatus file;
     while ((file = retriever.next()) != DirectoryTraversal.FINISH_TOKEN) {
       statistics.addParityFile(file);
-      incFileScanned();
+      incFileScanned(file);
     }
     LOG.info("Finish collecting statistics in " +
         parityLocation + "\n" + statistics);
@@ -410,8 +423,13 @@ public long getFilesScanned() {
     return filesScanned;
   }
 
-  private void incFileScanned() {
-    filesScanned += 1;
+  private void incFileScanned(FileStatus file) throws IOException {
+    if (file.isDir()) {
+      filesScanned += fs.listStatus(file.getPath()).length;
+    } else {
+      filesScanned += 1;
+    }
+    
     if (filesScanned % FILES_SCANNED_LOGGING_PERIOD == 0) {
       LOG.info("Scanned " +
           StringUtils.humanReadableInt(filesScanned) + " files.");
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/StripeReader.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/StripeReader.java
index 1e6c1f2d..e37b26d6 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/StripeReader.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/StripeReader.java
@@ -45,9 +45,12 @@ public abstract class StripeReader {
   public static class LocationPair {
     private int stripeIdx;
     private int blockIdxInStripe;
-    public LocationPair(int stripeIdx, int blockIdxInStripe) {
+    private List<FileStatus> lfs;
+    public LocationPair(int stripeIdx, int blockIdxInStripe, 
+        List<FileStatus> lfs) {
       this.stripeIdx = stripeIdx;
       this.blockIdxInStripe = blockIdxInStripe;
+      this.lfs = lfs;
     }
     
     int getStripeIdx() {
@@ -57,6 +60,10 @@ int getStripeIdx() {
     int getBlockIdxInStripe() {
       return blockIdxInStripe;
     }
+    
+    List<FileStatus> getListFileStatus() {
+      return lfs;
+    }
   }
   
   public StripeReader(Configuration conf, Codec codec,
@@ -146,10 +153,10 @@ public static LocationPair getBlockLocation(Codec codec, FileSystem srcFs,
     int stripeIdx = 0; 
     int blockIdxInStripe = 0;
     int blockIdx = blockIdxInFile; 
+    List<FileStatus> lfs = null;
     if (codec.isDirRaid) {
       Path parentPath = srcFile.getParent();
-      List<FileStatus> lfs = RaidNode.getDirectoryBlockLocations(conf,
-          srcFs, parentPath);
+      lfs = RaidNode.listDirectoryRaidFileStatus(conf, srcFs, parentPath);
       if (lfs == null) {
         throw new IOException("Couldn't list files under " + parentPath);
       }
@@ -167,20 +174,30 @@ public static LocationPair getBlockLocation(Codec codec, FileSystem srcFs,
     }
     stripeIdx = blockIdx / codec.stripeLength;
     blockIdxInStripe = blockIdx % codec.stripeLength; 
-    return new LocationPair(stripeIdx, blockIdxInStripe);
+    return new LocationPair(stripeIdx, blockIdxInStripe, lfs);
+  }
+  
+  public static LocationPair getParityBlockLocation(Codec codec, 
+      final int blockIdxInFile) {
+    
+    int stripeIdx = blockIdxInFile / codec.parityLength;
+    int blockIdxInStripe = blockIdxInFile % codec.parityLength;
+    
+    return new LocationPair(stripeIdx, blockIdxInStripe, null);
   }
   
   public static StripeReader getStripeReader(Codec codec, Configuration conf, 
-      long blockSize, FileSystem fs, long stripeIdx, Path srcFile,
-      long srcSize) throws IOException {
+      long blockSize, FileSystem fs, long stripeIdx, FileStatus srcStat)
+          throws IOException {
     if (codec.isDirRaid) {
+      Path srcDir = srcStat.isDir()? srcStat.getPath():
+        srcStat.getPath().getParent();
       return new DirectoryStripeReader(conf, codec, fs, stripeIdx,
-          srcFile.getParent(), 
-          RaidNode.getDirectoryBlockLocations(conf, fs,
-              srcFile.getParent())); 
+          srcDir, 
+          RaidNode.listDirectoryRaidFileStatus(conf, fs, srcDir)); 
     } else {
       return new FileStripeReader(conf, blockSize, 
-        codec, fs, stripeIdx, srcFile, srcSize);
+        codec, fs, stripeIdx, srcStat.getPath(), srcStat.getLen());
     }
   }
   
diff --git a/src/contrib/raid/src/java/org/apache/hadoop/raid/XORDecoder.java b/src/contrib/raid/src/java/org/apache/hadoop/raid/XORDecoder.java
index 3920d07d..445d9463 100644
--- a/src/contrib/raid/src/java/org/apache/hadoop/raid/XORDecoder.java
+++ b/src/contrib/raid/src/java/org/apache/hadoop/raid/XORDecoder.java
@@ -46,6 +46,7 @@ public XORDecoder(
   @Override
   protected long fixErasedBlockImpl(
       FileSystem fs, Path srcFile, FileSystem parityFs, Path parityFile,
+      boolean fixSource,
       long blockSize, long errorOffset, long limit, boolean partial, 
       OutputStream out, Progressable reporter, CRC32 crc) throws IOException {
     if (partial) {
@@ -62,9 +63,9 @@ protected long fixErasedBlockImpl(
 
     try {
       long errorBlockOffset = (errorOffset / blockSize) * blockSize;
-      long[] srcOffsets = stripeOffsets(errorOffset, blockSize);
+      long[] srcOffsets = stripeOffsets(errorOffset, blockSize, fixSource);
       for (int i = 0; i < srcOffsets.length; i++) {
-        if (srcOffsets[i] == errorBlockOffset) {
+        if (fixSource && srcOffsets[i] == errorBlockOffset) {
           inputs[i] = new FSDataInputStream(
             new RaidUtils.ZeroInputStream(blockSize));
           LOG.info("Using zeros at " + srcFile + ":" + errorBlockOffset);
@@ -80,9 +81,16 @@ protected long fixErasedBlockImpl(
           LOG.info("Using zeros at " + srcFile + ":" + errorBlockOffset);
         }
       }
-      FSDataInputStream parityFileIn = parityFs.open(parityFile);
-      parityFileIn.seek(parityOffset(errorOffset, blockSize));
-      inputs[inputs.length - 1] = parityFileIn;
+
+      if (fixSource) {
+        FSDataInputStream parityFileIn = parityFs.open(parityFile);
+        parityFileIn.seek(parityOffset(errorOffset, blockSize));
+        inputs[inputs.length - 1] = parityFileIn;
+      } else {
+        inputs[inputs.length - 1] = new FSDataInputStream(
+            new RaidUtils.ZeroInputStream(blockSize));
+        LOG.info("Using zeros at " + parityFile + ":" + errorBlockOffset);
+      }
     } catch (IOException e) {
       RaidUtils.closeStreams(inputs);
       throw e;
@@ -125,9 +133,15 @@ protected long fixErasedBlockImpl(
     }
   }
 
-  protected long[] stripeOffsets(long errorOffset, long blockSize) {
+  protected long[] stripeOffsets(long errorOffset, long blockSize, 
+                                 boolean fixSource) {
     long[] offsets = new long[stripeSize];
-    long stripeIdx = errorOffset / (blockSize * stripeSize);
+    long stripeIdx;
+    if (fixSource) {
+      stripeIdx = errorOffset / (blockSize * stripeSize);
+    } else {
+      stripeIdx = errorOffset / blockSize;
+    }
     long startOffsetOfStripe = stripeIdx * stripeSize * blockSize;
     for (int i = 0; i < stripeSize; i++) {
       offsets[i] = startOffsetOfStripe + i * blockSize;
diff --git a/src/contrib/raid/src/java/raid-default.xml b/src/contrib/raid/src/java/raid-default.xml
new file mode 100644
index 00000000..6ac7c01e
--- /dev/null
+++ b/src/contrib/raid/src/java/raid-default.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+<!-- Codec specifications -->
+<property>
+  <name>raid.codecs.json</name>
+    <value>[
+{
+"id" : "rs",
+"parity_dir" : "/raidrs",
+"stripe_length" : 10,
+"parity_length" : 4,
+"priority" : 300,
+"erasure_code" : "org.apache.hadoop.raid.ReedSolomonCode",
+"description" : "ReedSolomonCode code",
+"simulate_block_fix": false
+},
+{
+"id" : "xor",
+"parity_dir" : "/raid",
+"stripe_length" : 10,
+"parity_length" : 1,
+"priority" : 100,
+"erasure_code" : "org.apache.hadoop.raid.XORCode",
+"description" : "XORCode code",
+"simulate_block_fix": false
+}
+]</value>
+  <description>JSon string that contains all Raid codecs</description>
+</property>
+
+</configuration>
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidDfs.java b/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidDfs.java
index 9280c45b..d246309d 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidDfs.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidDfs.java
@@ -132,9 +132,15 @@ private DistributedRaidFileSystem getRaidFS() throws IOException {
     URI dfsUri = dfs.getUri();
     return (DistributedRaidFileSystem)FileSystem.get(dfsUri, clientConf);
   }
+  
+  public static void waitForFileRaided(
+      Log logger, FileSystem fileSys, Path file, Path destPath)
+  throws IOException, InterruptedException {
+    waitForFileRaided(logger, fileSys, file, destPath, (short)1);
+  }
 
   public static void waitForFileRaided(
-    Log logger, FileSystem fileSys, Path file, Path destPath)
+    Log logger, FileSystem fileSys, Path file, Path destPath, short targetReplication)
   throws IOException, InterruptedException {
     FileStatus parityStat = null;
     String fileName = file.getName().toString();
@@ -172,11 +178,53 @@ public static void waitForFileRaided(
 
     while (true) {
       FileStatus stat = fileSys.getFileStatus(file);
-      if (stat.getReplication() == 1) break;
+      if (stat.getReplication() == targetReplication) break;
       Thread.sleep(1000);
     }
   }
-
+  
+  public static void waitForDirRaided(
+      Log logger, FileSystem fileSys, Path file, Path destPath) 
+    throws IOException, InterruptedException {
+    waitForDirRaided(logger, fileSys, file, destPath, (short)1);
+  }
+  
+  public static void waitForDirRaided(
+      Log logger, FileSystem fileSys, Path file, Path destPath, short targetReplication)
+    throws IOException, InterruptedException {
+    FileStatus parityStat = null;
+    String fileName = file.getName().toString();
+    long startTime = System.currentTimeMillis();
+    FileStatus srcStat = fileSys.getFileStatus(file);
+    // wait till file is raided
+    while (parityStat == null &&
+        System.currentTimeMillis() - startTime < 90000) {
+      logger.info("Waiting for files to be raided.");
+      try {
+        FileStatus[] listPaths = fileSys.listStatus(destPath);
+        if (listPaths != null) {
+          for (FileStatus f : listPaths) {
+            logger.info("File raided so far : " + f.getPath());
+            String found = f.getPath().getName().toString();
+            if (fileName.equals(found) &&
+                srcStat.getModificationTime() == f.getModificationTime()) {
+              parityStat = f;
+              break;
+            }
+          }
+        }
+      } catch (FileNotFoundException e) {
+        //ignore
+      }
+      Thread.sleep(1000);                  // keep waiting
+    }
+    assertTrue("Parity file is not generated", parityStat != null);
+    assertEquals(srcStat.getModificationTime(), parityStat.getModificationTime());
+    for (FileStatus stat: fileSys.listStatus(file)) {
+      assertEquals(stat.getReplication(), targetReplication);
+    }
+  }
+  
   private void corruptBlockAndValidate(Path srcFile, Path destPath,
     int[] listBlockNumToCorrupt, long blockSize, int numBlocks,
     MiniDFSCluster cluster)
@@ -679,22 +727,23 @@ public static long createTestFile(FileSystem fileSys, Path name, int repl,
    * we will generate these files and put their checksum into crcs array
    * The seeds we use to generate files are stored in seeds array 
    */
-  public static void createTestFiles(Path srcDir, long[] fileSizes,
-      long[] blockSizes, long[] crcs, int[] seeds, Codec codec,
+  public static Path[] createTestFiles(Path srcDir, long[] fileSizes,
+      long[] blockSizes, long[] crcs, int[] seeds,
       FileSystem fileSys, short repl)
           throws IOException {
-    Path parityDir = new Path(codec.parityDirectory);
-    RaidDFSUtil.cleanUp(fileSys, srcDir);
-    RaidDFSUtil.cleanUp(fileSys, parityDir);
+    Path[] files = new Path[fileSizes.length];
     fileSys.mkdirs(srcDir);
     LOG.info("Create files under directory " + srcDir);
     Random rand = new Random();
     for (int i = 0; i < fileSizes.length; i++) {
-      Path file = new Path(srcDir, "file" + i);
+      Path file = files[i] = new Path(srcDir, "file" + i);
       seeds[i] = rand.nextInt();
-      crcs[i] = TestRaidDfs.createTestFile(fileSys, file, repl, fileSizes[i],
+      crcs[i] = TestRaidDfs.createTestFile(fileSys, files[i], repl, fileSizes[i],
           blockSizes[i], seeds[i]);
+      assertEquals("file size is not expected", fileSizes[i],
+          fileSys.getFileStatus(file).getLen()); 
     }
+    return files;
   }
 
   //
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidFastCopy.java b/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidFastCopy.java
index 2fd3040b..a5652ec5 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidFastCopy.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidFastCopy.java
@@ -12,6 +12,7 @@
 import static org.junit.Assert.*;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.mortbay.log.Log;
 
 public class TestRaidFastCopy {
 
@@ -36,9 +37,12 @@ public static void setUpBeforeClass() throws Exception {
     for (String dir : dirs) {
       if (new File(dir).exists()) {
         confFile = dir + fileName;
-        FileOutputStream out = new FileOutputStream(confFile);
+        String tmpConfFile = confFile + ".tmp";
+        FileOutputStream out = new FileOutputStream(tmpConfFile);
         conf.writeXml(out);
         out.close();
+        //rename the xml 
+        (new File(tmpConfFile)).renameTo(new File(confFile));
         flag = true;
       }
     }
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/hdfs/server/namenode/TestDirectoryRaidBlockPlacement.java b/src/contrib/raid/src/test/org/apache/hadoop/hdfs/server/namenode/TestDirectoryRaidBlockPlacement.java
new file mode 100644
index 00000000..5d652fa9
--- /dev/null
+++ b/src/contrib/raid/src/test/org/apache/hadoop/hdfs/server/namenode/TestDirectoryRaidBlockPlacement.java
@@ -0,0 +1,136 @@
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.TestRaidDfs;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.raid.Codec;
+import org.apache.hadoop.raid.RaidNode;
+import org.apache.hadoop.raid.RaidUtils;
+import org.apache.hadoop.raid.Utils;
+import org.junit.Test;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+public class TestDirectoryRaidBlockPlacement extends TestCase {
+  private Configuration conf = null;
+  private MiniDFSCluster cluster = null;
+  private FSNamesystem namesystem = null;
+  private BlockPlacementPolicyRaid policy = null;
+  private FileSystem fs = null;
+
+  String[] rack1 = {"/rack1", "/rack1", "/rack1"};
+  String[] host1 = {"host1.rack1.com", "host2.rack1.com", "host3.rack1.com"};
+
+  final static Log LOG =
+      LogFactory.getLog(TestDirectoryRaidBlockPlacement.class);
+
+  protected void setupCluster() throws IOException {
+    conf = new Configuration();
+    conf.setLong("dfs.blockreport.intervalMsec", 1000L);
+    conf.set("dfs.replication.pending.timeout.sec", "2");
+    conf.setLong("dfs.block.size", 1L);
+    conf.set("dfs.block.replicator.classname",
+        "org.apache.hadoop.hdfs.server.namenode.BlockPlacementPolicyRaid");
+    Utils.loadTestCodecs(conf, 5, 5, 1, 3, "/raid", "/raidrs", false, true);
+    conf.setInt("io.bytes.per.checksum", 1);
+
+    cluster = new MiniDFSCluster(conf, 3, true, rack1, host1);
+    cluster.waitActive();
+    namesystem = cluster.getNameNode().getNamesystem();
+    Assert.assertTrue("BlockPlacementPolicy type is not correct.",
+        namesystem.replicator instanceof BlockPlacementPolicyRaid);
+    policy = (BlockPlacementPolicyRaid) namesystem.replicator;
+    fs = cluster.getFileSystem();
+  }
+
+  protected void closeCluster() throws IOException {
+    if (null != cluster) {
+      cluster.shutdown();
+    }
+  }
+
+  @Test
+  public void testGetCompanionBLocks() throws IOException {
+
+    try {
+      setupCluster();
+      String[] files = new String[] {"/dir/file1", "/dir/file2", "/dir/file3"};
+      Codec codec = Codec.getCodec("rs");
+      for (String file : files) {
+        TestRaidDfs.createTestFile(fs, new Path(file), 3, 2, 8192L);
+      }
+      FileStatus stat = fs.getFileStatus(new Path("/dir"));
+      RaidNode.doDirRaid(conf, stat, new Path(codec.parityDirectory), codec, 
+          new RaidNode.Statistics(), 
+          RaidUtils.NULL_PROGRESSABLE, false, 1, 1);       
+      
+      Collection<LocatedBlock> companionBlocks;
+      
+      for (int i=0; i<2; i++) {
+        for (int j=0; j<2; j++) {
+          companionBlocks = getCompanionBlocks(
+              namesystem, policy, getBlocks(namesystem, 
+                  files[i]).get(j).getBlock());
+          Assert.assertEquals(8, companionBlocks.size());
+        }
+      }
+      
+      companionBlocks = getCompanionBlocks(
+          namesystem, policy, getBlocks(namesystem, 
+              files[2]).get(0).getBlock());
+      Assert.assertEquals(8, companionBlocks.size());
+      
+      companionBlocks = getCompanionBlocks(
+          namesystem, policy, getBlocks(namesystem, 
+              files[2]).get(1).getBlock());
+      Assert.assertEquals(4, companionBlocks.size());
+      
+      String parityFile = "/raidrs/dir";
+      
+      for (int i=0; i<3; i++) {
+        companionBlocks = getCompanionBlocks(
+            namesystem, policy, getBlocks(namesystem, 
+                parityFile).get(i).getBlock());
+        Assert.assertEquals(8, companionBlocks.size());
+      }
+      
+      for (int i=3; i<6; i++) {
+        companionBlocks = getCompanionBlocks(
+            namesystem, policy, getBlocks(namesystem, 
+                parityFile).get(i).getBlock());
+        Assert.assertEquals(4, companionBlocks.size());
+      }
+    } finally {
+      closeCluster();
+    }
+  }
+  
+  private Collection<LocatedBlock> getCompanionBlocks(
+      FSNamesystem namesystem, BlockPlacementPolicyRaid policy,
+      Block block) throws IOException {
+    INodeFile inode = namesystem.blocksMap.getINode(block);
+    BlockPlacementPolicyRaid.FileInfo info = 
+        policy.getFileInfo(inode.getFullPathName());
+    return policy.getCompanionBlocks(inode.getFullPathName(), info, block);
+  }
+  
+  private List<LocatedBlock> getBlocks(FSNamesystem namesystem, String file) 
+      throws IOException {
+    FileStatus stat = namesystem.getFileInfo(file);
+    return namesystem.getBlockLocations(
+               file, 0, stat.getLen()).getLocatedBlocks();
+  }
+
+}
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/BadReedSolomonCode.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/BadReedSolomonCode.java
new file mode 100644
index 00000000..accf43f1
--- /dev/null
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/BadReedSolomonCode.java
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.raid;
+
+public class BadReedSolomonCode extends ReedSolomonCode {
+  @Override
+  public void decode(int[] data, int[] erasedLocation, int[] erasedValue) {
+    erasedValue[0] = -1; // Write something bad
+  }
+  
+  @Override
+  public void decodeBulk(
+    byte[][] readBufs, byte[][] writeBufs, int[] erasedLocations) {
+    assert(erasedLocations.length == writeBufs.length);
+    assert(erasedLocations.length <= 1);
+    byte[] output = writeBufs[0];
+    // Set the output to zeros.
+    for (int j = 0; j < output.length; j++) {
+      output[j] = -1;
+    }
+  }
+}
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/ConfigBuilder.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/ConfigBuilder.java
index 353b6cf5..0c0d5887 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/ConfigBuilder.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/ConfigBuilder.java
@@ -31,19 +31,12 @@ public void addPolicy(String name, String path, String parent) {
     policies.add(str);
   }
 
-  public void addPolicy(String name, short srcReplication,
-                        long targetReplication, long metaReplication) {
+  public void addAbstractPolicy(String name, 
+                        long targetReplication, long metaReplication, String codecId) {
     String str =
         "<policy name = \"" + name + "\"> " +
            "<srcPath/> " +
-           "<codecId>xor</codecId> " +
-           "<property> " +
-             "<name>srcReplication</name> " +
-             "<value>" + srcReplication + "</value> " +
-             "<description>" +
-               "pick only files whole replFactor is greater than or equal to " +
-             "</description> " +
-           "</property> " +
+           "<codecId>" + codecId + "</codecId> " +
            "<property> " +
              "<name>targetReplication</name> " +
              "<value>" + targetReplication + "</value> " +
@@ -68,25 +61,19 @@ public void addPolicy(String name, short srcReplication,
     policies.add(str);
   }
   
-  public void addPolicy(String name, String path, short srcReplication,
+  public void addPolicy(String name, String path,
                         long targetReplication, long metaReplication) {
-    addPolicy(name, path, srcReplication, targetReplication, metaReplication, 
+    addPolicy(name, path, targetReplication, metaReplication, 
         "xor");
   }
 
-  public void addPolicy(String name, String path, short srcReplication,
+  public void addPolicy(String name, String path, 
                         long targetReplication, long metaReplication,
                         String code) {
     String str =
         "<policy name = \"" + name + "\"> " +
           "<srcPath prefix=\"" + path + "\"/> " +
            "<codecId>" + code + "</codecId> " +
-           "<property> " +
-             "<name>srcReplication</name> " +
-             "<value>" + srcReplication + "</value> " +
-             "<description> pick only files whole replFactor is greater than or equal to " +
-             "</description> " + 
-           "</property> " +
            "<property> " +
              "<name>targetReplication</name> " +
              "<value>" + targetReplication + "</value> " +
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestCodec.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestCodec.java
index 7885a9f7..ce8f2559 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestCodec.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestCodec.java
@@ -18,47 +18,55 @@
 
 package org.apache.hadoop.raid;
 
+import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.Callable;
+
 import junit.framework.TestCase;
 import org.apache.hadoop.conf.Configuration;
 
 public class TestCodec extends TestCase {
-
+  String jsonStr =
+      "    [\n" +
+      "      {   \n" +
+      "        \"id\"            : \"rs\",\n" +
+      "        \"parity_dir\"    : \"/raidrs\",\n" +
+      "        \"stripe_length\" : 10,\n" +
+      "        \"parity_length\" : 4,\n" +
+      "        \"priority\"      : 300,\n" +
+      "        \"erasure_code\"  : \"org.apache.hadoop.raid.ReedSolomonCode\",\n" +
+      "        \"description\"   : \"ReedSolomonCode code\",\n" +
+      "        \"simulate_block_fix\"  : true,\n" +
+      "      },  \n" +
+      "      {   \n" +
+      "        \"id\"            : \"xor\",\n" +
+      "        \"parity_dir\"    : \"/raid\",\n" +
+      "        \"stripe_length\" : 10, \n" +
+      "        \"parity_length\" : 1,\n" +
+      "        \"priority\"      : 100,\n" +
+      "        \"erasure_code\"  : \"org.apache.hadoop.raid.XORCode\",\n" +
+      "        \"simulate_block_fix\"  : false,\n" + 
+      "      },  \n" +
+      "      {   \n" +
+      "        \"id\"            : \"sr\",\n" +
+      "        \"parity_dir\"    : \"/raidsr\",\n" +
+      "        \"stripe_length\" : 10, \n" +
+      "        \"parity_length\" : 5, \n" +
+      "        \"degree\"        : 2,\n" +
+      "        \"erasure_code\"  : \"org.apache.hadoop.raid.SimpleRegeneratingCode\",\n" +
+      "        \"priority\"      : 200,\n" +
+      "        \"description\"   : \"SimpleRegeneratingCode code\",\n" +
+      "        \"simulate_block_fix\"  : false,\n" +
+      "      },  \n" +
+      "    ]\n";
+  
   public void testCreation() throws Exception {
     Configuration conf = new Configuration();
-    String jsonStr =
-"    [\n" +
-"      {   \n" +
-"        \"id\"            : \"rs\",\n" +
-"        \"parity_dir\"    : \"/raidrs\",\n" +
-"        \"stripe_length\" : 10,\n" +
-"        \"parity_length\" : 4,\n" +
-"        \"priority\"      : 300,\n" +
-"        \"erasure_code\"  : \"org.apache.hadoop.raid.ReedSolomonCode\",\n" +
-"        \"description\"   : \"ReedSolomonCode code\",\n" +
-"        \"simulate_block_fix\"  : true,\n" +
-"      },  \n" +
-"      {   \n" +
-"        \"id\"            : \"xor\",\n" +
-"        \"parity_dir\"    : \"/raid\",\n" +
-"        \"stripe_length\" : 10, \n" +
-"        \"parity_length\" : 1,\n" +
-"        \"priority\"      : 100,\n" +
-"        \"erasure_code\"  : \"org.apache.hadoop.raid.XORCode\",\n" +
-"        \"simulate_block_fix\"  : false,\n" + 
-"      },  \n" +
-"      {   \n" +
-"        \"id\"            : \"sr\",\n" +
-"        \"parity_dir\"    : \"/raidsr\",\n" +
-"        \"stripe_length\" : 10, \n" +
-"        \"parity_length\" : 5, \n" +
-"        \"degree\"        : 2,\n" +
-"        \"erasure_code\"  : \"org.apache.hadoop.raid.SimpleRegeneratingCode\",\n" +
-"        \"priority\"      : 200,\n" +
-"        \"description\"   : \"SimpleRegeneratingCode code\",\n" +
-"        \"simulate_block_fix\"  : false,\n" +
-"      },  \n" +
-"    ]\n";
+    
     conf.set("raid.codecs.json", jsonStr);
     Codec.initializeCodecs(conf);
 
@@ -87,7 +95,6 @@ public void testCreation() throws Exception {
     assertEquals("/raidsr", codecs.get(1).parityDirectory);
     assertEquals("/tmp/raidsr", codecs.get(1).tmpParityDirectory);
     assertEquals("/tmp/raidsr_har", codecs.get(1).tmpHarDirectory);
-    assertEquals(2, codecs.get(1).json.getInt("degree"));
     assertEquals("SimpleRegeneratingCode code", codecs.get(1).description);
     assertEquals(false, codecs.get(1).simulateBlockFix);
 
@@ -104,5 +111,29 @@ public void testCreation() throws Exception {
     assertTrue(codecs.get(0).createErasureCode(conf) instanceof ReedSolomonCode);
     assertTrue(codecs.get(2).createErasureCode(conf) instanceof XORCode);
   }
+  
+  public void testMultiThreadCreation() 
+      throws InterruptedException, ExecutionException {
+    final Configuration conf = new Configuration();
+    
+    conf.set("raid.codecs.json", jsonStr);
+    
+    int numThreads = 100;
+    ExecutorService excutor = Executors.newFixedThreadPool(numThreads);
+    Future<Boolean>[] futures = new Future[numThreads];
+    for (int i=0; i<numThreads; i++) {
+      futures[i] = excutor.submit(new Callable<Boolean>() {
+        @Override
+        public Boolean call() throws Exception {
+          Codec.initializeCodecs(conf);
+          return true;
+        }
+      });
+    }
+    
+    for (int i=0; i<numThreads; i++) {
+      assertTrue(futures[i].get());
+    }
+  }
 
 }
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryBlockFixer.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryBlockFixer.java
new file mode 100644
index 00000000..2b58eb6c
--- /dev/null
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryBlockFixer.java
@@ -0,0 +1,756 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.raid;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.net.URI;
+import java.nio.channels.FileChannel;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.zip.CRC32;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.RaidDFSUtil;
+import org.apache.hadoop.hdfs.TestDatanodeBlockScanner;
+import org.apache.hadoop.hdfs.TestRaidDfs;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.mapred.MiniMRCluster;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.raid.DistBlockIntegrityMonitor.Priority;
+import org.apache.hadoop.raid.DistBlockIntegrityMonitor.Worker.LostFileInfo;
+import org.apache.hadoop.util.StringUtils;
+import org.junit.Test;
+
+
+public class TestDirectoryBlockFixer extends TestCase {
+  final static Log LOG = LogFactory.getLog(
+                            "org.apache.hadoop.raid.TestDirectoryBlockFixer");
+  final static String TEST_DIR = new File(System.getProperty("test.build.data",
+      "build/contrib/raid/test/data")).getAbsolutePath();
+  final static String CONFIG_FILE = new File(TEST_DIR, 
+      "test-raid.xml").getAbsolutePath();
+  final static long RELOAD_INTERVAL = 1000;
+  final static int NUM_DATANODES = 3;
+  final long blockSize = 8192L;
+  final long[] fileSizes =
+      new long[]{blockSize + blockSize/2, // block 0, 1
+      3*blockSize,                  // block 2, 3
+      blockSize + blockSize/2 + 1}; // block 4, 5, 6, 7
+  final long[] blockSizes = new long[]{blockSize, 2*blockSize, blockSize/2};
+  final Integer[] rsCorruptFileIdx1 = new Integer[]{0, 1, 2, 3, 5, 6, 7};
+  final int[] rsNumCorruptBlocksInFiles1 = new int[] {2, 2, 3};
+  final Integer[] rsCorruptFileIdx2 = new Integer[]{1, 2, 3, 4, 5, 6};
+  final int[] rsNumCorruptBlocksInFiles2 = new int[] {1, 2, 3};
+  Configuration conf;
+  String namenode = null;
+  MiniDFSCluster dfsCluster = null;
+  String hftp = null;
+  MiniMRCluster mr = null;
+  FileSystem fileSys = null;
+  RaidNode cnode = null;
+  String jobTrackerName = null;
+  Random rand = new Random();
+  static {
+    ParityFilePair.disableCacheUsedInTestOnly();
+  }
+  
+  public Configuration getRaidNodeConfig(Configuration conf, boolean local) {
+    // create an instance of the RaidNode
+    Configuration localConf = new Configuration(conf);
+    localConf.setInt("raid.blockfix.interval", 1000);
+    if (local) {
+      localConf.set("raid.blockfix.classname",
+                    "org.apache.hadoop.raid.LocalBlockIntegrityMonitor");
+    } else {
+      localConf.set("raid.blockfix.classname",
+                    "org.apache.hadoop.raid.DistBlockIntegrityMonitor");
+    }
+    localConf.setLong("raid.blockfix.filespertask", 2L);
+    return localConf;
+  }
+
+  @Test
+  public void testDirectoryFilterUnfixableFiles() throws IOException {
+    conf = new Configuration();
+    dfsCluster = new MiniDFSCluster(conf, NUM_DATANODES, true, null);
+    dfsCluster.waitActive();
+    FileSystem fs = dfsCluster.getFileSystem();
+
+    Utils.loadTestCodecs(conf, 3, 5, 1,
+        3, "/destraid", "/destraidrs", false, true);
+    try {
+      Configuration testConf = fs.getConf();
+      BlockIntegrityMonitor blockFixer = new
+          LocalBlockIntegrityMonitor(testConf);
+
+      String p1 = "/user/foo/f1";
+      String p2 = "/user/foo/f2";
+      String p3 = "/user1/foo/bar/f1";
+      String p4 = "/a/b";
+      String p5 = "/c";
+      String p6 = "/destraidrs/user";
+      String p7 = "/destraid/user1/foo";
+      
+      fs.mkdirs(new Path(p6));
+
+      List<String> fileList = new ArrayList<String>();
+      fileList.add(p1);
+      fileList.add(p2);
+      fileList.add(p3);
+      fileList.add(p4);
+      fileList.add(p5);
+
+      blockFixer.filterUnreconstructableSourceFiles(fs, fileList.iterator());
+      // p3 and p5 should be filtered out.
+      assertEquals(3, fileList.size());
+
+      Set<String> filtered = new HashSet<String>();
+      for (String p: fileList) filtered.add(p);
+      assertFalse("File not filtered", filtered.contains(p3));
+      assertFalse("File not filtered", filtered.contains(p5));
+
+      fileList.add(p3);
+      fs.mkdirs(new Path(p7));
+      blockFixer.filterUnreconstructableSourceFiles(fs, fileList.iterator());
+      // Nothing is filtered.
+      assertEquals(4, fileList.size());
+    } finally {
+      dfsCluster.shutdown();
+    }
+  }
+  
+  @Test
+  public void testDirBlockFixLocal() throws Exception {
+    implDirBlockFix(true);
+  }
+
+  @Test
+  public void testDirBlockFixDist() throws Exception {
+    implDirBlockFix(false);
+  }
+
+  /**
+   * Create a file with three stripes, corrupt a block each in two stripes,
+   * and wait for the the file to be fixed.
+   */
+  private void implDirBlockFix(boolean local) throws Exception {
+    LOG.info("Test testDirBlockFix started.");
+    int stripeLength = 3;
+    mySetup(stripeLength);
+    long[] crcs = new long[3];
+    int[] seeds = new int[3];
+    Path dirPath = new Path("/user/dhruba/raidtestrs");
+    Path[] files = TestRaidDfs.createTestFiles(dirPath,
+        fileSizes, blockSizes, crcs, seeds, fileSys, (short)1);
+    Path destPath = new Path("/destraidrs/user/dhruba");
+    LOG.info("Test testDirBlockFix created test files");
+    Configuration localConf = this.getRaidNodeConfig(conf, local);
+
+    try {
+      cnode = RaidNode.createRaidNode(null, localConf);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dirPath, destPath);
+      cnode.stop(); cnode.join();
+      
+      DistributedFileSystem dfs = (DistributedFileSystem)fileSys;
+      String[] corruptFiles = DFSUtil.getCorruptFiles(dfs);
+      assertEquals("no corrupt files expected", 0, corruptFiles.length);
+      assertEquals("filesFixed() should return 0 before fixing files",
+                   0, cnode.blockIntegrityMonitor.getNumFilesFixed());
+      this.corruptFiles(dirPath, crcs, rsCorruptFileIdx1, dfs, files, 
+          rsNumCorruptBlocksInFiles1);
+      cnode = RaidNode.createRaidNode(null, localConf);
+      long start = System.currentTimeMillis();
+      while (cnode.blockIntegrityMonitor.getNumFilesFixed() < 3 &&
+             System.currentTimeMillis() - start < 120000) {
+        LOG.info("Test testDirBlockFix waiting for files to be fixed.");
+        Thread.sleep(1000);
+      }
+      assertEquals("file not fixed", 3,
+          cnode.blockIntegrityMonitor.getNumFilesFixed());
+      
+      dfs = getDFS(conf, dfs);
+      for (int i = 0; i < fileSizes.length; i++) {
+        assertTrue("file " + files[i] + " not fixed",
+            TestRaidDfs.validateFile(dfs, files[i], fileSizes[i],
+              crcs[i]));
+      }
+    } catch (Exception e) {
+      LOG.info("Test testDirBlockFix Exception " + e, e);
+      throw e;
+    } finally {
+      myTearDown();
+    }
+    LOG.info("Test testDirBlockFix completed.");
+  }
+
+  /**
+   * Tests integrity of generated block.
+   * Create a file and delete a block entirely. Wait for the block to be
+   * regenerated. Now stop RaidNode and corrupt the generated block.
+   * Test that corruption in the generated block can be detected by clients.
+   */
+  private void generatedBlockTestCommon(String testName, int blockToCorrupt,
+                                        boolean local) throws Exception {
+    LOG.info("Test " + testName + " started.");
+    int stripeLength = 3;
+    mySetup(stripeLength);
+    long[] crcs = new long[3];
+    int[] seeds = new int[3];
+    Path dirPath = new Path("/user/dhruba/raidtest");
+    Path[] files = TestRaidDfs.createTestFiles(dirPath,
+        fileSizes, blockSizes, crcs, seeds, fileSys, (short)1);
+    Path destPath = new Path("/destraid/user/dhruba");
+    LOG.info("Test " + testName + " created test files");
+    Configuration localConf = this.getRaidNodeConfig(conf, local);
+
+    try {
+      cnode = RaidNode.createRaidNode(null, localConf);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dirPath, destPath);
+      cnode.stop(); cnode.join();
+      
+      DistributedFileSystem dfs = (DistributedFileSystem)fileSys;
+      String[] corruptFiles = DFSUtil.getCorruptFiles(dfs);
+      assertEquals("no corrupt files expected", 0, corruptFiles.length);
+      assertEquals("filesFixed() should return 0 before fixing files",
+                   0, cnode.blockIntegrityMonitor.getNumFilesFixed());
+      
+      Integer[] corruptBlockIdxs = new Integer[]{blockToCorrupt};
+      TestDirectoryRaidDfs.corruptBlocksInDirectory(conf, dirPath,
+          crcs, corruptBlockIdxs, fileSys, dfsCluster, false, true);
+      
+      corruptFiles = DFSUtil.getCorruptFiles(dfs);
+      assertEquals("files not corrupted", corruptBlockIdxs.length,
+          corruptFiles.length);
+      int corruptFileIdx = -1;
+      for (int i = 0; i < files.length; i++) {
+        if (files[i].toUri().getPath().equals(corruptFiles[0])) {
+          corruptFileIdx = i;
+          break;
+        }
+      }
+      assertNotSame("Wrong corrupt file", -1, corruptFileIdx);
+      cnode = RaidNode.createRaidNode(null, localConf);
+      long start = System.currentTimeMillis();
+      while (cnode.blockIntegrityMonitor.getNumFilesFixed() < 1 &&
+             System.currentTimeMillis() - start < 120000) {
+        LOG.info("Test testDirBlockFix waiting for files to be fixed.");
+        Thread.sleep(1000);
+      }
+      assertEquals("file not fixed", 1,
+          cnode.blockIntegrityMonitor.getNumFilesFixed());
+      // Stop RaidNode
+      cnode.stop(); cnode.join(); cnode = null;
+
+      // The block has successfully been reconstructed.
+      dfs = getDFS(conf, dfs);
+      assertTrue("file not fixed",
+                 TestRaidDfs.validateFile(dfs, files[corruptFileIdx], 
+                     fileSizes[corruptFileIdx], crcs[corruptFileIdx]));
+
+      // Now corrupt the generated block.
+      TestDirectoryRaidDfs.corruptBlocksInDirectory(conf, dirPath,
+          crcs, corruptBlockIdxs, dfs, dfsCluster, false, false);
+      try {
+        TestRaidDfs.validateFile(dfs, files[corruptFileIdx], 
+            fileSizes[corruptFileIdx], crcs[corruptFileIdx]);
+        fail("Expected exception not thrown");
+      } catch (org.apache.hadoop.fs.ChecksumException ce) {
+      } catch (org.apache.hadoop.fs.BlockMissingException bme) {
+      }
+    } catch (Exception e) {
+      LOG.info("Test " + testName + " Exception " + e, e);
+      throw e;
+    } finally {
+      myTearDown();
+    }
+    LOG.info("Test " + testName + " completed.");
+  }
+
+  /**
+   * Tests integrity of generated block.
+   * Create a file and delete a block entirely. Wait for the block to be
+   * regenerated. Now stop RaidNode and corrupt the generated block.
+   * Test that corruption in the generated block can be detected by clients.
+   */
+  @Test
+  public void testGeneratedBlockLocal() throws Exception {
+    generatedBlockTestCommon("testGeneratedBlock", 2, true);
+  }
+
+  /**
+   * Tests integrity of generated block.
+   * Create a file and delete a block entirely. Wait for the block to be
+   * regenerated. Now stop RaidNode and corrupt the generated block.
+   * Test that corruption in the generated block can be detected by clients.
+   */
+  @Test
+  public void testGeneratedBlockDist() throws Exception {
+    generatedBlockTestCommon("testGeneratedBlock", 2, false);
+  }
+
+  /**
+   * Tests integrity of generated last block.
+   * Create a file and delete a block entirely. Wait for the block to be
+   * regenerated. Now stop RaidNode and corrupt the generated block.
+   * Test that corruption in the generated block can be detected by clients.
+   */
+  @Test
+  public void testGeneratedLastBlockLocal() throws Exception {
+    generatedBlockTestCommon("testGeneratedLastBlock", -1, true);
+  }
+
+  /**
+   * Tests integrity of generated last block.
+   * Create a file and delete a block entirely. Wait for the block to be
+   * regenerated. Now stop RaidNode and corrupt the generated block.
+   * Test that corruption in the generated block can be detected by clients.
+   */
+  @Test
+  public void testGeneratedLastBlockDist() throws Exception {
+    generatedBlockTestCommon("testGeneratedLastBlock", -1, false);
+  }
+  
+  @Test
+  public void testParityBlockFixLocal() throws Exception {
+    implParityBlockFix("testParityBlockFixLocal", true);
+  }
+
+  @Test
+  public void testParityBlockFixDist() throws Exception {
+    implParityBlockFix("testParityBlockFixDist", false);
+  }
+  
+  /**
+   * Corrupt a parity file and wait for it to get fixed.
+   */
+  private void implParityBlockFix(String testName, boolean local)
+    throws Exception {
+    LOG.info("Test " + testName + " started.");
+    int stripeLength = 3;
+    mySetup(stripeLength); 
+    long[] crcs = new long[3];
+    int[] seeds = new int[3];
+    Path dirPath = new Path("/user/dhruba/raidtest");
+    Path[] files = TestRaidDfs.createTestFiles(dirPath,
+        fileSizes, blockSizes, crcs, seeds, fileSys, (short)1);
+    Path destPath = new Path("/destraid/user/dhruba");
+    Path parityFile = new Path("/destraid/user/dhruba/raidtest");
+    LOG.info("Test " + testName + " created test files");
+    Configuration localConf = this.getRaidNodeConfig(conf, local);
+
+    try {
+      cnode = RaidNode.createRaidNode(null, localConf);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dirPath, destPath);
+      cnode.stop(); cnode.join();
+
+      long parityCRC = RaidDFSUtil.getCRC(fileSys, parityFile);
+
+      FileStatus parityStat = fileSys.getFileStatus(parityFile);
+      DistributedFileSystem dfs = (DistributedFileSystem)fileSys;
+      LocatedBlocks locs = RaidDFSUtil.getBlockLocations(
+        dfs, parityFile.toUri().getPath(), 0, parityStat.getLen());
+      String[] corruptFiles = DFSUtil.getCorruptFiles(dfs);
+      
+      assertEquals("no corrupt files expected", 0, corruptFiles.length);
+      assertEquals("filesFixed() should return 0 before fixing files",
+                   0, cnode.blockIntegrityMonitor.getNumFilesFixed());
+
+      // Corrupt parity blocks for different stripes.
+      int[] corruptBlockIdxs = new int[]{0, 1, 2};
+      for (int idx: corruptBlockIdxs)
+        corruptBlock(locs.get(idx).getBlock().getBlockName(), dfsCluster);
+      RaidDFSUtil.reportCorruptBlocks(dfs, parityFile, corruptBlockIdxs,
+          2*blockSize);
+
+      corruptFiles = DFSUtil.getCorruptFiles(dfs);
+      assertEquals("file not corrupted",
+                   1, corruptFiles.length);
+      assertEquals("wrong file corrupted",
+                   corruptFiles[0], parityFile.toUri().getPath());
+
+      cnode = RaidNode.createRaidNode(null, localConf);
+      long start = System.currentTimeMillis();
+      while (cnode.blockIntegrityMonitor.getNumFilesFixed() < 1 &&
+             System.currentTimeMillis() - start < 120000) {
+        LOG.info("Test " + testName + " waiting for files to be fixed.");
+        Thread.sleep(3000);
+      }
+      assertEquals("file not fixed",
+                   1, cnode.blockIntegrityMonitor.getNumFilesFixed());
+
+      long checkCRC = RaidDFSUtil.getCRC(fileSys, parityFile);
+
+      assertEquals("file not fixed",
+                   parityCRC, checkCRC);
+
+    } catch (Exception e) {
+      LOG.info("Test " + testName + " Exception " + e +
+               StringUtils.stringifyException(e));
+      throw e;
+    } finally {
+      myTearDown();
+    }
+    LOG.info("Test " + testName + " completed.");
+  }
+  
+  private void corruptFiles(Path dirPath, long[] crcs, 
+      Integer[] corruptBlockIdxs, DistributedFileSystem dfs,
+      Path[] files, int[] numCorruptBlocksInFiles) throws IOException {
+    int totalCorruptFiles = DFSUtil.getCorruptFiles(dfs).length;
+    TestDirectoryRaidDfs.corruptBlocksInDirectory(conf, dirPath,
+        crcs, corruptBlockIdxs, fileSys, dfsCluster, false, true);
+    
+    String[] corruptFiles = DFSUtil.getCorruptFiles(dfs);
+    for (int i = 0; i < numCorruptBlocksInFiles.length; i++) {
+      if (numCorruptBlocksInFiles[i] > 0)
+        totalCorruptFiles++;
+    }
+    assertEquals("files not corrupted", totalCorruptFiles,
+        corruptFiles.length);
+    for (int i = 0; i< fileSizes.length; i++) {
+      assertEquals("wrong number of corrupt blocks for file " + 
+          files[i], numCorruptBlocksInFiles[i],
+          RaidDFSUtil.corruptBlocksInFile(dfs,
+          files[i].toUri().getPath(), 0, fileSizes[i]).size());
+    }
+  }
+
+  /**
+   * tests that we can have 2 concurrent jobs fixing files 
+   * (dist block fixer)
+   */
+  @Test
+  public void testConcurrentJobs() throws Exception {
+    LOG.info("Test testConcurrentJobs started.");
+    int stripeLength = 3;
+    mySetup(stripeLength); 
+    long[] crcs1 = new long[3];
+    int[] seeds1 = new int[3];
+    long[] crcs2 = new long[3];
+    int[] seeds2 = new int[3];
+    Path dirPath1 = new Path("/user/dhruba/raidtestrs/1");
+    Path[] files1 = TestRaidDfs.createTestFiles(dirPath1,
+        fileSizes, blockSizes, crcs1, seeds1, fileSys, (short)1);
+    Path dirPath2 = new Path("/user/dhruba/raidtestrs/2");
+    Path[] files2 = TestRaidDfs.createTestFiles(dirPath2,
+        fileSizes, blockSizes, crcs2, seeds2, fileSys, (short)1);
+    Path destPath = new Path("/destraidrs/user/dhruba/raidtestrs");
+    
+    LOG.info("Test testConcurrentJobs created test files");
+    Configuration localConf = this.getRaidNodeConfig(conf, false);
+    try {
+      cnode = RaidNode.createRaidNode(null, localConf);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dirPath1, destPath);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dirPath2, destPath);
+      cnode.stop(); cnode.join();
+      
+      DistributedFileSystem dfs = (DistributedFileSystem)fileSys;
+      String[] corruptFiles = DFSUtil.getCorruptFiles(dfs);
+      assertEquals("no corrupt files expected", 0, corruptFiles.length);
+      assertEquals("filesFixed() should return 0 before fixing files",
+                   0, cnode.blockIntegrityMonitor.getNumFilesFixed());
+      //corrupt directory 1
+      this.corruptFiles(dirPath1, crcs1, rsCorruptFileIdx1, dfs, files1, 
+          rsNumCorruptBlocksInFiles1);
+
+      cnode = RaidNode.createRaidNode(null, localConf);
+      DistBlockIntegrityMonitor blockFixer =
+          (DistBlockIntegrityMonitor) cnode.blockIntegrityMonitor;
+      long start = System.currentTimeMillis();
+
+      // All files are HIGH-PRI corrupt files
+      while (blockFixer.jobsRunning() < 1 &&
+             System.currentTimeMillis() - start < 60000) {
+        LOG.info("Test testDirBlockFix waiting for fixing job 1 to start");
+        Thread.sleep(1000);
+      }
+      assertEquals("job 1 not running", 1, blockFixer.jobsRunning());
+      
+      //Corrupt directory 2
+      this.corruptFiles(dirPath2, crcs2, rsCorruptFileIdx2, dfs, files2,
+          rsNumCorruptBlocksInFiles2);
+      
+      // 1 LOW-PRI file and 2 HIGH-PRI files 
+      while (blockFixer.jobsRunning() < 3 &&
+             System.currentTimeMillis() - start < 60000) {
+        LOG.info("Test testDirBlockFix waiting for fixing job 2 and 3 to start");
+        Thread.sleep(1000);
+      }
+      assertEquals("3 jobs are running", 3, blockFixer.jobsRunning());
+
+      while (blockFixer.getNumFilesFixed() < 6 &&
+             System.currentTimeMillis() - start < 240000) {
+        LOG.info("Test testDirBlockFix waiting for files to be fixed.");
+        Thread.sleep(1000);
+      }
+      assertEquals("files not fixed", 6, blockFixer.getNumFilesFixed());
+      dfs = getDFS(conf, dfs);
+      for (int i = 0; i < fileSizes.length; i++) {
+        assertTrue("file " + files1[i] + " not fixed",
+                 TestRaidDfs.validateFile(dfs, files1[i], fileSizes[i], crcs1[i]));
+      }
+      for (int i = 0; i < fileSizes.length; i++) {
+        assertTrue("file " + files2[i] + " not fixed",
+                 TestRaidDfs.validateFile(dfs, files2[i], fileSizes[i], crcs2[i]));
+      }
+    } catch (Exception e) {
+      LOG.info("Test testConcurrentJobs exception " + e, e);
+      throw e;
+    } finally {
+      myTearDown();
+    }
+  }
+
+  /**
+   * tests that the distributed block fixer obeys
+   * the limit on how many jobs to submit simultaneously.
+   */
+  @Test
+  public void testMaxPendingJobs() throws Exception {
+    LOG.info("Test testMaxPendingJobs started.");
+    int stripeLength = 3;
+    mySetup(stripeLength); 
+    long[] crcs1 = new long[3];
+    int[] seeds1 = new int[3];
+    long[] crcs2 = new long[3];
+    int[] seeds2 = new int[3];
+    Path dirPath1 = new Path("/user/dhruba/raidtestrs/1");
+    Path[] files1 = TestRaidDfs.createTestFiles(dirPath1,
+        fileSizes, blockSizes, crcs1, seeds1, fileSys, (short)1);
+    Path dirPath2 = new Path("/user/dhruba/raidtestrs/2");
+    Path[] files2 = TestRaidDfs.createTestFiles(dirPath2,
+        fileSizes, blockSizes, crcs2, seeds2, fileSys, (short)1);
+    Path destPath = new Path("/destraidrs/user/dhruba/raidtestrs");
+    LOG.info("Test testMaxPendingJobs created test files");
+    Configuration localConf = this.getRaidNodeConfig(conf, false);
+    localConf.setLong("raid.blockfix.maxpendingjobs", 1L);
+
+    try {
+      cnode = RaidNode.createRaidNode(null, localConf);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dirPath1, destPath);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dirPath2, destPath);
+      cnode.stop(); cnode.join();
+
+      DistributedFileSystem dfs = (DistributedFileSystem)fileSys;
+      String[] corruptFiles = DFSUtil.getCorruptFiles(dfs);
+      assertEquals("no corrupt files expected", 0, corruptFiles.length);
+      assertEquals("filesFixed() should return 0 before fixing files",
+                   0, cnode.blockIntegrityMonitor.getNumFilesFixed());
+      //corrupt directory 1
+      this.corruptFiles(dirPath1, crcs1, rsCorruptFileIdx1, dfs, files1, 
+          rsNumCorruptBlocksInFiles1);
+
+      cnode = RaidNode.createRaidNode(null, localConf);
+      DistBlockIntegrityMonitor blockFixer = (DistBlockIntegrityMonitor) cnode.blockIntegrityMonitor;
+      long start = System.currentTimeMillis();
+
+      while (blockFixer.jobsRunning() < 1 &&
+             System.currentTimeMillis() - start < 60000) {
+        LOG.info("Test testDirBlockFix waiting for fixing job 1 to start");
+        Thread.sleep(1000);
+      }
+      assertEquals("job not running", 1, blockFixer.jobsRunning());
+
+      //corrupt directory 2
+      this.corruptFiles(dirPath2, crcs2, rsCorruptFileIdx2, dfs, files2,
+          rsNumCorruptBlocksInFiles2);
+      
+      // wait until both files are fixed
+      while (blockFixer.getNumFilesFixed() < 6 &&
+             System.currentTimeMillis() - start < 120000) {
+        // make sure the block fixer does not start a second job while
+        // the first one is still running
+        assertTrue("too many jobs running", blockFixer.jobsRunning() <= 1);
+        Thread.sleep(1000);
+      }
+      assertEquals("files not fixed", 6, blockFixer.getNumFilesFixed());
+      dfs = getDFS(conf, dfs);
+      for (int i = 0; i < fileSizes.length; i++) {
+        assertTrue("file " + files1[i] + " not fixed",
+                 TestRaidDfs.validateFile(dfs, files1[i], fileSizes[i], crcs1[i]));
+      }
+      for (int i = 0; i < fileSizes.length; i++) {
+        assertTrue("file " + files2[i] + " not fixed",
+                 TestRaidDfs.validateFile(dfs, files2[i], fileSizes[i], crcs2[i]));
+      }
+    } catch (Exception e) {
+      LOG.info("Test testMaxPendingJobs exception " + e +
+               StringUtils.stringifyException(e));
+      throw e;
+    } finally {
+      myTearDown();
+    }
+  }
+
+  static class FakeDistBlockIntegrityMonitor extends DistBlockIntegrityMonitor {
+    Map<String, List<String>> submittedJobs =
+      new HashMap<String, List<String>>();
+    FakeDistBlockIntegrityMonitor(Configuration conf) {
+      super(conf);
+    }
+
+    @Override
+    void submitJob(Job job, List<String> filesInJob, Priority priority,
+        Map<Job, List<LostFileInfo>> jobIndex) {
+
+      LOG.info("Job " + job.getJobName() + " was submitted ");
+      submittedJobs.put(job.getJobName(), filesInJob);
+    }
+  }
+
+  public void testMultiplePriorities() throws Exception {
+    long[] crcs = new long[3];
+    int[] seeds = new int[3];
+    Path dirPath = new Path("/home/test");
+    int stripeLength = 3;
+    short repl = 1;
+    mySetup(stripeLength); 
+    Codec codec = Codec.getCodec("rs");
+    LOG.info("Starting testMultiplePriorities");
+    try {
+      // Create test file and raid it.
+      Path[] files = TestRaidDfs.createTestFiles(dirPath,
+          fileSizes, blockSizes, crcs, seeds, fileSys, (short)1);
+      FileStatus stat = fileSys.getFileStatus(dirPath);
+      RaidNode.doRaid(conf, stat, new Path(codec.parityDirectory), codec,
+          new RaidNode.Statistics(), RaidUtils.NULL_PROGRESSABLE,
+        false, repl, repl);
+      
+      Integer[] corruptBlockIdxs = new Integer[]{0, 2};
+      LOG.info("Corrupt block " + corruptBlockIdxs + " of directory " + dirPath);
+      TestDirectoryRaidDfs.corruptBlocksInDirectory(conf, dirPath,
+          crcs, corruptBlockIdxs, fileSys, dfsCluster, false, true);
+
+      // Create Block Fixer and fix.
+      FakeDistBlockIntegrityMonitor distBlockFixer = new FakeDistBlockIntegrityMonitor(conf);
+      assertEquals(0, distBlockFixer.submittedJobs.size());
+
+      // One job should be submitted.
+      distBlockFixer.getCorruptionMonitor().checkAndReconstructBlocks();
+      assertEquals(1, distBlockFixer.submittedJobs.size());
+
+      // No new job should be submitted since we already have one.
+      distBlockFixer.getCorruptionMonitor().checkAndReconstructBlocks();
+      assertEquals(1, distBlockFixer.submittedJobs.size());
+
+      // Corrupt two more blocks
+      corruptBlockIdxs = new Integer[]{4, 5};
+      LOG.info("Corrupt block " + corruptBlockIdxs + " of directory " + dirPath);
+      TestDirectoryRaidDfs.corruptBlocksInDirectory(conf, dirPath,
+          crcs, corruptBlockIdxs, fileSys, dfsCluster, false, true);
+      
+      // A new job should be submitted since two blocks are corrupt.
+      distBlockFixer.getCorruptionMonitor().checkAndReconstructBlocks();
+      assertEquals(2, distBlockFixer.submittedJobs.size());
+    } finally {
+      myTearDown();
+    }
+  }
+
+  public static DistributedFileSystem getDFS(
+        Configuration conf, FileSystem dfs) throws IOException {
+    Configuration clientConf = new Configuration(conf);
+    clientConf.set("fs.hdfs.impl",
+                   "org.apache.hadoop.hdfs.DistributedFileSystem");
+    clientConf.setBoolean("fs.hdfs.impl.disable.cache", true);
+    URI dfsUri = dfs.getUri();
+    FileSystem.closeAll();
+    return (DistributedFileSystem) FileSystem.get(dfsUri, clientConf);
+  }
+
+  private void mySetup(int stripeLength) throws Exception {
+    if (System.getProperty("hadoop.log.dir") == null) {
+      String base = new File(".").getAbsolutePath();
+      System.setProperty("hadoop.log.dir", new Path(base).toString() + "/logs");
+    }
+
+    new File(TEST_DIR).mkdirs(); // Make sure data directory exists
+    conf = new Configuration();
+
+    conf.set("raid.config.file", CONFIG_FILE);
+    conf.setBoolean("raid.config.reload", true);
+    conf.setLong("raid.config.reload.interval", RELOAD_INTERVAL);
+
+    // scan all policies once every 5 second
+    conf.setLong("raid.policy.rescan.interval", 5000);
+
+    // do not use map-reduce cluster for Raiding
+    conf.set("raid.classname", "org.apache.hadoop.raid.LocalRaidNode");
+    conf.set("raid.server.address", "localhost:0");
+    conf.set("mapred.raid.http.address", "localhost:0");
+
+    Utils.loadTestCodecs(conf, stripeLength, stripeLength, 1, 3, "/destraid",
+        "/destraidrs", false, true);
+
+    conf.setBoolean("dfs.permissions", false);
+
+    dfsCluster = new MiniDFSCluster(conf, NUM_DATANODES, true, null);
+    dfsCluster.waitActive();
+    fileSys = dfsCluster.getFileSystem();
+    namenode = fileSys.getUri().toString();
+
+    FileSystem.setDefaultUri(conf, namenode);
+    mr = new MiniMRCluster(4, namenode, 3);
+    jobTrackerName = "localhost:" + mr.getJobTrackerPort();
+    hftp = "hftp://localhost.localdomain:" + dfsCluster.getNameNodePort();
+
+    FileSystem.setDefaultUri(conf, namenode);
+    conf.set("mapred.job.tracker", jobTrackerName);
+    ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
+    cb.addPolicy("RaidTest1", "/user/dhruba/raidtest",
+        1, 1);
+    cb.addPolicy("RaidTest2", "/user/dhruba/raidtestrs",
+        1, 1, "rs");
+    cb.persist();
+  }
+
+  private void myTearDown() throws Exception {
+    if (cnode != null) { cnode.stop(); cnode.join(); }
+    if (mr != null) { mr.shutdown(); }
+    if (dfsCluster != null) { dfsCluster.shutdown(); }
+  }
+
+  static void corruptBlock(String blockName, MiniDFSCluster dfs) throws IOException {
+    boolean corrupted = false;
+    for (int i = 0; i < NUM_DATANODES; i++) {
+      corrupted |= TestDatanodeBlockScanner.corruptReplica(blockName, i, dfs);
+    }
+    assertTrue("could not corrupt block", corrupted);
+  }
+}
+
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryPlacementMonitor.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryPlacementMonitor.java
new file mode 100644
index 00000000..2296c1e2
--- /dev/null
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryPlacementMonitor.java
@@ -0,0 +1,165 @@
+package org.apache.hadoop.raid;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocatedFileStatus;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.TestRaidDfs;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.raid.PlacementMonitor.BlockInfo;
+import org.apache.hadoop.raid.TestPlacementMonitor.FakeBlockAndDatanodeResolver;
+import org.apache.hadoop.raid.TestPlacementMonitor.FakeExecutorService;
+import org.apache.hadoop.raid.Utils.Builder;
+import org.apache.log4j.Level;
+
+import junit.framework.TestCase;
+
+public class TestDirectoryPlacementMonitor extends TestCase {
+  {
+    ((Log4JLogger)NameNode.stateChangeLog).getLogger().setLevel(Level.ALL);
+    ((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
+  }
+  final static Log LOG = LogFactory.getLog(
+      "org.apache.hadoop.raid.TestDirectoryPlacementMonitor");
+  final String[] racks =
+    {"/rack1", "/rack1", "/rack1", "/rack1", "/rack1", "/rack1"};
+  final String[] hosts =
+    {"host1.rack1.com", "host2.rack1.com", "host3.rack1.com",
+     "host4.rack1.com", "host5.rack1.com", "host6.rack1.com"};
+  final int stripeSize = 3;
+  final long blockSize = 1024L;
+  final long[] fileSizes =
+      new long[]{blockSize + blockSize/2, // block 0, 1
+                 3*blockSize,                  // block 2, 3
+                 blockSize + blockSize/2 + 1}; // block 4, 5, 6, 7
+  final long[] blockSizes = new long[]{blockSize, 2*blockSize, blockSize/2};
+  
+  private boolean checkHistogram(Configuration conf, FileSystem fileSys,
+      FileStatus dirStat, FileStatus parityStat) throws IOException {
+    //Remove the cached items
+    HashMap<String, LocatedFileStatus> cache = PlacementMonitor.locatedFileStatusCache.get();
+    cache.clear();
+    PlacementMonitor.locatedFileStatusCache.remove();
+    PlacementMonitor placementMonitor = new PlacementMonitor(conf);
+    placementMonitor.start();
+    BlockMover blockMover = placementMonitor.blockMover;
+    TestPlacementMonitor tpm = new TestPlacementMonitor();
+    FakeExecutorService fakeBlockMover = tpm.new 
+        FakeExecutorService();
+    FakeBlockAndDatanodeResolver resolver = tpm.new 
+        FakeBlockAndDatanodeResolver();
+    blockMover.executor = fakeBlockMover;
+    try {
+      // Start to check the placement 
+      List<BlockInfo> srcLstBI = placementMonitor.getBlockInfos(fileSys,
+          dirStat);
+      List<BlockInfo> parityLstBI = new LinkedList<BlockInfo>();
+      if (parityStat != null)
+          parityLstBI = placementMonitor.getBlockInfos(fileSys, parityStat);
+      assertEquals("Source file blocks don't match parity file blocks", 
+          parityLstBI.size(), RaidNode.numStripes(srcLstBI.size(), stripeSize));
+      for (int i = 0; i< parityLstBI.size(); i++) {
+        StringBuilder sb = new StringBuilder();
+        for (int j = i * stripeSize; j < srcLstBI.size() && j < (i+1)*stripeSize; j++) {
+          sb.append(srcLstBI.get(j).blockLocation.getOffset() + ":");
+          for (String name: srcLstBI.get(j).blockLocation.getNames()) {
+            sb.append(name);
+            sb.append(" ");
+          }
+          sb.append(";");
+        }
+        for (String name: parityLstBI.get(i).blockLocation.getNames()) {
+          sb.append(name);
+          sb.append(" ");
+        }
+        LOG.info("Stripe " + i + " " + sb);
+      }
+      placementMonitor.checkBlockLocations(
+          srcLstBI, parityLstBI, Codec.getCodec("dir-rs"),
+          dirStat, resolver);
+      Map<Integer, Long> hist =
+          placementMonitor.blockHistograms.get("dir-rs");
+      for (Integer key: hist.keySet()) {
+        LOG.info(" Integer: " + key + " Long: " + hist.get(key));
+      }
+      return hist.size() > 1;
+    } finally {
+      if (placementMonitor != null) {
+        placementMonitor.stop();
+      }
+    }
+  }
+  /**
+   * This test creates a bunch of files under the directory 
+   * and monitor the block mover moves the blocks
+   * @throws Exception
+   */
+  public void testDirectoryPlacementMonitor() throws Exception {
+    TestRaidPurge trp = new TestRaidPurge();
+    LOG.info("Test testDirectoryPlacementMonitor  started.");
+    long targetReplication = 1;
+    long metaReplication   = 1;
+    long[] crcs = new long[3];
+    int[] seeds = new int[3];
+    final Path dir1 = new Path("/user/dhruba/dirraidrstest/1");
+    final Path destPath = new Path("/dir-raidrs/user/dhruba/dirraidrstest");
+
+    trp.createClusters(true, 6, racks, hosts);
+    trp.conf.setLong(PurgeMonitor.PURGE_MONITOR_SLEEP_TIME_KEY, 10000L);
+    trp.conf.setBoolean(PlacementMonitor.SIMULATE_KEY, false);
+    
+    FileSystem fileSys = trp.fileSys;
+    RaidNode cnode = null;
+   
+    try {
+      trp.mySetup(targetReplication, metaReplication);
+      Utils.loadTestCodecs(trp.conf, new Builder[] {
+        Utils.getXORBuilder(),
+        Utils.getXORBuilder().dirRaid(
+            true).setParityDir("/dir-raid").setCodeId("dir-xor"),
+        Utils.getRSBuilder().dirRaid(true).setParityDir(
+            "/dir-raidrs").setCodeId("dir-rs").setParityLength(
+            1).setStripeLength(stripeSize)
+      });
+      fileSys.delete(dir1, true);
+      fileSys.delete(destPath, true);
+      TestRaidDfs.createTestFiles(dir1, fileSizes, blockSizes,
+          crcs, seeds, fileSys, (short)1);
+      FileStatus dirStat = fileSys.getFileStatus(dir1);
+      LOG.info("Created test files");
+      // create an instance of the RaidNode
+      Configuration localConf = new Configuration(trp.conf);
+      cnode = RaidNode.createRaidNode(null, localConf);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dir1, destPath);
+      LOG.info("all are raided.");
+      long startTime = System.currentTimeMillis();
+      boolean badPlacement = true;
+      while (System.currentTimeMillis() - startTime < 120000 && badPlacement) {
+        badPlacement = checkHistogram(trp.conf, fileSys, dirStat, 
+            fileSys.getFileStatus(new Path(destPath, dir1.getName())));
+        Thread.sleep(3000);
+      }
+      assertEquals("Files are still in bad placement", badPlacement, false);
+      LOG.info("Test testDirectoryPlacementMonitor completed.");
+    } catch (Exception e) {
+      LOG.info("testDirectoryPlacementMonitor fails", e);
+      throw e;
+    } finally {
+      if (cnode != null) { cnode.stop(); cnode.join(); }
+      LOG.info("doTestPurge delete directory  " + dir1);
+      fileSys.delete(dir1, true);
+      trp.stopClusters();
+    }
+  }
+}
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryRaidDfs.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryRaidDfs.java
index d4ebff68..ad87c1ba 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryRaidDfs.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryRaidDfs.java
@@ -41,6 +41,7 @@
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.RaidDFSUtil;
 import org.apache.hadoop.hdfs.TestRaidDfs;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.raid.DirectoryStripeReader.BlockInfo;
 
@@ -143,7 +144,8 @@ private void myTearDown() throws Exception {
     if (dfs != null) { dfs.shutdown(); }
   }
  
-  private DistributedRaidFileSystem getRaidFS(FileSystem fileSys)
+  static private DistributedRaidFileSystem getRaidFS(FileSystem fileSys,
+      Configuration conf)
       throws IOException {
     DistributedFileSystem dfs = (DistributedFileSystem)fileSys;
     Configuration clientConf = new Configuration(conf);
@@ -154,14 +156,14 @@ private DistributedRaidFileSystem getRaidFS(FileSystem fileSys)
     return (DistributedRaidFileSystem)FileSystem.get(dfsUri, clientConf);
   }
   
-  private void corruptBlocksInDirectory(Configuration conf, 
+  static public void corruptBlocksInDirectory(Configuration conf, 
       Path srcDir, long[] crcs, Integer[] listBlockNumToCorrupt,
-      Codec codec, FileSystem fileSys, MiniDFSCluster cluster, 
-      boolean validate) throws IOException {
+      FileSystem fileSys, MiniDFSCluster cluster, 
+      boolean validate, boolean reportBadBlocks) throws IOException {
     long[] lengths = new long[crcs.length];
     // Get all block Info;
     ArrayList<BlockInfo> blocks = new ArrayList<BlockInfo>();
-    List<FileStatus> lfs = RaidNode.getDirectoryBlockLocations(conf,
+    List<FileStatus> lfs = RaidNode.listDirectoryRaidFileStatus(conf,
         fileSys, srcDir);
     assertNotNull(lfs);
     for (int fid = 0; fid < lfs.size(); fid++) {
@@ -202,11 +204,15 @@ private void corruptBlocksInDirectory(Configuration conf,
       TestRaidDfs.corruptBlock(srcFile,
           locations.get(bi.blockId).getBlock(),
           NUM_DATANODES, true, cluster);
+      if (reportBadBlocks) {
+        cluster.getNameNode().reportBadBlocks(new LocatedBlock[]
+            {locations.get(bi.blockId)});
+      }
       affectedFiles.add(bi.fileIdx);
     }
     // validate files
     if (validate) {
-      DistributedRaidFileSystem raidfs = getRaidFS(fileSys);
+      DistributedRaidFileSystem raidfs = getRaidFS(fileSys, conf);
       for (Integer fid: affectedFiles) {
         FileStatus stat = lfs.get(fid);
         assertTrue(TestRaidDfs.validateFile(raidfs, stat.getPath(),
@@ -242,8 +248,11 @@ public void testRaidDirDfs(String code, Integer[][] corrupt)
           assert fileSizes[j].length == blockSizes[j].length;
           long[] crcs = new long[fileSizes[j].length];
           int[] seeds = new int[fileSizes[j].length];
+          Path parityDir = new Path(codec.parityDirectory);
+          RaidDFSUtil.cleanUp(fileSys, srcDir);
+          RaidDFSUtil.cleanUp(fileSys, parityDir);
           TestRaidDfs.createTestFiles(srcDir, fileSizes[j],
-            blockSizes[j], crcs, seeds, curCodec, fileSys, (short)1);
+            blockSizes[j], crcs, seeds, fileSys, (short)1);
           assertTrue(RaidNode.doRaid(conf,
             fileSys.getFileStatus(srcDir),
             new Path(curCodec.parityDirectory), curCodec,
@@ -251,7 +260,7 @@ public void testRaidDirDfs(String code, Integer[][] corrupt)
             RaidUtils.NULL_PROGRESSABLE,
             false, 1, 1));
           corruptBlocksInDirectory(conf, srcDir,
-            crcs, corrupt[i], curCodec, fileSys, dfs, true);
+            crcs, corrupt[i], fileSys, dfs, true, false);
           RaidDFSUtil.cleanUp(fileSys, srcDir);
           RaidDFSUtil.cleanUp(fileSys, new Path(curCodec.parityDirectory));
           RaidDFSUtil.cleanUp(fileSys, new Path("/tmp"));
@@ -291,8 +300,11 @@ public void testTooManyErrorsDecode() throws Exception {
           for (int j = 0; j < fsizes.length; j++) {
             long[] crcs = new long[fsizes[j].length];
             int[] seeds = new int[fsizes[j].length];
+            Path parityDir = new Path(codec.parityDirectory);
+            RaidDFSUtil.cleanUp(fileSys, srcDir);
+            RaidDFSUtil.cleanUp(fileSys, parityDir);
             TestRaidDfs.createTestFiles(srcDir, fsizes[j],
-                bsizes[j], crcs, seeds, curCodec, fileSys, (short)1);
+                bsizes[j], crcs, seeds, fileSys, (short)1);
             assertTrue(RaidNode.doRaid(conf,
                 fileSys.getFileStatus(srcDir),
                 new Path(curCodec.parityDirectory), curCodec,
@@ -302,7 +314,7 @@ public void testTooManyErrorsDecode() throws Exception {
             boolean expectedExceptionThrown = false;
             try {
               corruptBlocksInDirectory(conf, srcDir,
-                  crcs, corrupts[i], curCodec, fileSys, dfs, true);
+                  crcs, corrupts[i], fileSys, dfs, true, false);
               // Should not reach.
             } catch (IOException e) {
               LOG.info("Expected exception caught" + e);
@@ -331,12 +343,14 @@ public void testTooManyErrorsEncode() throws Exception {
         for (int j = 0; j < fileSizes.length; j++) {
           long[] crcs = new long[fileSizes[j].length];
           int[] seeds = new int[fileSizes[j].length];
+          Path parityDir = new Path(codec.parityDirectory);
+          RaidDFSUtil.cleanUp(fileSys, srcDir);
+          RaidDFSUtil.cleanUp(fileSys, parityDir);
           TestRaidDfs.createTestFiles(srcDir, fileSizes[j],
-              blockSizes[j], crcs, seeds, curCodec, fileSys, (short)1);
+              blockSizes[j], crcs, seeds, fileSys, (short)1);
           corruptBlocksInDirectory(conf, srcDir,
               crcs, new Integer[]{rand.nextInt() % 3},
-              curCodec, fileSys, dfs, false);
-          
+              fileSys, dfs, false, false);
           boolean expectedExceptionThrown = false;
           try {
             RaidNode.doRaid(conf, fileSys.getFileStatus(srcDir),
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryRaidShellFsck.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryRaidShellFsck.java
new file mode 100644
index 00000000..69cf04ba
--- /dev/null
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestDirectoryRaidShellFsck.java
@@ -0,0 +1,302 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.raid;
+
+import java.io.File;
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.After;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.TestRaidDfs;
+import org.apache.hadoop.raid.RaidNode;
+
+public class TestDirectoryRaidShellFsck  extends TestCase {
+  final static Log LOG =
+    LogFactory.getLog("org.apache.hadoop.raid.TestDirectoryRaidShellFsck");
+  final static String TEST_DIR = 
+    new File(System.
+             getProperty("test.build.data", "build/contrib/raid/test/data")).
+    getAbsolutePath();
+  final static int NUM_DATANODES = 4;
+  final static int STRIPE_BLOCKS = 3; // number of blocks per stripe
+  final static long BASIC_BLOCK_SIZE = 8192L; // size of block in byte
+  final static long PARITY_BLOCK_SIZE = BASIC_BLOCK_SIZE * 2;
+  final short targetReplication = 1;
+  final short metaReplication = 1;
+  final long[] fileSizes =
+      new long[]{BASIC_BLOCK_SIZE + BASIC_BLOCK_SIZE/2, // block 0, 1
+      3*BASIC_BLOCK_SIZE,                               // block 2, 3
+      BASIC_BLOCK_SIZE + BASIC_BLOCK_SIZE/2 + 1};       // block 4, 5, 6, 7
+  final long[] blockSizes = new long[]{BASIC_BLOCK_SIZE, 2*BASIC_BLOCK_SIZE,
+      BASIC_BLOCK_SIZE/2};
+  final Path srcDir = new Path("/user/dhruba/raidtestrs");
+  final Path parityFile = new Path("/destraidrs/user/dhruba/raidtestrs");
+  Configuration conf = null;
+  Configuration clientConf = null;
+  MiniDFSCluster cluster = null;
+  DistributedFileSystem dfs = null;
+  RaidShell shell = null;
+  String[] args = null;
+  Path[] files = null;
+  FileStatus[] srcStats = null;
+  FileStatus parityStat = null;
+
+  /**
+   * creates a MiniDFS instance with a raided file in it
+   */
+  public void setUpCluster(int rsPairtyLength) throws IOException, ClassNotFoundException {
+    new File(TEST_DIR).mkdirs(); // Make sure data directory exists
+    conf = new Configuration();
+    Utils.loadTestCodecs(conf, STRIPE_BLOCKS, STRIPE_BLOCKS, 1, rsPairtyLength,
+        "/destraid", "/destraidrs", false, true);
+    conf.setBoolean("dfs.permissions", false);
+    cluster = new MiniDFSCluster(conf, NUM_DATANODES, true, null);
+    cluster.waitActive();
+    dfs = (DistributedFileSystem) cluster.getFileSystem();
+    String namenode = dfs.getUri().toString();
+    FileSystem.setDefaultUri(conf, namenode);
+    Codec dirRS = Codec.getCodec("rs");
+    long[] crcs = new long[fileSizes.length];
+    int[] seeds = new int[fileSizes.length];
+    files = TestRaidDfs.createTestFiles(srcDir, fileSizes,
+      blockSizes, crcs, seeds, (FileSystem)dfs, (short)1);
+    assertTrue(RaidNode.doRaid(conf, dfs.getFileStatus(srcDir),
+      new Path(dirRS.parityDirectory), dirRS,
+      new RaidNode.Statistics(),
+      RaidUtils.NULL_PROGRESSABLE,
+      false, 1, 1));
+    srcStats = new FileStatus[files.length];
+    for (int i = 0 ; i < files.length; i++) {
+      srcStats[i] = dfs.getFileStatus(files[i]);
+    }
+    parityStat = dfs.getFileStatus(parityFile);
+    clientConf = new Configuration(conf);
+    clientConf.set("fs.hdfs.impl",
+                   "org.apache.hadoop.hdfs.DistributedRaidFileSystem");
+    clientConf.set("fs.raid.underlyingfs.impl",
+                   "org.apache.hadoop.hdfs.DistributedFileSystem");
+    // prepare shell and arguments
+    shell = new RaidShell(clientConf);
+    args = new String[2];
+    args[0] = "-fsck";
+    args[1] = "/";
+  }
+
+  /**
+   * removes a specified block from MiniDFS storage and reports it as corrupt
+   */
+  public static void removeAndReportBlock(MiniDFSCluster cluster, 
+                                    FileStatus fsStat,
+                                    int[] blockNums) 
+    throws IOException {
+    DistributedFileSystem blockDfs = (DistributedFileSystem)cluster.getFileSystem();
+    Path filePath = fsStat.getPath();
+    LocatedBlocks lbs = blockDfs.getClient().namenode.
+        getBlockLocations(filePath.toUri().getPath(), 0, fsStat.getLen());
+    for (int blockNum: blockNums) {
+      assert blockNum < lbs.getLocatedBlocks().size();
+      LocatedBlock block = lbs.get(blockNum);
+      TestRaidDfs.corruptBlock(filePath, block.getBlock(), 
+          NUM_DATANODES, true, cluster);
+      // report deleted block to the name node
+      LocatedBlock[] toReport = { block };
+      blockDfs.getClient().namenode.reportBadBlocks(toReport);
+    }
+  }
+
+  /**
+   * checks fsck with no missing blocks
+   */
+  @Test
+  public void testClean() throws Exception {
+    LOG.info("testClean");
+    setUpCluster(3);
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+    assertEquals("fsck should return 0", 0, result);
+  }
+
+  /**
+   * checks fsck with missing all blocks in files but not in parity files 
+   * Because parity stripe length is 3, we don't corrupt any files.
+   */
+  @Test
+  public void testFileBlockMissing() throws Exception {
+    LOG.info("testFileBlockMissing");
+    int rsParityLength = 3;
+    setUpCluster(rsParityLength);
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 0);
+    LOG.info("Corrupt all blocks in all source files");
+    for (int i = 0; i < files.length; i++) {
+      long blockNum = RaidNode.getNumBlocks(srcStats[i]);
+      for (int j = 0; j < blockNum; j++) {
+        removeAndReportBlock(cluster, srcStats[i], new int[]{j});
+      }
+    }
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, files.length);
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+    assertEquals("fsck should return 0", 0, result);
+  }
+
+  /**
+   * checks fsck with missing all blocks in parity block but not in file block
+   * Raid fsck actually skips all parity files.
+   */
+  @Test
+  public void testParityBlockMissing() throws Exception {
+    LOG.info("testParityBlockMissing");
+    int rsParityLength = 3;
+    setUpCluster(rsParityLength);
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 0);
+    long blockNum = RaidNode.getNumBlocks(parityStat);
+    LOG.info("Corrupt all blocks in parity file");
+    for (int i = 0; i < blockNum; i++) {
+      removeAndReportBlock(cluster, parityStat, new int[]{i});
+    }
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 1);
+
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+
+    assertEquals("fsck should return 0", 0, result);
+  }
+
+  /**
+   * checks fsck with missing block in both file block and parity block
+   * in different stripes
+   */
+  @Test
+  public void testFileBlockAndParityBlockMissingInDifferentStripes() 
+    throws Exception {
+    LOG.info("testFileBlockAndParityBlockMissingInDifferentStripes");
+    int rsParityLength = 3;
+    setUpCluster(rsParityLength);
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 0);
+    LOG.info("Corrupt all blocks of source files in the first stripe");
+    removeAndReportBlock(cluster, srcStats[0], new int[]{0, 1});
+    removeAndReportBlock(cluster, srcStats[1], new int[]{0});
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 2);
+    LOG.info("Corrupt all blocks of parity file in the second and third stripe");
+    removeAndReportBlock(cluster, parityStat, new int[]{3, 4, 5, 6, 7, 8});
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 3);
+
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+
+    assertEquals("fsck should return 0", 0, result);
+  }
+
+  /**
+   * checks fsck with missing blocks in both file block and parity block
+   * in same stripe
+   */
+  @Test
+  public void testFileBlockAndParityBlockMissingInSameStripe() 
+    throws Exception {
+    LOG.info("testFileBlockAndParityBlockMissingInSameStripe");
+    int rsParityLength = 3;
+    setUpCluster(rsParityLength);
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 0);
+    LOG.info("Corrupt all blocks of parity file in the first stripe");
+    removeAndReportBlock(cluster, parityStat, new int[]{0, 1, 2});
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 1);
+    LOG.info("Corrupt the second block in the first stripe");
+    removeAndReportBlock(cluster, srcStats[0], new int[]{1});
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 2);
+    LOG.info("Corrupt the first block in the second stripe");
+    removeAndReportBlock(cluster, srcStats[1], new int[]{1});
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 3);
+
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+    // only the fist file is corrupt 
+    assertEquals("fsck should return 1", 1, result);
+  }
+
+  /**
+   * checks fsck with 3 missing blocks in same stripe
+   * Because rsParityLength is 2, we corrupt a file.
+   */
+  @Test
+  public void test3FileBlocksMissingInSameStripe() 
+    throws Exception {
+    LOG.info("test3FileBlocksMissingInSameStripe");
+    int rsParityLength = 2;
+    setUpCluster(rsParityLength);
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 0);
+    LOG.info("Corrupt the all blocks of source files in the second " +
+        "stripe and thrid stripe, the second stripe is corrupt, so " + 
+        " file 1 and file 2 are corrupt");
+    removeAndReportBlock(cluster, srcStats[1], new int[]{1});
+    removeAndReportBlock(cluster, srcStats[2], new int[]{0, 1, 2, 3});
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 2);
+
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+
+    assertEquals("fsck should return 2", 2, result);
+  }
+  
+  /**
+   * Corrupt blocks in all stripes  
+   */
+  @Test
+  public void testCorruptionInAllStripes() throws Exception {
+    LOG.info("testCorruptionInAllStripes");
+    int rsParityLength = 3;
+    setUpCluster(rsParityLength);
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 0);
+    LOG.info(" Corrupt 2 blocks of source file in stripe 0, 1, 2 ");
+    removeAndReportBlock(cluster, srcStats[0], new int[]{0, 1});
+    removeAndReportBlock(cluster, srcStats[1], new int[]{1});
+    removeAndReportBlock(cluster, srcStats[2], new int[]{2, 3});
+
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 3);
+    LOG.info(" Corrupt 2 blocks of parity file in stripe 0, 2 ");
+    removeAndReportBlock(cluster, parityStat, new int[]{0, 1, 6, 7});
+    TestRaidShellFsck.waitUntilCorruptFileCount(dfs, 4);
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+    
+    // the second file is not recoverable
+    assertEquals("fsck should return 2", 2, result);
+  }
+  
+  @After
+  public void tearDown() throws Exception {
+    if (cluster != null) {
+      cluster.shutdown();
+      cluster = null;
+    }
+    dfs = null;
+    LOG.info("Test cluster shut down");
+  }
+
+}
\ No newline at end of file
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestErasureCodes.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestErasureCodes.java
index 013ddcc9..80e75242 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestErasureCodes.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestErasureCodes.java
@@ -17,10 +17,13 @@
  */
 package org.apache.hadoop.raid;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
+import org.junit.Assert;
+
 import junit.framework.TestCase;
 
 public class TestErasureCodes extends TestCase {
@@ -129,6 +132,64 @@ public void testRSPerformance() {
     assertTrue("Decode failed", java.util.Arrays.equals(copy, message[0]));
   }
 
+  public void testRSEncodeDecodeBulk() {
+    // verify the production size.
+    verifyRSEncodeDecodeBulk(10, 4);
+    
+    // verify a test size
+    verifyRSEncodeDecodeBulk(3, 3);
+  }
+  
+  public void verifyRSEncodeDecodeBulk(int stripeSize, int paritySize) {
+    ReedSolomonCode rsCode = new ReedSolomonCode(stripeSize, paritySize);
+    int symbolMax = (int) Math.pow(2, rsCode.symbolSize());
+    byte[][] message = new byte[stripeSize][];
+    byte[][] cpMessage = new byte[stripeSize][];
+    int bufsize = 1024 * 1024 * 10;
+    for (int i = 0; i < stripeSize; i++) {
+      message[i] = new byte[bufsize];
+      cpMessage[i] = new byte[bufsize];
+      for (int j = 0; j < bufsize; j++) {
+        message[i][j] = (byte) RAND.nextInt(symbolMax);
+        cpMessage[i][j] = message[i][j];
+      }
+    }
+    byte[][] parity = new byte[paritySize][];
+    for (int i = 0; i < paritySize; i++) {
+      parity[i] = new byte[bufsize];
+    }
+    
+    // encode.
+    rsCode.encodeBulk(cpMessage, parity);
+    
+    int erasedLocation = RAND.nextInt(stripeSize);
+    byte[] copy = new byte[bufsize];
+    for (int i = 0; i < bufsize; i++) {
+      copy[i] = message[erasedLocation][i];
+      message[erasedLocation][i] = (byte) 0;
+    }
+    
+    // test decode
+    byte[][] data = new byte[stripeSize + paritySize][];
+    for (int i = 0; i < paritySize; i++) {
+      data[i] = new byte[bufsize];
+      for (int j = 0; j < bufsize; j++) {
+        data[i][j] = parity[i][j];
+      }
+    }
+    
+    for (int i = 0; i< stripeSize; i++) {
+      data[i + paritySize] = new byte[bufsize];
+      for (int j = 0; j < bufsize; j++) {
+        data[i + paritySize][j] = message[i][j];
+      }
+    }
+    byte[][] writeBufs = new byte[1][];
+    writeBufs[0] = new byte[bufsize];
+    rsCode.decodeBulk(data, writeBufs, new int[] {erasedLocation + paritySize});
+    assertTrue("Decode failed", Arrays.equals(copy, writeBufs[0]));
+  }
+  
   public void testXorPerformance() {
     java.util.Random RAND = new java.util.Random();
     int stripeSize = 10;
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestParityMovement.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestParityMovement.java
index be9f24ee..df42ce7c 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestParityMovement.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestParityMovement.java
@@ -107,6 +107,12 @@ protected void mySetup(String erasureCode, int rsParityLength)
     fileWriter.write(str);
     fileWriter.close();
   }
+  
+  private void stopCluster() {
+    if (null != dfs) {
+      dfs.shutdown();
+    }
+  }
 
   private DistributedRaidFileSystem getRaidFS() throws IOException {
     DistributedFileSystem dfs = (DistributedFileSystem)fileSys;
@@ -128,6 +134,37 @@ private void doRaid(Path srcPath, Codec codec) throws IOException {
                 false, 1, 1);
   }
   
+  public void testRenameHar() throws Exception {
+    try {
+      mySetup("xor", 1);
+      
+      Path[] testPathList = new Path[] {
+          new Path ("/user/dikang/raidtest/rename/f1"),
+          new Path ("/user/dikang/raidtest/rename/f2"),
+          new Path ("/user/dikang/raidtest/rename/f3")};
+      
+      Path destHarPath = new Path ("/destraid/user/dikang/raidtest/rename");
+      
+      DistributedRaidFileSystem raidFs = getRaidFS();
+      for (Path srcPath : testPathList) {
+        TestRaidDfs.createTestFilePartialLastBlock(fileSys, srcPath, 
+            1, 8, 8192L);
+      }
+      
+      raidFs.mkdirs(destHarPath);
+      raidFs.mkdirs(new Path(destHarPath, "rename" + RaidNode.HAR_SUFFIX));
+      
+      raidFs.rename(new Path("/user/dikang/raidtest"), 
+          new Path("/user/dikang/raidtest1"));
+      fail("Expected fail for HAR rename");
+    } catch (IOException ie) {
+      String message = ie.getMessage();
+      assertTrue(message.contains("HAR dir"));
+    } finally {
+      stopCluster();
+    }
+  }
+  
   public void testRename() throws Exception {
     try {
       mySetup("xor", 1);
@@ -182,9 +219,7 @@ public void testRename() throws Exception {
           conf);
       assertTrue(raidFs.exists(parity.getPath()));
     } finally {
-      if (null != dfs) {
-        dfs.shutdown();
-      }
+      stopCluster();
     }
   }
 
@@ -259,9 +294,7 @@ public void testDeleteAndUndelete() throws Exception {
       assertTrue(raidFs.exists(srcParityPath));
       assertTrue(raidFs.exists(srcParityPath2));
     } finally {
-      if (null != dfs) {
-        dfs.shutdown();
-      }
+      stopCluster();
     }
   }
 }
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestPlacementMonitor.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestPlacementMonitor.java
index 0dfca1e0..84c9af3d 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestPlacementMonitor.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestPlacementMonitor.java
@@ -233,8 +233,7 @@ public void testChooseDatanode() throws Exception {
       }
     }
   }
-
-
+  
   /**
    * Test that check locatedBlocks will generate the correct move actions
    */
@@ -268,7 +267,7 @@ public void testCheckBlockLocations() throws IOException {
         LocatedBlockWithMetaInfo lb = new LocatedBlockWithMetaInfo(
             new Block(blockId++, 0, 0L), new DatanodeInfo[]{d}, 0L,
             0, 0, 0);
-        BlockInfo info = createBlockInfo(parity, lb);
+        BlockInfo info = createBlockInfo(src, lb);
         srcBlockList.add(lb);
         srcInfoList.add(info);
         resolver.addBlock(info, lb);
@@ -337,7 +336,7 @@ private BlockInfo createBlockInfo(Path file, LocatedBlock b) {
     return new BlockInfo(loc, file);
   }
 
-  class FakeBlockAndDatanodeResolver extends
+  public class FakeBlockAndDatanodeResolver extends
       PlacementMonitor.BlockAndDatanodeResolver {
     Map<BlockInfo, LocatedBlockWithMetaInfo> blockMap = new HashMap<BlockInfo, LocatedBlockWithMetaInfo>();
     Map<String, DatanodeInfo> nodeMap = new HashMap<String, DatanodeInfo>();
@@ -349,15 +348,19 @@ public void addNode(String name, DatanodeInfo node) {
     }
     @Override
     public LocatedBlockWithMetaInfo getLocatedBlock(BlockInfo blk) throws IOException {
-      return blockMap.get(blk);
+      return blockMap.containsKey(blk)? blockMap.get(blk): null;
     }
     @Override
     public DatanodeInfo getDatanodeInfo(String name) throws IOException {
-      return nodeMap.get(name);
+      return nodeMap.containsKey(name)? nodeMap.get(name): null;
+    }
+    
+    @Override
+    public void initialize(Path path, FileSystem fs) {
     }
   }
 
-  class FakeExecutorService extends ThreadPoolExecutor {
+  public class FakeExecutorService extends ThreadPoolExecutor {
     List<BlockMover.BlockMoveAction> actions;
     public FakeExecutorService() {
       this(1, 1, 1L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidNode.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidNode.java
index 5fa25be4..bf219e80 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidNode.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidNode.java
@@ -40,11 +40,15 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.TestRaidDfs;
+import org.apache.hadoop.mapred.Counters;
 import org.apache.hadoop.mapred.MiniMRCluster;
 import org.apache.hadoop.raid.protocol.PolicyInfo;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
+import org.apache.hadoop.raid.DistRaid.Counter;
 import org.apache.hadoop.raid.PlacementMonitor.BlockInfo;
+import org.apache.hadoop.raid.Utils.Builder;
 
 /**
   * Test the generation of parity blocks for files with different block
@@ -67,6 +71,25 @@ public class TestRaidNode extends TestCase {
   MiniMRCluster mr = null;
   FileSystem fileSys = null;
   String jobTrackerName = null;
+  
+  private void loadTestCodecs(int xorStripeLength, int rsStripeLength, 
+      int xorParityLength, int rsParityLength) 
+    throws IOException {
+    Utils.loadTestCodecs(conf, new Builder[] {
+        // priority 100
+        Utils.getXORBuilder().setStripeLength(xorStripeLength).setParityLength(
+            xorParityLength),
+        Utils.getXORBuilder().dirRaid(true).setParityDir(
+            "/dir-raid").setStripeLength(xorStripeLength).setParityLength(
+            xorParityLength).setCodeId("dir-xor").setPriority(101),
+        // priority 300
+        Utils.getRSBuilder().setStripeLength(rsStripeLength).setParityLength(
+            rsParityLength), 
+        Utils.getRSBuilder().dirRaid(true).setParityDir(
+            "/dir-raidrs").setStripeLength(rsStripeLength).setParityLength(
+            rsParityLength).setCodeId("dir-rs").setPriority(301)
+    });
+  }
 
   /**
    * create mapreduce and dfs clusters
@@ -84,8 +107,7 @@ private void createClusters(boolean local, boolean rackAware) throws Exception {
     conf.setLong("raid.config.reload.interval", RELOAD_INTERVAL);
     conf.setLong(JobMonitor.JOBMONITOR_INTERVAL_KEY, 20000L);
     conf.setLong(RaidNode.TRIGGER_MONITOR_SLEEP_TIME_KEY, 3000L);
-
-    Utils.loadTestCodecs(conf, 3, 10, 1, 5, "/raid", "/raidrs", false, false);
+    conf.setLong(RaidNode.MINIMUM_RAIDABLE_FILESIZE_KEY, 1L);
 
     // scan every policy every 5 seconds
     conf.setLong("raid.policy.rescan.interval", 5 * 1000L);
@@ -104,6 +126,7 @@ private void createClusters(boolean local, boolean rackAware) throws Exception {
         "org.apache.hadoop.hdfs.server.namenode.BlockPlacementPolicyRaid");
 
     conf.set("raid.server.address", "localhost:0");
+    this.loadTestCodecs(3, 10, 1, 5);
 
     // create a dfs and map-reduce cluster
     final int taskTrackers = 4;
@@ -155,10 +178,9 @@ public void testPathFilter() throws Exception {
     try {
       assertEquals(DataTransferProtocol.DATA_TRANSFER_VERSION,
                    RaidUtils.getDataTransferProtocolVersion(conf));
-      
       for (long blockSize : blockSizes) {
         for (int stripeLength : stripeLengths) {
-           Utils.loadTestCodecs(conf, stripeLength, 1, 3, "/raid", "/raidrs");
+           this.loadTestCodecs(stripeLength, stripeLength, 1, 3);
            doTestPathFilter(iter, targetReplication, metaReplication,
                                               stripeLength, blockSize, numBlock);
            iter++;
@@ -170,6 +192,33 @@ public void testPathFilter() throws Exception {
     }
     LOG.info("Test testPathFilter completed.");
   }
+  
+  private void simulateErrors(RaidShell shell, Path file1, long crc, long blockSize,
+      long numBlock, long stripeLength) throws IOException {
+    if (numBlock >= 1) {
+      LOG.info("doTestPathFilter Check error at beginning of file.");
+      simulateError(shell, fileSys, file1, crc, 0);
+    }
+
+    // check for error at the beginning of second block
+    if (numBlock >= 2) {
+      LOG.info("doTestPathFilter Check error at beginning of second block.");
+      simulateError(shell, fileSys, file1, crc, blockSize + 1);
+    }
+
+    // check for error at the middle of third block
+    if (numBlock >= 3) {
+      LOG.info("doTestPathFilter Check error at middle of third block.");
+      simulateError(shell, fileSys, file1, crc, 2 * blockSize + 10);
+    }
+
+    // check for error at the middle of second stripe
+    if (numBlock >= stripeLength + 1) {
+      LOG.info("doTestPathFilter Check error at middle of second stripe.");
+      simulateError(shell, fileSys, file1, crc,
+                                          stripeLength * blockSize + 100);
+    }
+  }
 
   /**
    * Test to run a filter
@@ -177,92 +226,62 @@ public void testPathFilter() throws Exception {
   private void doTestPathFilter(int iter, long targetReplication,
                           long metaReplication, long stripeLength,
                           long blockSize, int numBlock) throws Exception {
-    LOG.info("doTestPathFilter started---------------------------:" +  " iter " + iter +
-             " blockSize=" + blockSize + " stripeLength=" + stripeLength);
+    LOG.info("doTestPathFilter started---------------------------:" + 
+             " iter " + iter + " blockSize=" + blockSize + " stripeLength=" +
+             stripeLength);
     ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
-    cb.addPolicy("policy1", "/user/dhruba/raidtest", (short)1, targetReplication, metaReplication);
+    cb.addPolicy("policy1", "/user/dhruba/raidtest", 
+        targetReplication, metaReplication);
+    cb.addPolicy("policy2", "/user/dhruba/dir-raidtest", 
+        targetReplication, metaReplication, "dir-xor");
     cb.persist();
 
     RaidShell shell = null;
     Path dir = new Path("/user/dhruba/raidtest/");
     Path file1 = new Path(dir + "/file" + iter);
+    Path dir1 = new Path("/user/dhruba/dir-raidtest/1");
+    Path file2 = new Path(dir1 + "/file2");
+    Path file3 = new Path(dir1 + "/file3");
     RaidNode cnode = null;
     try {
       Path destPath = new Path("/raid/user/dhruba/raidtest");
+      Path destPath1 = new Path("/dir-raid/user/dhruba/dir-raidtest");
       fileSys.delete(dir, true);
       fileSys.delete(destPath, true);
+      fileSys.delete(dir1, true);
+      fileSys.delete(destPath1, true);
       long crc1 = createOldFile(fileSys, file1, 1, numBlock, blockSize);
+      long crc2 = createOldFile(fileSys, file2, 1, numBlock, blockSize);
+      long crc3 = createOldFile(fileSys, file3, 1, numBlock, blockSize);
       LOG.info("doTestPathFilter created test files for iteration " + iter);
 
       // create an instance of the RaidNode
       Configuration localConf = new Configuration(conf);
       cnode = RaidNode.createRaidNode(null, localConf);
-      FileStatus[] listPaths = null;
-
-      // wait till file is raided
-      while (true) {
-        try {
-          listPaths = fileSys.listStatus(destPath);
-          int count = 0;
-          if (listPaths != null && listPaths.length == 1) {
-            for (FileStatus s : listPaths) {
-              LOG.info("doTestPathFilter found path " + s.getPath());
-              if (!s.getPath().toString().endsWith(".tmp") &&
-                  fileSys.getFileStatus(file1).getReplication() ==
-                  targetReplication) {
-                count++;
-              }
-            }
-          }
-          if (count > 0) {
-            break;
-          }
-        } catch (FileNotFoundException e) {
-          //ignore
-        }
-        LOG.info("doTestPathFilter waiting for files to be raided. Found " + 
-                 (listPaths == null ? "none" : listPaths.length));
-        Thread.sleep(1000);                  // keep waiting
-      }
-      // assertEquals(listPaths.length, 1); // all files raided
+      TestRaidDfs.waitForFileRaided(LOG, fileSys, file1, destPath);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dir1, destPath1);
+      
       LOG.info("doTestPathFilter all files found in Raid.");
-
       // check for error at beginning of file
       shell = new RaidShell(conf);
       shell.initializeRpc(conf, cnode.getListenerAddress());
-      if (numBlock >= 1) {
-        LOG.info("doTestPathFilter Check error at beginning of file.");
-        simulateError(shell, fileSys, file1, crc1, 0);
-      }
-
-      // check for error at the beginning of second block
-      if (numBlock >= 2) {
-        LOG.info("doTestPathFilter Check error at beginning of second block.");
-        simulateError(shell, fileSys, file1, crc1, blockSize + 1);
-      }
-
-      // check for error at the middle of third block
-      if (numBlock >= 3) {
-        LOG.info("doTestPathFilter Check error at middle of third block.");
-        simulateError(shell, fileSys, file1, crc1, 2 * blockSize + 10);
-      }
-
-      // check for error at the middle of second stripe
-      if (numBlock >= stripeLength + 1) {
-        LOG.info("doTestPathFilter Check error at middle of second stripe.");
-        simulateError(shell, fileSys, file1, crc1,
-                                            stripeLength * blockSize + 100);
-      }
-
+      this.simulateErrors(shell, file1, crc1, blockSize,
+          numBlock, stripeLength);
+      this.simulateErrors(shell, file2, crc2, blockSize,
+          numBlock, stripeLength);
+      this.simulateErrors(shell, file3, crc3, blockSize,
+          numBlock, stripeLength);
     } catch (Exception e) {
-      LOG.info("doTestPathFilter Exception " + e +
-                                          StringUtils.stringifyException(e));
+      LOG.info("doTestPathFilter Exception ", e);
       throw e;
     } finally {
       if (shell != null) shell.close();
       if (cnode != null) { cnode.stop(); cnode.join(); }
-      LOG.info("doTestPathFilter delete file " + file1);
-      fileSys.delete(file1, true);
+      LOG.info("doTestPathFilter clean up" );
+      fileSys.delete(dir, true);
+      fileSys.delete(new Path("/raid"), true);
+      fileSys.delete(dir1, true);
+      fileSys.delete(new Path("/dir-raid"), true);
     }
     LOG.info("doTestPathFilter completed:" + " blockSize=" + blockSize +
                                              " stripeLength=" + stripeLength);
@@ -273,98 +292,69 @@ private void doTestPathFilter(int iter, long targetReplication,
   private void doCheckPolicy() throws Exception {
     LOG.info("doCheckPolicy started---------------------------:"); 
     short srcReplication = 3;
-    long targetReplication = 2;
+    short targetReplication = 2;
     long metaReplication = 1;
     long stripeLength = 2;
     long blockSize = 1024;
     int numBlock = 3;
     ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
-    cb.addPolicy("policy1", "/user/dhruba/policytest", (short)1, targetReplication,
+    cb.addPolicy("policy1", "/user/dhruba/policytest", targetReplication,
         metaReplication);
+    cb.addPolicy("policy2", "/user/dhruba/dir-policytest", 
+        targetReplication, metaReplication, "dir-xor");
     cb.persist();
     Path dir = new Path("/user/dhruba/policytest/");
-    Path file2 = new Path(dir + "/file2");
+    Path dir1 = new Path("/user/dhruba/dir-policytest/1");
+    Path file1 = new Path(dir + "/file1");
+    Path file2 = new Path(dir1 + "/file2");
+    Path file3 = new Path(dir1 + "/file3");
+    Path file4 = new Path(dir1 + "/file4");
     RaidNode cnode = null;
     try {
       Path destPath = new Path("/raid/user/dhruba/policytest");
+      Path destPath1 = new Path("/dir-raid/user/dhruba/dir-policytest");
       fileSys.delete(dir, true);
       fileSys.delete(destPath, true);
+      fileSys.delete(dir1, true);
+      fileSys.delete(destPath1, true);
 
       // create an instance of the RaidNode
       Configuration localConf = new Configuration(conf);
       cnode = RaidNode.createRaidNode(null, localConf);
 
       // this file should be picked up RaidNode
-      long crc2 = createOldFile(fileSys, file2, 2, numBlock, blockSize);
-      FileStatus[] listPaths = null;
-
-      long firstmodtime = 0;
-      // wait till file is raided
-      while (true) {
-        Thread.sleep(1000L);                  // waiting
-        listPaths = fileSys.listStatus(destPath);
-        int count = 0;
-        if (listPaths != null && listPaths.length == 1) {
-          for (FileStatus s : listPaths) {
-            LOG.info("doCheckPolicy found path " + s.getPath());
-            if (!s.getPath().toString().endsWith(".tmp") &&
-                fileSys.getFileStatus(file2).getReplication() ==
-                targetReplication) {
-              count++;
-              firstmodtime = s.getModificationTime();
-            }
-          }
-        }
-        if (count > 0) {
-          break;
-        }
-        LOG.info("doCheckPolicy waiting for files to be raided. Found " + 
-                 (listPaths == null ? "none" : listPaths.length));
-      }
-      assertEquals(listPaths.length, 1);
+      createOldFile(fileSys, file1, 3, numBlock, blockSize);
+      createOldFile(fileSys, file2, 3, numBlock, blockSize);
+      createOldFile(fileSys, file3, 3, numBlock, blockSize);
+      TestRaidDfs.waitForFileRaided(LOG, fileSys, file1, destPath, targetReplication);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dir1, destPath1, targetReplication);
 
       LOG.info("doCheckPolicy all files found in Raid the first time.");
 
       LOG.info("doCheckPolicy: recreating source file");
-      crc2 = createOldFile(fileSys, file2, 2, numBlock, blockSize);
-
-      FileStatus st = fileSys.getFileStatus(file2);
-      assertTrue(st.getModificationTime() > firstmodtime);
+      long firstmodetime1 = fileSys.getFileStatus(file1).getModificationTime();
+      createOldFile(fileSys, file1, 3, numBlock, blockSize);
+      assertTrue(fileSys.getFileStatus(file1).getModificationTime() > firstmodetime1);
       
-      // wait till file is raided
-      while (true) {
-        Thread.sleep(1000L);                  // waiting
-        listPaths = fileSys.listStatus(destPath);
-        int count = 0;
-        if (listPaths != null && listPaths.length == 1) {
-          for (FileStatus s : listPaths) {
-            LOG.info("doCheckPolicy found path " + s.getPath() + " " + s.getModificationTime());
-            if (!s.getPath().toString().endsWith(".tmp") &&
-                s.getModificationTime() > firstmodtime &&
-                fileSys.getFileStatus(file2).getReplication() ==
-                targetReplication) {
-              count++;
-            }
-          }
-        }
-        if (count > 0) {
-          break;
-        }
-        LOG.info("doCheckPolicy waiting for files to be raided. Found " + 
-                 (listPaths == null ? "none" : listPaths.length));
-      } 
-      assertEquals(listPaths.length, 1);
+      LOG.info("Change the modification time of directory");
+      long firstmodetime2 = fileSys.getFileStatus(dir1).getModificationTime();
+      createOldFile(fileSys, file4, 3, numBlock, blockSize);
+      assertTrue(fileSys.getFileStatus(dir1).getModificationTime() > firstmodetime2);
+      TestRaidDfs.waitForFileRaided(LOG, fileSys, file1, destPath, targetReplication);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dir1, destPath1, targetReplication);
 
       LOG.info("doCheckPolicy: file got re-raided as expected.");
       
     } catch (Exception e) {
-      LOG.info("doCheckPolicy Exception " + e +
-                                          StringUtils.stringifyException(e));
+      LOG.info("doCheckPolicy Exception ", e);
       throw e;
     } finally {
       if (cnode != null) { cnode.stop(); cnode.join(); }
-      LOG.info("doTestPathFilter delete file " + file2);
-      fileSys.delete(file2, false);
+      LOG.info("doTestPathFilter clean up");
+      fileSys.delete(dir, true);
+      fileSys.delete(new Path("/raid"), true);
+      fileSys.delete(dir1, true);
+      fileSys.delete(new Path("/dir-raid"), true);
     }
     LOG.info("doCheckPolicy completed:");
   }
@@ -384,7 +374,7 @@ static void createTestFiles(FileSystem fileSys, String path, String destpath, in
     fileSys.delete(destPath, true);
    
     for(int i = 0 ; i < nfile; i++){
-      Path file = new Path(path + "file" + i);
+      Path file = new Path(dir, "file" + i);
       createOldFile(fileSys, file, repl, nblock, blockSize);
     }
   }
@@ -394,7 +384,12 @@ private void checkTestFiles(String srcDir, String parityDir, int stripeLength,
       Codec codec, int nfiles) throws IOException {
     for(int i = 0 ; i < nfiles; i++){
       Path srcPath = new Path(srcDir, "file" + i);
-      Path parityPath = new Path(parityDir, "file" + i);
+      Path parityPath = null;
+      if (codec.isDirRaid) {
+        parityPath = new Path(parityDir);
+      } else {
+        parityPath = new Path(parityDir, "file" + i);
+      }
       FileStatus srcFile = fileSys.getFileStatus(srcPath);
       FileStatus parityStat = fileSys.getFileStatus(parityPath);
       assertEquals(srcFile.getReplication(), targetReplication);
@@ -405,9 +400,19 @@ private void checkTestFiles(String srcDir, String parityDir, int stripeLength,
       if (parityLength == 1) { 
         continue;
       }
-      int numBlocks = (int)Math.ceil(1D * srcFile.getLen() /
-                                     srcFile.getBlockSize());
-      int numStripes = (int)Math.ceil(1D * (numBlocks) / stripeLength);
+      if (codec.isDirRaid && i > 0) {
+        // One directory has one parity, just need to check once
+        continue;
+      }
+      long numBlocks;
+      if (codec.isDirRaid) {
+        List<FileStatus> lfs = RaidNode.listDirectoryRaidFileStatus(conf, fileSys, 
+            new Path(srcDir));
+        numBlocks = DirectoryStripeReader.getBlockNum(lfs);
+      } else {
+        numBlocks = RaidNode.numBlocks(srcFile);
+      }
+      int numStripes = (int)RaidNode.numStripes(numBlocks, stripeLength);
 
       Map<String, Integer> nodeToNumBlocks = new HashMap<String, Integer>();
       Set<String> nodesInThisStripe = new HashSet<String>();
@@ -421,7 +426,7 @@ private void checkTestFiles(String srcDir, String parityDir, int stripeLength,
           stripeBlocks.addAll(parityBlocks.subList(stripeStart, stripeEnd));
         }
         PlacementMonitor.countBlocksOnEachNode(stripeBlocks, nodeToNumBlocks, nodesInThisStripe);
-        LOG.info("file: " + srcPath + " stripe: " + stripeIndex);
+        LOG.info("file: " + parityPath + " stripe: " + stripeIndex);
         int max = 0;
         for (String node: nodeToNumBlocks.keySet()) {
           int count = nodeToNumBlocks.get(node);
@@ -442,22 +447,24 @@ public void testDistRaid() throws Exception {
     LOG.info("Test testDistRaid started.");
     short targetReplication = 2;
     short metaReplication   = 2;
-    short srcReplication = 1;
     short rstargetReplication = 1;
     short rsmetaReplication   = 1;
+    short xorstripeLength = 3;
     int rsstripeLength      = 10;
-    short rssrcReplication = 1;
-    
 
     createClusters(false, true);
     ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
-    cb.addPolicy("policy1", "/user/dhruba/raidtest", srcReplication, 
+    cb.addPolicy("policy1", "/user/dhruba/raidtest", 
         targetReplication, metaReplication);
-    cb.addPolicy("abstractPolicy", srcReplication, targetReplication, 
-        metaReplication);
+    cb.addAbstractPolicy("abstractPolicy", targetReplication, 
+        metaReplication, "xor");
     cb.addPolicy("policy2", "/user/dhruba/raidtest2", "abstractPolicy");
-    cb.addPolicy("policy3", "/user/dhruba/raidtest3", rssrcReplication, 
+    cb.addPolicy("policy3", "/user/dhruba/raidtest3", 
         rstargetReplication, rsmetaReplication, "rs");
+    cb.addPolicy("policy4", "/user/dhruba/dir-raidtest/", 
+        targetReplication, metaReplication, "dir-xor");
+    cb.addPolicy("policy5", "/user/dhruba/dir-raidtestrs/", 
+        rstargetReplication, rsmetaReplication, "dir-rs");
     cb.persist();
 
     RaidNode cnode = null;
@@ -468,6 +475,10 @@ public void testDistRaid() throws Exception {
           "/raid/user/dhruba/raidtest2", 5, 7);
       createTestFiles(fileSys, "/user/dhruba/raidtest3/",
           "/raidrs/user/dhruba/raidtest3", 1, 10);
+      createTestFiles(fileSys, "/user/dhruba/dir-raidtest/1/",
+          "/dir-raid/user/dhruba/dir-raidtest/1", 5, 7);
+      createTestFiles(fileSys, "/user/dhruba/dir-raidtestrs/2/",
+          "/dir-raidrs/user/dhruba/dir-raidtestrs/2", 2, 8);
       LOG.info("Test testDistRaid created test files");
 
       Configuration localConf = new Configuration(conf);
@@ -485,20 +496,36 @@ public void testDistRaid() throws Exception {
             Path srcPath = new Path("/user/dhruba/raidtest2");
             assertTrue(p.getSrcPath().equals(
                 srcPath.makeQualified(srcPath.getFileSystem(conf))));
-          } else {
-            assertTrue(p.getName().equals("policy3"));
+          } else if (p.getName().equals("policy3")){
             Path srcPath = new Path("/user/dhruba/raidtest3");
             assertTrue(p.getSrcPath().equals(
                 srcPath.makeQualified(srcPath.getFileSystem(conf))));
+          } else if (p.getName().equals("policy4")) {
+            Path srcPath = new Path("/user/dhruba/dir-raidtest/");
+            assertTrue(p.getSrcPath().equals(
+                srcPath.makeQualified(srcPath.getFileSystem(conf))));
+          } else {
+            assertEquals(p.getName(), "policy5");
+            Path srcPath = new Path("/user/dhruba/dir-raidtestrs/");
+            assertTrue(p.getSrcPath().equals(
+                srcPath.makeQualified(srcPath.getFileSystem(conf))));
           }
-          if (p.getName().equals("policy3")) {
-            assertTrue(p.getCodecId().equals("rs"));
+          if (p.getName().equals("policy3") || p.getName().equals("policy5")) {
+            if (p.getName().equals("policy3")) {
+              assertTrue(p.getCodecId().equals("rs"));
+            } else {
+              assertTrue(p.getCodecId().equals("dir-rs"));
+            }
             assertEquals(rstargetReplication,
                          Integer.parseInt(p.getProperty("targetReplication")));
             assertEquals(rsmetaReplication,
                          Integer.parseInt(p.getProperty("metaReplication")));
           } else {
-            assertTrue(p.getCodecId().equals("xor"));
+            if (p.getName().equals("policy4")) {
+              assertTrue(p.getCodecId().equals("dir-xor"));
+            } else {
+              assertTrue(p.getCodecId().equals("xor"));
+            }
             assertEquals(targetReplication,
                          Integer.parseInt(p.getProperty("targetReplication")));
             assertEquals(metaReplication,
@@ -507,12 +534,12 @@ public void testDistRaid() throws Exception {
       }
 
       long start = System.currentTimeMillis();
-      final int MAX_WAITTIME = 300000;
+      final int MAX_WAITTIME = 120000;
       
       assertTrue("cnode is not DistRaidNode", cnode instanceof DistRaidNode);
       DistRaidNode dcnode = (DistRaidNode) cnode;
 
-      while (dcnode.jobMonitor.jobsMonitored() < 3 &&
+      while (dcnode.jobMonitor.jobsMonitored() < 5 &&
              System.currentTimeMillis() - start < MAX_WAITTIME) {
         Thread.sleep(1000);
       }
@@ -524,14 +551,20 @@ public void testDistRaid() throws Exception {
       }
       assertEquals(dcnode.jobMonitor.jobsSucceeded(), dcnode.jobMonitor.jobsMonitored());
       checkTestFiles("/user/dhruba/raidtest/", "/raid/user/dhruba/raidtest", 
-          rsstripeLength, targetReplication, metaReplication, dcnode.placementMonitor,
+          xorstripeLength, targetReplication, metaReplication, dcnode.placementMonitor,
           Codec.getCodec("xor"), 5);
       checkTestFiles("/user/dhruba/raidtest2/", "/raid/user/dhruba/raidtest2", 
-          rsstripeLength, targetReplication, metaReplication, dcnode.placementMonitor,
+          xorstripeLength, targetReplication, metaReplication, dcnode.placementMonitor,
           Codec.getCodec("xor"), 5);
       checkTestFiles("/user/dhruba/raidtest3/", "/raidrs/user/dhruba/raidtest3", 
           rsstripeLength, rstargetReplication, rsmetaReplication, dcnode.placementMonitor,
           Codec.getCodec("rs"), 1);
+      checkTestFiles("/user/dhruba/dir-raidtest/1/", "/dir-raid/user/dhruba/dir-raidtest/1", 
+          xorstripeLength, targetReplication, metaReplication, dcnode.placementMonitor,
+          Codec.getCodec("dir-xor"), 5);
+      checkTestFiles("/user/dhruba/dir-raidtestrs/2/", "/dir-raidrs/user/dhruba/dir-raidtestrs/2", 
+          rsstripeLength, rstargetReplication, rsmetaReplication, dcnode.placementMonitor,
+          Codec.getCodec("dir-rs"), 2);
 
       LOG.info("Test testDistRaid successful.");
     } catch (Exception e) {
@@ -622,7 +655,7 @@ public void testSuspendTraversal() throws Exception {
 
     createClusters(false, false);
     ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
-    cb.addPolicy("policy1", "/user/dhruba/raidtest", (short)1, targetReplication, metaReplication);
+    cb.addPolicy("policy1", "/user/dhruba/raidtest", targetReplication, metaReplication);
     cb.persist();
 
     RaidNode cnode = null;
@@ -681,8 +714,8 @@ public void testSuspendTraversal() throws Exception {
   
   public void testFileListPolicy() throws Exception {
     LOG.info("Test testFileListPolicy started.");
-    long targetReplication = 2;
-    long metaReplication   = 2;
+    short targetReplication = 2;
+    short metaReplication   = 2;
     long stripeLength      = 3;
     short srcReplication = 3;
 
@@ -690,15 +723,40 @@ public void testFileListPolicy() throws Exception {
     // don't allow rescan, make sure only one job is submitted.
     conf.setLong("raid.policy.rescan.interval", 60 * 1000L);
     ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
-    cb.addPolicy("abstractPolicy", (short)1, targetReplication, metaReplication);
+    cb.addAbstractPolicy("abstractPolicy",  targetReplication, metaReplication,
+        "xor");
     cb.addFileListPolicy("policy2", "/user/rvadali/raidfilelist.txt", "abstractPolicy");
+    cb.addAbstractPolicy("abstractPolicy2", targetReplication, metaReplication,
+        "dir-xor");
+    cb.addFileListPolicy("policy3", "/user/rvadali/raiddirlist.txt", "abstractPolicy2");
     cb.persist();
 
     RaidNode cnode = null;
     Path fileListPath = new Path("/user/rvadali/raidfilelist.txt");
+    Path dirListPath = new Path("/user/rvadali/raiddirlist.txt");
     try {
       createTestFiles(fileSys, "/user/rvadali/raidtest/",
           "/raid/user/rvadali/raidtest", 5, 7, srcReplication);
+      createTestFiles(fileSys, "/user/rvadali/dir-raidtest/1/",
+          "/dir-raid/user/rvadali/dir-raidtest/1", 2, 7, srcReplication);
+      // althought the files reach the target replication, because
+      // they don't have parities, we are still going to raid them.
+      createTestFiles(fileSys, "/user/rvadali/dir-raidtest/2/",
+          "/dir-raid/user/rvadali/dir-raidtest/2", 2, 7, targetReplication);
+      // generate parities files for the following directory, raidnode
+      // won't raid them again
+      Path srcDir3 = new Path("/user/rvadali/dir-raidtest/3/");
+      Path destPath3 = new Path("/dir-raid/user/rvadali/dir-raidtest/3");
+      createTestFiles(fileSys, srcDir3.toString(), destPath3.toString(), 2, 4,
+          targetReplication);
+      Codec dirCode = Codec.getCodec("dir-xor");
+      FileStatus srcStat3 = fileSys.getFileStatus(srcDir3);
+      assertTrue(RaidNode.doRaid(conf, srcStat3,
+          new Path(dirCode.parityDirectory), dirCode, new RaidNode.Statistics(),
+          RaidUtils.NULL_PROGRESSABLE, false, targetReplication, metaReplication));
+      FileStatus parityStat3 = fileSys.getFileStatus(destPath3);
+      assertEquals(parityStat3.getModificationTime(), srcStat3.getModificationTime());
+      assertEquals(parityStat3.getReplication(), metaReplication);
       LOG.info("Test testFileListPolicy created test files");
 
       // Create list of files to raid.
@@ -708,14 +766,26 @@ public void testFileListPolicy() throws Exception {
         out.write(f.getPath().toString().getBytes());
         out.write("\n".getBytes());
       }
+      // write directory, we should filter it.
+      out.write("/user/rvadali/raidtest/\n".getBytes());
       out.close();
+      
+      FSDataOutputStream dirOut = fileSys.create(dirListPath);
+      FileStatus[] dirs = fileSys.listStatus(new Path("/user/rvadali/dir-raidtest"));
+      for (FileStatus dir: dirs) {
+        dirOut.write(dir.getPath().toString().getBytes());
+        dirOut.write("\n".getBytes());
+      }
+      // write file, we should filter it
+      dirOut.write("/user/rvadali/raidtest/file0\n".getBytes());
+      dirOut.close();
 
       cnode = RaidNode.createRaidNode(conf);
-      final int MAX_WAITTIME = 300000;
+      final int MAX_WAITTIME = 120000;
       DistRaidNode dcnode = (DistRaidNode) cnode;
 
       long start = System.currentTimeMillis();
-      int numJobsExpected = 1;
+      int numJobsExpected = 2;
       while (dcnode.jobMonitor.jobsSucceeded() < numJobsExpected &&
              System.currentTimeMillis() - start < MAX_WAITTIME) {
         LOG.info("Waiting for num jobs succeeded " + dcnode.jobMonitor.jobsSucceeded() + 
@@ -724,12 +794,26 @@ public void testFileListPolicy() throws Exception {
       }
       assertEquals(numJobsExpected, dcnode.jobMonitor.jobsMonitored());
       assertEquals(numJobsExpected, dcnode.jobMonitor.jobsSucceeded());
-
-      FileStatus[] parityFiles = fileSys.listStatus(
-        new Path("/raid/user/rvadali/raidtest"));
-      assertEquals(files.length, parityFiles.length);
+      
+      Path destPath = new Path("/raid/user/rvadali/raidtest");
+      for (FileStatus file : files) {
+        TestRaidDfs.waitForFileRaided(LOG, fileSys, file.getPath(), destPath,
+            targetReplication);
+      }
+      Path destPath1 = new Path("/dir-raid/user/rvadali/dir-raidtest");
+      for (FileStatus dir : dirs) {
+        TestRaidDfs.waitForDirRaided(LOG, fileSys, dir.getPath(), destPath1,
+            targetReplication);
+      }
+      Map<String, Counters> raidProgress = dcnode.jobMonitor.getRaidProgress();
+      long succeedFiles = 0;
+      for (Counters ctrs: raidProgress.values()) {
+        Counters.Counter ctr = ctrs.findCounter(Counter.FILES_SUCCEEDED);
+        succeedFiles += ctr.getValue();
+      }
+      // We have one raided directory, so it's total - 1;
+      assertEquals(succeedFiles, files.length + dirs.length -1); 
       LOG.info("Test testFileListPolicy successful.");
-
     } catch (Exception e) {
       LOG.info("testFileListPolicy Exception " + e + StringUtils.stringifyException(e));
       throw e;
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidPurge.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidPurge.java
index 49b8d973..10f18a06 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidPurge.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidPurge.java
@@ -18,39 +18,28 @@
 package org.apache.hadoop.raid;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Properties;
 import java.util.Random;
-import java.util.zip.CRC32;
-
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.log4j.Level;
-
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.mapred.MiniMRCluster;
-import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.raid.protocol.PolicyInfo;
 import org.apache.hadoop.hdfs.TestRaidDfs;
 import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.raid.protocol.PolicyInfo;
+import org.apache.hadoop.raid.Utils.Builder;
 
 /**
  * If a file gets deleted, then verify that the parity file gets deleted too.
@@ -61,7 +50,7 @@ public class TestRaidPurge extends TestCase {
   final static String CONFIG_FILE = new File(TEST_DIR, 
       "test-raid.xml").getAbsolutePath();
   final static long RELOAD_INTERVAL = 1000;
-  final static Log LOG = LogFactory.getLog("org.apache.hadoop.raid.TestRaidNode");
+  final static Log LOG = LogFactory.getLog("org.apache.hadoop.raid.TestRaidPurge");
   final Random rand = new Random();
 
   {
@@ -77,10 +66,15 @@ public class TestRaidPurge extends TestCase {
   FileSystem fileSys = null;
   String jobTrackerName = null;
 
+  public void createClusters(boolean local, int numNodes) throws Exception {
+    createClusters(local, numNodes, null, null);
+  }
+  
   /**
    * create mapreduce and dfs clusters
    */
-  private void createClusters(boolean local) throws Exception {
+  public void createClusters(boolean local, int numNodes, 
+      String[] racks, String[] hosts) throws Exception {
 
     new File(TEST_DIR).mkdirs(); // Make sure data directory exists
     conf = new Configuration();
@@ -90,9 +84,6 @@ private void createClusters(boolean local) throws Exception {
 
     // scan all policies once every 5 second
     conf.setLong("raid.policy.rescan.interval", 5000);
-
-    Utils.loadTestCodecs(conf);
-
     // the RaidNode does the raiding inline (instead of submitting to map/reduce)
     if (local) {
       conf.set("raid.classname", "org.apache.hadoop.raid.LocalRaidNode");
@@ -102,86 +93,46 @@ private void createClusters(boolean local) throws Exception {
     // use local block fixer
     conf.set("raid.blockfix.classname",
              "org.apache.hadoop.raid.LocalBlockIntegrityMonitor");
+    conf.set("dfs.block.replicator.classname",
+             "org.apache.hadoop.hdfs.server.namenode.BlockPlacementPolicyRaid");
 
     conf.set("raid.server.address", "localhost:0");
+    conf.setLong("dfs.blockreport.intervalMsec", 1000L);
     
     // create a dfs and map-reduce cluster
-    final int taskTrackers = 4;
-    final int jobTrackerPort = 60050;
+    final int taskTrackers = numNodes;
 
-    dfs = new MiniDFSCluster(conf, 3, true, null);
+    dfs = new MiniDFSCluster(conf, numNodes, true, racks, hosts);
     dfs.waitActive();
     fileSys = dfs.getFileSystem();
     namenode = fileSys.getUri().toString();
-    mr = new MiniMRCluster(taskTrackers, namenode, 3);
+    mr = new MiniMRCluster(taskTrackers, namenode, numNodes);
     jobTrackerName = "localhost:" + mr.getJobTrackerPort();
     hftp = "hftp://localhost.localdomain:" + dfs.getNameNodePort();
 
     FileSystem.setDefaultUri(conf, namenode);
     conf.set("mapred.job.tracker", jobTrackerName);
+    //Don't allow empty file to be raid
+    conf.setLong(RaidNode.MINIMUM_RAIDABLE_FILESIZE_KEY, 1L);
   }
     
-  /**
-   * create raid.xml file for RaidNode
-   */
-  private void mySetup(long targetReplication,
-    long metaReplication, long stripeLength) throws Exception {
-    int harDelay = 1; // 1 day.
-    mySetup(targetReplication, metaReplication, stripeLength, harDelay);
-  }
-
-  private void mySetup(long targetReplication,
-    long metaReplication, long stripeLength, int harDelay) throws Exception {
-    FileWriter fileWriter = new FileWriter(CONFIG_FILE);
-    fileWriter.write("<?xml version=\"1.0\"?>\n");
-    String str = "<configuration> " +
-                   "<policy name = \"RaidTest1\"> " +
-                      "<srcPath prefix=\"/user/dhruba/raidtest\"/> " +
-                      "<codecId>xor</codecId> " +
-                      "<destPath> /raid</destPath> " +
-                      "<property> " +
-                        "<name>targetReplication</name> " +
-                        "<value>" + targetReplication + "</value> " +
-                        "<description>after RAIDing, decrease the replication factor of a file to this value." +
-                        "</description> " + 
-                      "</property> " +
-                      "<property> " +
-                        "<name>metaReplication</name> " +
-                        "<value>" + metaReplication + "</value> " +
-                        "<description> replication factor of parity file" +
-                        "</description> " + 
-                      "</property> " +
-                      "<property> " +
-                        "<name>stripeLength</name> " +
-                        "<value>" + stripeLength + "</value> " +
-                        "<description> the max number of blocks in a file to RAID together " +
-                        "</description> " + 
-                      "</property> " +
-                      "<property> " +
-                        "<name>modTimePeriod</name> " +
-                        "<value>2000</value> " + 
-                        "<description> time (milliseconds) after a file is modified to make it " +
-                                       "a candidate for RAIDing " +
-                        "</description> " + 
-                      "</property> " +
-                      "<property> " +
-                        "<name>time_before_har</name> " +
-                        "<value> " + harDelay + "</value> " +
-                        "<description> amount of time waited before har'ing parity files" +
-                        "</description> " + 
-                      "</property> " +
-                   "</policy>" +
-                 "</configuration>";
-    fileWriter.write(str);
-    fileWriter.close();
-
-    Utils.loadTestCodecs(conf);
+  public void mySetup(long targetReplication,
+    long metaReplication) throws Exception {
+    // Initialize Raid Policy config
+    ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
+    cb.addPolicy("policy1", "/user/dhruba/raidtest", 
+        targetReplication, metaReplication);
+    cb.addPolicy("policy2", "/user/dhruba/dirraidtest", 
+        targetReplication, metaReplication, "dir-xor");
+    cb.addPolicy("policy3", "/user/dhruba/dirraidrstest", 
+        targetReplication, metaReplication, "dir-rs");
+    cb.persist();
   }
 
   /**
    * stop clusters created earlier
    */
-  private void stopClusters() throws Exception {
+  public void stopClusters() throws Exception {
     if (mr != null) { mr.shutdown(); }
     if (dfs != null) { dfs.shutdown(); }
   }
@@ -200,7 +151,7 @@ public void testPurge() throws Exception {
     int  numBlock          = 9;
     int  iter = 0;
 
-    createClusters(true);
+    createClusters(true, 3);
     try {
       for (long blockSize : blockSizes) {
         for (long stripeLength : stripeLengths) {
@@ -214,7 +165,18 @@ public void testPurge() throws Exception {
     }
     LOG.info("Test testPurge completed.");
   }
-
+  
+  private void waitFilesDelete(List<Path> destPaths) throws IOException,
+    InterruptedException {
+    // wait till parity file and directory are automatically deleted
+    for (Path destPath: destPaths) {
+      while (fileSys.listStatus(destPath).length > 0) {
+        LOG.info("doTestPurge waiting for parity files to be removed.");
+        Thread.sleep(1000);                  // keep waiting
+      }
+    }
+  }
+  
   /**
    * Create parity file, delete original file and then validate that
    * parity file is automatically deleted.
@@ -224,46 +186,40 @@ private void doTestPurge(int iter, long targetReplication,
                           long blockSize, int numBlock) throws Exception {
     LOG.info("doTestPurge started---------------------------:" +  " iter " + iter +
              " blockSize=" + blockSize + " stripeLength=" + stripeLength);
-    mySetup(targetReplication, metaReplication, stripeLength);
+    mySetup(targetReplication, metaReplication);
+    Utils.loadTestCodecs(conf, new Builder[] {
+        Utils.getXORBuilder().setStripeLength(stripeLength),
+        Utils.getXORBuilder().setStripeLength(stripeLength).dirRaid(
+            true).setParityDir("/dir-raid").setCodeId("dir-xor")
+    });
+    
     Path dir = new Path("/user/dhruba/raidtest/");
     Path file1 = new Path(dir + "/file" + iter);
+    Path dir1 = new Path("/user/dhruba/dirraidtest/" + iter);
+    Path file2 = new Path(dir1 + "/file1");
+    Path file3 = new Path(dir1 + "/file2");
     RaidNode cnode = null;
     try {
-      Path destPath = new Path("/raid/user/dhruba/raidtest");
+      List<Path> destPaths = new ArrayList<Path>();
+      Path destPath1 = new Path("/raid/user/dhruba/raidtest");
+      destPaths.add(destPath1);
+      Path destPath2 = new Path("/dir-raid/user/dhruba/dirraidtest");
+      destPaths.add(destPath2);
       fileSys.delete(dir, true);
-      fileSys.delete(destPath, true);
+      fileSys.delete(dir1, true);
+      fileSys.delete(destPath1, true);
+      fileSys.delete(destPath2, true);
       TestRaidNode.createOldFile(fileSys, file1, 1, numBlock, blockSize);
+      TestRaidNode.createOldFile(fileSys, file2, 1, numBlock, blockSize);
+      TestRaidNode.createOldFile(fileSys, file3, 1, numBlock, blockSize);
       LOG.info("doTestPurge created test files for iteration " + iter);
 
       // create an instance of the RaidNode
       Configuration localConf = new Configuration(conf);
       cnode = RaidNode.createRaidNode(null, localConf);
-      FileStatus[] listPaths = null;
-
-      // wait till file is raided
-      while (true) {
-        try {
-          listPaths = fileSys.listStatus(destPath);
-          int count = 0;
-          if (listPaths != null && listPaths.length == 1) {
-            for (FileStatus s : listPaths) {
-              LOG.info("doTestPurge found path " + s.getPath());
-              if (!s.getPath().toString().endsWith(".tmp")) {
-                count++;
-              }
-            }
-          }
-          if (count > 0) {
-            break;
-          }
-        } catch (FileNotFoundException e) {
-          //ignore
-        }
-        LOG.info("doTestPurge waiting for files to be raided. Found " + 
-                 (listPaths == null ? "none" : listPaths.length));
-        Thread.sleep(1000);                  // keep waiting
-      }
-      // assertEquals(listPaths.length, 1); // all files raided
+      
+      TestRaidDfs.waitForFileRaided(LOG, fileSys, file1, destPath1);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dir1, destPath2);
       LOG.info("doTestPurge all files found in Raid.");
 
       // delete original file
@@ -271,12 +227,11 @@ private void doTestPurge(int iter, long targetReplication,
                  fileSys.delete(file1, true));
       LOG.info("deleted file " + file1);
 
-      // wait till parity file and directory are automatically deleted
-      while (fileSys.listStatus(destPath).length == 0) {
-        LOG.info("doTestPurge waiting for parity files to be removed.");
-        Thread.sleep(1000);                  // keep waiting
-      }
-
+      // delete original directory
+      assertTrue("Unable to delete original directory " + dir1,
+                 fileSys.delete(dir1, true));
+      LOG.info("deleted directory " + dir1);
+      waitFilesDelete(destPaths);
     } catch (Exception e) {
       LOG.info("doTestPurge Exception " + e +
                                           StringUtils.stringifyException(e));
@@ -285,6 +240,7 @@ private void doTestPurge(int iter, long targetReplication,
       if (cnode != null) { cnode.stop(); cnode.join(); }
       LOG.info("doTestPurge delete file " + file1);
       fileSys.delete(file1, true);
+      fileSys.delete(dir1, true);
     }
     LOG.info("doTestPurge completed:" + " blockSize=" + blockSize +
              " stripeLength=" + stripeLength);
@@ -296,9 +252,11 @@ private void doTestPurge(int iter, long targetReplication,
    */
   public void testPurgeHar() throws Exception {
     LOG.info("testPurgeHar started");
-    int harDelay = 0;
-    createClusters(true);
-    mySetup(1, 1, 5, harDelay);
+    createClusters(true, 3);
+    mySetup(1, 1);
+    Utils.loadTestCodecs(conf, new Builder[] {
+        Utils.getXORBuilder().setStripeLength(5),
+    });
     Path dir = new Path("/user/dhruba/raidtest/");
     Path destPath = new Path("/raid/user/dhruba/raidtest");
     Path file1 = new Path(dir + "/file");
@@ -315,7 +273,7 @@ public void testPurgeHar() throws Exception {
       // Wait till har is created.
       while (true) {
         try {
-          FileStatus[] listPaths = listPaths = fileSys.listStatus(destPath);
+          FileStatus[] listPaths = fileSys.listStatus(destPath);
           if (listPaths != null && listPaths.length == 1) {
             FileStatus s = listPaths[0];
             LOG.info("testPurgeHar found path " + s.getPath());
@@ -371,34 +329,55 @@ public void testPurgeDirectory() throws Exception {
     long metaReplication   = 1;
     int  numBlock          = 9;
 
-    createClusters(true);
-    mySetup(targetReplication, metaReplication, stripeLength);
+    createClusters(true, 3);
+    mySetup(targetReplication, metaReplication);
+    Utils.loadTestCodecs(conf, new Builder[] {
+        Utils.getXORBuilder().setStripeLength(stripeLength),
+        Utils.getXORBuilder().setStripeLength(stripeLength).dirRaid(
+            true).setParityDir("/dir-raid").setCodeId("dir-xor")
+    });
     Path dir = new Path("/user/dhruba/raidtest/");
     Path file1 = new Path(dir + "/file1");
+    Path dir1 = new Path("/user/dhruba/dirraidtest/1");
+    Path file2 = new Path(dir1 + "/file2");
+    Path file3 = new Path(dir1 + "/file3");
     RaidNode cnode = null;
     try {
+      List<Path> destPaths = new ArrayList<Path>();
+      Path destPath1 = new Path("/raid/user/dhruba/raidtest");
+      destPaths.add(destPath1);
+      Path destPath2 = new Path("/dir-raid/user/dhruba/dirraidtest");
+      destPaths.add(destPath2);
       TestRaidNode.createOldFile(fileSys, file1, 1, numBlock, blockSize);
-
+      TestRaidNode.createOldFile(fileSys, file2, 1, numBlock, blockSize);
+      TestRaidNode.createOldFile(fileSys, file3, 1, numBlock, blockSize);
+      
       // create an instance of the RaidNode
       Configuration localConf = new Configuration(conf);
       cnode = RaidNode.createRaidNode(null, localConf);
-
-      Path destPath = new Path("/raid/user/dhruba/raidtest");
-      TestRaidDfs.waitForFileRaided(LOG, fileSys, file1, destPath);
+      TestRaidDfs.waitForFileRaided(LOG, fileSys, file1, destPath1);
+      TestRaidDfs.waitForDirRaided(LOG, fileSys, dir1, destPath2);
 
       // delete original directory.
       assertTrue("Unable to delete original directory " + file1 ,
                  fileSys.delete(file1.getParent(), true));
-      LOG.info("deleted file " + file1);
+      LOG.info("deleted directory " + file1.getParent());
+      
+      // delete original directory
+      assertTrue("Unable to delete original direcotry" + dir1, 
+          fileSys.delete(dir1.getParent(), true));
+      LOG.info("deleted directory " + dir1.getParent());
 
       // wait till parity file and directory are automatically deleted
       long start = System.currentTimeMillis();
-      while (fileSys.exists(destPath) &&
+      while ((fileSys.exists(destPath1) ||
+              fileSys.exists(destPath2)) &&
             System.currentTimeMillis() - start < 120000) {
         LOG.info("testPurgeDirectory waiting for parity files to be removed.");
         Thread.sleep(1000);                  // keep waiting
       }
-      assertFalse(fileSys.exists(destPath));
+      assertFalse(fileSys.exists(destPath1));
+      assertFalse(fileSys.exists(destPath2));
 
     } catch (Exception e) {
       LOG.info("testPurgeDirectory Exception " + e +
@@ -408,6 +387,7 @@ public void testPurgeDirectory() throws Exception {
       if (cnode != null) { cnode.stop(); cnode.join(); }
       LOG.info("testPurgeDirectory delete file " + file1);
       fileSys.delete(file1, true);
+      fileSys.delete(dir1, true);
       stopClusters();
     }
   }
@@ -416,54 +396,143 @@ public void testPurgeDirectory() throws Exception {
    * Test that an XOR parity file is removed when a RS parity file is detected.
    */
   public void testPurgePreference() throws Exception {
-    createClusters(true);
-    Path dir = new Path("/user/test/raidtest/");
+    LOG.info("Test testPurgePreference started");
+    createClusters(true, 3);
+    Utils.loadTestCodecs(conf, new Builder[] {
+        Utils.getXORBuilder(), // priority 100
+        Utils.getXORBuilder().dirRaid(true).setParityDir(
+            "/dir-raid").setCodeId("dir-xor").setPriority(101),
+        Utils.getRSBuilder(),  // priority 300
+        Utils.getRSBuilder().dirRaid(true).setParityDir(
+            "/dir-raidrs").setCodeId("dir-rs").setPriority(301),
+        Utils.getXORBuilder().setParityDir("/test-raidrs").setCodeId(
+            "testrs").setPriority(1000).simulatedBlockFixed(true)
+    });
+    mySetup(1, 1);
+    Path dir = new Path("/user/test/raidtest");
     Path file1 = new Path(dir + "/file1");
-
-    PolicyInfo infoXor = new PolicyInfo("testPurgePreference", conf);
-    infoXor.setSrcPath("/user/test/raidtest");
-    infoXor.setCodecId("xor");
-    infoXor.setDescription("test policy");
-    infoXor.setProperty("targetReplication", "2");
-    infoXor.setProperty("metaReplication", "2");
-
-    PolicyInfo infoRs = new PolicyInfo("testPurgePreference", conf);
-    infoRs.setSrcPath("/user/test/raidtest");
-    infoRs.setCodecId("rs");
-    infoRs.setDescription("test policy");
-    infoRs.setProperty("targetReplication", "1");
-    infoRs.setProperty("metaReplication", "1");
+    HashMap<String, PolicyInfo> infos = new HashMap<String, PolicyInfo>();
+    for (Codec code: Codec.getCodecs()) {
+      PolicyInfo pi = new PolicyInfo("testPurgePreference", conf);
+      pi.setSrcPath("/user/test/raidtest");
+      pi.setCodecId(code.id);
+      pi.setDescription("test policy");
+      pi.setProperty("targetReplication", "1");
+      pi.setProperty("metaReplication", "1");
+      infos.put(code.id, pi);
+    }
+    
     try {
+      LOG.info("Create a old file");
       TestRaidNode.createOldFile(fileSys, file1, 1, 9, 8192L);
       FileStatus stat = fileSys.getFileStatus(file1);
-
+      FileStatus dirStat = fileSys.getFileStatus(dir);
+      HashMap<String, Path> parityFiles = new HashMap<String, Path>();
       // Create the parity files.
-      RaidNode.doRaid(
-        conf, infoXor, stat, new RaidNode.Statistics(), Reporter.NULL);
-      RaidNode.doRaid(
-        conf, infoRs, stat, new RaidNode.Statistics(), Reporter.NULL);
-      Path xorParity =
-        new Path("/raid", "user/test/raidtest/file1");
-      Path rsParity =
-        new Path("/raidrs", "user/test/raidtest/file1");
-      assertTrue(fileSys.exists(xorParity));
-      assertTrue(fileSys.exists(rsParity));
-
+      LOG.info("Start Raiding");
+      for (PolicyInfo pi: infos.values()){
+        Codec code = Codec.getCodec(pi.getCodecId());
+        FileStatus fsStat = (code.isDirRaid)? dirStat: stat;
+        RaidNode.doRaid(
+          conf, pi, fsStat, new RaidNode.Statistics(), Reporter.NULL);
+        Path parity = RaidNode.getOriginalParityFile(new Path(code.parityDirectory),
+              fsStat.getPath());
+        assertTrue(fileSys.exists(parity));
+        parityFiles.put(pi.getCodecId(), parity);
+      }
+      LOG.info("Finished Raiding");
       // Check purge of a single parity file.
       PurgeMonitor purgeMonitor = new PurgeMonitor(conf, null);
+      LOG.info("Purge testrs");
+      purgeMonitor.purgeCode(Codec.getCodec("testrs"));
+      // Simulate code couldn't purge normal code even with higher priority
+      assertTrue(fileSys.exists(parityFiles.get("testrs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-rs")));
+      assertTrue(fileSys.exists(parityFiles.get("rs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-xor")));
+      assertTrue(fileSys.exists(parityFiles.get("xor")));
+      
+      LOG.info("Purge dir-rs");
+      purgeMonitor.purgeCode(Codec.getCodec("dir-rs"));
+      // Calling purge under the Dir-RS path has no effect.
+      assertTrue(fileSys.exists(parityFiles.get("testrs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-rs")));
+      assertTrue(fileSys.exists(parityFiles.get("rs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-xor")));
+      assertTrue(fileSys.exists(parityFiles.get("xor")));
+      
+      LOG.info("Purge rs");
       purgeMonitor.purgeCode(Codec.getCodec("rs"));
-      // Calling purge under the RS path has no effect.
-      assertTrue(fileSys.exists(xorParity));
-      assertTrue(fileSys.exists(rsParity));
-
+      // Calling purge under the rs path will delete rs
+      assertTrue(fileSys.exists(parityFiles.get("testrs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-rs")));
+      assertFalse(fileSys.exists(parityFiles.get("rs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-xor")));
+      assertTrue(fileSys.exists(parityFiles.get("xor")));
+      
+      LOG.info("Purge dir-xor");
+      purgeMonitor.purgeCode(Codec.getCodec("dir-xor"));
+      // Calling purge under the Dir-xor path will delete dir-xor
+      assertTrue(fileSys.exists(parityFiles.get("testrs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-rs")));
+      assertFalse(fileSys.exists(parityFiles.get("dir-xor")));
+      assertTrue(fileSys.exists(parityFiles.get("xor")));
+      
+      LOG.info("Purge xor");
       purgeMonitor.purgeCode(Codec.getCodec("xor"));
-      // XOR parity must have been purged by now.
-      assertFalse(fileSys.exists(xorParity));
-      assertTrue(fileSys.exists(rsParity));
-
+      assertFalse(fileSys.exists(parityFiles.get("xor")));
+      assertTrue(fileSys.exists(parityFiles.get("testrs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-rs")));
+      
+      LOG.info("delete dir-rs parity file");
+      fileSys.delete(parityFiles.get("dir-rs"), true);
+      assertFalse(fileSys.exists(parityFiles.get("dir-rs")));
+      //Recreate RS and Dir-XOR
+      LOG.info("Raid rs");
+      RaidNode.doRaid(
+          conf, infos.get("rs"), stat, new RaidNode.Statistics(),
+          Reporter.NULL);
+      assertTrue(fileSys.exists(parityFiles.get("rs")));
+      LOG.info("Raid dir-xor");
+      RaidNode.doRaid(
+          conf, infos.get("dir-xor"), dirStat, new RaidNode.Statistics(),
+          Reporter.NULL);
+      assertTrue(fileSys.exists(parityFiles.get("dir-xor")));
+      LOG.info("Raid xor");
+      RaidNode.doRaid(
+          conf, infos.get("xor"), stat, new RaidNode.Statistics(),
+          Reporter.NULL);
+      assertTrue(fileSys.exists(parityFiles.get("xor")));
+      
+      LOG.info("Purge dir-xor should fail because rs doesn't have parity " +
+          "file for directory, only dir-rs could purge dir-xor");
+      purgeMonitor.purgeCode(Codec.getCodec("dir-xor"));
+      // Calling purge under the Dir-XOR path succeeds
+      assertTrue(fileSys.exists(parityFiles.get("testrs")));
+      assertTrue(fileSys.exists(parityFiles.get("rs")));
+      assertTrue(fileSys.exists(parityFiles.get("dir-xor")));
+      assertTrue(fileSys.exists(parityFiles.get("xor")));
+      
+      LOG.info("delete dir-xor parity file");
+      fileSys.delete(parityFiles.get("dir-xor"), true);
+      assertFalse(fileSys.exists(parityFiles.get("dir-xor")));
+      
+      LOG.info("Purge xor");
+      purgeMonitor.purgeCode(Codec.getCodec("xor"));
+      // Calling purge under the Dir-RS path has no effect.
+      assertTrue(fileSys.exists(parityFiles.get("testrs")));
+      assertTrue(fileSys.exists(parityFiles.get("rs")));
+      assertFalse(fileSys.exists(parityFiles.get("xor")));
+      
+      // The following is har related stuff
+       
+      Path rsParity = parityFiles.get("rs");
+      Path xorParity = parityFiles.get("xor");
+      PolicyInfo infoXor = infos.get("xor");
+      PolicyInfo infoRs = infos.get("rs");
       // Now check the purge of a parity har.
       // Delete the RS parity for now.
-      fileSys.delete(rsParity);
+      fileSys.delete(rsParity, true);
       // Recreate the XOR parity.
       Path xorHar = new Path("/raid", "user/test/raidtest/raidtest" +
           RaidNode.HAR_SUFFIX);
@@ -474,7 +543,9 @@ public void testPurgePreference() throws Exception {
 
       // Create the har.
       long cutoff = System.currentTimeMillis();
-      RaidNode cnode = RaidNode.createRaidNode(conf);
+      // create an instance of the RaidNode
+      Configuration localConf = new Configuration(conf);
+      RaidNode cnode = RaidNode.createRaidNode(localConf);
       FileStatus raidStat =
          fileSys.getFileStatus(new Path("/raid"));
       cnode.recurseHar(Codec.getCodec("xor"), fileSys, raidStat,
@@ -495,7 +566,7 @@ public void testPurgePreference() throws Exception {
       assertTrue(fileSys.exists(rsParity));
       assertFalse(fileSys.exists(xorParity));
       assertFalse(fileSys.exists(xorHar));
-
+      LOG.info("Test testPurgePreference completed");
     } finally {
       stopClusters();
     }
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
index 50045955..a23ca510 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
@@ -19,17 +19,8 @@
 
 import java.io.File;
 import java.io.FileWriter;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
 import java.util.Random;
 import java.util.zip.CRC32;
 
@@ -39,23 +30,19 @@
 
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.ToolRunner;
-import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FilterFileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.ClientProtocol;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
-import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.DistributedRaidFileSystem;
 import org.apache.hadoop.hdfs.TestRaidDfs;
 import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.mapred.MiniMRCluster;
 import org.apache.hadoop.raid.RaidNode;
 
 
@@ -66,6 +53,8 @@ public class TestRaidShell extends TestCase {
       "build/contrib/raid/test/data")).getAbsolutePath();
   final static String CONFIG_FILE = new File(TEST_DIR,
       "test-raid.xml").getAbsolutePath();
+  final static private String RAID_SRC_PATH = "/user/raidtest";
+  final static private String RAID_POLICY_NAME = "RaidTest1";
   final static long RELOAD_INTERVAL = 1000;
   final static int NUM_DATANODES = 3;
   Configuration conf;
@@ -76,6 +65,53 @@ public class TestRaidShell extends TestCase {
   RaidNode cnode = null;
   Random rand = new Random();
 
+  /**
+   * Test distRaid command
+   * @throws Exception
+   */
+  public void testDistRaid() throws Exception {
+    LOG.info("TestDist started.");
+    // create a dfs and map-reduce cluster
+    mySetup(3, -1);
+    MiniMRCluster mr = new MiniMRCluster(4, namenode, 3);
+    String jobTrackerName = "localhost:" + mr.getJobTrackerPort();
+    conf.set("mapred.job.tracker", jobTrackerName);
+
+    try {
+      // Create files to be raided
+      TestRaidNode.createTestFiles(fileSys, RAID_SRC_PATH,
+          "/raid" + RAID_SRC_PATH, 1, 3, (short)3);
+      String subDir = RAID_SRC_PATH + "/subdir";
+      TestRaidNode.createTestFiles(
+          fileSys, subDir, "/raid" + subDir, 1, 3, (short)3);
+      
+      // Create RaidShell and raid the files.
+      RaidShell shell = new RaidShell(conf);
+      String[] args = new String[3];
+      args[0] = "-distRaid";
+      args[1] = RAID_POLICY_NAME;
+      args[2] = RAID_SRC_PATH;
+      assertEquals(0, ToolRunner.run(shell, args));
+
+      // Check files are raided
+      checkIfFileRaided(new Path(RAID_SRC_PATH, "file0"));
+      checkIfFileRaided(new Path(subDir, "file0"));
+    } finally {
+      mr.shutdown();
+      myTearDown();
+    }
+  }
+  
+  // check if a file has been raided
+  private void checkIfFileRaided(Path srcPath) throws IOException {
+    FileStatus srcStat = fileSys.getFileStatus(srcPath);
+    assertEquals(1, srcStat.getReplication());
+    
+    Path parityPath = new Path("/raid", srcPath);
+    FileStatus parityStat = fileSys.getFileStatus(parityPath);
+    assertEquals(1, parityStat.getReplication());
+  }
+  
   /**
    * Create a file with three stripes, corrupt a block each in two stripes,
    * and wait for the the file to be fixed.
@@ -85,8 +121,8 @@ public void testBlockFix() throws Exception {
     long blockSize = 8192L;
     int stripeLength = 3;
     mySetup(stripeLength, -1);
-    Path file1 = new Path("/user/dhruba/raidtest/file1");
-    Path destPath = new Path("/raid/user/dhruba/raidtest");
+    Path file1 = new Path(RAID_SRC_PATH, "file1");
+    Path destPath = new Path("/raid"+RAID_SRC_PATH);
     long crc1 = TestRaidDfs.createTestFilePartialLastBlock(fileSys, file1,
                                                           1, 7, blockSize);
     long file1Len = fileSys.getFileStatus(file1).getLen();
@@ -207,8 +243,8 @@ private void mySetup(int stripeLength, int timeBeforeHar) throws Exception {
     FileWriter fileWriter = new FileWriter(CONFIG_FILE);
     fileWriter.write("<?xml version=\"1.0\"?>\n");
     String str = "<configuration> " +
-                   "<policy name = \"RaidTest1\"> " +
-                        "<srcPath prefix=\"/user/dhruba/raidtest\"/> " +
+                   "<policy name = \"" + RAID_POLICY_NAME + "\"> " +
+                        "<srcPath prefix=\"" + RAID_SRC_PATH + "\"/> " +
                         "<codecId>xor</codecId> " +
                         "<destPath> /raid</destPath> " +
                         "<property> " +
@@ -225,7 +261,7 @@ private void mySetup(int stripeLength, int timeBeforeHar) throws Exception {
                         "</property> " +
                         "<property> " +
                           "<name>modTimePeriod</name> " +
-                          "<value>2000</value> " +
+                          "<value>0</value> " +
                           "<description> time (milliseconds) after a file is modified to make it " +
                                          "a candidate for RAIDing " +
                           "</description> " +
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShellFsck.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShellFsck.java
index 4d0ab9a5..e1fec8a8 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShellFsck.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShellFsck.java
@@ -21,48 +21,28 @@
 import java.io.FileWriter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
 import java.util.Random;
-import java.util.zip.CRC32;
-
 import org.junit.Test;
 import org.junit.After;
 import static org.junit.Assert.assertTrue;
-
+import static org.junit.Assert.assertEquals;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.ToolRunner;
-import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FilterFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.protocol.ClientProtocol;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
-import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.DistributedRaidFileSystem;
 import org.apache.hadoop.hdfs.TestRaidDfs;
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.raid.RaidNode;
 import org.apache.hadoop.raid.HarIndex;
 
-
 public class TestRaidShellFsck {
   final static Log LOG =
     LogFactory.getLog("org.apache.hadoop.raid.TestRaidShellFsck");
@@ -309,31 +289,16 @@ private void raidTestFiles(Path raidPath, Path[] filePaths, boolean doHar)
    * sleeps for up to 20s until the number of corrupt files 
    * in the file system is equal to the number specified
    */
-  private void waitUntilCorruptFileCount(DistributedFileSystem dfs,
+  static public void waitUntilCorruptFileCount(DistributedFileSystem dfs,
                                          int corruptFiles)
-    throws IOException {
-    int initialCorruptFiles = DFSUtil.getCorruptFiles(dfs).length;
+    throws IOException, InterruptedException {
     long waitStart = System.currentTimeMillis();
-    while (DFSUtil.getCorruptFiles(dfs).length != corruptFiles) {
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException ignore) {
-        
-      }
-
-      if (System.currentTimeMillis() > waitStart + 20000L) {
-        break;
-      }
-    }
-    
-    long waited = System.currentTimeMillis() - waitStart;
-
-    int corruptFilesFound = DFSUtil.getCorruptFiles(dfs).length;
-    if (corruptFilesFound != corruptFiles) {
-      throw new IOException("expected " + corruptFiles + 
-                            " corrupt files but got " +
-                            corruptFilesFound);
+    while (DFSUtil.getCorruptFiles(dfs).length != corruptFiles &&
+        System.currentTimeMillis() < waitStart + 20000L) {
+      Thread.sleep(1000);
     }
+    assertEquals("expected " + corruptFiles + " corrupt files", 
+        corruptFiles, DFSUtil.getCorruptFiles(dfs).length);
   }
 
   /**
@@ -460,28 +425,6 @@ private void removeHarParityBlock(int block) throws IOException {
     }
   }
 
-
-  /**
-   * returns the data directories for a data node
-   */
-  private File[] getDataDirs(int datanode) throws IOException{
-    File data_dir = new File(System.getProperty("test.build.data"), 
-                             "dfs/data/");
-    File dir1 = new File(data_dir, "data"+(2 * datanode + 1));
-    File dir2 = new File(data_dir, "data"+(2 * datanode + 2));
-    if (!(dir1.isDirectory() && dir2.isDirectory())) {
-      throw new IOException("data directories not found for data node " + 
-                            datanode + ": " + dir1.toString() + " " + 
-                            dir2.toString());
-    }
-
-    File[] dirs = new File[2];
-    dirs[0] = new File(dir1, "current");
-    dirs[1] = new File(dir2, "current");
-    return dirs;
-  }
-
-
   /**
    * checks fsck with no missing blocks
    */
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShellFsck_CorruptCounter.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShellFsck_CorruptCounter.java
new file mode 100644
index 00000000..106ad58d
--- /dev/null
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShellFsck_CorruptCounter.java
@@ -0,0 +1,720 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.raid;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.zip.CRC32;
+
+import org.junit.Test;
+import org.junit.After;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.fs.BlockLocation;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FilterFileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.DistributedRaidFileSystem;
+import org.apache.hadoop.hdfs.TestRaidDfs;
+import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.raid.RaidNode;
+import org.apache.hadoop.raid.HarIndex;
+
+
+public class TestRaidShellFsck_CorruptCounter {
+  final static Log LOG =
+    LogFactory.getLog("org.apache.hadoop.raid.TestRaidShellFsck_CorruptCounter");
+  final static String TEST_DIR = 
+    new File(System.
+             getProperty("test.build.data", "build/contrib/raid/test/data")).
+    getAbsolutePath();
+  final static String CONFIG_FILE = new File(TEST_DIR, "test-raid.xml").
+    getAbsolutePath();
+  final static long RELOAD_INTERVAL = 1000;
+  final static int NUM_DATANODES = 4;
+  final static int STRIPE_BLOCKS = 3; // number of file blocks per stripe
+  final static int PARITY_BLOCKS = 3; // number of file blocks per stripe
+
+  final static int FILE_BLOCKS = 6; // number of blocks that file consists of
+  final static short REPL = 1; // replication factor before raiding
+  final static long BLOCK_SIZE = 8192L; // size of block in byte
+  final static String DIR_PATH = "/user/rashmikv/raidtest";
+  final static Path FILE_PATH0 =
+    new Path("/user/rashmikv/raidtest/file0.test");
+  final static Path FILE_PATH1 =
+    new Path("/user/rashmikv/raidtest/file1.test");
+  final static Path FILE_PATH2 =
+      new Path("/user/rashmikv/raidtest/file2.test");
+  final static String MONITOR_DIRS = "/,/user";
+  /*to test RS:
+   * Confirm that codec is set to "rs" in the setUp function
+   */
+  final static Path RAID_PATH = new Path("/raidrs/user/rashmikv/raidtest");
+  final static String RAID_DIR = "/raidrs";
+  final static String CODE_USED ="rs";
+   
+     
+  final static String HAR_NAME = "raidtest_raid.har";
+  
+  Configuration conf = null;
+  Configuration raidConf = null;
+  Configuration clientConf = null;
+  MiniDFSCluster cluster = null;
+  DistributedFileSystem dfs = null;
+  RaidNode rnode = null;
+  
+  
+  RaidShell shell = null;
+  String[] args = null;
+
+
+  /**
+   * creates a MiniDFS instance with a raided file in it
+   */
+  private void setUp(boolean doHar) throws IOException, ClassNotFoundException {
+    final int timeBeforeHar;
+    if (doHar) {
+      timeBeforeHar = 0;
+    } else {
+      timeBeforeHar = -1;
+    }
+
+
+    new File(TEST_DIR).mkdirs(); // Make sure data directory exists
+    conf = new Configuration();
+
+    Utils.loadTestCodecs(conf, 3, 1, 3, "/raid", "/raidrs");
+
+    conf.set("raid.config.file", CONFIG_FILE);
+    conf.setBoolean("raid.config.reload", true);
+    conf.setLong("raid.config.reload.interval", RELOAD_INTERVAL);
+
+    // scan all policies once every 5 second
+    conf.setLong("raid.policy.rescan.interval", 5000);
+
+    // do not use map-reduce cluster for Raiding
+    conf.set("raid.classname", "org.apache.hadoop.raid.LocalRaidNode");
+    // use local block fixer
+    /*conf.set("raid.blockfix.classname", 
+             "org.apache.hadoop.raid.LocalBlockIntegrityMonitor");*/
+    conf.set("raid.blockfix.classname", 
+        "org.apache.hadoop.raid.DistBlockIntegrityMonitor");
+
+    conf.set("raid.server.address", "localhost:0");
+
+    conf.setInt("dfs.corruptfilesreturned.max", 500);
+
+    conf.setBoolean("dfs.permissions", false);
+    conf.set("raid.corruptfile.counter.dirs", MONITOR_DIRS);
+    conf.setInt("raid.corruptfilecount.interval", 1000);
+ 
+    conf.setLong("raid.blockfix.maxpendingjobs", 1L);
+
+
+    cluster = new MiniDFSCluster(conf, NUM_DATANODES, true, null);
+    cluster.waitActive();
+    dfs = (DistributedFileSystem) cluster.getFileSystem();
+    String namenode = dfs.getUri().toString();
+
+    FileSystem.setDefaultUri(conf, namenode);
+
+    FileWriter fileWriter = new FileWriter(CONFIG_FILE);
+    fileWriter.write("<?xml version=\"1.0\"?>\n");
+    //Change the codec name: rs of xor here:
+    String str =
+      "<configuration> " +
+      "    <policy name = \"RaidTest1\"> " +
+      "      <srcPath prefix=\"" + DIR_PATH + "\"/> " +
+      "      <codecId>rs</codecId> " +
+      "      <destPath> " + RAID_DIR + " </destPath> " +
+      "      <property> " +
+      "        <name>targetReplication</name> " +
+      "        <value>1</value> " +
+      "        <description>after RAIDing, decrease the replication " +
+      "factor of a file to this value.</description> " +
+      "      </property> " +
+      "      <property> " +
+      "        <name>metaReplication</name> " +
+      "        <value>1</value> " +
+      "        <description> replication factor of parity file</description> " +
+      "      </property> " +
+      "      <property> " +
+      "        <name>modTimePeriod</name> " +
+      "        <value>2000</value> " +
+      "        <description>time (milliseconds) after a file is modified " + 
+      "to make it a candidate for RAIDing</description> " +
+      "      </property> ";
+   
+    if (timeBeforeHar >= 0) {
+      str +=
+        "      <property> " +
+        "        <name>time_before_har</name> " +
+        "        <value>" + timeBeforeHar + "</value> " +
+        "        <description> amount of time waited before har'ing parity " +
+        "files</description> " +
+        "     </property> ";
+    }
+
+    str +=
+      "    </policy>" +
+      "</configuration>";
+
+    fileWriter.write(str);
+    fileWriter.close();
+
+    createTestFile(FILE_PATH0);
+    createTestFile(FILE_PATH1);
+    createTestFile(FILE_PATH2);
+
+    
+    Path[] filePaths = { FILE_PATH0, FILE_PATH1, FILE_PATH2  };
+    raidTestFiles(RAID_PATH, filePaths, doHar);
+
+    clientConf = new Configuration(raidConf);
+    clientConf.set("fs.hdfs.impl",
+                   "org.apache.hadoop.hdfs.DistributedRaidFileSystem");
+    clientConf.set("fs.raid.underlyingfs.impl",
+                   "org.apache.hadoop.hdfs.DistributedFileSystem");
+
+    // prepare shell and arguments
+    shell = new RaidShell(clientConf);
+    args = new String[3];
+    args[0] = "-fsck";
+    args[1] = DIR_PATH;
+    args[2] = "-retNumStrpsMissingBlksRS";
+
+  }
+  
+  /**
+   * Creates test file consisting of random data
+   */
+  private void createTestFile(Path filePath) throws IOException {
+    Random rand = new Random();
+    FSDataOutputStream stm = dfs.create(filePath, true, 
+                                        conf.getInt("io.file.buffer.size",
+                                                    4096), REPL, BLOCK_SIZE);
+
+    final byte[] b = new byte[(int) BLOCK_SIZE];
+    for (int i = 0; i < FILE_BLOCKS; i++) {
+      rand.nextBytes(b);
+      stm.write(b);
+    }
+    stm.close();
+    LOG.info("test file created");
+
+  }
+
+  /**
+   * raids test file
+   */
+  private void raidTestFiles(Path raidPath, Path[] filePaths, boolean doHar)
+    throws IOException, ClassNotFoundException {
+    // create RaidNode
+    raidConf = new Configuration(conf);
+    raidConf.setInt(RaidNode.RAID_PARITY_HAR_THRESHOLD_DAYS_KEY, 0);
+    raidConf.setInt("raid.blockfix.interval", 1000);
+    
+    raidConf.setLong("raid.blockfix.maxpendingjobs", 1L);
+
+    // the RaidNode does the raiding inline (instead of submitting to MR node)
+    conf.set("raid.classname", "org.apache.hadoop.raid.LocalRaidNode");
+    rnode = RaidNode.createRaidNode(null, raidConf);
+
+    for (Path filePath: filePaths) {
+      long waitStart = System.currentTimeMillis();
+      boolean raided = false;
+      
+      Path parityFilePath = new Path(RAID_DIR, 
+                                     filePath.toString().substring(1));
+
+      while (!raided) {
+        try {
+          FileStatus[] listPaths = dfs.listStatus(raidPath);
+          if (listPaths != null) {
+            if (doHar) {
+              // case with HAR
+              for (FileStatus f: listPaths) {
+                if (f.getPath().toString().endsWith(".har")) {
+                  // check if the parity file is in the index
+                  final Path indexPath = new Path(f.getPath(), "_index");
+                  final FileStatus indexFileStatus = 
+                    dfs.getFileStatus(indexPath);
+                  final HarIndex harIndex = 
+                    new HarIndex(dfs.open(indexPath), indexFileStatus.getLen());
+                  final HarIndex.IndexEntry indexEntry =
+                    harIndex.findEntryByFileName(parityFilePath.toString());
+                  if (indexEntry != null) {
+                    LOG.info("raid file " + parityFilePath.toString() + 
+                             " found in Har archive: " + 
+                             f.getPath().toString() +
+                             " ts=" + indexEntry.mtime);
+                    raided = true;
+                    break;
+                  }
+                }
+              }
+              
+            } else {
+              // case without HAR
+              for (FileStatus f : listPaths) {
+                Path found = new Path(f.getPath().toUri().getPath());
+                if (parityFilePath.equals(found)) {
+                  LOG.info("raid file found: " + f.getPath().toString());
+                  raided = true;
+                  break;
+                }
+              }
+            }
+          }
+        } catch (FileNotFoundException ignore) {
+        }
+        if (!raided) {
+          if (System.currentTimeMillis() > waitStart + 40000L) {
+            LOG.error("parity file not created after 40s");
+            throw new IOException("parity file not HARed after 40s");
+          } else {
+            try {
+              Thread.sleep(1000);
+            } catch (InterruptedException ignore) {
+            }
+          }
+        }
+      }
+    }
+
+    rnode.stop();
+    rnode.join();
+    rnode = null;
+    LOG.info("test file raided");    
+  }
+
+  /**
+   * sleeps for up to 20s until the number of corrupt files 
+   * in the file system is equal to the number specified
+   */
+  private void waitUntilCorruptFileCount(DistributedFileSystem dfs,
+                                         int corruptFiles)
+    throws IOException {
+    int initialCorruptFiles = DFSUtil.getCorruptFiles(dfs).length;
+    long waitStart = System.currentTimeMillis();
+    while (DFSUtil.getCorruptFiles(dfs).length != corruptFiles) {
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException ignore) {
+        
+      }
+
+      if (System.currentTimeMillis() > waitStart + 20000L) {
+        break;
+      }
+    }
+    
+    long waited = System.currentTimeMillis() - waitStart;
+
+    int corruptFilesFound = DFSUtil.getCorruptFiles(dfs).length;
+    if (corruptFilesFound != corruptFiles) {
+      throw new IOException("expected " + corruptFiles + 
+                            " corrupt files but got " +
+                            corruptFilesFound);
+    }
+  }
+
+  /**
+   * removes a specified block from MiniDFS storage and reports it as corrupt
+   */
+  private void removeAndReportBlock(DistributedFileSystem blockDfs,
+                                    Path filePath,
+                                    LocatedBlock block) 
+    throws IOException {
+    TestRaidDfs.corruptBlock(filePath, block.getBlock(), 
+        NUM_DATANODES, true, cluster);
+   
+    // report deleted block to the name node
+    LocatedBlock[] toReport = { block };
+    blockDfs.getClient().namenode.reportBadBlocks(toReport);
+
+  }
+
+
+  /**
+   * removes a file block in the specified stripe
+   */
+  private void removeFileBlock(Path filePath, int stripe, int blockInStripe)
+    throws IOException {
+    LocatedBlocks fileBlocks = dfs.getClient().namenode.
+      getBlockLocations(filePath.toString(), 0, FILE_BLOCKS * BLOCK_SIZE);
+    if (fileBlocks.locatedBlockCount() != FILE_BLOCKS) {
+      throw new IOException("expected " + FILE_BLOCKS + 
+                            " file blocks but found " + 
+                            fileBlocks.locatedBlockCount());
+    }
+    if (blockInStripe >= STRIPE_BLOCKS) {
+      throw new IOException("blockInStripe is " + blockInStripe +
+                            " but must be smaller than " + STRIPE_BLOCKS);
+    }
+    LocatedBlock block = fileBlocks.get(stripe * STRIPE_BLOCKS + blockInStripe);
+    removeAndReportBlock(dfs, filePath, block);
+    LOG.info("removed file " + filePath.toString() + " block " +
+             stripe * STRIPE_BLOCKS + " in stripe " + stripe);
+  }
+
+  private void removeParityBlock(Path filePath, int stripe) throws IOException {
+    removeParityBlock(filePath, stripe, 0);
+  }
+  /**
+   * removes a parity block in the specified stripe
+   */
+  private void removeParityBlock(Path filePath, int stripe, int blockInStripe) throws IOException {
+    // find parity file
+    ParityFilePair ppair =
+        ParityFilePair.getParityFile(Codec.getCodec(CODE_USED), filePath, conf);
+   // System.err.println("Got the parityFilePair");
+    String parityPathStr = ppair.getPath().toUri().getPath();
+   // System.err.println("Path to parity"+parityPathStr);
+    LOG.info("parity path: " + parityPathStr);
+    FileSystem parityFS = ppair.getFileSystem();
+    if (!(parityFS instanceof DistributedFileSystem)) {
+      throw new IOException("parity file is not on distributed file system");
+    }
+    DistributedFileSystem parityDFS = (DistributedFileSystem) parityFS;
+
+    
+    // now corrupt the block corresponding to the stripe selected
+    FileStatus parityFileStatus =
+      parityDFS.getFileStatus(new Path(parityPathStr));
+    long parityBlockSize = parityFileStatus.getBlockSize();
+    long parityFileLength = parityFileStatus.getLen();
+    long parityFileLengthInBlocks = (parityFileLength / parityBlockSize) + 
+      (((parityFileLength % parityBlockSize) == 0) ? 0L : 1L);
+    if (parityFileLengthInBlocks <= stripe) {
+      throw new IOException("selected stripe " + stripe + 
+                            " but parity file only has " + 
+                            parityFileLengthInBlocks + " blocks");
+    }
+    if (parityBlockSize != BLOCK_SIZE) {
+      throw new IOException("file block size is " + BLOCK_SIZE + 
+                            " but parity file block size is " + 
+                            parityBlockSize);
+    }
+    LocatedBlocks parityFileBlocks = parityDFS.getClient().namenode.
+      getBlockLocations(parityPathStr, 0, parityFileLength);
+    if (blockInStripe >= PARITY_BLOCKS) {
+      throw new IOException("blockInStripe is " + blockInStripe +
+                            " but must be smaller than " + PARITY_BLOCKS);
+    }
+    LocatedBlock parityFileBlock = parityFileBlocks.get(stripe * PARITY_BLOCKS + blockInStripe);
+    removeAndReportBlock(parityDFS, new Path(parityPathStr), parityFileBlock);
+    LOG.info("removed parity file block/stripe " + stripe + " for " + filePath.toString());
+
+  }
+
+   /**
+   * returns the data directories for a data node
+   */
+  private File[] getDataDirs(int datanode) throws IOException{
+    File data_dir = new File(System.getProperty("test.build.data"), 
+                             "dfs/data/");
+    File dir1 = new File(data_dir, "data"+(2 * datanode + 1));
+    File dir2 = new File(data_dir, "data"+(2 * datanode + 2));
+    if (!(dir1.isDirectory() && dir2.isDirectory())) {
+      throw new IOException("data directories not found for data node " + 
+                            datanode + ": " + dir1.toString() + " " + 
+                            dir2.toString());
+    }
+
+    File[] dirs = new File[2];
+    dirs[0] = new File(dir1, "current");
+    dirs[1] = new File(dir2, "current");
+    return dirs;
+  }
+
+
+  /**
+   * checks fsck with no missing blocks
+   */
+  @Test
+  public void testClean() throws Exception {
+    LOG.info("testClean");
+    setUp(false);
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+    
+    int limit= Codec.getCodec("rs").stripeLength+Codec.getCodec("rs").parityLength;
+    long[] result2 = new long[limit];
+    
+    for (int i=0; i<limit;i++) {
+      result2[i]=shell.getStrpMissingBlks(i);
+      assertTrue("New fsck should return 0, but returns " +
+          Long.toString(result2[i]), result2[i] == 0);
+    }
+    
+    assertTrue("fsck should return 0, but returns " +
+               Integer.toString(result), result == 0);
+  }
+
+
+  /**
+   * checks fsck with missing block in file block but not in parity block
+   */
+  @Test
+  public void testFileBlockMissing() throws Exception {
+    LOG.info("testFileBlockMissing");
+    setUp(false);
+    waitUntilCorruptFileCount(dfs, 0);
+    removeFileBlock(FILE_PATH0, 0, 0);
+    
+    //corrupting two source blocks in the same stripe
+    removeFileBlock(FILE_PATH1, 0, 0);
+    removeFileBlock(FILE_PATH1, 0, 2); 
+
+    waitUntilCorruptFileCount(dfs, 2);
+
+    ToolRunner.run(shell, args);
+    int result = shell.getCorruptCount();
+    
+    int limit= Codec.getCodec("rs").stripeLength+Codec.getCodec("rs").parityLength;
+
+    long[] result2 = new long[limit];
+    for (int i=0; i<limit;i++) {
+      System.err.println("Reading the resulting array");
+      result2[i]=shell.getStrpMissingBlks(i);
+    }
+    assertTrue("Assertion1: New fsck should return 1, but returns " + 
+        Long.toString(result2[0]), result2[0] == 1);
+    assertTrue("Assertion2: New fsck should return 1, but returns " + 
+        Long.toString(result2[1]), result2[1] == 1);
+    
+    assertTrue("fsck should return 0, but returns " + 
+               Integer.toString(result), result == 0);
+  }
+
+  /**
+   * 
+   * checks new fsck with missing blocks in both parity block and file block
+   */
+  @Test
+  public void testParityBlockMissing() throws Exception {
+    LOG.info("testParityBlockMissing");
+    setUp(false);
+    waitUntilCorruptFileCount(dfs, 0);
+    //file0 has one source blocks and one parity blocks missing in stripe 0
+    removeFileBlock(FILE_PATH0, 0, 2);
+    removeParityBlock(FILE_PATH0, 0);
+    //file1 has two source blocks missing in stripe0 and two parity blocks missing in stripe0
+    removeFileBlock(FILE_PATH1, 0, 0);
+    removeFileBlock(FILE_PATH1, 0, 1);
+    removeParityBlock(FILE_PATH1, 0);
+    removeParityBlock(FILE_PATH1, 0, 1);
+   
+    waitUntilCorruptFileCount(dfs, 4);
+    //file2 has two source block missing
+    removeFileBlock(FILE_PATH2, 1, 0);
+    removeFileBlock(FILE_PATH2, 1, 1);
+
+    ToolRunner.run(shell, args);
+    int limit= Codec.getCodec("rs").stripeLength+Codec.getCodec("rs").parityLength;
+
+    long[] result2 = new long[limit];
+    for (int i=0; i<limit;i++) {
+      result2[i]=shell.getStrpMissingBlks(i);
+    }
+    assertTrue("Assertion1: New fsck should return 0, but returns " + 
+        Long.toString(result2[0]), result2[0] == 0);
+    assertTrue("Assertion2: New fsck should return 2, but returns " + 
+        Long.toString(result2[1]), result2[1] == 2);
+    assertTrue("Assertion2: New fsck should return 1, but returns " + 
+        Long.toString(result2[3]), result2[3] == 1);
+    
+    int result = shell.getCorruptCount();
+
+    assertTrue("fsck should return 0, but returns " +
+               Integer.toString(result), result == 1);
+  }
+
+/**
+   * checks the new counters added in corruptFileCounter through the Raid node
+   * (raid shell fsck is not run explicitly)
+   */
+  @Test
+  public void testCountersInCorruptFileCounter() 
+    throws Exception {
+    LOG.info("testCountersInCorruptFileCounter");
+    setUp(false);
+    waitUntilCorruptFileCount(dfs, 0); 
+    //file 0 has one source missing (1+0) blocks missing
+    removeFileBlock(FILE_PATH0, 1, 0);
+    waitUntilCorruptFileCount(dfs, 1);
+    //file 1 has three source and one parity block missing = (3+1) blocks missing
+    removeFileBlock(FILE_PATH1, 0, 0);
+    removeFileBlock(FILE_PATH1, 0, 1);
+    removeFileBlock(FILE_PATH1, 0, 2);
+    waitUntilCorruptFileCount(dfs, 2);
+    removeParityBlock(FILE_PATH1, 0,0);
+    waitUntilCorruptFileCount(dfs, 3);
+    
+    //File 2 has 3 source blocks and 1 parity blocks missing = (3+2) blocks missing
+    removeFileBlock(FILE_PATH2, 1, 0);
+    removeFileBlock(FILE_PATH2, 1, 1);
+    removeFileBlock(FILE_PATH2, 1, 2);
+    waitUntilCorruptFileCount(dfs, 4);
+
+    removeParityBlock(FILE_PATH2, 1, 0);
+    removeParityBlock(FILE_PATH2, 1, 2);
+
+    waitUntilCorruptFileCount(dfs, 5);
+
+    Configuration localConf = new Configuration(conf);
+    localConf.setBoolean("raid.blockreconstruction.corrupt.disable", true);
+    localConf.setInt("raid.blockfix.interval", 3000);
+    localConf.set("raid.blockfix.classname", 
+                  "org.apache.hadoop.raid.DistBlockIntegrityMonitor");
+    localConf.setLong("raid.blockfix.filespertask", 2L);
+    localConf.setLong("raid.blockfix.maxpendingjobs", 1L);
+    localConf.set("raid.corruptfile.counter.dirs", MONITOR_DIRS);
+    ///user/rashmikv/raidtest,
+    localConf.setInt("raid.corruptfilecount.interval", 2000);
+    rnode = RaidNode.createRaidNode(null, localConf);
+    Thread.sleep(3000);
+    
+    System.err.println("Checking Raid Node") ;
+
+    long result = rnode.getNumFilesWithMissingBlks();
+    assertTrue("Result should be 3 but returns " +Long.toString(result), result==3);
+    
+    long[] result2 = rnode.getNumStrpWithMissingBlksRS();
+    
+    assertTrue("Result at index 0 should be 1 but got "+Long.toString(result2[0]), result2[0]==1);
+    assertTrue("Result at index 1 should be 0 but got "+Long.toString(result2[1]), result2[1]==0);
+    assertTrue("Result at index 2 should be 0 but got "+Long.toString(result2[2]), result2[2]==0);
+    assertTrue("Result at index 3 should be 1 but got "+Long.toString(result2[3]), result2[3]==1);
+    assertTrue("Result at index 4 should be 1 but got "+Long.toString(result2[4]), result2[4]==1);
+    
+   System.err.println("Checking Raid Node Metrics") ;
+   RaidNodeMetrics inst = RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID);
+   long result4=inst.numFilesWithMissingBlks.get();
+   assertTrue("Number of files with missing blocks should be 3 but got "+Long.toString(result4),result4==3);
+   long result5=inst.numStrpsOneMissingBlk.get();
+   long result6=inst.numStrpsTwoMissingBlk.get();
+
+   long result7=inst.numStrpsThreeMissingBlk.get();
+   long result8=inst.numStrpsFourMissingBlk.get();
+
+   long result9=inst.numStrpsFiveMoreMissingBlk.get();
+   
+   assertTrue("result 5 incorrect",result5==1);
+   assertTrue("result 6 incorrect",result6==0);
+   assertTrue("result 7 incorrect",result7==0);
+   assertTrue("result 8 incorrect",result8==1);
+   assertTrue("result 9 incorrect",result9==1);
+
+    tearDown();
+  }
+  
+  @Test
+  public void testRaidNodeMetricsNumFilesToFixDropped() 
+    throws Exception {
+    LOG.info("testRaidNodeMetricsNumFileToFixDropped");
+    setUp(false);
+    waitUntilCorruptFileCount(dfs, 0);
+
+    //file 0 has one source missing (1+0) blocks missing
+    removeFileBlock(FILE_PATH0, 0, 0);
+
+    waitUntilCorruptFileCount(dfs, 1);
+    //file 1 has three source and one parity block missing = (1) blocks missing
+    removeFileBlock(FILE_PATH1, 0, 0);
+    waitUntilCorruptFileCount(dfs, 2);
+   
+    //File 2 has 3 source blocks and 1 parity blocks missing = (3+0) blocks missing
+    removeFileBlock(FILE_PATH2, 1, 0);
+    removeFileBlock(FILE_PATH2, 1, 1);
+    removeFileBlock(FILE_PATH2, 1, 2);
+
+    waitUntilCorruptFileCount(dfs, 3);
+
+    Configuration localConf = new Configuration(conf);
+    //disabling corrupt file counter
+    localConf.setBoolean("raid.corruptfile.counter.disable", true);
+    localConf.setInt("raid.blockfix.interval", 2000);
+    localConf.setInt("raid.blockcheck.interval", 2000);
+    localConf.set("raid.blockfix.classname", 
+                  "org.apache.hadoop.raid.DistBlockIntegrityMonitor");
+    localConf.setLong("raid.blockfix.filespertask", 2L);
+    localConf.setLong("raid.blockfix.maxpendingjobs", 1L);
+    localConf.set("raid.corruptfile.counter.dirs", MONITOR_DIRS);
+    localConf.setInt("raid.corruptfilecount.interval", 2000);
+    rnode = RaidNode.createRaidNode(null, localConf);
+    Thread.sleep(3000);
+    
+    LOG.info("Checking Raid Node Metric numFilesToFixDropped") ;
+    RaidNodeMetrics inst = RaidNodeMetrics.getInstance(RaidNodeMetrics.DEFAULT_NAMESPACE_ID);
+    long result=inst.numFilesToFixDropped.get();
+    LOG.info("Num files to fix dropped in raid node metrics is " + result);
+    assertTrue("Number of files to fix dropped with missing blocks should be 2 but got "+Long.toString(result),result==2);
+    tearDown();
+  }
+  
+  @After
+  public void tearDown() throws Exception {
+    if (rnode != null) {
+      rnode.stop();
+      rnode.join();
+      rnode = null;
+    }
+
+    if (cluster != null) {
+      cluster.shutdown();
+      cluster = null;
+    }
+    
+    dfs = null;
+
+    LOG.info("Test cluster shut down");
+  }
+  
+
+}
+
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestSimulationBlockFixer.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestSimulationBlockFixer.java
index cff0b1a9..a82c61d1 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestSimulationBlockFixer.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestSimulationBlockFixer.java
@@ -24,6 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileChecksum;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -62,7 +63,7 @@ public class TestSimulationBlockFixer  extends TestCase {
   }
   
   private void mySetup(int stripeLength, int timeBeforeHar, 
-      String xorCode) throws Exception {
+      String xorCode, String rsCode, String code) throws Exception {
 
     new File(TEST_DIR).mkdirs(); // Make sure data directory exists
     conf = new Configuration();
@@ -79,7 +80,7 @@ private void mySetup(int stripeLength, int timeBeforeHar,
     conf.set("raid.server.address", "localhost:0");
 
     Utils.loadTestCodecs(conf, stripeLength, stripeLength, 1, 3, "/destraid",
-        "/destraidrs", true, xorCode, "org.apache.hadoop.raid.ReedSolomonCode",
+        "/destraidrs", true, xorCode, rsCode,
         false);
 
     conf.setBoolean("dfs.permissions", false);
@@ -98,7 +99,7 @@ private void mySetup(int stripeLength, int timeBeforeHar,
     conf.set("mapred.job.tracker", jobTrackerName);
     
     ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
-    cb.addPolicy("RaidTest1", "/user/dhruba/raidtest", (short)1, 1, 1);
+    cb.addPolicy("RaidTest1", "/user/dhruba/raidtest", 1, 1, code);
     cb.persist();
   }
 
@@ -108,29 +109,51 @@ private void myTearDown() throws Exception {
     if (dfsCluster != null) { dfsCluster.shutdown(); }
   }
   
+  
   public void testGoodBlockFixer() throws Exception {
-    implSimulationBlockFixer(true);
+    implSimulationBlockFixer(true, "xor", true);
+    implSimulationBlockFixer(true, "rs", true);
   }
   
   public void testBadBlockFixer() throws Exception {
-    implSimulationBlockFixer(false);
+    implSimulationBlockFixer(false, "xor", true);
+    implSimulationBlockFixer(false, "rs", true);
+  }
+  
+  
+  public void testGoodParityBlockFixer() throws Exception {
+    implSimulationBlockFixer(true, "xor", false);
+    implSimulationBlockFixer(true, "rs", false);
   }
   
-  public void implSimulationBlockFixer(boolean isGoodFixer) throws Exception {
+  public void testBadParityBlockFixer() throws Exception {
+    implSimulationBlockFixer(false, "xor", false);
+    implSimulationBlockFixer(false, "rs", false);
+  }
+  
+  public void implSimulationBlockFixer(boolean isGoodFixer, String code, 
+      boolean fixSource) throws Exception {
     LOG.info("Test TestSimulationBlockFixer started.");
     long blockSize = 8192L;
     int stripeLength = 3;
     if (isGoodFixer) {
-      mySetup(stripeLength, -1, "org.apache.hadoop.raid.XORCode"); 
+      mySetup(stripeLength, -1, "org.apache.hadoop.raid.XORCode",
+          "org.apache.hadoop.raid.ReedSolomonCode", code); 
     } else {
       mySetup(stripeLength, -1,
-          "org.apache.hadoop.raid.BadXORCode"); 
+          "org.apache.hadoop.raid.BadXORCode",
+          "org.apache.hadoop.raid.BadReedSolomonCode", code); 
     }
     Path file1 = new Path("/user/dhruba/raidtest/file1");
-    Path destPath = new Path("/destraid/user/dhruba/raidtest");
+    Path destPath;
+    if (code.equals("xor")) {
+      destPath = new Path("/destraid/user/dhruba/raidtest");
+    } else {
+      // equals ("rs")
+      destPath = new Path("/destraidrs/user/dhruba/raidtest");
+    }
     long crc1 = TestRaidDfs.createTestFilePartialLastBlock(fileSys, file1,
                                                           1, 7, blockSize);
-    long file1Len = fileSys.getFileStatus(file1).getLen();
     LOG.info("Test testBlockFix created test files");
 
     // create an instance of the RaidNode
@@ -140,34 +163,59 @@ public void implSimulationBlockFixer(boolean isGoodFixer) throws Exception {
                   "org.apache.hadoop.raid.DistBlockIntegrityMonitor");
     localConf.setLong("raid.blockfix.filespertask", 2L);
 
+    Codec codec = Codec.getCodec(code);
+    
     try {
       cnode = RaidNode.createRaidNode(null, localConf);
       TestRaidDfs.waitForFileRaided(LOG, fileSys, file1, destPath);
       cnode.stop(); cnode.join();
       
-      FileStatus srcStat = fileSys.getFileStatus(file1);
+      ParityFilePair pfPair = ParityFilePair.getParityFile(codec, file1, 
+          localConf);
+      assertNotNull(pfPair);
+      Path parity = pfPair.getPath();
+      
+      FileStatus stat;
       DistributedFileSystem dfs = (DistributedFileSystem)fileSys;
-      LocatedBlocks locs = RaidDFSUtil.getBlockLocations(
-        dfs, file1.toUri().getPath(), 0, srcStat.getLen());
-
+      
       String[] corruptFiles = DFSUtil.getCorruptFiles(dfs);
       assertEquals("no corrupt files expected", 0, corruptFiles.length);
       assertEquals("filesFixed() should return 0 before fixing files",
                    0, cnode.blockIntegrityMonitor.getNumFilesFixed());
       
-      // Corrupt blocks in two different stripes. We can fix them.
-      int[] corruptBlockIdxs = new int[]{1, 4, 6};
-      for (int idx: corruptBlockIdxs)
-        TestBlockFixer.corruptBlock(locs.get(idx).getBlock().getBlockName(), dfsCluster);
-      RaidDFSUtil.reportCorruptBlocks(dfs, file1, corruptBlockIdxs, blockSize);
+      Path corruptFile;
+      int [] corruptBlockIdxs;
+      if (fixSource) {
+        stat = fileSys.getFileStatus(file1);
+        LocatedBlocks locs = RaidDFSUtil.getBlockLocations(
+            dfs, file1.toUri().getPath(), 0, stat.getLen());
+        // Corrupt blocks in two different stripes. We can fix them.
+        corruptBlockIdxs = new int[]{1, 4, 6};
+        for (int idx: corruptBlockIdxs) {
+          TestBlockFixer.corruptBlock(locs.get(idx).getBlock().getBlockName(), dfsCluster);
+        }
+        RaidDFSUtil.reportCorruptBlocks(dfs, file1, corruptBlockIdxs, blockSize);
+        corruptFile = file1;
+      } else {
+        crc1 = RaidDFSUtil.getCRC(fileSys, parity);
+        stat = fileSys.getFileStatus(parity);
+        LocatedBlocks locs = RaidDFSUtil.getBlockLocations(
+            dfs, parity.toUri().getPath(), 0, stat.getLen());
+        corruptBlockIdxs = new int[] {0, 1, 2};
+        for (int idx : corruptBlockIdxs) {
+          TestBlockFixer.corruptBlock(locs.get(idx).getBlock().getBlockName(), dfsCluster);
+        }
+        RaidDFSUtil.reportCorruptBlocks(dfs, parity, corruptBlockIdxs, blockSize);
+        corruptFile = parity;
+      }
       
       corruptFiles = DFSUtil.getCorruptFiles(dfs);
       assertEquals("file not corrupted", 1, corruptFiles.length);
       assertEquals("wrong file corrupted",
-                   corruptFiles[0], file1.toUri().getPath());
+                   corruptFiles[0], corruptFile.toUri().getPath());
       assertEquals("wrong number of corrupt blocks", 3,
-        RaidDFSUtil.corruptBlocksInFile(dfs, file1.toUri().getPath(), 0,
-          srcStat.getLen()).size());
+        RaidDFSUtil.corruptBlocksInFile(dfs, corruptFile.toUri().getPath(), 0,
+          stat.getLen()).size());
 
       cnode = RaidNode.createRaidNode(null, localConf);
       long start = System.currentTimeMillis();
@@ -178,9 +226,9 @@ public void implSimulationBlockFixer(boolean isGoodFixer) throws Exception {
       }
       assertEquals("file not fixed", 1, cnode.blockIntegrityMonitor.getNumFilesFixed());
       
-      dfs = TestBlockFixer.getDFS(conf, dfs);
-      assertTrue("file not fixed",
-                 TestRaidDfs.validateFile(dfs, file1, file1Len, crc1));
+      boolean fixed = TestRaidDfs.validateFile(dfs, corruptFile, stat.getLen(), crc1);
+      assertTrue("file not fixed: " + corruptFile.toString(), fixed);
+        
       // Verify the counters are right
       long expectedNumFailures = isGoodFixer? 0: corruptBlockIdxs.length;
       assertEquals(expectedNumFailures,
@@ -190,7 +238,8 @@ public void implSimulationBlockFixer(boolean isGoodFixer) throws Exception {
       
       long expectedNumFailedJobs = isGoodFixer? 0: 1;
       assertEquals("Number of simulated failed jobs should be " +
-          expectedNumFailedJobs, expectedNumFailedJobs, 
+          String.valueOf(expectedNumFailedJobs) +
+          " file: " + corruptFile, expectedNumFailedJobs, 
           ((DistBlockIntegrityMonitor.Worker)cnode.
               blockIntegrityMonitor.getCorruptionMonitor()).simFailJobIndex.
               size());
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestStatisticsCollector.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestStatisticsCollector.java
index 067f81b7..9358800d 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestStatisticsCollector.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestStatisticsCollector.java
@@ -39,6 +39,7 @@
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.raid.Statistics.Counters;
 import org.apache.hadoop.raid.protocol.PolicyInfo;
+import org.apache.hadoop.raid.Utils.Builder;
 
 /**
  * Verifies {@link Statistics} collects raid statistics
@@ -50,7 +51,6 @@ public class TestStatisticsCollector extends TestCase {
   final FakeConfigManager fakeConfigManager = new FakeConfigManager();
   final FakeRaidNode fakeRaidNode = new FakeRaidNode();
 
-
   public void testExcludes() throws IOException {
     conf.set("raid.exclude.patterns", "/exclude/,/df_mf/");
     RaidState.Checker checker = new RaidState.Checker(
@@ -101,11 +101,34 @@ public void testCollect() throws Exception {
     }
   }
 
+  
+  public void testCollectDirRaid() throws Exception {
+    
+    MiniDFSCluster dfs = null;
+    try {
+      dfs = new MiniDFSCluster(conf, 3, true, null);
+      dfs.waitActive();
+      FileSystem fs = dfs.getFileSystem();
+      // load the test directory codecs.
+      Utils.loadTestCodecs(conf, new Builder[] {Utils.getDirXORBuilder(), 
+          Utils.getDirRSBuilder()});
+      verifyDirRaidSourceCollect("dir-rs", fs, false);
+      verifyDirRaidSourceCollect("dir-xor", fs, false);
+      verifyParityCollect("dir-rs", fs);
+      verifyParityCollect("dir-xor", fs);
+    } finally {
+      if (dfs != null) {
+        dfs.shutdown();
+      }
+    }
+  }
+  
   public void testSnapshot() throws Exception {
     conf.set(StatisticsCollector.STATS_SNAPSHOT_FILE_KEY,
              "/tmp/raidStatsSnapshot");
     MiniDFSCluster dfs = null;
     try {
+      Utils.loadTestCodecs(conf);
       dfs = new MiniDFSCluster(conf, 3, true, null);
       dfs.waitActive();
       FileSystem fs = dfs.getFileSystem();
@@ -117,6 +140,56 @@ public void testSnapshot() throws Exception {
     }
   }
 
+  public void verifyDirRaidSourceCollect(String codecId, FileSystem fs,
+                                         boolean writeAndRestoreSnapshot) 
+                                             throws IOException {
+    PolicyInfo info = new PolicyInfo("Test-Dir-Raid-" + codecId, conf);
+    info.setSrcPath("/a");
+    info.setProperty("modTimePeriod", "0");
+    info.setProperty("targetReplication", "1");
+    info.setCodecId(codecId);
+    
+    PolicyInfo infoTooNew = new PolicyInfo("Test-Too-New-" + codecId, conf);
+    infoTooNew.setSrcPath("/new");
+    infoTooNew.setProperty("modTimePeriod", "" + Long.MAX_VALUE);
+    infoTooNew.setProperty("targetReplication", "1");
+    infoTooNew.setCodecId(codecId);
+    
+    createFile(fs, new Path("/a/b/NOT_RAIDED1"), 1, 1, 10240L);
+    createFile(fs, new Path("/a/b/NOT_RAIDED2"), 2, 2, 10240L);
+    createFile(fs, new Path("/a/b/NOT_RAIDED3"), 1, 3, 10240L);
+    
+    createFile(fs, new Path("/a/c/RAIDED1"), 1, 1, 10240L);
+    createFile(fs, new Path("/a/c/RAIDED2"), 1, 2, 10240L);
+    createFile(fs, new Path("/a/c/RAIDED3"), 1, 3, 10240L);
+    createFile(fs, new Path("/a/c/RAIDED4"), 1, 4, 10240L);
+    createFile(fs, new Path("/a/c/RAIDED5"), 1, 5, 10240L);
+    
+    createFile(fs, new Path("/a/d/TOO_SMALL1"), 1, 1, 10240L);
+    createFile(fs, new Path("/a/d/TOO_SMALL2"), 2, 1, 10240L);
+
+    createFile(fs, new Path("/new/TOO_NEW1"), 3, 4, 10240L);
+    createFile(fs, new Path("/new/TOO_NEW2"), 3, 5, 10240L);
+    
+    StatisticsCollector collector =
+        new StatisticsCollector(fakeRaidNode, fakeConfigManager, conf);
+    List<PolicyInfo> allPolicies = Arrays.asList(info, infoTooNew);
+    collector.collect(allPolicies);
+    Statistics st = collector.getRaidStatistics(codecId);
+    
+    LOG.info("Dir Statistics collected " + st);
+    LOG.info("Dir Statistics html:\n " + st.htmlTable());
+    Counters raided = st.getSourceCounters(RaidState.RAIDED);
+    Counters tooSmall = st.getSourceCounters(RaidState.NOT_RAIDED_TOO_SMALL);
+    Counters tooNew = st.getSourceCounters(RaidState.NOT_RAIDED_TOO_NEW);
+    Counters notRaided = st.getSourceCounters(RaidState.NOT_RAIDED_BUT_SHOULD);
+    
+    assertCounters(raided, 1, 5, 15, 15 * 10240L, 15 * 10240L);
+    assertCounters(tooSmall, 1, 2, 2, 3 * 10240L, 2 * 10240L);
+    assertCounters(tooNew, 1, 2, 9, 27 * 10240L, 9 * 10240L);
+    assertCounters(notRaided, 1, 3, 6, 8 * 10240L, 6 * 10240L);
+  }
+  
   public void verifySourceCollect(String codecId, FileSystem fs,
                                   boolean writeAndRestoreSnapshot)
       throws Exception {
@@ -259,6 +332,12 @@ private void assertCounters(Counters counters, long numFiles,
     assertEquals(numBytes, counters.getNumBytes());
     assertEquals(numLogicalBytes, counters.getNumLogical());
   }
+  
+  private void assertCounters(Counters counters, long numDirs, long numFiles,
+      long numBlocks, long numBytes, long numLogicalBytes) {
+    assertEquals(numDirs, counters.getNumDirs());
+    assertCounters(counters, numFiles, numBlocks, numBytes, numLogicalBytes);
+  }
 
   private static long createFile(
       FileSystem fileSys, Path name, int repl, int numBlocks, long blocksize)
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestTempDirectoryCleanUp.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestTempDirectoryCleanUp.java
index 37a762fe..dd5ec175 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestTempDirectoryCleanUp.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestTempDirectoryCleanUp.java
@@ -119,19 +119,17 @@ private void createTestFiles() throws IOException {
   private Configuration initializeConfig() throws IOException {
     short targetReplication = 2;
     short metaReplication   = 2;
-    short srcReplication = 1;
     short rstargetReplication = 1;
     short rsmetaReplication   = 1;
-    short rssrcReplication = 1;
     
     // Initialize Raid Policy config
     ConfigBuilder cb = new ConfigBuilder(CONFIG_FILE);
-    cb.addPolicy("policy1", "/user/dhruba/raidtest", srcReplication, 
+    cb.addPolicy("policy1", "/user/dhruba/raidtest",
         targetReplication, metaReplication);
-    cb.addPolicy("abstractPolicy", srcReplication, targetReplication,
-        metaReplication);
+    cb.addAbstractPolicy("abstractPolicy",targetReplication,
+        metaReplication, "xor");
     cb.addPolicy("policy2", "/user/dhruba/raidtest2", "abstractPolicy");
-    cb.addPolicy("policy3", "/user/dhruba/raidtest3", rssrcReplication, 
+    cb.addPolicy("policy3", "/user/dhruba/raidtest3",
         rstargetReplication, rsmetaReplication, "rs");
     cb.persist();
     // Initialize Raidnode config
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/Utils.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/Utils.java
index 57358f7f..6c60d9df 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/Utils.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/Utils.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.raid;
 
 import java.io.IOException;
+import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -75,42 +76,140 @@ public static void loadTestCodecs(Configuration conf,
       boolean isSimulatedBlockFixed, String xorCode, String rsCode, 
       boolean isDirRaid)
           throws IOException {
+    Builder[] builders = new Builder[]{
+    getXORBuilder().setParityDir(xorParityDirectory).setStripeLength(
+        xorStripeLength).setParityLength(xorParityLength).setCodeClass(
+        xorCode).simulatedBlockFixed(isSimulatedBlockFixed).dirRaid(
+        isDirRaid), 
+    getRSBuilder().setParityDir(rsParityDirectory).setStripeLength(
+        rsStripeLength).setParityLength(rsParityLength).setCodeClass(
+        rsCode).simulatedBlockFixed(isSimulatedBlockFixed).dirRaid(
+        isDirRaid)}; 
+    loadTestCodecs(conf, builders);
+  }
+  
+  public static void loadTestCodecs(Configuration conf, Builder[] codecs) 
+    throws IOException {
     Codec.clearCodecs();
-    String codecsJSON = "[ " +
-    " { " +
-      "\"id\":\"xor\"," +
-      "\"parity_dir\":\"" + xorParityDirectory + "\"," +
-      "\"tmp_parity_dir\":\"" + "/tmp" + xorParityDirectory + "\"," +
-      "\"tmp_har_dir\":\"" + "/tmp" + xorParityDirectory + "_har" + "\"," +
-      "\"stripe_length\":" + xorStripeLength + "," +
-      "\"parity_length\":" + xorParityLength + "," +
-      "\"priority\":" + 100 + "," +
-      "\"erasure_code\":\"" + xorCode + "\"," +
-      "\"description\":\"XOR Code\"," +
-      "\"dir_raid\":" + isDirRaid + "," +
-      "\"simulate_block_fix\":" + isSimulatedBlockFixed + "," +
-    " }, " +
-    " { " +
-      "\"id\":\"rs\"," +
-      "\"parity_dir\":\"" + rsParityDirectory + "\"," +
-      "\"tmp_parity_dir\":\"" + "/tmp" + rsParityDirectory + "\"," +
-      "\"tmp_har_dir\":\"" + "/tmp" + rsParityDirectory + "_har" + "\"," +
-      "\"stripe_length\":" + rsStripeLength + "," +
-      "\"parity_length\":" + rsParityLength + "," +
-      "\"priority\":" + 300 + "," +
-      "\"erasure_code\":\"" + rsCode + "\"," +
-      "\"description\":\"Reed Solomon Code\"," +
-      "\"dir_raid\":" + isDirRaid + "," +
-      "\"simulate_block_fix\":" + isSimulatedBlockFixed + "," +
-    " }, " +
-    " ] ";
-    LOG.info("raid.codecs.json=" + codecsJSON);
-    conf.set("raid.codecs.json", codecsJSON);
+    StringBuilder sb = new StringBuilder();
+    sb.append("[ ");
+    for (Builder codec : codecs) {
+      sb.append(codec.getCodecJson());
+    }
+    sb.append(" ] ");
+    LOG.info("raid.codecs.json=" + sb.toString());
+    conf.set("raid.codecs.json", sb.toString());
     Codec.initializeCodecs(conf);
     LOG.info("Test codec loaded");
     for (Codec c : Codec.getCodecs()) {
       LOG.info("Loaded raid code:" + c.id);
     }
+    RaidNodeMetrics.clearInstances();
+  }
+  
+  public static Builder getXORBuilder() {
+    return (new Utils()).new Builder("xor", "/raid", 5, 1, 100,
+        "org.apache.hadoop.raid.XORCode",
+        false, false);
+  }
+  
+  public static Builder getDirXORBuilder() {
+    return (new Utils()).new Builder("dir-xor", "/dir-raid", 5, 1, 400,
+        "org.apache.hadoop.raid.XORCode",
+        false, true);
+  }
+  
+  public static Builder getRSBuilder() {
+    return (new Utils()).new Builder("rs", "/raidrs", 5, 3, 300,
+        "org.apache.hadoop.raid.ReedSolomonCode",
+        false, false);
+  }
+  
+  public static Builder getDirRSBuilder() {
+    return (new Utils()).new Builder("dir-rs", "/dir-raidrs", 5, 3, 600,
+        "org.apache.hadoop.raid.ReedSolomonCode",
+        false, true);
+  }
+  
+  public class Builder {
+    private String id = "xor";
+    private String parityDirectory = "/raid";
+    private long stripeLength = 5;
+    private int parityLength = 1;
+    private int priority = 100;
+    private String codeClass = "org.apache.hadoop.raid.XORCode";
+    private boolean isDirRaid = false;
+    private boolean isSimulatedBlockFixed = false;
+    
+    public Builder(String id, String parityDirectory,
+        int stripeLength, int parityLength, int priority, 
+        String codeClass, boolean isSimulatedBlockFixed, boolean isDirRaid) {
+      this.id = id;
+      this.parityDirectory = parityDirectory;
+      this.stripeLength = stripeLength;
+      this.parityLength = parityLength;
+      this.priority = priority;
+      this.codeClass = codeClass;
+      this.isDirRaid = isDirRaid;
+      this.isSimulatedBlockFixed = isSimulatedBlockFixed;
+    }
+    
+    public Builder setCodeId(String newId) {
+      this.id = newId;
+      return this;
+    }
+    
+    public Builder setParityDir(String newParityDirectory) {
+      this.parityDirectory = newParityDirectory;
+      return this;
+    }
+    
+    public Builder setStripeLength(long newStripeLength) {
+      this.stripeLength = newStripeLength;
+      return this;
+    }
+    
+    public Builder setParityLength(int newParityLength) {
+      this.parityLength = newParityLength;
+      return this;
+    }
+    
+    public Builder setPriority(int newPriority) {
+      this.priority = newPriority;
+      return this;
+    }
+    
+    public Builder setCodeClass(String newCodeClass) {
+      this.codeClass = newCodeClass;
+      return this;
+    }
+    
+    public Builder dirRaid(boolean isDirRaid) {
+      this.isDirRaid = isDirRaid;
+      return this;
+    }
+    
+    public Builder simulatedBlockFixed(boolean isSimulatedBlockFixed) {
+      this.isSimulatedBlockFixed = isSimulatedBlockFixed;
+      return this;
+    }
+    
+    public String getCodecJson() {
+      return
+          " { " +
+            "\"id\":\"" + id  + "\"," +
+            "\"parity_dir\":\"" + parityDirectory + "\"," +
+            "\"tmp_parity_dir\":\"" + "/tmp" + parityDirectory + "\"," +
+            "\"tmp_har_dir\":\"" + "/tmp" + parityDirectory + "_har" + "\"," +
+            "\"stripe_length\":" + stripeLength + "," +
+            "\"parity_length\":" + parityLength + "," +
+            "\"priority\":" + priority + "," +
+            "\"erasure_code\":\"" + codeClass + "\"," +
+            "\"description\":\"" + id + " Code\"," +
+            "\"dir_raid\":" + isDirRaid + "," +
+            "\"simulate_block_fix\":" + isSimulatedBlockFixed + "," +
+          " }, ";
+    }
   }
 
 }
diff --git a/src/contrib/raid/webapps/raid/raid.jsp b/src/contrib/raid/webapps/raid/raid.jsp
index 0c21d643..3bedd6d7 100644
--- a/src/contrib/raid/webapps/raid/raid.jsp
+++ b/src/contrib/raid/webapps/raid/raid.jsp
@@ -16,8 +16,6 @@
   RaidNode raidNode = (RaidNode) application.getAttribute("raidnode");
   StatisticsCollector stats = (StatisticsCollector) raidNode
       .getStatsCollector();
-  Statistics xorSt = stats.getRaidStatistics("xor");
-  Statistics rsSt = stats.getRaidStatistics("rs");
   PurgeMonitor purge = raidNode.getPurgeMonitor();
   PlacementMonitor place = raidNode.getPlacementMonitor();
   DiskStatus ds = new DFSClient(raidNode.getConf()).getNSDiskStatus();
@@ -85,51 +83,35 @@
   out.print(table(tableStr));
 %>
 <hr>
-<h2>XOR</h2>
 <%
-  String paritySize, estParitySize;
-  if (xorSt != null) {
-    out.print(xorSt.htmlTable());
-    saving = StringUtils.byteDesc(xorSt.getSaving());
-    doneSaving = StringUtils.byteDesc(xorSt.getDoneSaving());
-    repl = StringUtils.limitDecimalTo2(xorSt.getEffectiveReplication());
-    paritySize = StringUtils.byteDesc(xorSt.getParityCounters()
-        .getNumBytes());
-    estParitySize = StringUtils.byteDesc(xorSt.getEstimatedParitySize());
-    tableStr = "";
-    tableStr += tr(td("Effective Replication") + td(":") + td(repl));
-    tableStr += tr(td("Saving") + td(":") + td(saving));
-    tableStr += tr(td("Done Saving") + td(":") + td(doneSaving));
-    tableStr += tr(td("Parity / Expected") + td(":")
-        + td(paritySize + " / " + estParitySize));
-    out.print(table(tableStr));
-  } else {
-    out.print("Wait for collecting");
-  }
-%>
-<hr>
-<h2>RS</h2>
-<%
-  if (rsSt != null) {
-    out.print(rsSt.htmlTable());
-    saving = StringUtils.byteDesc(rsSt.getSaving());
-    doneSaving = StringUtils.byteDesc(rsSt.getDoneSaving());
-    repl = StringUtils.limitDecimalTo2(rsSt.getEffectiveReplication());
-    paritySize = StringUtils.byteDesc(rsSt.getParityCounters()
-        .getNumBytes());
-    estParitySize = StringUtils.byteDesc(rsSt.getEstimatedParitySize());
-    tableStr = "";
-    tableStr += tr(td("Effective Replication") + td(":") + td(repl));
-    tableStr += tr(td("Saving") + td(":") + td(saving));
-    tableStr += tr(td("Done Saving") + td(":") + td(doneSaving));
-    tableStr += tr(td("Parity / Expected") + td(":")
-        + td(paritySize + " / " + estParitySize));
-    out.print(table(tableStr));
-  } else {
-    out.print("Wait for collecting");
+  for (Codec codec: Codec.getCodecs()) {
+    out.print("\n<h2>" + codec.id + " (" +
+              (codec.isDirRaid?"Directory-level":
+                               "File-level") +
+              ") " + "</h2>\n");
+    Statistics codeStats = stats.getRaidStatistics(codec.id);
+    String paritySize, estParitySize;
+    if (codeStats != null) {
+      out.print(codeStats.htmlTable());
+      saving = StringUtils.byteDesc(codeStats.getSaving());
+      doneSaving = StringUtils.byteDesc(codeStats.getDoneSaving());
+      repl = StringUtils.limitDecimalTo2(codeStats.getEffectiveReplication());
+      paritySize = StringUtils.byteDesc(codeStats.getParityCounters()
+          .getNumBytes());
+      estParitySize = StringUtils.byteDesc(codeStats.getEstimatedParitySize());
+      tableStr = "";
+      tableStr += tr(td("Effective Replication") + td(":") + td(repl));
+      tableStr += tr(td("Saving") + td(":") + td(saving));
+      tableStr += tr(td("Done Saving") + td(":") + td(doneSaving));
+      tableStr += tr(td("Parity / Expected") + td(":")
+          + td(paritySize + " / " + estParitySize));
+      out.print(table(tableStr));
+    } else {
+      out.print("Wait for collecting");
+    }
+    out.print("\n<hr>\n");
   }
 %>
-<hr>
 <h2>Purge Progress</h2>
 <%
   out.print(purge.htmlTable());
@@ -156,6 +138,15 @@
     out.print(table(tableStr));
   }
 %>
+<%
+  String metricsUrl = raidNode.getReadReconstructionMetricsUrl();
+  if (metricsUrl != null && !metricsUrl.trim().equals("")) {
+    out.print("<hr>\n");
+    out.print("<h2>Read Reconstruction Metrics "
+        + JspUtils.link("see details", metricsUrl)
+        + "</h2>");
+  }
+%>
 <%
   BlockIntegrityMonitor.Status status = null;
   boolean unsupported = false;
diff --git a/src/contrib/seekablecompression/ivy.xml b/src/contrib/seekablecompression/ivy.xml
index 4703cf5d..9ca34b6b 100644
--- a/src/contrib/seekablecompression/ivy.xml
+++ b/src/contrib/seekablecompression/ivy.xml
@@ -41,5 +41,9 @@
       name="junit"
       rev="${junit.version}"
       conf="common->default"/>
+    <dependency org="org.json"
+      name="json"
+      rev="${json.version}"
+      conf="common->default"/>
   </dependencies>
 </ivy-module>
diff --git a/src/contrib/snapshot/ivy.xml b/src/contrib/snapshot/ivy.xml
index 14a77a39..dbc8b66b 100644
--- a/src/contrib/snapshot/ivy.xml
+++ b/src/contrib/snapshot/ivy.xml
@@ -74,5 +74,13 @@
       name="core"
       rev="${core.version}"
       conf="common->default"/>
+    <dependency org="org.json"
+      name="json"
+      rev="${json.version}"
+      conf="common->default"/>
+    <dependency org="com.google.guava"
+      name="guava"
+      rev="${guava.version}"
+      conf="common->default"/>
   </dependencies>
 </ivy-module>
diff --git a/src/contrib/snapshot/ivy/libraries.properties b/src/contrib/snapshot/ivy/libraries.properties
index 35efd9d2..581b28fc 100644
--- a/src/contrib/snapshot/ivy/libraries.properties
+++ b/src/contrib/snapshot/ivy/libraries.properties
@@ -3,3 +3,4 @@
 #These are the versions of our dependencies (in alphabetical order)
 log4j.version=1.2.15
 slf4j-api.version=1.6.1
+guava.version=r09
diff --git a/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/SnapshotClient.java b/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/SnapshotClient.java
index aa1dd5e2..e3c24684 100644
--- a/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/SnapshotClient.java
+++ b/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/SnapshotClient.java
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
 import org.apache.hadoop.hdfs.server.namenode.SnapshotShell;
diff --git a/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/server/namenode/SnapshotNode.java b/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/server/namenode/SnapshotNode.java
index 89d0b7b4..5641f298 100644
--- a/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/server/namenode/SnapshotNode.java
+++ b/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/server/namenode/SnapshotNode.java
@@ -23,15 +23,20 @@
 import org.apache.hadoop.conf.*;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.DFSLocatedBlocks;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.protocol.*;
 import org.apache.hadoop.hdfs.server.common.Storage.*;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 import org.apache.hadoop.hdfs.server.namenode.FSImage.CheckpointStates;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
 import org.apache.hadoop.hdfs.server.namenode.LeaseManager.*;
 import org.apache.hadoop.hdfs.server.namenode.WaitingRoom.*;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
 import org.apache.hadoop.hdfs.server.protocol.SnapshotProtocol;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.common.Util;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.ipc.*;
 import org.apache.hadoop.util.Daemon;
@@ -43,8 +48,6 @@
 import java.util.*;
 import java.util.concurrent.*;
 
-import org.apache.hadoop.metrics.jvm.JvmMetrics;
-
 /**********************************************************
  * The SnapshotNode is responsible for taking periodic 
  * snapshots of the HDFS. The current design only allows
@@ -282,7 +285,7 @@ public LocatedBlocksWithMetaInfo[] getLocatedBlocks(String snapshotId,
   @Override
   public void createSnapshot(String snapshotId, boolean updateLeases) throws IOException {
     // Create new SnapshotStore
-    SnapshotStorage ssStore = new SnapshotStorage(conf, new File(tempDir));
+    SnapshotStorage ssStore = new SnapshotStorage(conf, Util.stringAsURI(tempDir));
 
     // Download image & edit files from namenode
     downloadSnapshotFiles(ssStore);
@@ -418,6 +421,7 @@ void updateLeasedFiles(SnapshotStorage ssStore) throws IOException {
    */
   void downloadSnapshotFiles(SnapshotStorage ssStore) throws IOException {
     CheckpointSignature start = namenode.getCheckpointSignature();
+    ssStore.storage.setStorageInfo(start);
     CheckpointSignature end = null;
     boolean success;
 
@@ -426,27 +430,24 @@ void downloadSnapshotFiles(SnapshotStorage ssStore) throws IOException {
       prepareDownloadDirs();
 
       // get fsimage
-      String fileId = "getimage=1";
       File[] srcNames = ssStore.getImageFiles();
       assert srcNames.length == 1 : "No snapshot temporary dir.";
-      TransferFsImage.getFileClient(fileServer, fileId, srcNames, false);
+      TransferFsImage.downloadImageToStorage(fileServer, HdfsConstants.INVALID_TXID, ssStore, true, srcNames);
       LOG.info("Downloaded file " + srcNames[0].getName() + " size " +
                srcNames[0].length() + " bytes.");
 
       // get edits file
-      fileId = "getedit=1";
       srcNames = ssStore.getEditsFiles();
       assert srcNames.length == 1 : "No snapshot temporary dir.";
-      TransferFsImage.getFileClient(fileServer, fileId, srcNames, false);
+      TransferFsImage.downloadEditsToStorage(fileServer, new RemoteEditLog(), ssStore, false);
       LOG.info("Downloaded file " + srcNames[0].getName() + " size " +
                srcNames[0].length() + " bytes.");
 
       // get edits.new file (only if in the middle of ckpt)
       try {
-        fileId = "geteditnew=1";
         srcNames = ssStore.getEditsNewFiles();
         assert srcNames.length == 1 : "No snapshot temporary dir.";
-        TransferFsImage.getFileClient(fileServer, fileId, srcNames, false);
+        TransferFsImage.downloadEditsToStorage(fileServer, new RemoteEditLog(), ssStore, true);
         LOG.info("Downloaded file " + srcNames[0].getName() + " size " +
                srcNames[0].length() + " bytes.");
       } catch (FileNotFoundException e) {
@@ -483,15 +484,10 @@ static class SnapshotStorage extends FSImage {
     File tempDir;
     DataOutputStream out;
 
-    public SnapshotStorage(Configuration conf, File tempDir) throws IOException {
+    public SnapshotStorage(Configuration conf, URI tempDir) throws IOException {
       super(tempDir);
       this.conf = conf;
-      this.tempDir = tempDir;
-    }
-
-    @Override
-    public boolean isConversionNeeded(StorageDirectory sd) {
-      return false;
+      this.tempDir = new File(tempDir.getPath());
     }
 
     /**
@@ -508,8 +504,16 @@ void doMerge() throws IOException {
         throw new IOException("Could not locate snapshot temp directory.");
       }
 
-      loadFSImage(getImageFile(sdTemp, NameNodeFile.IMAGE));
-      loadFSEdits(sdTemp);
+      loadFSImage(NNStorage.getStorageFile(sdTemp, NameNodeFile.IMAGE));
+      Collection<EditLogInputStream> editStreams = new ArrayList<EditLogInputStream>(); 
+      EditLogInputStream is = new EditLogFileInputStream(NNStorage.getStorageFile(sdTemp, NameNodeFile.EDITS));
+      editStreams.add(is);
+      File editsNew = NNStorage.getStorageFile(sdTemp, NameNodeFile.EDITS_NEW);
+      if (editsNew.exists()) {
+        is = new EditLogFileInputStream(editsNew);
+        editStreams.add(is);
+      }
+      loadEdits(editStreams);
     }
 
     /** 
diff --git a/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/server/namenode/WaitingRoom.java b/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/server/namenode/WaitingRoom.java
index d641a692..e2013a37 100644
--- a/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/server/namenode/WaitingRoom.java
+++ b/src/contrib/snapshot/src/java/org/apache/hadoop/hdfs/server/namenode/WaitingRoom.java
@@ -23,7 +23,7 @@
 import org.apache.hadoop.fs.permission.*;
 import org.apache.hadoop.conf.*;
 import org.apache.hadoop.hdfs.DFSClient;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.protocol.*;
 import org.apache.hadoop.hdfs.server.common.Storage.*;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
diff --git a/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotFileRead.java b/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotFileRead.java
index fcdc5806..e7ea9066 100644
--- a/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotFileRead.java
+++ b/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotFileRead.java
@@ -27,7 +27,7 @@
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.SnapshotClient;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.server.common.Storage.*;
diff --git a/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotFileRename.java b/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotFileRename.java
index a7c786dd..dd0ce889 100644
--- a/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotFileRename.java
+++ b/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotFileRename.java
@@ -21,6 +21,8 @@
 import org.apache.commons.logging.LogFactory;
 import junit.framework.TestCase;
 import java.io.*;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.*;
 
 import org.apache.hadoop.conf.Configuration;
@@ -29,6 +31,7 @@
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.server.common.Storage.*;
 import org.apache.hadoop.hdfs.server.common.StorageInfo;
+import org.apache.hadoop.hdfs.server.common.Util;
 import org.apache.hadoop.hdfs.server.namenode.SnapshotNode.SnapshotStorage;
 import org.apache.hadoop.net.NetUtils;
 
@@ -53,7 +56,7 @@ public void testFileDeleteRename() throws IOException {
 
     String tempDir = conf.get("fs.snapshot.tempdir", "/tmp/snapshot");
     SnapshotNode ssNode = new SnapshotNode(conf);
-    SnapshotStorage ssStore = new SnapshotStorage(conf, new File(tempDir));
+    SnapshotStorage ssStore = new SnapshotStorage(conf, Util.stringAsURI(tempDir));
 
     dfs = cluster.getFileSystem();
     ssDir = conf.get("fs.snapshot.dir", "/.SNAPSHOT");
diff --git a/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotShell.java b/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotShell.java
index e8655daf..25851022 100644
--- a/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotShell.java
+++ b/src/contrib/snapshot/src/test/org/apache/hadoop/hdfs/server/namenode/TestSnapshotShell.java
@@ -27,7 +27,7 @@
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.DFSLocatedBlocks;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
diff --git a/src/contrib/streaming/ivy.xml b/src/contrib/streaming/ivy.xml
index 680a402b..82c3ec74 100644
--- a/src/contrib/streaming/ivy.xml
+++ b/src/contrib/streaming/ivy.xml
@@ -76,6 +76,10 @@
       name="guava"
       rev="${guava.version}"
       conf="common->master"/>
+    <dependency org="org.json"
+      name="json"
+      rev="${json.version}"
+      conf="common->default"/>
 <!--    <dependency org="net.java.dev.jets3t"
       name="jets3t"
       rev="${jets3t.version}"
diff --git a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
index ed1b6e25..e823cdd9 100644
--- a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
+++ b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
@@ -18,31 +18,40 @@
 
 package org.apache.hadoop.streaming;
 
-import java.io.*;
-import java.nio.charset.CharacterCodingException;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.charset.CharacterCodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
-import java.util.Map;
 import java.util.Iterator;
-import java.util.Arrays;
-import java.util.ArrayList;
+import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.logging.*;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.io.BytesWritable;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.serializer.Serializer;
 import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.OutputCollector;
+import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.util.LineReader;
+import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.UTF8ByteArrayUtils;
 
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.BytesWritable;
-
-import org.apache.hadoop.fs.FileSystem;
-
 /** Shared functionality for PipeMapper, PipeReducer.
  */
 public abstract class PipeMapRed {
@@ -66,6 +75,21 @@ public abstract class PipeMapRed {
   
   private final static int BUFFER_SIZE = 128 * 1024;
 
+  Serializer<Object> clientInputSerializer;
+  
+  /** "map" or "reduce", used for creating configuration keys */
+  private final String mapOrReduce;
+
+  /** Whether to skip outputting a new line in the input to the user process */
+  protected boolean ignoreNewLine;
+  
+  /** Whether to skip outputting the key in the input to the user process */
+  protected boolean ignoreKey;
+
+  PipeMapRed(String mapOrReduce) { 
+    this.mapOrReduce = mapOrReduce;
+  }
+
   static String[] splitArgs(String args) {
     ArrayList argList = new ArrayList();
     char[] ch = args.toCharArray();
@@ -176,6 +200,8 @@ public void configure(JobConf job) {
 
       errThread_ = new MRErrorThread();
       errThread_.start();
+
+      configureSerializer("stream." + mapOrReduce + ".input.serializer.class", job);
     } catch (Exception e) {
       logStackTrace(e);
       LOG.error("configuration exception", e);
@@ -191,6 +217,8 @@ void setStreamJobDetails(JobConf job) {
       logprintln("JobConf set minRecWrittenToEnableSkip_ =" + minRecWrittenToEnableSkip_);
     }
     taskId_ = StreamUtil.getTaskInfo(job_);
+    ignoreNewLine = job.getBoolean("stream." + mapOrReduce + ".input.ignoreNewLine", false);
+    ignoreKey = job.getBoolean("stream." + mapOrReduce + ".input.ignoreKey", false);
   }
 
   void logStackTrace(Exception e) {
@@ -612,6 +640,11 @@ String logFailure(Exception e) {
    * @throws IOException
    */
   void write(Object value) throws IOException {
+    if (clientInputSerializer != null) {
+      clientInputSerializer.serialize(value);
+      return;
+    }
+
     byte[] bval;
     int valSize;
     if (value instanceof BytesWritable) {
@@ -630,6 +663,25 @@ void write(Object value) throws IOException {
     clientOut_.write(bval, 0, valSize);
   }
 
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+  void configureSerializer(String confKey, Configuration conf) {
+    Class clientInputSerializerClass = conf.getClass(confKey, null);
+    if (clientInputSerializerClass != null) {
+      LOG.info("Using custom serializer: " + clientInputSerializerClass.getName());
+      clientInputSerializer = 
+          (Serializer) ReflectionUtils.newInstance(clientInputSerializerClass, conf);
+
+      try {
+        clientInputSerializer.open(clientOut_);
+      } catch (IOException e) {
+        LOG.error("Could not open serializer", e);
+        throw new RuntimeException(e);
+      }
+    } else {
+      LOG.info("Not using a custom serializer");
+    }
+  }
+
   long startTime_;
   long numRecRead_ = 0;
   long numRecWritten_ = 0;
diff --git a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapper.java b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapper.java
index be761ba5..b15ed13e 100644
--- a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapper.java
+++ b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapper.java
@@ -18,13 +18,14 @@
 
 package org.apache.hadoop.streaming;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Mapper;
-import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.OutputCollector;
+import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.SkipBadRecords;
 import org.apache.hadoop.mapred.TextInputFormat;
 import org.apache.hadoop.util.StringUtils;
@@ -34,13 +35,16 @@
  */
 public class PipeMapper extends PipeMapRed implements Mapper {
 
-  private boolean ignoreKey = false;
   private boolean skipping = false;
 
   private byte[] mapOutputFieldSeparator;
   private byte[] mapInputFieldSeparator;
   private int numOfMapOutputKeyFields = 1;
-  
+
+  PipeMapper() {
+    super("map");
+  }
+
   String getPipeCommand(JobConf job) {
     String str = job.get("stream.map.streamprocessor");
     if (str == null) {
@@ -59,6 +63,7 @@ boolean getDoPipe() {
     return true;
   }
   
+  @SuppressWarnings("unchecked")
   public void configure(JobConf job) {
     super.configure(job);
     //disable the auto increment of the counter. For streaming, no of 
@@ -66,8 +71,9 @@ public void configure(JobConf job) {
     //records input.
     SkipBadRecords.setAutoIncrMapperProcCount(job, false);
     skipping = job.getBoolean("mapred.skip.on", false);
-    String inputFormatClassName = job.getClass("mapred.input.format.class", TextInputFormat.class).getCanonicalName();
-    ignoreKey = inputFormatClassName.equals(TextInputFormat.class.getCanonicalName());
+    String inputFormatClassName = job.getClass("mapred.input.format.class",
+        TextInputFormat.class).getCanonicalName();
+    ignoreKey = ignoreKey || inputFormatClassName.equals(TextInputFormat.class.getCanonicalName());
 
     try {
       mapOutputFieldSeparator = job.get("stream.map.output.field.separator", "\t").getBytes("UTF-8");
@@ -103,7 +109,9 @@ public void map(Object key, Object value, OutputCollector output, Reporter repor
           clientOut_.write(getInputSeparator());
         }
         write(value);
-        clientOut_.write('\n');
+        if (!ignoreNewLine) {
+          clientOut_.write('\n');
+        }
         if(skipping) {
           //flush the streams on every record input if running in skip mode
           //so that we don't buffer other records surrounding a bad record. 
diff --git a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeReducer.java b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeReducer.java
index 122c3b4a..017e8565 100644
--- a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeReducer.java
+++ b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeReducer.java
@@ -20,18 +20,17 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
 import java.net.URLDecoder;
+import java.util.Iterator;
 
+import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.SkipBadRecords;
 import org.apache.hadoop.util.StringUtils;
 
-import org.apache.hadoop.io.Writable;
-
 /** A generic Reducer bridge.
  *  It delegates operations to an external program via stdin and stdout.
  */
@@ -42,6 +41,10 @@ public class PipeReducer extends PipeMapRed implements Reducer {
   private int numOfReduceOutputKeyFields = 1;
   private boolean skipping = false;
   
+  PipeReducer() {
+    super("reduce");
+  }
+  
   String getPipeCommand(JobConf job) {
     String str = job.get("stream.reduce.streamprocessor");
     if (str == null) {
@@ -97,10 +100,14 @@ public void reduce(Object key, Iterator values, OutputCollector output,
                                    + StringUtils.stringifyException(
                                                                     outerrThreadsThrowable));
           }
-          write(key);
-          clientOut_.write(getInputSeparator());
+          if (!ignoreKey) {
+            write(key);
+            clientOut_.write(getInputSeparator());
+          }
           write(val);
-          clientOut_.write('\n');
+          if (!ignoreNewLine) {
+            clientOut_.write('\n');
+          }
         } else {
           // "identity reduce"
           output.collect(key, val);
@@ -117,14 +124,14 @@ public void reduce(Object key, Iterator values, OutputCollector output,
       String extraInfo = "";
       try {
         int exitVal = sim.exitValue();
-	if (exitVal == 0) {
-	  extraInfo = "subprocess exited successfully\n";
-	} else {
-	  extraInfo = "subprocess exited with error code " + exitVal + "\n";
-	};
+        if (exitVal == 0) {
+          extraInfo = "subprocess exited successfully\n";
+        } else {
+          extraInfo = "subprocess exited with error code " + exitVal + "\n";
+        };
       } catch (IllegalThreadStateException e) {
         // hmm, but child is still running.  go figure.
-	extraInfo = "subprocess still running\n";
+        extraInfo = "subprocess still running\n";
       };
       appendLogToJobLog("failure");
       mapRedFinished();
diff --git a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
index 3a8fd97e..f3a0f016 100644
--- a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
+++ b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
@@ -106,6 +106,23 @@ public void setConf(Configuration conf) {
   
   @Override
   public int run(String[] args) throws Exception {
+    // Set up graceful shutdowns
+    Runtime.getRuntime().addShutdownHook(new Thread() {
+      @Override
+      public void run() {
+        if (running_ != null) {
+          try {
+            if (!running_.isComplete()) {
+              LOG.warn("killing " + running_.getTrackingURL());
+              running_.killJob();
+            }
+          } catch (IOException e) {
+            LOG.error("error killing " + running_.getID(), e);
+          }
+        }
+      }
+    });
+
     try {
       this.argv_ = args;
       init();
@@ -145,7 +162,7 @@ static public JobConf createJob(String[] argv) throws IOException {
 
   /**
    * This is the method that actually 
-   * intializes the job conf and submits the job
+   * initializes the job conf and submits the job
    * to the jobtracker
    * @throws IOException
    * @deprecated use {@link #run(String[])} instead.
diff --git a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreaming.java b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreaming.java
index 877a4dfd..fafaac2b 100644
--- a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreaming.java
+++ b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreaming.java
@@ -20,6 +20,7 @@
 
 import junit.framework.TestCase;
 import java.io.*;
+import java.util.UUID;
 
 import org.apache.hadoop.fs.FileUtil;
 
@@ -31,8 +32,10 @@ public class TestStreaming extends TestCase
 
   // "map" command: grep -E (red|green|blue)
   // reduce command: uniq
-  protected File INPUT_FILE = new File("input.txt");
-  protected File OUTPUT_DIR = new File("out");
+  protected String inputOutputPrefix =
+      System.getProperty("test.build.data", "/tmp") + "/" + UUID.randomUUID().toString();
+  protected File INPUT_FILE = new File(inputOutputPrefix + "_input.txt");
+  protected File OUTPUT_DIR = new File(inputOutputPrefix + "_out");
   protected String input = "roses.are.red\nviolets.are.blue\nbunnies.are.pink\n";
   // map behaves like "/usr/bin/tr . \\n"; (split words into lines)
   protected String map = StreamUtil.makeJavaCommand(TrApp.class, new String[]{".", "\\n"});
diff --git a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingIgnoreKey.java b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingIgnoreKey.java
new file mode 100644
index 00000000..bde9eb24
--- /dev/null
+++ b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingIgnoreKey.java
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.streaming;
+
+import java.io.File;
+import java.io.IOException;
+
+/** Test ignoring the key when preparing input for the stream reducer */
+public class TestStreamingIgnoreKey extends TestStreaming {
+
+  public TestStreamingIgnoreKey() throws IOException {
+    super();
+  }
+
+  protected String[] genArgs() {
+    return new String[] {
+        "-input", INPUT_FILE.getAbsolutePath(),
+        "-output", OUTPUT_DIR.getAbsolutePath(),
+        "-mapper", map,
+        "-reducer", reduce,
+        "-jobconf", "stream.tmpdir=" + System.getProperty("test.build.data","/tmp"),
+        "-jobconf", "stream.reduce.input.ignoreKey=true"
+    };
+  }
+
+  public void testCommandLine() throws IOException {
+    createInput();
+    boolean mayExist = false;
+    StreamJob job = new StreamJob(genArgs(), mayExist);
+    job.go();
+    File outFile = new File(OUTPUT_DIR, "part-00000").getAbsoluteFile();
+    String output = StreamUtil.slurp(outFile);
+    outFile.delete();
+    System.out.println("Output: " + output + " (length: " + output.length() + ")");
+    assertEquals("R\t\n", output);
+  }
+}
diff --git a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
index 0687d6ae..051a8c7e 100644
--- a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
+++ b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
@@ -73,6 +73,7 @@ String[] genArgs(String memLimit) {
    * is expected to be a failure.  
    */
   public void testCommandLine() {
+    /*
     if (StreamUtil.isCygwin()) {
       return;
     }
@@ -95,6 +96,7 @@ public void testCommandLine() {
       mr.shutdown();
       dfs.shutdown();
     }
+    */
   }
 
   private void writeInputFile(FileSystem fs, Path dir) throws IOException {
diff --git a/src/contrib/thriftdatanode/README b/src/contrib/thriftdatanode/README
new file mode 100644
index 00000000..915a8bf2
--- /dev/null
+++ b/src/contrib/thriftdatanode/README
@@ -0,0 +1,33 @@
+                        Thrift API for HDFS Datanode
+                        ============================
+
+Introduction:
+============
+
+The Hadoop Distributed File System is written in Java. An application
+that wants to store/fetch data to/from HDFS can use the Java API
+This means that applications that are not written in Java cannot
+access HDFS in an elegant manner.
+
+Thrift is a software framework for scalable cross-language services 
+development. It combines a powerful software stack with a code generation 
+engine to build services that work efficiently and seamlessly 
+between C++, Java, Python, PHP, and Ruby.
+
+This project exposes HDFS Datanode APIs using the Thrift software stack. This
+allows applciations written in a myriad of languages to access
+HDFS data elegantly.
+
+
+The Application Programming Interface (API)
+===========================================
+The HDFS Datanode API that is exposed through Thrift can be found in if/hadoopdatanode.thrift.
+
+Compilation
+===========
+The compilation process creates a server org.apache.hadoop.thriftfs.HadooopThriftDatanodeServer
+that implements the Thrift interface defined in if/hadoopdatanode.thrift.
+
+Th thrift compiler is used to generate API stubs in python, php, ruby,
+cocoa, etc. The generated code is checked into the directories gen-*.
+The generated java API is checked into lib/hadoopthriftdatanodeapi.jar.
diff --git a/src/contrib/thriftdatanode/build.xml b/src/contrib/thriftdatanode/build.xml
new file mode 100644
index 00000000..67a61307
--- /dev/null
+++ b/src/contrib/thriftdatanode/build.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+
+<!--
+   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.
+-->
+
+<!--
+Before you can run these subtargets directly, you need
+to call at top-level: ant deploy-contrib compile-core-test
+-->
+<project name="thriftdatanode" default="jar">
+
+  <import file="../build-contrib.xml"/>
+
+  <!-- create the list of files to add to the classpath -->
+  <fileset dir="${hadoop.root}/../thriftfs/lib" id="contrib.classpath">
+    <include name="**/*.jar" />
+    <exclude name="**/excluded/" />
+  </fileset>
+
+  <target name="thriftif">
+    <echo>Executing thrift (which needs to be in your path) to build java hadoopfs APIs.... </echo>
+    <exec executable="thrift"  failonerror="true" dir=".">
+      <arg line="--gen java --gen py -o ${root} if/hadoopdatanode.thrift " />
+    </exec>
+  </target>
+
+  <property name="gen.java.dir" value="${src.dir}/../../gen-java"/>
+
+  <!-- Compiles thrift-generated java code. Should be run when thirft
+       interface is changed. -->
+  <target name="thriftjar" depends="thriftif, init, ivy-retrieve-common">
+    <javac
+     encoding="${build.encoding}"
+     srcdir="${gen.java.dir}"
+     includes="**/*.java"
+     destdir="${build.classes}"
+     debug="${javac.debug}"
+     deprecation="${javac.deprecation}">
+     <classpath refid="contrib-classpath"/>
+    </javac>
+    <jar
+      jarfile="${root}/lib/hadoopthriftdatanodeapi.jar"
+      basedir="${build.classes}"
+      includes="**/thriftdatanode/api/"
+    />
+  </target>
+
+  <!-- Override jar target to specify main class -->
+  <target name="jar" depends="compile, copy.libs">
+    <echo>Building hadoop datanode thrift proxy ${build.dir}/hadoop-${version}-${name}.jar</echo>
+    <jar
+      jarfile="${build.dir}/hadoop-${version}-${name}.jar"
+      basedir="${build.classes}"
+    >
+  	<manifest>
+	    <attribute name="Main-Class" value="org.apache.hadoop.thriftdatanode.HadooopThriftDatanodeServer"/>
+	</manifest>
+    </jar>
+  </target>
+
+  <target name="copy.libs">
+    <mkdir dir="${build.dir}/lib"/>
+    <copy todir="${build.dir}/lib">
+      <!-- Copies the libthrift jar and the thrift API jar -->
+      <fileset dir="${src.dir}/../../lib"/>
+      <!-- Copies the thrift definition. Useful as a lib reference -->
+      <fileset dir="${src.dir}/../../if"/>
+    </copy>
+    <!-- Copies the thrift generated python libraries -->
+    <mkdir dir="${build.dir}/lib/py"/>
+    <copy todir="${build.dir}/lib/py">
+      <fileset dir="${src.dir}/../../gen-py"/>
+    </copy>
+
+  </target>
+</project>
diff --git a/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode.cpp b/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode.cpp
new file mode 100644
index 00000000..717e8186
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode.cpp
@@ -0,0 +1,1467 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+#include "ThriftHadoopDatanode.h"
+
+
+
+uint32_t ThriftHadoopDatanode_recoverBlock_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->datanode.read(iprot);
+          this->__isset.datanode = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->namespaceId.read(iprot);
+          this->__isset.namespaceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->block.read(iprot);
+          this->__isset.block = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->keepLength);
+          this->__isset.keepLength = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->targets.clear();
+            uint32_t _size0;
+            ::apache::thrift::protocol::TType _etype3;
+            iprot->readListBegin(_etype3, _size0);
+            this->targets.resize(_size0);
+            uint32_t _i4;
+            for (_i4 = 0; _i4 < _size0; ++_i4)
+            {
+              xfer += this->targets[_i4].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.targets = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->deadline);
+          this->__isset.deadline = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_recoverBlock_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_recoverBlock_args");
+  xfer += oprot->writeFieldBegin("datanode", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->datanode.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("namespaceId", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->namespaceId.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += this->block.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("keepLength", ::apache::thrift::protocol::T_BOOL, 4);
+  xfer += oprot->writeBool(this->keepLength);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("targets", ::apache::thrift::protocol::T_LIST, 5);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->targets.size()));
+    std::vector<TDatanodeID> ::const_iterator _iter5;
+    for (_iter5 = this->targets.begin(); _iter5 != this->targets.end(); ++_iter5)
+    {
+      xfer += (*_iter5).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("deadline", ::apache::thrift::protocol::T_I64, 6);
+  xfer += oprot->writeI64(this->deadline);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_recoverBlock_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_recoverBlock_pargs");
+  xfer += oprot->writeFieldBegin("datanode", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->datanode)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("namespaceId", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->namespaceId)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += (*(this->block)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("keepLength", ::apache::thrift::protocol::T_BOOL, 4);
+  xfer += oprot->writeBool((*(this->keepLength)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("targets", ::apache::thrift::protocol::T_LIST, 5);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->targets)).size()));
+    std::vector<TDatanodeID> ::const_iterator _iter6;
+    for (_iter6 = (*(this->targets)).begin(); _iter6 != (*(this->targets)).end(); ++_iter6)
+    {
+      xfer += (*_iter6).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("deadline", ::apache::thrift::protocol::T_I64, 6);
+  xfer += oprot->writeI64((*(this->deadline)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_recoverBlock_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->success.read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_recoverBlock_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_recoverBlock_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+    xfer += this->success.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_recoverBlock_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += (*(this->success)).read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockInfo_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->datanode.read(iprot);
+          this->__isset.datanode = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->namespaceid.read(iprot);
+          this->__isset.namespaceid = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->block.read(iprot);
+          this->__isset.block = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockInfo_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_getBlockInfo_args");
+  xfer += oprot->writeFieldBegin("datanode", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->datanode.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("namespaceid", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->namespaceid.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += this->block.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockInfo_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_getBlockInfo_pargs");
+  xfer += oprot->writeFieldBegin("datanode", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->datanode)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("namespaceid", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->namespaceid)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += (*(this->block)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockInfo_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->success.read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockInfo_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_getBlockInfo_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+    xfer += this->success.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockInfo_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += (*(this->success)).read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_copyBlock_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->datanode.read(iprot);
+          this->__isset.datanode = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->srcNamespaceId.read(iprot);
+          this->__isset.srcNamespaceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->srcblock.read(iprot);
+          this->__isset.srcblock = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->dstNamespaceId.read(iprot);
+          this->__isset.dstNamespaceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->destBlock.read(iprot);
+          this->__isset.destBlock = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->target.read(iprot);
+          this->__isset.target = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->asynchronous);
+          this->__isset.asynchronous = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_copyBlock_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_copyBlock_args");
+  xfer += oprot->writeFieldBegin("datanode", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->datanode.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("srcNamespaceId", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->srcNamespaceId.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("srcblock", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += this->srcblock.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("dstNamespaceId", ::apache::thrift::protocol::T_STRUCT, 4);
+  xfer += this->dstNamespaceId.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("destBlock", ::apache::thrift::protocol::T_STRUCT, 5);
+  xfer += this->destBlock.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("target", ::apache::thrift::protocol::T_STRUCT, 6);
+  xfer += this->target.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("asynchronous", ::apache::thrift::protocol::T_BOOL, 7);
+  xfer += oprot->writeBool(this->asynchronous);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_copyBlock_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_copyBlock_pargs");
+  xfer += oprot->writeFieldBegin("datanode", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->datanode)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("srcNamespaceId", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->srcNamespaceId)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("srcblock", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += (*(this->srcblock)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("dstNamespaceId", ::apache::thrift::protocol::T_STRUCT, 4);
+  xfer += (*(this->dstNamespaceId)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("destBlock", ::apache::thrift::protocol::T_STRUCT, 5);
+  xfer += (*(this->destBlock)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("target", ::apache::thrift::protocol::T_STRUCT, 6);
+  xfer += (*(this->target)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("asynchronous", ::apache::thrift::protocol::T_BOOL, 7);
+  xfer += oprot->writeBool((*(this->asynchronous)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_copyBlock_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_copyBlock_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_copyBlock_result");
+
+  if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_copyBlock_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockPathInfo_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->datanode.read(iprot);
+          this->__isset.datanode = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->namespaceId.read(iprot);
+          this->__isset.namespaceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->block.read(iprot);
+          this->__isset.block = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockPathInfo_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_getBlockPathInfo_args");
+  xfer += oprot->writeFieldBegin("datanode", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->datanode.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("namespaceId", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->namespaceId.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += this->block.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockPathInfo_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_getBlockPathInfo_pargs");
+  xfer += oprot->writeFieldBegin("datanode", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->datanode)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("namespaceId", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->namespaceId)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += (*(this->block)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockPathInfo_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->success.read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockPathInfo_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopDatanode_getBlockPathInfo_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+    xfer += this->success.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopDatanode_getBlockPathInfo_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += (*(this->success)).read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+void ThriftHadoopDatanodeClient::recoverBlock(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block, const bool keepLength, const std::vector<TDatanodeID> & targets, const int64_t deadline)
+{
+  send_recoverBlock(datanode, namespaceId, block, keepLength, targets, deadline);
+  recv_recoverBlock(_return);
+}
+
+void ThriftHadoopDatanodeClient::send_recoverBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block, const bool keepLength, const std::vector<TDatanodeID> & targets, const int64_t deadline)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("recoverBlock", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopDatanode_recoverBlock_pargs args;
+  args.datanode = &datanode;
+  args.namespaceId = &namespaceId;
+  args.block = &block;
+  args.keepLength = &keepLength;
+  args.targets = &targets;
+  args.deadline = &deadline;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopDatanodeClient::recv_recoverBlock(ThdfsBlock& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("recoverBlock") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopDatanode_recoverBlock_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "recoverBlock failed: unknown result");
+}
+
+void ThriftHadoopDatanodeClient::getBlockInfo(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceid, const ThdfsBlock& block)
+{
+  send_getBlockInfo(datanode, namespaceid, block);
+  recv_getBlockInfo(_return);
+}
+
+void ThriftHadoopDatanodeClient::send_getBlockInfo(const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceid, const ThdfsBlock& block)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getBlockInfo", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopDatanode_getBlockInfo_pargs args;
+  args.datanode = &datanode;
+  args.namespaceid = &namespaceid;
+  args.block = &block;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopDatanodeClient::recv_getBlockInfo(ThdfsBlock& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getBlockInfo") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopDatanode_getBlockInfo_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getBlockInfo failed: unknown result");
+}
+
+void ThriftHadoopDatanodeClient::copyBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& srcNamespaceId, const ThdfsBlock& srcblock, const ThdfsNamespaceId& dstNamespaceId, const ThdfsBlock& destBlock, const TDatanodeID& target, const bool asynchronous)
+{
+  send_copyBlock(datanode, srcNamespaceId, srcblock, dstNamespaceId, destBlock, target, asynchronous);
+  recv_copyBlock();
+}
+
+void ThriftHadoopDatanodeClient::send_copyBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& srcNamespaceId, const ThdfsBlock& srcblock, const ThdfsNamespaceId& dstNamespaceId, const ThdfsBlock& destBlock, const TDatanodeID& target, const bool asynchronous)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("copyBlock", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopDatanode_copyBlock_pargs args;
+  args.datanode = &datanode;
+  args.srcNamespaceId = &srcNamespaceId;
+  args.srcblock = &srcblock;
+  args.dstNamespaceId = &dstNamespaceId;
+  args.destBlock = &destBlock;
+  args.target = &target;
+  args.asynchronous = &asynchronous;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopDatanodeClient::recv_copyBlock()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("copyBlock") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopDatanode_copyBlock_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  return;
+}
+
+void ThriftHadoopDatanodeClient::getBlockPathInfo(ThdfsBlockPath& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block)
+{
+  send_getBlockPathInfo(datanode, namespaceId, block);
+  recv_getBlockPathInfo(_return);
+}
+
+void ThriftHadoopDatanodeClient::send_getBlockPathInfo(const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getBlockPathInfo", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopDatanode_getBlockPathInfo_pargs args;
+  args.datanode = &datanode;
+  args.namespaceId = &namespaceId;
+  args.block = &block;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopDatanodeClient::recv_getBlockPathInfo(ThdfsBlockPath& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getBlockPathInfo") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopDatanode_getBlockPathInfo_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getBlockPathInfo failed: unknown result");
+}
+
+bool ThriftHadoopDatanodeProcessor::process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* callContext) {
+
+  ::apache::thrift::protocol::TProtocol* iprot = piprot.get();
+  ::apache::thrift::protocol::TProtocol* oprot = poprot.get();
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+  int32_t seqid;
+
+  iprot->readMessageBegin(fname, mtype, seqid);
+
+  if (mtype != ::apache::thrift::protocol::T_CALL && mtype != ::apache::thrift::protocol::T_ONEWAY) {
+    iprot->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot->readMessageEnd();
+    iprot->getTransport()->readEnd();
+    ::apache::thrift::TApplicationException x(::apache::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
+    oprot->writeMessageBegin(fname, ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return false;
+  }
+
+  return process_fn(iprot, oprot, fname, seqid, callContext);
+}
+
+bool ThriftHadoopDatanodeProcessor::process_fn(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, std::string& fname, int32_t seqid, void* callContext) {
+  std::map<std::string, void (ThriftHadoopDatanodeProcessor::*)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*)>::iterator pfn;
+  pfn = processMap_.find(fname);
+  if (pfn == processMap_.end()) {
+    iprot->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot->readMessageEnd();
+    iprot->getTransport()->readEnd();
+    ::apache::thrift::TApplicationException x(::apache::thrift::TApplicationException::UNKNOWN_METHOD, "Invalid method name: '"+fname+"'");
+    oprot->writeMessageBegin(fname, ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return false;
+  }
+  (this->*(pfn->second))(seqid, iprot, oprot, callContext);
+  return true;
+}
+
+void ThriftHadoopDatanodeProcessor::process_recoverBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopDatanode.recoverBlock", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopDatanode.recoverBlock");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopDatanode.recoverBlock");
+  }
+
+  ThriftHadoopDatanode_recoverBlock_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopDatanode.recoverBlock", bytes);
+  }
+
+  ThriftHadoopDatanode_recoverBlock_result result;
+  try {
+    iface_->recoverBlock(result.success, args.datanode, args.namespaceId, args.block, args.keepLength, args.targets, args.deadline);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopDatanode.recoverBlock");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("recoverBlock", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopDatanode.recoverBlock");
+  }
+
+  oprot->writeMessageBegin("recoverBlock", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopDatanode.recoverBlock", bytes);
+  }
+}
+
+void ThriftHadoopDatanodeProcessor::process_getBlockInfo(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopDatanode.getBlockInfo", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopDatanode.getBlockInfo");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopDatanode.getBlockInfo");
+  }
+
+  ThriftHadoopDatanode_getBlockInfo_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopDatanode.getBlockInfo", bytes);
+  }
+
+  ThriftHadoopDatanode_getBlockInfo_result result;
+  try {
+    iface_->getBlockInfo(result.success, args.datanode, args.namespaceid, args.block);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopDatanode.getBlockInfo");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getBlockInfo", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopDatanode.getBlockInfo");
+  }
+
+  oprot->writeMessageBegin("getBlockInfo", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopDatanode.getBlockInfo", bytes);
+  }
+}
+
+void ThriftHadoopDatanodeProcessor::process_copyBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopDatanode.copyBlock", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopDatanode.copyBlock");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopDatanode.copyBlock");
+  }
+
+  ThriftHadoopDatanode_copyBlock_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopDatanode.copyBlock", bytes);
+  }
+
+  ThriftHadoopDatanode_copyBlock_result result;
+  try {
+    iface_->copyBlock(args.datanode, args.srcNamespaceId, args.srcblock, args.dstNamespaceId, args.destBlock, args.target, args.asynchronous);
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopDatanode.copyBlock");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("copyBlock", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopDatanode.copyBlock");
+  }
+
+  oprot->writeMessageBegin("copyBlock", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopDatanode.copyBlock", bytes);
+  }
+}
+
+void ThriftHadoopDatanodeProcessor::process_getBlockPathInfo(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopDatanode.getBlockPathInfo", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopDatanode.getBlockPathInfo");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopDatanode.getBlockPathInfo");
+  }
+
+  ThriftHadoopDatanode_getBlockPathInfo_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopDatanode.getBlockPathInfo", bytes);
+  }
+
+  ThriftHadoopDatanode_getBlockPathInfo_result result;
+  try {
+    iface_->getBlockPathInfo(result.success, args.datanode, args.namespaceId, args.block);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopDatanode.getBlockPathInfo");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getBlockPathInfo", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopDatanode.getBlockPathInfo");
+  }
+
+  oprot->writeMessageBegin("getBlockPathInfo", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopDatanode.getBlockPathInfo", bytes);
+  }
+}
+
+
+
diff --git a/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode.h b/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode.h
new file mode 100644
index 00000000..b2ed3083
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode.h
@@ -0,0 +1,758 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+#ifndef ThriftHadoopDatanode_H
+#define ThriftHadoopDatanode_H
+
+#include <TProcessor.h>
+#include "hadoopdatanode_types.h"
+
+
+
+class ThriftHadoopDatanodeIf {
+ public:
+  virtual ~ThriftHadoopDatanodeIf() {}
+  virtual void recoverBlock(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block, const bool keepLength, const std::vector<TDatanodeID> & targets, const int64_t deadline) = 0;
+  virtual void getBlockInfo(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceid, const ThdfsBlock& block) = 0;
+  virtual void copyBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& srcNamespaceId, const ThdfsBlock& srcblock, const ThdfsNamespaceId& dstNamespaceId, const ThdfsBlock& destBlock, const TDatanodeID& target, const bool asynchronous) = 0;
+  virtual void getBlockPathInfo(ThdfsBlockPath& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block) = 0;
+};
+
+class ThriftHadoopDatanodeNull : virtual public ThriftHadoopDatanodeIf {
+ public:
+  virtual ~ThriftHadoopDatanodeNull() {}
+  void recoverBlock(ThdfsBlock& /* _return */, const TDatanodeID& /* datanode */, const ThdfsNamespaceId& /* namespaceId */, const ThdfsBlock& /* block */, const bool /* keepLength */, const std::vector<TDatanodeID> & /* targets */, const int64_t /* deadline */) {
+    return;
+  }
+  void getBlockInfo(ThdfsBlock& /* _return */, const TDatanodeID& /* datanode */, const ThdfsNamespaceId& /* namespaceid */, const ThdfsBlock& /* block */) {
+    return;
+  }
+  void copyBlock(const TDatanodeID& /* datanode */, const ThdfsNamespaceId& /* srcNamespaceId */, const ThdfsBlock& /* srcblock */, const ThdfsNamespaceId& /* dstNamespaceId */, const ThdfsBlock& /* destBlock */, const TDatanodeID& /* target */, const bool /* asynchronous */) {
+    return;
+  }
+  void getBlockPathInfo(ThdfsBlockPath& /* _return */, const TDatanodeID& /* datanode */, const ThdfsNamespaceId& /* namespaceId */, const ThdfsBlock& /* block */) {
+    return;
+  }
+};
+
+typedef struct _ThriftHadoopDatanode_recoverBlock_args__isset {
+  _ThriftHadoopDatanode_recoverBlock_args__isset() : datanode(false), namespaceId(false), block(false), keepLength(false), targets(false), deadline(false) {}
+  bool datanode;
+  bool namespaceId;
+  bool block;
+  bool keepLength;
+  bool targets;
+  bool deadline;
+} _ThriftHadoopDatanode_recoverBlock_args__isset;
+
+class ThriftHadoopDatanode_recoverBlock_args {
+ public:
+
+  ThriftHadoopDatanode_recoverBlock_args() : keepLength(0), deadline(0) {
+  }
+
+  virtual ~ThriftHadoopDatanode_recoverBlock_args() throw() {}
+
+  TDatanodeID datanode;
+  ThdfsNamespaceId namespaceId;
+  ThdfsBlock block;
+  bool keepLength;
+  std::vector<TDatanodeID>  targets;
+  int64_t deadline;
+
+  _ThriftHadoopDatanode_recoverBlock_args__isset __isset;
+
+  void __set_datanode(const TDatanodeID& val) {
+    datanode = val;
+  }
+
+  void __set_namespaceId(const ThdfsNamespaceId& val) {
+    namespaceId = val;
+  }
+
+  void __set_block(const ThdfsBlock& val) {
+    block = val;
+  }
+
+  void __set_keepLength(const bool val) {
+    keepLength = val;
+  }
+
+  void __set_targets(const std::vector<TDatanodeID> & val) {
+    targets = val;
+  }
+
+  void __set_deadline(const int64_t val) {
+    deadline = val;
+  }
+
+  bool operator == (const ThriftHadoopDatanode_recoverBlock_args & rhs) const
+  {
+    if (!(datanode == rhs.datanode))
+      return false;
+    if (!(namespaceId == rhs.namespaceId))
+      return false;
+    if (!(block == rhs.block))
+      return false;
+    if (!(keepLength == rhs.keepLength))
+      return false;
+    if (!(targets == rhs.targets))
+      return false;
+    if (!(deadline == rhs.deadline))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopDatanode_recoverBlock_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopDatanode_recoverBlock_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopDatanode_recoverBlock_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopDatanode_recoverBlock_pargs() throw() {}
+
+  const TDatanodeID* datanode;
+  const ThdfsNamespaceId* namespaceId;
+  const ThdfsBlock* block;
+  const bool* keepLength;
+  const std::vector<TDatanodeID> * targets;
+  const int64_t* deadline;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopDatanode_recoverBlock_result__isset {
+  _ThriftHadoopDatanode_recoverBlock_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopDatanode_recoverBlock_result__isset;
+
+class ThriftHadoopDatanode_recoverBlock_result {
+ public:
+
+  ThriftHadoopDatanode_recoverBlock_result() {
+  }
+
+  virtual ~ThriftHadoopDatanode_recoverBlock_result() throw() {}
+
+  ThdfsBlock success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopDatanode_recoverBlock_result__isset __isset;
+
+  void __set_success(const ThdfsBlock& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopDatanode_recoverBlock_result & rhs) const
+  {
+    if (!(success == rhs.success))
+      return false;
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopDatanode_recoverBlock_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopDatanode_recoverBlock_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopDatanode_recoverBlock_presult__isset {
+  _ThriftHadoopDatanode_recoverBlock_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopDatanode_recoverBlock_presult__isset;
+
+class ThriftHadoopDatanode_recoverBlock_presult {
+ public:
+
+
+  virtual ~ThriftHadoopDatanode_recoverBlock_presult() throw() {}
+
+  ThdfsBlock* success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopDatanode_recoverBlock_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopDatanode_getBlockInfo_args__isset {
+  _ThriftHadoopDatanode_getBlockInfo_args__isset() : datanode(false), namespaceid(false), block(false) {}
+  bool datanode;
+  bool namespaceid;
+  bool block;
+} _ThriftHadoopDatanode_getBlockInfo_args__isset;
+
+class ThriftHadoopDatanode_getBlockInfo_args {
+ public:
+
+  ThriftHadoopDatanode_getBlockInfo_args() {
+  }
+
+  virtual ~ThriftHadoopDatanode_getBlockInfo_args() throw() {}
+
+  TDatanodeID datanode;
+  ThdfsNamespaceId namespaceid;
+  ThdfsBlock block;
+
+  _ThriftHadoopDatanode_getBlockInfo_args__isset __isset;
+
+  void __set_datanode(const TDatanodeID& val) {
+    datanode = val;
+  }
+
+  void __set_namespaceid(const ThdfsNamespaceId& val) {
+    namespaceid = val;
+  }
+
+  void __set_block(const ThdfsBlock& val) {
+    block = val;
+  }
+
+  bool operator == (const ThriftHadoopDatanode_getBlockInfo_args & rhs) const
+  {
+    if (!(datanode == rhs.datanode))
+      return false;
+    if (!(namespaceid == rhs.namespaceid))
+      return false;
+    if (!(block == rhs.block))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopDatanode_getBlockInfo_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopDatanode_getBlockInfo_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopDatanode_getBlockInfo_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopDatanode_getBlockInfo_pargs() throw() {}
+
+  const TDatanodeID* datanode;
+  const ThdfsNamespaceId* namespaceid;
+  const ThdfsBlock* block;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopDatanode_getBlockInfo_result__isset {
+  _ThriftHadoopDatanode_getBlockInfo_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopDatanode_getBlockInfo_result__isset;
+
+class ThriftHadoopDatanode_getBlockInfo_result {
+ public:
+
+  ThriftHadoopDatanode_getBlockInfo_result() {
+  }
+
+  virtual ~ThriftHadoopDatanode_getBlockInfo_result() throw() {}
+
+  ThdfsBlock success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopDatanode_getBlockInfo_result__isset __isset;
+
+  void __set_success(const ThdfsBlock& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopDatanode_getBlockInfo_result & rhs) const
+  {
+    if (!(success == rhs.success))
+      return false;
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopDatanode_getBlockInfo_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopDatanode_getBlockInfo_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopDatanode_getBlockInfo_presult__isset {
+  _ThriftHadoopDatanode_getBlockInfo_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopDatanode_getBlockInfo_presult__isset;
+
+class ThriftHadoopDatanode_getBlockInfo_presult {
+ public:
+
+
+  virtual ~ThriftHadoopDatanode_getBlockInfo_presult() throw() {}
+
+  ThdfsBlock* success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopDatanode_getBlockInfo_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopDatanode_copyBlock_args__isset {
+  _ThriftHadoopDatanode_copyBlock_args__isset() : datanode(false), srcNamespaceId(false), srcblock(false), dstNamespaceId(false), destBlock(false), target(false), asynchronous(false) {}
+  bool datanode;
+  bool srcNamespaceId;
+  bool srcblock;
+  bool dstNamespaceId;
+  bool destBlock;
+  bool target;
+  bool asynchronous;
+} _ThriftHadoopDatanode_copyBlock_args__isset;
+
+class ThriftHadoopDatanode_copyBlock_args {
+ public:
+
+  ThriftHadoopDatanode_copyBlock_args() : asynchronous(0) {
+  }
+
+  virtual ~ThriftHadoopDatanode_copyBlock_args() throw() {}
+
+  TDatanodeID datanode;
+  ThdfsNamespaceId srcNamespaceId;
+  ThdfsBlock srcblock;
+  ThdfsNamespaceId dstNamespaceId;
+  ThdfsBlock destBlock;
+  TDatanodeID target;
+  bool asynchronous;
+
+  _ThriftHadoopDatanode_copyBlock_args__isset __isset;
+
+  void __set_datanode(const TDatanodeID& val) {
+    datanode = val;
+  }
+
+  void __set_srcNamespaceId(const ThdfsNamespaceId& val) {
+    srcNamespaceId = val;
+  }
+
+  void __set_srcblock(const ThdfsBlock& val) {
+    srcblock = val;
+  }
+
+  void __set_dstNamespaceId(const ThdfsNamespaceId& val) {
+    dstNamespaceId = val;
+  }
+
+  void __set_destBlock(const ThdfsBlock& val) {
+    destBlock = val;
+  }
+
+  void __set_target(const TDatanodeID& val) {
+    target = val;
+  }
+
+  void __set_asynchronous(const bool val) {
+    asynchronous = val;
+  }
+
+  bool operator == (const ThriftHadoopDatanode_copyBlock_args & rhs) const
+  {
+    if (!(datanode == rhs.datanode))
+      return false;
+    if (!(srcNamespaceId == rhs.srcNamespaceId))
+      return false;
+    if (!(srcblock == rhs.srcblock))
+      return false;
+    if (!(dstNamespaceId == rhs.dstNamespaceId))
+      return false;
+    if (!(destBlock == rhs.destBlock))
+      return false;
+    if (!(target == rhs.target))
+      return false;
+    if (!(asynchronous == rhs.asynchronous))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopDatanode_copyBlock_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopDatanode_copyBlock_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopDatanode_copyBlock_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopDatanode_copyBlock_pargs() throw() {}
+
+  const TDatanodeID* datanode;
+  const ThdfsNamespaceId* srcNamespaceId;
+  const ThdfsBlock* srcblock;
+  const ThdfsNamespaceId* dstNamespaceId;
+  const ThdfsBlock* destBlock;
+  const TDatanodeID* target;
+  const bool* asynchronous;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopDatanode_copyBlock_result__isset {
+  _ThriftHadoopDatanode_copyBlock_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopDatanode_copyBlock_result__isset;
+
+class ThriftHadoopDatanode_copyBlock_result {
+ public:
+
+  ThriftHadoopDatanode_copyBlock_result() {
+  }
+
+  virtual ~ThriftHadoopDatanode_copyBlock_result() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopDatanode_copyBlock_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopDatanode_copyBlock_result & rhs) const
+  {
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopDatanode_copyBlock_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopDatanode_copyBlock_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopDatanode_copyBlock_presult__isset {
+  _ThriftHadoopDatanode_copyBlock_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopDatanode_copyBlock_presult__isset;
+
+class ThriftHadoopDatanode_copyBlock_presult {
+ public:
+
+
+  virtual ~ThriftHadoopDatanode_copyBlock_presult() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopDatanode_copyBlock_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopDatanode_getBlockPathInfo_args__isset {
+  _ThriftHadoopDatanode_getBlockPathInfo_args__isset() : datanode(false), namespaceId(false), block(false) {}
+  bool datanode;
+  bool namespaceId;
+  bool block;
+} _ThriftHadoopDatanode_getBlockPathInfo_args__isset;
+
+class ThriftHadoopDatanode_getBlockPathInfo_args {
+ public:
+
+  ThriftHadoopDatanode_getBlockPathInfo_args() {
+  }
+
+  virtual ~ThriftHadoopDatanode_getBlockPathInfo_args() throw() {}
+
+  TDatanodeID datanode;
+  ThdfsNamespaceId namespaceId;
+  ThdfsBlock block;
+
+  _ThriftHadoopDatanode_getBlockPathInfo_args__isset __isset;
+
+  void __set_datanode(const TDatanodeID& val) {
+    datanode = val;
+  }
+
+  void __set_namespaceId(const ThdfsNamespaceId& val) {
+    namespaceId = val;
+  }
+
+  void __set_block(const ThdfsBlock& val) {
+    block = val;
+  }
+
+  bool operator == (const ThriftHadoopDatanode_getBlockPathInfo_args & rhs) const
+  {
+    if (!(datanode == rhs.datanode))
+      return false;
+    if (!(namespaceId == rhs.namespaceId))
+      return false;
+    if (!(block == rhs.block))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopDatanode_getBlockPathInfo_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopDatanode_getBlockPathInfo_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopDatanode_getBlockPathInfo_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopDatanode_getBlockPathInfo_pargs() throw() {}
+
+  const TDatanodeID* datanode;
+  const ThdfsNamespaceId* namespaceId;
+  const ThdfsBlock* block;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopDatanode_getBlockPathInfo_result__isset {
+  _ThriftHadoopDatanode_getBlockPathInfo_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopDatanode_getBlockPathInfo_result__isset;
+
+class ThriftHadoopDatanode_getBlockPathInfo_result {
+ public:
+
+  ThriftHadoopDatanode_getBlockPathInfo_result() {
+  }
+
+  virtual ~ThriftHadoopDatanode_getBlockPathInfo_result() throw() {}
+
+  ThdfsBlockPath success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopDatanode_getBlockPathInfo_result__isset __isset;
+
+  void __set_success(const ThdfsBlockPath& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopDatanode_getBlockPathInfo_result & rhs) const
+  {
+    if (!(success == rhs.success))
+      return false;
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopDatanode_getBlockPathInfo_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopDatanode_getBlockPathInfo_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopDatanode_getBlockPathInfo_presult__isset {
+  _ThriftHadoopDatanode_getBlockPathInfo_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopDatanode_getBlockPathInfo_presult__isset;
+
+class ThriftHadoopDatanode_getBlockPathInfo_presult {
+ public:
+
+
+  virtual ~ThriftHadoopDatanode_getBlockPathInfo_presult() throw() {}
+
+  ThdfsBlockPath* success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopDatanode_getBlockPathInfo_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+class ThriftHadoopDatanodeClient : virtual public ThriftHadoopDatanodeIf {
+ public:
+  ThriftHadoopDatanodeClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) :
+    piprot_(prot),
+    poprot_(prot) {
+    iprot_ = prot.get();
+    oprot_ = prot.get();
+  }
+  ThriftHadoopDatanodeClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) :
+    piprot_(iprot),
+    poprot_(oprot) {
+    iprot_ = iprot.get();
+    oprot_ = oprot.get();
+  }
+  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+    return piprot_;
+  }
+  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+    return poprot_;
+  }
+  void recoverBlock(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block, const bool keepLength, const std::vector<TDatanodeID> & targets, const int64_t deadline);
+  void send_recoverBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block, const bool keepLength, const std::vector<TDatanodeID> & targets, const int64_t deadline);
+  void recv_recoverBlock(ThdfsBlock& _return);
+  void getBlockInfo(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceid, const ThdfsBlock& block);
+  void send_getBlockInfo(const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceid, const ThdfsBlock& block);
+  void recv_getBlockInfo(ThdfsBlock& _return);
+  void copyBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& srcNamespaceId, const ThdfsBlock& srcblock, const ThdfsNamespaceId& dstNamespaceId, const ThdfsBlock& destBlock, const TDatanodeID& target, const bool asynchronous);
+  void send_copyBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& srcNamespaceId, const ThdfsBlock& srcblock, const ThdfsNamespaceId& dstNamespaceId, const ThdfsBlock& destBlock, const TDatanodeID& target, const bool asynchronous);
+  void recv_copyBlock();
+  void getBlockPathInfo(ThdfsBlockPath& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block);
+  void send_getBlockPathInfo(const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block);
+  void recv_getBlockPathInfo(ThdfsBlockPath& _return);
+ protected:
+  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+  ::apache::thrift::protocol::TProtocol* iprot_;
+  ::apache::thrift::protocol::TProtocol* oprot_;
+};
+
+class ThriftHadoopDatanodeProcessor : virtual public ::apache::thrift::TProcessor {
+ protected:
+  boost::shared_ptr<ThriftHadoopDatanodeIf> iface_;
+  virtual bool process_fn(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, std::string& fname, int32_t seqid, void* callContext);
+ private:
+  std::map<std::string, void (ThriftHadoopDatanodeProcessor::*)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*)> processMap_;
+  void process_recoverBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getBlockInfo(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_copyBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getBlockPathInfo(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ public:
+  ThriftHadoopDatanodeProcessor(boost::shared_ptr<ThriftHadoopDatanodeIf> iface) :
+    iface_(iface) {
+    processMap_["recoverBlock"] = &ThriftHadoopDatanodeProcessor::process_recoverBlock;
+    processMap_["getBlockInfo"] = &ThriftHadoopDatanodeProcessor::process_getBlockInfo;
+    processMap_["copyBlock"] = &ThriftHadoopDatanodeProcessor::process_copyBlock;
+    processMap_["getBlockPathInfo"] = &ThriftHadoopDatanodeProcessor::process_getBlockPathInfo;
+  }
+
+  virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* callContext);
+  virtual ~ThriftHadoopDatanodeProcessor() {}
+};
+
+class ThriftHadoopDatanodeMultiface : virtual public ThriftHadoopDatanodeIf {
+ public:
+  ThriftHadoopDatanodeMultiface(std::vector<boost::shared_ptr<ThriftHadoopDatanodeIf> >& ifaces) : ifaces_(ifaces) {
+  }
+  virtual ~ThriftHadoopDatanodeMultiface() {}
+ protected:
+  std::vector<boost::shared_ptr<ThriftHadoopDatanodeIf> > ifaces_;
+  ThriftHadoopDatanodeMultiface() {}
+  void add(boost::shared_ptr<ThriftHadoopDatanodeIf> iface) {
+    ifaces_.push_back(iface);
+  }
+ public:
+  void recoverBlock(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block, const bool keepLength, const std::vector<TDatanodeID> & targets, const int64_t deadline) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      if (i == sz - 1) {
+        ifaces_[i]->recoverBlock(_return, datanode, namespaceId, block, keepLength, targets, deadline);
+        return;
+      } else {
+        ifaces_[i]->recoverBlock(_return, datanode, namespaceId, block, keepLength, targets, deadline);
+      }
+    }
+  }
+
+  void getBlockInfo(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceid, const ThdfsBlock& block) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      if (i == sz - 1) {
+        ifaces_[i]->getBlockInfo(_return, datanode, namespaceid, block);
+        return;
+      } else {
+        ifaces_[i]->getBlockInfo(_return, datanode, namespaceid, block);
+      }
+    }
+  }
+
+  void copyBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& srcNamespaceId, const ThdfsBlock& srcblock, const ThdfsNamespaceId& dstNamespaceId, const ThdfsBlock& destBlock, const TDatanodeID& target, const bool asynchronous) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      ifaces_[i]->copyBlock(datanode, srcNamespaceId, srcblock, dstNamespaceId, destBlock, target, asynchronous);
+    }
+  }
+
+  void getBlockPathInfo(ThdfsBlockPath& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      if (i == sz - 1) {
+        ifaces_[i]->getBlockPathInfo(_return, datanode, namespaceId, block);
+        return;
+      } else {
+        ifaces_[i]->getBlockPathInfo(_return, datanode, namespaceId, block);
+      }
+    }
+  }
+
+};
+
+
+
+#endif
diff --git a/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode_server.skeleton.cpp b/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode_server.skeleton.cpp
new file mode 100644
index 00000000..3f15655e
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-cpp/ThriftHadoopDatanode_server.skeleton.cpp
@@ -0,0 +1,57 @@
+// This autogenerated skeleton file illustrates how to build a server.
+// You should copy it to another filename to avoid overwriting it.
+
+#include "ThriftHadoopDatanode.h"
+#include <protocol/TBinaryProtocol.h>
+#include <server/TSimpleServer.h>
+#include <transport/TServerSocket.h>
+#include <transport/TBufferTransports.h>
+
+using namespace ::apache::thrift;
+using namespace ::apache::thrift::protocol;
+using namespace ::apache::thrift::transport;
+using namespace ::apache::thrift::server;
+
+using boost::shared_ptr;
+
+class ThriftHadoopDatanodeHandler : virtual public ThriftHadoopDatanodeIf {
+ public:
+  ThriftHadoopDatanodeHandler() {
+    // Your initialization goes here
+  }
+
+  void recoverBlock(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block, const bool keepLength, const std::vector<TDatanodeID> & targets, const int64_t deadline) {
+    // Your implementation goes here
+    printf("recoverBlock\n");
+  }
+
+  void getBlockInfo(ThdfsBlock& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceid, const ThdfsBlock& block) {
+    // Your implementation goes here
+    printf("getBlockInfo\n");
+  }
+
+  void copyBlock(const TDatanodeID& datanode, const ThdfsNamespaceId& srcNamespaceId, const ThdfsBlock& srcblock, const ThdfsNamespaceId& dstNamespaceId, const ThdfsBlock& destBlock, const TDatanodeID& target, const bool asynchronous) {
+    // Your implementation goes here
+    printf("copyBlock\n");
+  }
+
+  void getBlockPathInfo(ThdfsBlockPath& _return, const TDatanodeID& datanode, const ThdfsNamespaceId& namespaceId, const ThdfsBlock& block) {
+    // Your implementation goes here
+    printf("getBlockPathInfo\n");
+  }
+
+};
+
+int main(int argc, char **argv) {
+  int port = 9090;
+  shared_ptr<ThriftHadoopDatanodeHandler> handler(new ThriftHadoopDatanodeHandler());
+  shared_ptr<TProcessor> processor(new ThriftHadoopDatanodeProcessor(handler));
+  shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
+  shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
+  shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
+
+  TSimpleServer server(processor, serverTransport, transportFactory, protocolFactory);
+  server.serve();
+  return 0;
+}
+
diff --git a/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_constants.cpp b/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_constants.cpp
new file mode 100644
index 00000000..ecf0d136
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_constants.cpp
@@ -0,0 +1,16 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+#include "hadoopdatanode_constants.h"
+
+
+
+const hadoopdatanodeConstants g_hadoopdatanode_constants;
+
+hadoopdatanodeConstants::hadoopdatanodeConstants() {
+}
+
+
+
diff --git a/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_constants.h b/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_constants.h
new file mode 100644
index 00000000..f63ff578
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_constants.h
@@ -0,0 +1,23 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+#ifndef hadoopdatanode_CONSTANTS_H
+#define hadoopdatanode_CONSTANTS_H
+
+#include "hadoopdatanode_types.h"
+
+
+
+class hadoopdatanodeConstants {
+ public:
+  hadoopdatanodeConstants();
+
+};
+
+extern const hadoopdatanodeConstants g_hadoopdatanode_constants;
+
+
+
+#endif
diff --git a/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_types.cpp b/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_types.cpp
new file mode 100644
index 00000000..ab885f15
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_types.cpp
@@ -0,0 +1,367 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+#include "hadoopdatanode_types.h"
+
+
+
+const char* ThdfsNamespaceId::ascii_fingerprint = "E86CACEB22240450EDCBEFC3A83970E4";
+const uint8_t ThdfsNamespaceId::binary_fingerprint[16] = {0xE8,0x6C,0xAC,0xEB,0x22,0x24,0x04,0x50,0xED,0xCB,0xEF,0xC3,0xA8,0x39,0x70,0xE4};
+
+uint32_t ThdfsNamespaceId::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->id);
+          this->__isset.id = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThdfsNamespaceId::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThdfsNamespaceId");
+  xfer += oprot->writeFieldBegin("id", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->id);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* ThdfsBlock::ascii_fingerprint = "EA2D65F1E0BB78760205682082304B41";
+const uint8_t ThdfsBlock::binary_fingerprint[16] = {0xEA,0x2D,0x65,0xF1,0xE0,0xBB,0x78,0x76,0x02,0x05,0x68,0x20,0x82,0x30,0x4B,0x41};
+
+uint32_t ThdfsBlock::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->blockId);
+          this->__isset.blockId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->numBytes);
+          this->__isset.numBytes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->generationStamp);
+          this->__isset.generationStamp = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThdfsBlock::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThdfsBlock");
+  xfer += oprot->writeFieldBegin("blockId", ::apache::thrift::protocol::T_I64, 1);
+  xfer += oprot->writeI64(this->blockId);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("numBytes", ::apache::thrift::protocol::T_I64, 2);
+  xfer += oprot->writeI64(this->numBytes);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("generationStamp", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64(this->generationStamp);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* ThdfsBlockPath::ascii_fingerprint = "07A9615F837F7D0A952B595DD3020972";
+const uint8_t ThdfsBlockPath::binary_fingerprint[16] = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+
+uint32_t ThdfsBlockPath::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->localBlockPath);
+          this->__isset.localBlockPath = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->localMetaPath);
+          this->__isset.localMetaPath = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThdfsBlockPath::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThdfsBlockPath");
+  xfer += oprot->writeFieldBegin("localBlockPath", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->localBlockPath);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("localMetaPath", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->localMetaPath);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* TDatanodeID::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1";
+const uint8_t TDatanodeID::binary_fingerprint[16] = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+
+uint32_t TDatanodeID::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->name);
+          this->__isset.name = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t TDatanodeID::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("TDatanodeID");
+  xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->name);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* MalformedInputException::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1";
+const uint8_t MalformedInputException::binary_fingerprint[16] = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+
+uint32_t MalformedInputException::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->message);
+          this->__isset.message = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t MalformedInputException::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("MalformedInputException");
+  xfer += oprot->writeFieldBegin("message", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->message);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* ThriftIOException::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1";
+const uint8_t ThriftIOException::binary_fingerprint[16] = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+
+uint32_t ThriftIOException::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->message);
+          this->__isset.message = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftIOException::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftIOException");
+  xfer += oprot->writeFieldBegin("message", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->message);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
diff --git a/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_types.h b/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_types.h
new file mode 100644
index 00000000..8847a4c4
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-cpp/hadoopdatanode_types.h
@@ -0,0 +1,290 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+#ifndef hadoopdatanode_TYPES_H
+#define hadoopdatanode_TYPES_H
+
+#include <Thrift.h>
+#include <TApplicationException.h>
+#include <protocol/TProtocol.h>
+#include <transport/TTransport.h>
+
+
+
+
+
+typedef struct _ThdfsNamespaceId__isset {
+  _ThdfsNamespaceId__isset() : id(false) {}
+  bool id;
+} _ThdfsNamespaceId__isset;
+
+class ThdfsNamespaceId {
+ public:
+
+  static const char* ascii_fingerprint; // = "E86CACEB22240450EDCBEFC3A83970E4";
+  static const uint8_t binary_fingerprint[16]; // = {0xE8,0x6C,0xAC,0xEB,0x22,0x24,0x04,0x50,0xED,0xCB,0xEF,0xC3,0xA8,0x39,0x70,0xE4};
+
+  ThdfsNamespaceId() : id(0) {
+  }
+
+  virtual ~ThdfsNamespaceId() throw() {}
+
+  int32_t id;
+
+  _ThdfsNamespaceId__isset __isset;
+
+  void __set_id(const int32_t val) {
+    id = val;
+  }
+
+  bool operator == (const ThdfsNamespaceId & rhs) const
+  {
+    if (!(id == rhs.id))
+      return false;
+    return true;
+  }
+  bool operator != (const ThdfsNamespaceId &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThdfsNamespaceId & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThdfsBlock__isset {
+  _ThdfsBlock__isset() : blockId(false), numBytes(false), generationStamp(false) {}
+  bool blockId;
+  bool numBytes;
+  bool generationStamp;
+} _ThdfsBlock__isset;
+
+class ThdfsBlock {
+ public:
+
+  static const char* ascii_fingerprint; // = "EA2D65F1E0BB78760205682082304B41";
+  static const uint8_t binary_fingerprint[16]; // = {0xEA,0x2D,0x65,0xF1,0xE0,0xBB,0x78,0x76,0x02,0x05,0x68,0x20,0x82,0x30,0x4B,0x41};
+
+  ThdfsBlock() : blockId(0), numBytes(0), generationStamp(0) {
+  }
+
+  virtual ~ThdfsBlock() throw() {}
+
+  int64_t blockId;
+  int64_t numBytes;
+  int64_t generationStamp;
+
+  _ThdfsBlock__isset __isset;
+
+  void __set_blockId(const int64_t val) {
+    blockId = val;
+  }
+
+  void __set_numBytes(const int64_t val) {
+    numBytes = val;
+  }
+
+  void __set_generationStamp(const int64_t val) {
+    generationStamp = val;
+  }
+
+  bool operator == (const ThdfsBlock & rhs) const
+  {
+    if (!(blockId == rhs.blockId))
+      return false;
+    if (!(numBytes == rhs.numBytes))
+      return false;
+    if (!(generationStamp == rhs.generationStamp))
+      return false;
+    return true;
+  }
+  bool operator != (const ThdfsBlock &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThdfsBlock & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThdfsBlockPath__isset {
+  _ThdfsBlockPath__isset() : localBlockPath(false), localMetaPath(false) {}
+  bool localBlockPath;
+  bool localMetaPath;
+} _ThdfsBlockPath__isset;
+
+class ThdfsBlockPath {
+ public:
+
+  static const char* ascii_fingerprint; // = "07A9615F837F7D0A952B595DD3020972";
+  static const uint8_t binary_fingerprint[16]; // = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+
+  ThdfsBlockPath() : localBlockPath(""), localMetaPath("") {
+  }
+
+  virtual ~ThdfsBlockPath() throw() {}
+
+  std::string localBlockPath;
+  std::string localMetaPath;
+
+  _ThdfsBlockPath__isset __isset;
+
+  void __set_localBlockPath(const std::string& val) {
+    localBlockPath = val;
+  }
+
+  void __set_localMetaPath(const std::string& val) {
+    localMetaPath = val;
+  }
+
+  bool operator == (const ThdfsBlockPath & rhs) const
+  {
+    if (!(localBlockPath == rhs.localBlockPath))
+      return false;
+    if (!(localMetaPath == rhs.localMetaPath))
+      return false;
+    return true;
+  }
+  bool operator != (const ThdfsBlockPath &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThdfsBlockPath & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _TDatanodeID__isset {
+  _TDatanodeID__isset() : name(false) {}
+  bool name;
+} _TDatanodeID__isset;
+
+class TDatanodeID {
+ public:
+
+  static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
+  static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+
+  TDatanodeID() : name("") {
+  }
+
+  virtual ~TDatanodeID() throw() {}
+
+  std::string name;
+
+  _TDatanodeID__isset __isset;
+
+  void __set_name(const std::string& val) {
+    name = val;
+  }
+
+  bool operator == (const TDatanodeID & rhs) const
+  {
+    if (!(name == rhs.name))
+      return false;
+    return true;
+  }
+  bool operator != (const TDatanodeID &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const TDatanodeID & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _MalformedInputException__isset {
+  _MalformedInputException__isset() : message(false) {}
+  bool message;
+} _MalformedInputException__isset;
+
+class MalformedInputException : public ::apache::thrift::TException {
+ public:
+
+  static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
+  static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+
+  MalformedInputException() : message("") {
+  }
+
+  virtual ~MalformedInputException() throw() {}
+
+  std::string message;
+
+  _MalformedInputException__isset __isset;
+
+  void __set_message(const std::string& val) {
+    message = val;
+  }
+
+  bool operator == (const MalformedInputException & rhs) const
+  {
+    if (!(message == rhs.message))
+      return false;
+    return true;
+  }
+  bool operator != (const MalformedInputException &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const MalformedInputException & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftIOException__isset {
+  _ThriftIOException__isset() : message(false) {}
+  bool message;
+} _ThriftIOException__isset;
+
+class ThriftIOException : public ::apache::thrift::TException {
+ public:
+
+  static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
+  static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+
+  ThriftIOException() : message("") {
+  }
+
+  virtual ~ThriftIOException() throw() {}
+
+  std::string message;
+
+  _ThriftIOException__isset __isset;
+
+  void __set_message(const std::string& val) {
+    message = val;
+  }
+
+  bool operator == (const ThriftIOException & rhs) const
+  {
+    if (!(message == rhs.message))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftIOException &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftIOException & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+
+#endif
diff --git a/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/MalformedInputException.java b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/MalformedInputException.java
new file mode 100644
index 00000000..9680b42e
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/MalformedInputException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftdatanode.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MalformedInputException extends Exception implements org.apache.thrift.TBase<MalformedInputException, MalformedInputException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MalformedInputException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MalformedInputException.class, metaDataMap);
+  }
+
+  public MalformedInputException() {
+  }
+
+  public MalformedInputException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public MalformedInputException(MalformedInputException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public MalformedInputException deepCopy() {
+    return new MalformedInputException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public MalformedInputException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof MalformedInputException)
+      return this.equals((MalformedInputException)that);
+    return false;
+  }
+
+  public boolean equals(MalformedInputException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(MalformedInputException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    MalformedInputException typedOther = (MalformedInputException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("MalformedInputException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/TDatanodeID.java b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/TDatanodeID.java
new file mode 100644
index 00000000..94715aa2
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/TDatanodeID.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftdatanode.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TDatanodeID implements org.apache.thrift.TBase<TDatanodeID, TDatanodeID._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDatanodeID");
+
+  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String name; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    NAME((short)1, "name");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // NAME
+          return NAME;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TDatanodeID.class, metaDataMap);
+  }
+
+  public TDatanodeID() {
+  }
+
+  public TDatanodeID(
+    String name)
+  {
+    this();
+    this.name = name;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public TDatanodeID(TDatanodeID other) {
+    if (other.isSetName()) {
+      this.name = other.name;
+    }
+  }
+
+  public TDatanodeID deepCopy() {
+    return new TDatanodeID(this);
+  }
+
+  @Override
+  public void clear() {
+    this.name = null;
+  }
+
+  public String getName() {
+    return this.name;
+  }
+
+  public TDatanodeID setName(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public void unsetName() {
+    this.name = null;
+  }
+
+  /** Returns true if field name is set (has been assigned a value) and false otherwise */
+  public boolean isSetName() {
+    return this.name != null;
+  }
+
+  public void setNameIsSet(boolean value) {
+    if (!value) {
+      this.name = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case NAME:
+      if (value == null) {
+        unsetName();
+      } else {
+        setName((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case NAME:
+      return getName();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case NAME:
+      return isSetName();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof TDatanodeID)
+      return this.equals((TDatanodeID)that);
+    return false;
+  }
+
+  public boolean equals(TDatanodeID that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_name = true && this.isSetName();
+    boolean that_present_name = true && that.isSetName();
+    if (this_present_name || that_present_name) {
+      if (!(this_present_name && that_present_name))
+        return false;
+      if (!this.name.equals(that.name))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(TDatanodeID other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    TDatanodeID typedOther = (TDatanodeID)other;
+
+    lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // NAME
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.name = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.name != null) {
+      oprot.writeFieldBegin(NAME_FIELD_DESC);
+      oprot.writeString(this.name);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("TDatanodeID(");
+    boolean first = true;
+
+    sb.append("name:");
+    if (this.name == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.name);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsBlock.java b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsBlock.java
new file mode 100644
index 00000000..fe2fdc7a
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsBlock.java
@@ -0,0 +1,487 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftdatanode.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ThdfsBlock implements org.apache.thrift.TBase<ThdfsBlock, ThdfsBlock._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThdfsBlock");
+
+  private static final org.apache.thrift.protocol.TField BLOCK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("blockId", org.apache.thrift.protocol.TType.I64, (short)1);
+  private static final org.apache.thrift.protocol.TField NUM_BYTES_FIELD_DESC = new org.apache.thrift.protocol.TField("numBytes", org.apache.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.thrift.protocol.TField GENERATION_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("generationStamp", org.apache.thrift.protocol.TType.I64, (short)3);
+
+  public long blockId; // required
+  public long numBytes; // required
+  public long generationStamp; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    BLOCK_ID((short)1, "blockId"),
+    NUM_BYTES((short)2, "numBytes"),
+    GENERATION_STAMP((short)3, "generationStamp");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // BLOCK_ID
+          return BLOCK_ID;
+        case 2: // NUM_BYTES
+          return NUM_BYTES;
+        case 3: // GENERATION_STAMP
+          return GENERATION_STAMP;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __BLOCKID_ISSET_ID = 0;
+  private static final int __NUMBYTES_ISSET_ID = 1;
+  private static final int __GENERATIONSTAMP_ISSET_ID = 2;
+  private BitSet __isset_bit_vector = new BitSet(3);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.BLOCK_ID, new org.apache.thrift.meta_data.FieldMetaData("blockId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.NUM_BYTES, new org.apache.thrift.meta_data.FieldMetaData("numBytes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.GENERATION_STAMP, new org.apache.thrift.meta_data.FieldMetaData("generationStamp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThdfsBlock.class, metaDataMap);
+  }
+
+  public ThdfsBlock() {
+  }
+
+  public ThdfsBlock(
+    long blockId,
+    long numBytes,
+    long generationStamp)
+  {
+    this();
+    this.blockId = blockId;
+    setBlockIdIsSet(true);
+    this.numBytes = numBytes;
+    setNumBytesIsSet(true);
+    this.generationStamp = generationStamp;
+    setGenerationStampIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public ThdfsBlock(ThdfsBlock other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    this.blockId = other.blockId;
+    this.numBytes = other.numBytes;
+    this.generationStamp = other.generationStamp;
+  }
+
+  public ThdfsBlock deepCopy() {
+    return new ThdfsBlock(this);
+  }
+
+  @Override
+  public void clear() {
+    setBlockIdIsSet(false);
+    this.blockId = 0;
+    setNumBytesIsSet(false);
+    this.numBytes = 0;
+    setGenerationStampIsSet(false);
+    this.generationStamp = 0;
+  }
+
+  public long getBlockId() {
+    return this.blockId;
+  }
+
+  public ThdfsBlock setBlockId(long blockId) {
+    this.blockId = blockId;
+    setBlockIdIsSet(true);
+    return this;
+  }
+
+  public void unsetBlockId() {
+    __isset_bit_vector.clear(__BLOCKID_ISSET_ID);
+  }
+
+  /** Returns true if field blockId is set (has been assigned a value) and false otherwise */
+  public boolean isSetBlockId() {
+    return __isset_bit_vector.get(__BLOCKID_ISSET_ID);
+  }
+
+  public void setBlockIdIsSet(boolean value) {
+    __isset_bit_vector.set(__BLOCKID_ISSET_ID, value);
+  }
+
+  public long getNumBytes() {
+    return this.numBytes;
+  }
+
+  public ThdfsBlock setNumBytes(long numBytes) {
+    this.numBytes = numBytes;
+    setNumBytesIsSet(true);
+    return this;
+  }
+
+  public void unsetNumBytes() {
+    __isset_bit_vector.clear(__NUMBYTES_ISSET_ID);
+  }
+
+  /** Returns true if field numBytes is set (has been assigned a value) and false otherwise */
+  public boolean isSetNumBytes() {
+    return __isset_bit_vector.get(__NUMBYTES_ISSET_ID);
+  }
+
+  public void setNumBytesIsSet(boolean value) {
+    __isset_bit_vector.set(__NUMBYTES_ISSET_ID, value);
+  }
+
+  public long getGenerationStamp() {
+    return this.generationStamp;
+  }
+
+  public ThdfsBlock setGenerationStamp(long generationStamp) {
+    this.generationStamp = generationStamp;
+    setGenerationStampIsSet(true);
+    return this;
+  }
+
+  public void unsetGenerationStamp() {
+    __isset_bit_vector.clear(__GENERATIONSTAMP_ISSET_ID);
+  }
+
+  /** Returns true if field generationStamp is set (has been assigned a value) and false otherwise */
+  public boolean isSetGenerationStamp() {
+    return __isset_bit_vector.get(__GENERATIONSTAMP_ISSET_ID);
+  }
+
+  public void setGenerationStampIsSet(boolean value) {
+    __isset_bit_vector.set(__GENERATIONSTAMP_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case BLOCK_ID:
+      if (value == null) {
+        unsetBlockId();
+      } else {
+        setBlockId((Long)value);
+      }
+      break;
+
+    case NUM_BYTES:
+      if (value == null) {
+        unsetNumBytes();
+      } else {
+        setNumBytes((Long)value);
+      }
+      break;
+
+    case GENERATION_STAMP:
+      if (value == null) {
+        unsetGenerationStamp();
+      } else {
+        setGenerationStamp((Long)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case BLOCK_ID:
+      return Long.valueOf(getBlockId());
+
+    case NUM_BYTES:
+      return Long.valueOf(getNumBytes());
+
+    case GENERATION_STAMP:
+      return Long.valueOf(getGenerationStamp());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case BLOCK_ID:
+      return isSetBlockId();
+    case NUM_BYTES:
+      return isSetNumBytes();
+    case GENERATION_STAMP:
+      return isSetGenerationStamp();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof ThdfsBlock)
+      return this.equals((ThdfsBlock)that);
+    return false;
+  }
+
+  public boolean equals(ThdfsBlock that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_blockId = true;
+    boolean that_present_blockId = true;
+    if (this_present_blockId || that_present_blockId) {
+      if (!(this_present_blockId && that_present_blockId))
+        return false;
+      if (this.blockId != that.blockId)
+        return false;
+    }
+
+    boolean this_present_numBytes = true;
+    boolean that_present_numBytes = true;
+    if (this_present_numBytes || that_present_numBytes) {
+      if (!(this_present_numBytes && that_present_numBytes))
+        return false;
+      if (this.numBytes != that.numBytes)
+        return false;
+    }
+
+    boolean this_present_generationStamp = true;
+    boolean that_present_generationStamp = true;
+    if (this_present_generationStamp || that_present_generationStamp) {
+      if (!(this_present_generationStamp && that_present_generationStamp))
+        return false;
+      if (this.generationStamp != that.generationStamp)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(ThdfsBlock other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    ThdfsBlock typedOther = (ThdfsBlock)other;
+
+    lastComparison = Boolean.valueOf(isSetBlockId()).compareTo(typedOther.isSetBlockId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetBlockId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockId, typedOther.blockId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetNumBytes()).compareTo(typedOther.isSetNumBytes());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetNumBytes()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numBytes, typedOther.numBytes);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetGenerationStamp()).compareTo(typedOther.isSetGenerationStamp());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGenerationStamp()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.generationStamp, typedOther.generationStamp);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // BLOCK_ID
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.blockId = iprot.readI64();
+            setBlockIdIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // NUM_BYTES
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.numBytes = iprot.readI64();
+            setNumBytesIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 3: // GENERATION_STAMP
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.generationStamp = iprot.readI64();
+            setGenerationStampIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldBegin(BLOCK_ID_FIELD_DESC);
+    oprot.writeI64(this.blockId);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(NUM_BYTES_FIELD_DESC);
+    oprot.writeI64(this.numBytes);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(GENERATION_STAMP_FIELD_DESC);
+    oprot.writeI64(this.generationStamp);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("ThdfsBlock(");
+    boolean first = true;
+
+    sb.append("blockId:");
+    sb.append(this.blockId);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("numBytes:");
+    sb.append(this.numBytes);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("generationStamp:");
+    sb.append(this.generationStamp);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsBlockPath.java b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsBlockPath.java
new file mode 100644
index 00000000..3c8b3079
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsBlockPath.java
@@ -0,0 +1,408 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftdatanode.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ThdfsBlockPath implements org.apache.thrift.TBase<ThdfsBlockPath, ThdfsBlockPath._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThdfsBlockPath");
+
+  private static final org.apache.thrift.protocol.TField LOCAL_BLOCK_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("localBlockPath", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField LOCAL_META_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("localMetaPath", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+  public String localBlockPath; // required
+  public String localMetaPath; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    LOCAL_BLOCK_PATH((short)1, "localBlockPath"),
+    LOCAL_META_PATH((short)2, "localMetaPath");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // LOCAL_BLOCK_PATH
+          return LOCAL_BLOCK_PATH;
+        case 2: // LOCAL_META_PATH
+          return LOCAL_META_PATH;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.LOCAL_BLOCK_PATH, new org.apache.thrift.meta_data.FieldMetaData("localBlockPath", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.LOCAL_META_PATH, new org.apache.thrift.meta_data.FieldMetaData("localMetaPath", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThdfsBlockPath.class, metaDataMap);
+  }
+
+  public ThdfsBlockPath() {
+  }
+
+  public ThdfsBlockPath(
+    String localBlockPath,
+    String localMetaPath)
+  {
+    this();
+    this.localBlockPath = localBlockPath;
+    this.localMetaPath = localMetaPath;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public ThdfsBlockPath(ThdfsBlockPath other) {
+    if (other.isSetLocalBlockPath()) {
+      this.localBlockPath = other.localBlockPath;
+    }
+    if (other.isSetLocalMetaPath()) {
+      this.localMetaPath = other.localMetaPath;
+    }
+  }
+
+  public ThdfsBlockPath deepCopy() {
+    return new ThdfsBlockPath(this);
+  }
+
+  @Override
+  public void clear() {
+    this.localBlockPath = null;
+    this.localMetaPath = null;
+  }
+
+  public String getLocalBlockPath() {
+    return this.localBlockPath;
+  }
+
+  public ThdfsBlockPath setLocalBlockPath(String localBlockPath) {
+    this.localBlockPath = localBlockPath;
+    return this;
+  }
+
+  public void unsetLocalBlockPath() {
+    this.localBlockPath = null;
+  }
+
+  /** Returns true if field localBlockPath is set (has been assigned a value) and false otherwise */
+  public boolean isSetLocalBlockPath() {
+    return this.localBlockPath != null;
+  }
+
+  public void setLocalBlockPathIsSet(boolean value) {
+    if (!value) {
+      this.localBlockPath = null;
+    }
+  }
+
+  public String getLocalMetaPath() {
+    return this.localMetaPath;
+  }
+
+  public ThdfsBlockPath setLocalMetaPath(String localMetaPath) {
+    this.localMetaPath = localMetaPath;
+    return this;
+  }
+
+  public void unsetLocalMetaPath() {
+    this.localMetaPath = null;
+  }
+
+  /** Returns true if field localMetaPath is set (has been assigned a value) and false otherwise */
+  public boolean isSetLocalMetaPath() {
+    return this.localMetaPath != null;
+  }
+
+  public void setLocalMetaPathIsSet(boolean value) {
+    if (!value) {
+      this.localMetaPath = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case LOCAL_BLOCK_PATH:
+      if (value == null) {
+        unsetLocalBlockPath();
+      } else {
+        setLocalBlockPath((String)value);
+      }
+      break;
+
+    case LOCAL_META_PATH:
+      if (value == null) {
+        unsetLocalMetaPath();
+      } else {
+        setLocalMetaPath((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case LOCAL_BLOCK_PATH:
+      return getLocalBlockPath();
+
+    case LOCAL_META_PATH:
+      return getLocalMetaPath();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case LOCAL_BLOCK_PATH:
+      return isSetLocalBlockPath();
+    case LOCAL_META_PATH:
+      return isSetLocalMetaPath();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof ThdfsBlockPath)
+      return this.equals((ThdfsBlockPath)that);
+    return false;
+  }
+
+  public boolean equals(ThdfsBlockPath that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_localBlockPath = true && this.isSetLocalBlockPath();
+    boolean that_present_localBlockPath = true && that.isSetLocalBlockPath();
+    if (this_present_localBlockPath || that_present_localBlockPath) {
+      if (!(this_present_localBlockPath && that_present_localBlockPath))
+        return false;
+      if (!this.localBlockPath.equals(that.localBlockPath))
+        return false;
+    }
+
+    boolean this_present_localMetaPath = true && this.isSetLocalMetaPath();
+    boolean that_present_localMetaPath = true && that.isSetLocalMetaPath();
+    if (this_present_localMetaPath || that_present_localMetaPath) {
+      if (!(this_present_localMetaPath && that_present_localMetaPath))
+        return false;
+      if (!this.localMetaPath.equals(that.localMetaPath))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(ThdfsBlockPath other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    ThdfsBlockPath typedOther = (ThdfsBlockPath)other;
+
+    lastComparison = Boolean.valueOf(isSetLocalBlockPath()).compareTo(typedOther.isSetLocalBlockPath());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLocalBlockPath()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.localBlockPath, typedOther.localBlockPath);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLocalMetaPath()).compareTo(typedOther.isSetLocalMetaPath());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLocalMetaPath()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.localMetaPath, typedOther.localMetaPath);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // LOCAL_BLOCK_PATH
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.localBlockPath = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // LOCAL_META_PATH
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.localMetaPath = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.localBlockPath != null) {
+      oprot.writeFieldBegin(LOCAL_BLOCK_PATH_FIELD_DESC);
+      oprot.writeString(this.localBlockPath);
+      oprot.writeFieldEnd();
+    }
+    if (this.localMetaPath != null) {
+      oprot.writeFieldBegin(LOCAL_META_PATH_FIELD_DESC);
+      oprot.writeString(this.localMetaPath);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("ThdfsBlockPath(");
+    boolean first = true;
+
+    sb.append("localBlockPath:");
+    if (this.localBlockPath == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.localBlockPath);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("localMetaPath:");
+    if (this.localMetaPath == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.localMetaPath);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsNamespaceId.java b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsNamespaceId.java
new file mode 100644
index 00000000..d294d638
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThdfsNamespaceId.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftdatanode.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ThdfsNamespaceId implements org.apache.thrift.TBase<ThdfsNamespaceId, ThdfsNamespaceId._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThdfsNamespaceId");
+
+  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I32, (short)1);
+
+  public int id; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    ID((short)1, "id");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // ID
+          return ID;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __ID_ISSET_ID = 0;
+  private BitSet __isset_bit_vector = new BitSet(1);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThdfsNamespaceId.class, metaDataMap);
+  }
+
+  public ThdfsNamespaceId() {
+  }
+
+  public ThdfsNamespaceId(
+    int id)
+  {
+    this();
+    this.id = id;
+    setIdIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public ThdfsNamespaceId(ThdfsNamespaceId other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    this.id = other.id;
+  }
+
+  public ThdfsNamespaceId deepCopy() {
+    return new ThdfsNamespaceId(this);
+  }
+
+  @Override
+  public void clear() {
+    setIdIsSet(false);
+    this.id = 0;
+  }
+
+  public int getId() {
+    return this.id;
+  }
+
+  public ThdfsNamespaceId setId(int id) {
+    this.id = id;
+    setIdIsSet(true);
+    return this;
+  }
+
+  public void unsetId() {
+    __isset_bit_vector.clear(__ID_ISSET_ID);
+  }
+
+  /** Returns true if field id is set (has been assigned a value) and false otherwise */
+  public boolean isSetId() {
+    return __isset_bit_vector.get(__ID_ISSET_ID);
+  }
+
+  public void setIdIsSet(boolean value) {
+    __isset_bit_vector.set(__ID_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case ID:
+      if (value == null) {
+        unsetId();
+      } else {
+        setId((Integer)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case ID:
+      return Integer.valueOf(getId());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case ID:
+      return isSetId();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof ThdfsNamespaceId)
+      return this.equals((ThdfsNamespaceId)that);
+    return false;
+  }
+
+  public boolean equals(ThdfsNamespaceId that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_id = true;
+    boolean that_present_id = true;
+    if (this_present_id || that_present_id) {
+      if (!(this_present_id && that_present_id))
+        return false;
+      if (this.id != that.id)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(ThdfsNamespaceId other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    ThdfsNamespaceId typedOther = (ThdfsNamespaceId)other;
+
+    lastComparison = Boolean.valueOf(isSetId()).compareTo(typedOther.isSetId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // ID
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
+            this.id = iprot.readI32();
+            setIdIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldBegin(ID_FIELD_DESC);
+    oprot.writeI32(this.id);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("ThdfsNamespaceId(");
+    boolean first = true;
+
+    sb.append("id:");
+    sb.append(this.id);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThriftHadoopDatanode.java b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThriftHadoopDatanode.java
new file mode 100644
index 00000000..9d99ca10
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThriftHadoopDatanode.java
@@ -0,0 +1,4504 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftdatanode.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ThriftHadoopDatanode {
+
+  public interface Iface {
+
+    public ThdfsBlock recoverBlock(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, boolean keepLength, List<TDatanodeID> targets, long deadline) throws ThriftIOException, org.apache.thrift.TException;
+
+    public ThdfsBlock getBlockInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceid, ThdfsBlock block) throws ThriftIOException, org.apache.thrift.TException;
+
+    public void copyBlock(TDatanodeID datanode, ThdfsNamespaceId srcNamespaceId, ThdfsBlock srcblock, ThdfsNamespaceId dstNamespaceId, ThdfsBlock destBlock, TDatanodeID target, boolean asynchronous) throws ThriftIOException, org.apache.thrift.TException;
+
+    public ThdfsBlockPath getBlockPathInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block) throws ThriftIOException, org.apache.thrift.TException;
+
+  }
+
+  public interface AsyncIface {
+
+    public void recoverBlock(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, boolean keepLength, List<TDatanodeID> targets, long deadline, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.recoverBlock_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void getBlockInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceid, ThdfsBlock block, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getBlockInfo_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void copyBlock(TDatanodeID datanode, ThdfsNamespaceId srcNamespaceId, ThdfsBlock srcblock, ThdfsNamespaceId dstNamespaceId, ThdfsBlock destBlock, TDatanodeID target, boolean asynchronous, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.copyBlock_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void getBlockPathInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getBlockPathInfo_call> resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+      public Factory() {}
+      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+        return new Client(prot);
+      }
+      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+        return new Client(iprot, oprot);
+      }
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol prot)
+    {
+      super(prot, prot);
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      super(iprot, oprot);
+    }
+
+    public ThdfsBlock recoverBlock(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, boolean keepLength, List<TDatanodeID> targets, long deadline) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_recoverBlock(datanode, namespaceId, block, keepLength, targets, deadline);
+      return recv_recoverBlock();
+    }
+
+    public void send_recoverBlock(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, boolean keepLength, List<TDatanodeID> targets, long deadline) throws org.apache.thrift.TException
+    {
+      recoverBlock_args args = new recoverBlock_args();
+      args.setDatanode(datanode);
+      args.setNamespaceId(namespaceId);
+      args.setBlock(block);
+      args.setKeepLength(keepLength);
+      args.setTargets(targets);
+      args.setDeadline(deadline);
+      sendBase("recoverBlock", args);
+    }
+
+    public ThdfsBlock recv_recoverBlock() throws ThriftIOException, org.apache.thrift.TException
+    {
+      recoverBlock_result result = new recoverBlock_result();
+      receiveBase(result, "recoverBlock");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "recoverBlock failed: unknown result");
+    }
+
+    public ThdfsBlock getBlockInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceid, ThdfsBlock block) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_getBlockInfo(datanode, namespaceid, block);
+      return recv_getBlockInfo();
+    }
+
+    public void send_getBlockInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceid, ThdfsBlock block) throws org.apache.thrift.TException
+    {
+      getBlockInfo_args args = new getBlockInfo_args();
+      args.setDatanode(datanode);
+      args.setNamespaceid(namespaceid);
+      args.setBlock(block);
+      sendBase("getBlockInfo", args);
+    }
+
+    public ThdfsBlock recv_getBlockInfo() throws ThriftIOException, org.apache.thrift.TException
+    {
+      getBlockInfo_result result = new getBlockInfo_result();
+      receiveBase(result, "getBlockInfo");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getBlockInfo failed: unknown result");
+    }
+
+    public void copyBlock(TDatanodeID datanode, ThdfsNamespaceId srcNamespaceId, ThdfsBlock srcblock, ThdfsNamespaceId dstNamespaceId, ThdfsBlock destBlock, TDatanodeID target, boolean asynchronous) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_copyBlock(datanode, srcNamespaceId, srcblock, dstNamespaceId, destBlock, target, asynchronous);
+      recv_copyBlock();
+    }
+
+    public void send_copyBlock(TDatanodeID datanode, ThdfsNamespaceId srcNamespaceId, ThdfsBlock srcblock, ThdfsNamespaceId dstNamespaceId, ThdfsBlock destBlock, TDatanodeID target, boolean asynchronous) throws org.apache.thrift.TException
+    {
+      copyBlock_args args = new copyBlock_args();
+      args.setDatanode(datanode);
+      args.setSrcNamespaceId(srcNamespaceId);
+      args.setSrcblock(srcblock);
+      args.setDstNamespaceId(dstNamespaceId);
+      args.setDestBlock(destBlock);
+      args.setTarget(target);
+      args.setAsynchronous(asynchronous);
+      sendBase("copyBlock", args);
+    }
+
+    public void recv_copyBlock() throws ThriftIOException, org.apache.thrift.TException
+    {
+      copyBlock_result result = new copyBlock_result();
+      receiveBase(result, "copyBlock");
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      return;
+    }
+
+    public ThdfsBlockPath getBlockPathInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_getBlockPathInfo(datanode, namespaceId, block);
+      return recv_getBlockPathInfo();
+    }
+
+    public void send_getBlockPathInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block) throws org.apache.thrift.TException
+    {
+      getBlockPathInfo_args args = new getBlockPathInfo_args();
+      args.setDatanode(datanode);
+      args.setNamespaceId(namespaceId);
+      args.setBlock(block);
+      sendBase("getBlockPathInfo", args);
+    }
+
+    public ThdfsBlockPath recv_getBlockPathInfo() throws ThriftIOException, org.apache.thrift.TException
+    {
+      getBlockPathInfo_result result = new getBlockPathInfo_result();
+      receiveBase(result, "getBlockPathInfo");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getBlockPathInfo failed: unknown result");
+    }
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+        this.clientManager = clientManager;
+        this.protocolFactory = protocolFactory;
+      }
+      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+        return new AsyncClient(protocolFactory, clientManager, transport);
+      }
+    }
+
+    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+      super(protocolFactory, clientManager, transport);
+    }
+
+    public void recoverBlock(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, boolean keepLength, List<TDatanodeID> targets, long deadline, org.apache.thrift.async.AsyncMethodCallback<recoverBlock_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      recoverBlock_call method_call = new recoverBlock_call(datanode, namespaceId, block, keepLength, targets, deadline, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class recoverBlock_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private TDatanodeID datanode;
+      private ThdfsNamespaceId namespaceId;
+      private ThdfsBlock block;
+      private boolean keepLength;
+      private List<TDatanodeID> targets;
+      private long deadline;
+      public recoverBlock_call(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, boolean keepLength, List<TDatanodeID> targets, long deadline, org.apache.thrift.async.AsyncMethodCallback<recoverBlock_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.datanode = datanode;
+        this.namespaceId = namespaceId;
+        this.block = block;
+        this.keepLength = keepLength;
+        this.targets = targets;
+        this.deadline = deadline;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("recoverBlock", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        recoverBlock_args args = new recoverBlock_args();
+        args.setDatanode(datanode);
+        args.setNamespaceId(namespaceId);
+        args.setBlock(block);
+        args.setKeepLength(keepLength);
+        args.setTargets(targets);
+        args.setDeadline(deadline);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ThdfsBlock getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_recoverBlock();
+      }
+    }
+
+    public void getBlockInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceid, ThdfsBlock block, org.apache.thrift.async.AsyncMethodCallback<getBlockInfo_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getBlockInfo_call method_call = new getBlockInfo_call(datanode, namespaceid, block, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getBlockInfo_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private TDatanodeID datanode;
+      private ThdfsNamespaceId namespaceid;
+      private ThdfsBlock block;
+      public getBlockInfo_call(TDatanodeID datanode, ThdfsNamespaceId namespaceid, ThdfsBlock block, org.apache.thrift.async.AsyncMethodCallback<getBlockInfo_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.datanode = datanode;
+        this.namespaceid = namespaceid;
+        this.block = block;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getBlockInfo", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getBlockInfo_args args = new getBlockInfo_args();
+        args.setDatanode(datanode);
+        args.setNamespaceid(namespaceid);
+        args.setBlock(block);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ThdfsBlock getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getBlockInfo();
+      }
+    }
+
+    public void copyBlock(TDatanodeID datanode, ThdfsNamespaceId srcNamespaceId, ThdfsBlock srcblock, ThdfsNamespaceId dstNamespaceId, ThdfsBlock destBlock, TDatanodeID target, boolean asynchronous, org.apache.thrift.async.AsyncMethodCallback<copyBlock_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      copyBlock_call method_call = new copyBlock_call(datanode, srcNamespaceId, srcblock, dstNamespaceId, destBlock, target, asynchronous, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class copyBlock_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private TDatanodeID datanode;
+      private ThdfsNamespaceId srcNamespaceId;
+      private ThdfsBlock srcblock;
+      private ThdfsNamespaceId dstNamespaceId;
+      private ThdfsBlock destBlock;
+      private TDatanodeID target;
+      private boolean asynchronous;
+      public copyBlock_call(TDatanodeID datanode, ThdfsNamespaceId srcNamespaceId, ThdfsBlock srcblock, ThdfsNamespaceId dstNamespaceId, ThdfsBlock destBlock, TDatanodeID target, boolean asynchronous, org.apache.thrift.async.AsyncMethodCallback<copyBlock_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.datanode = datanode;
+        this.srcNamespaceId = srcNamespaceId;
+        this.srcblock = srcblock;
+        this.dstNamespaceId = dstNamespaceId;
+        this.destBlock = destBlock;
+        this.target = target;
+        this.asynchronous = asynchronous;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("copyBlock", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        copyBlock_args args = new copyBlock_args();
+        args.setDatanode(datanode);
+        args.setSrcNamespaceId(srcNamespaceId);
+        args.setSrcblock(srcblock);
+        args.setDstNamespaceId(dstNamespaceId);
+        args.setDestBlock(destBlock);
+        args.setTarget(target);
+        args.setAsynchronous(asynchronous);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_copyBlock();
+      }
+    }
+
+    public void getBlockPathInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, org.apache.thrift.async.AsyncMethodCallback<getBlockPathInfo_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getBlockPathInfo_call method_call = new getBlockPathInfo_call(datanode, namespaceId, block, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getBlockPathInfo_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private TDatanodeID datanode;
+      private ThdfsNamespaceId namespaceId;
+      private ThdfsBlock block;
+      public getBlockPathInfo_call(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, org.apache.thrift.async.AsyncMethodCallback<getBlockPathInfo_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.datanode = datanode;
+        this.namespaceId = namespaceId;
+        this.block = block;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getBlockPathInfo", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getBlockPathInfo_args args = new getBlockPathInfo_args();
+        args.setDatanode(datanode);
+        args.setNamespaceId(namespaceId);
+        args.setBlock(block);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ThdfsBlockPath getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getBlockPathInfo();
+      }
+    }
+
+  }
+
+  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
+    public Processor(I iface) {
+      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+    }
+
+    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      processMap.put("recoverBlock", new recoverBlock());
+      processMap.put("getBlockInfo", new getBlockInfo());
+      processMap.put("copyBlock", new copyBlock());
+      processMap.put("getBlockPathInfo", new getBlockPathInfo());
+      return processMap;
+    }
+
+    private static class recoverBlock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, recoverBlock_args> {
+      public recoverBlock() {
+        super("recoverBlock");
+      }
+
+      protected recoverBlock_args getEmptyArgsInstance() {
+        return new recoverBlock_args();
+      }
+
+      protected recoverBlock_result getResult(I iface, recoverBlock_args args) throws org.apache.thrift.TException {
+        recoverBlock_result result = new recoverBlock_result();
+        try {
+          result.success = iface.recoverBlock(args.datanode, args.namespaceId, args.block, args.keepLength, args.targets, args.deadline);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class getBlockInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getBlockInfo_args> {
+      public getBlockInfo() {
+        super("getBlockInfo");
+      }
+
+      protected getBlockInfo_args getEmptyArgsInstance() {
+        return new getBlockInfo_args();
+      }
+
+      protected getBlockInfo_result getResult(I iface, getBlockInfo_args args) throws org.apache.thrift.TException {
+        getBlockInfo_result result = new getBlockInfo_result();
+        try {
+          result.success = iface.getBlockInfo(args.datanode, args.namespaceid, args.block);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class copyBlock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, copyBlock_args> {
+      public copyBlock() {
+        super("copyBlock");
+      }
+
+      protected copyBlock_args getEmptyArgsInstance() {
+        return new copyBlock_args();
+      }
+
+      protected copyBlock_result getResult(I iface, copyBlock_args args) throws org.apache.thrift.TException {
+        copyBlock_result result = new copyBlock_result();
+        try {
+          iface.copyBlock(args.datanode, args.srcNamespaceId, args.srcblock, args.dstNamespaceId, args.destBlock, args.target, args.asynchronous);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class getBlockPathInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getBlockPathInfo_args> {
+      public getBlockPathInfo() {
+        super("getBlockPathInfo");
+      }
+
+      protected getBlockPathInfo_args getEmptyArgsInstance() {
+        return new getBlockPathInfo_args();
+      }
+
+      protected getBlockPathInfo_result getResult(I iface, getBlockPathInfo_args args) throws org.apache.thrift.TException {
+        getBlockPathInfo_result result = new getBlockPathInfo_result();
+        try {
+          result.success = iface.getBlockPathInfo(args.datanode, args.namespaceId, args.block);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+  }
+
+  public static class recoverBlock_args implements org.apache.thrift.TBase<recoverBlock_args, recoverBlock_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("recoverBlock_args");
+
+    private static final org.apache.thrift.protocol.TField DATANODE_FIELD_DESC = new org.apache.thrift.protocol.TField("datanode", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField NAMESPACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("namespaceId", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("block", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+    private static final org.apache.thrift.protocol.TField KEEP_LENGTH_FIELD_DESC = new org.apache.thrift.protocol.TField("keepLength", org.apache.thrift.protocol.TType.BOOL, (short)4);
+    private static final org.apache.thrift.protocol.TField TARGETS_FIELD_DESC = new org.apache.thrift.protocol.TField("targets", org.apache.thrift.protocol.TType.LIST, (short)5);
+    private static final org.apache.thrift.protocol.TField DEADLINE_FIELD_DESC = new org.apache.thrift.protocol.TField("deadline", org.apache.thrift.protocol.TType.I64, (short)6);
+
+    public TDatanodeID datanode; // required
+    public ThdfsNamespaceId namespaceId; // required
+    public ThdfsBlock block; // required
+    public boolean keepLength; // required
+    public List<TDatanodeID> targets; // required
+    public long deadline; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      DATANODE((short)1, "datanode"),
+      NAMESPACE_ID((short)2, "namespaceId"),
+      BLOCK((short)3, "block"),
+      KEEP_LENGTH((short)4, "keepLength"),
+      TARGETS((short)5, "targets"),
+      DEADLINE((short)6, "deadline");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // DATANODE
+            return DATANODE;
+          case 2: // NAMESPACE_ID
+            return NAMESPACE_ID;
+          case 3: // BLOCK
+            return BLOCK;
+          case 4: // KEEP_LENGTH
+            return KEEP_LENGTH;
+          case 5: // TARGETS
+            return TARGETS;
+          case 6: // DEADLINE
+            return DEADLINE;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __KEEPLENGTH_ISSET_ID = 0;
+    private static final int __DEADLINE_ISSET_ID = 1;
+    private BitSet __isset_bit_vector = new BitSet(2);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.DATANODE, new org.apache.thrift.meta_data.FieldMetaData("datanode", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class)));
+      tmpMap.put(_Fields.NAMESPACE_ID, new org.apache.thrift.meta_data.FieldMetaData("namespaceId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsNamespaceId.class)));
+      tmpMap.put(_Fields.BLOCK, new org.apache.thrift.meta_data.FieldMetaData("block", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsBlock.class)));
+      tmpMap.put(_Fields.KEEP_LENGTH, new org.apache.thrift.meta_data.FieldMetaData("keepLength", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.TARGETS, new org.apache.thrift.meta_data.FieldMetaData("targets", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class))));
+      tmpMap.put(_Fields.DEADLINE, new org.apache.thrift.meta_data.FieldMetaData("deadline", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(recoverBlock_args.class, metaDataMap);
+    }
+
+    public recoverBlock_args() {
+    }
+
+    public recoverBlock_args(
+      TDatanodeID datanode,
+      ThdfsNamespaceId namespaceId,
+      ThdfsBlock block,
+      boolean keepLength,
+      List<TDatanodeID> targets,
+      long deadline)
+    {
+      this();
+      this.datanode = datanode;
+      this.namespaceId = namespaceId;
+      this.block = block;
+      this.keepLength = keepLength;
+      setKeepLengthIsSet(true);
+      this.targets = targets;
+      this.deadline = deadline;
+      setDeadlineIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public recoverBlock_args(recoverBlock_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetDatanode()) {
+        this.datanode = new TDatanodeID(other.datanode);
+      }
+      if (other.isSetNamespaceId()) {
+        this.namespaceId = new ThdfsNamespaceId(other.namespaceId);
+      }
+      if (other.isSetBlock()) {
+        this.block = new ThdfsBlock(other.block);
+      }
+      this.keepLength = other.keepLength;
+      if (other.isSetTargets()) {
+        List<TDatanodeID> __this__targets = new ArrayList<TDatanodeID>();
+        for (TDatanodeID other_element : other.targets) {
+          __this__targets.add(new TDatanodeID(other_element));
+        }
+        this.targets = __this__targets;
+      }
+      this.deadline = other.deadline;
+    }
+
+    public recoverBlock_args deepCopy() {
+      return new recoverBlock_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.datanode = null;
+      this.namespaceId = null;
+      this.block = null;
+      setKeepLengthIsSet(false);
+      this.keepLength = false;
+      this.targets = null;
+      setDeadlineIsSet(false);
+      this.deadline = 0;
+    }
+
+    public TDatanodeID getDatanode() {
+      return this.datanode;
+    }
+
+    public recoverBlock_args setDatanode(TDatanodeID datanode) {
+      this.datanode = datanode;
+      return this;
+    }
+
+    public void unsetDatanode() {
+      this.datanode = null;
+    }
+
+    /** Returns true if field datanode is set (has been assigned a value) and false otherwise */
+    public boolean isSetDatanode() {
+      return this.datanode != null;
+    }
+
+    public void setDatanodeIsSet(boolean value) {
+      if (!value) {
+        this.datanode = null;
+      }
+    }
+
+    public ThdfsNamespaceId getNamespaceId() {
+      return this.namespaceId;
+    }
+
+    public recoverBlock_args setNamespaceId(ThdfsNamespaceId namespaceId) {
+      this.namespaceId = namespaceId;
+      return this;
+    }
+
+    public void unsetNamespaceId() {
+      this.namespaceId = null;
+    }
+
+    /** Returns true if field namespaceId is set (has been assigned a value) and false otherwise */
+    public boolean isSetNamespaceId() {
+      return this.namespaceId != null;
+    }
+
+    public void setNamespaceIdIsSet(boolean value) {
+      if (!value) {
+        this.namespaceId = null;
+      }
+    }
+
+    public ThdfsBlock getBlock() {
+      return this.block;
+    }
+
+    public recoverBlock_args setBlock(ThdfsBlock block) {
+      this.block = block;
+      return this;
+    }
+
+    public void unsetBlock() {
+      this.block = null;
+    }
+
+    /** Returns true if field block is set (has been assigned a value) and false otherwise */
+    public boolean isSetBlock() {
+      return this.block != null;
+    }
+
+    public void setBlockIsSet(boolean value) {
+      if (!value) {
+        this.block = null;
+      }
+    }
+
+    public boolean isKeepLength() {
+      return this.keepLength;
+    }
+
+    public recoverBlock_args setKeepLength(boolean keepLength) {
+      this.keepLength = keepLength;
+      setKeepLengthIsSet(true);
+      return this;
+    }
+
+    public void unsetKeepLength() {
+      __isset_bit_vector.clear(__KEEPLENGTH_ISSET_ID);
+    }
+
+    /** Returns true if field keepLength is set (has been assigned a value) and false otherwise */
+    public boolean isSetKeepLength() {
+      return __isset_bit_vector.get(__KEEPLENGTH_ISSET_ID);
+    }
+
+    public void setKeepLengthIsSet(boolean value) {
+      __isset_bit_vector.set(__KEEPLENGTH_ISSET_ID, value);
+    }
+
+    public int getTargetsSize() {
+      return (this.targets == null) ? 0 : this.targets.size();
+    }
+
+    public java.util.Iterator<TDatanodeID> getTargetsIterator() {
+      return (this.targets == null) ? null : this.targets.iterator();
+    }
+
+    public void addToTargets(TDatanodeID elem) {
+      if (this.targets == null) {
+        this.targets = new ArrayList<TDatanodeID>();
+      }
+      this.targets.add(elem);
+    }
+
+    public List<TDatanodeID> getTargets() {
+      return this.targets;
+    }
+
+    public recoverBlock_args setTargets(List<TDatanodeID> targets) {
+      this.targets = targets;
+      return this;
+    }
+
+    public void unsetTargets() {
+      this.targets = null;
+    }
+
+    /** Returns true if field targets is set (has been assigned a value) and false otherwise */
+    public boolean isSetTargets() {
+      return this.targets != null;
+    }
+
+    public void setTargetsIsSet(boolean value) {
+      if (!value) {
+        this.targets = null;
+      }
+    }
+
+    public long getDeadline() {
+      return this.deadline;
+    }
+
+    public recoverBlock_args setDeadline(long deadline) {
+      this.deadline = deadline;
+      setDeadlineIsSet(true);
+      return this;
+    }
+
+    public void unsetDeadline() {
+      __isset_bit_vector.clear(__DEADLINE_ISSET_ID);
+    }
+
+    /** Returns true if field deadline is set (has been assigned a value) and false otherwise */
+    public boolean isSetDeadline() {
+      return __isset_bit_vector.get(__DEADLINE_ISSET_ID);
+    }
+
+    public void setDeadlineIsSet(boolean value) {
+      __isset_bit_vector.set(__DEADLINE_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case DATANODE:
+        if (value == null) {
+          unsetDatanode();
+        } else {
+          setDatanode((TDatanodeID)value);
+        }
+        break;
+
+      case NAMESPACE_ID:
+        if (value == null) {
+          unsetNamespaceId();
+        } else {
+          setNamespaceId((ThdfsNamespaceId)value);
+        }
+        break;
+
+      case BLOCK:
+        if (value == null) {
+          unsetBlock();
+        } else {
+          setBlock((ThdfsBlock)value);
+        }
+        break;
+
+      case KEEP_LENGTH:
+        if (value == null) {
+          unsetKeepLength();
+        } else {
+          setKeepLength((Boolean)value);
+        }
+        break;
+
+      case TARGETS:
+        if (value == null) {
+          unsetTargets();
+        } else {
+          setTargets((List<TDatanodeID>)value);
+        }
+        break;
+
+      case DEADLINE:
+        if (value == null) {
+          unsetDeadline();
+        } else {
+          setDeadline((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case DATANODE:
+        return getDatanode();
+
+      case NAMESPACE_ID:
+        return getNamespaceId();
+
+      case BLOCK:
+        return getBlock();
+
+      case KEEP_LENGTH:
+        return Boolean.valueOf(isKeepLength());
+
+      case TARGETS:
+        return getTargets();
+
+      case DEADLINE:
+        return Long.valueOf(getDeadline());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case DATANODE:
+        return isSetDatanode();
+      case NAMESPACE_ID:
+        return isSetNamespaceId();
+      case BLOCK:
+        return isSetBlock();
+      case KEEP_LENGTH:
+        return isSetKeepLength();
+      case TARGETS:
+        return isSetTargets();
+      case DEADLINE:
+        return isSetDeadline();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof recoverBlock_args)
+        return this.equals((recoverBlock_args)that);
+      return false;
+    }
+
+    public boolean equals(recoverBlock_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_datanode = true && this.isSetDatanode();
+      boolean that_present_datanode = true && that.isSetDatanode();
+      if (this_present_datanode || that_present_datanode) {
+        if (!(this_present_datanode && that_present_datanode))
+          return false;
+        if (!this.datanode.equals(that.datanode))
+          return false;
+      }
+
+      boolean this_present_namespaceId = true && this.isSetNamespaceId();
+      boolean that_present_namespaceId = true && that.isSetNamespaceId();
+      if (this_present_namespaceId || that_present_namespaceId) {
+        if (!(this_present_namespaceId && that_present_namespaceId))
+          return false;
+        if (!this.namespaceId.equals(that.namespaceId))
+          return false;
+      }
+
+      boolean this_present_block = true && this.isSetBlock();
+      boolean that_present_block = true && that.isSetBlock();
+      if (this_present_block || that_present_block) {
+        if (!(this_present_block && that_present_block))
+          return false;
+        if (!this.block.equals(that.block))
+          return false;
+      }
+
+      boolean this_present_keepLength = true;
+      boolean that_present_keepLength = true;
+      if (this_present_keepLength || that_present_keepLength) {
+        if (!(this_present_keepLength && that_present_keepLength))
+          return false;
+        if (this.keepLength != that.keepLength)
+          return false;
+      }
+
+      boolean this_present_targets = true && this.isSetTargets();
+      boolean that_present_targets = true && that.isSetTargets();
+      if (this_present_targets || that_present_targets) {
+        if (!(this_present_targets && that_present_targets))
+          return false;
+        if (!this.targets.equals(that.targets))
+          return false;
+      }
+
+      boolean this_present_deadline = true;
+      boolean that_present_deadline = true;
+      if (this_present_deadline || that_present_deadline) {
+        if (!(this_present_deadline && that_present_deadline))
+          return false;
+        if (this.deadline != that.deadline)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(recoverBlock_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      recoverBlock_args typedOther = (recoverBlock_args)other;
+
+      lastComparison = Boolean.valueOf(isSetDatanode()).compareTo(typedOther.isSetDatanode());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDatanode()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datanode, typedOther.datanode);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetNamespaceId()).compareTo(typedOther.isSetNamespaceId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetNamespaceId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.namespaceId, typedOther.namespaceId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetBlock()).compareTo(typedOther.isSetBlock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBlock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.block, typedOther.block);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetKeepLength()).compareTo(typedOther.isSetKeepLength());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetKeepLength()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keepLength, typedOther.keepLength);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetTargets()).compareTo(typedOther.isSetTargets());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTargets()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.targets, typedOther.targets);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDeadline()).compareTo(typedOther.isSetDeadline());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDeadline()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deadline, typedOther.deadline);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // DATANODE
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.datanode = new TDatanodeID();
+              this.datanode.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // NAMESPACE_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.namespaceId = new ThdfsNamespaceId();
+              this.namespaceId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // BLOCK
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.block = new ThdfsBlock();
+              this.block.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 4: // KEEP_LENGTH
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.keepLength = iprot.readBool();
+              setKeepLengthIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 5: // TARGETS
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+                this.targets = new ArrayList<TDatanodeID>(_list0.size);
+                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+                {
+                  TDatanodeID _elem2; // required
+                  _elem2 = new TDatanodeID();
+                  _elem2.read(iprot);
+                  this.targets.add(_elem2);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 6: // DEADLINE
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.deadline = iprot.readI64();
+              setDeadlineIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.datanode != null) {
+        oprot.writeFieldBegin(DATANODE_FIELD_DESC);
+        this.datanode.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.namespaceId != null) {
+        oprot.writeFieldBegin(NAMESPACE_ID_FIELD_DESC);
+        this.namespaceId.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.block != null) {
+        oprot.writeFieldBegin(BLOCK_FIELD_DESC);
+        this.block.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(KEEP_LENGTH_FIELD_DESC);
+      oprot.writeBool(this.keepLength);
+      oprot.writeFieldEnd();
+      if (this.targets != null) {
+        oprot.writeFieldBegin(TARGETS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.targets.size()));
+          for (TDatanodeID _iter3 : this.targets)
+          {
+            _iter3.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(DEADLINE_FIELD_DESC);
+      oprot.writeI64(this.deadline);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("recoverBlock_args(");
+      boolean first = true;
+
+      sb.append("datanode:");
+      if (this.datanode == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.datanode);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("namespaceId:");
+      if (this.namespaceId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.namespaceId);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("block:");
+      if (this.block == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.block);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("keepLength:");
+      sb.append(this.keepLength);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("targets:");
+      if (this.targets == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.targets);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("deadline:");
+      sb.append(this.deadline);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class recoverBlock_result implements org.apache.thrift.TBase<recoverBlock_result, recoverBlock_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("recoverBlock_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThdfsBlock success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsBlock.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(recoverBlock_result.class, metaDataMap);
+    }
+
+    public recoverBlock_result() {
+    }
+
+    public recoverBlock_result(
+      ThdfsBlock success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public recoverBlock_result(recoverBlock_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new ThdfsBlock(other.success);
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public recoverBlock_result deepCopy() {
+      return new recoverBlock_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public ThdfsBlock getSuccess() {
+      return this.success;
+    }
+
+    public recoverBlock_result setSuccess(ThdfsBlock success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public recoverBlock_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((ThdfsBlock)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof recoverBlock_result)
+        return this.equals((recoverBlock_result)that);
+      return false;
+    }
+
+    public boolean equals(recoverBlock_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(recoverBlock_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      recoverBlock_result typedOther = (recoverBlock_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new ThdfsBlock();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("recoverBlock_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getBlockInfo_args implements org.apache.thrift.TBase<getBlockInfo_args, getBlockInfo_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getBlockInfo_args");
+
+    private static final org.apache.thrift.protocol.TField DATANODE_FIELD_DESC = new org.apache.thrift.protocol.TField("datanode", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField NAMESPACEID_FIELD_DESC = new org.apache.thrift.protocol.TField("namespaceid", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("block", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+
+    public TDatanodeID datanode; // required
+    public ThdfsNamespaceId namespaceid; // required
+    public ThdfsBlock block; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      DATANODE((short)1, "datanode"),
+      NAMESPACEID((short)2, "namespaceid"),
+      BLOCK((short)3, "block");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // DATANODE
+            return DATANODE;
+          case 2: // NAMESPACEID
+            return NAMESPACEID;
+          case 3: // BLOCK
+            return BLOCK;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.DATANODE, new org.apache.thrift.meta_data.FieldMetaData("datanode", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class)));
+      tmpMap.put(_Fields.NAMESPACEID, new org.apache.thrift.meta_data.FieldMetaData("namespaceid", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsNamespaceId.class)));
+      tmpMap.put(_Fields.BLOCK, new org.apache.thrift.meta_data.FieldMetaData("block", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsBlock.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getBlockInfo_args.class, metaDataMap);
+    }
+
+    public getBlockInfo_args() {
+    }
+
+    public getBlockInfo_args(
+      TDatanodeID datanode,
+      ThdfsNamespaceId namespaceid,
+      ThdfsBlock block)
+    {
+      this();
+      this.datanode = datanode;
+      this.namespaceid = namespaceid;
+      this.block = block;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getBlockInfo_args(getBlockInfo_args other) {
+      if (other.isSetDatanode()) {
+        this.datanode = new TDatanodeID(other.datanode);
+      }
+      if (other.isSetNamespaceid()) {
+        this.namespaceid = new ThdfsNamespaceId(other.namespaceid);
+      }
+      if (other.isSetBlock()) {
+        this.block = new ThdfsBlock(other.block);
+      }
+    }
+
+    public getBlockInfo_args deepCopy() {
+      return new getBlockInfo_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.datanode = null;
+      this.namespaceid = null;
+      this.block = null;
+    }
+
+    public TDatanodeID getDatanode() {
+      return this.datanode;
+    }
+
+    public getBlockInfo_args setDatanode(TDatanodeID datanode) {
+      this.datanode = datanode;
+      return this;
+    }
+
+    public void unsetDatanode() {
+      this.datanode = null;
+    }
+
+    /** Returns true if field datanode is set (has been assigned a value) and false otherwise */
+    public boolean isSetDatanode() {
+      return this.datanode != null;
+    }
+
+    public void setDatanodeIsSet(boolean value) {
+      if (!value) {
+        this.datanode = null;
+      }
+    }
+
+    public ThdfsNamespaceId getNamespaceid() {
+      return this.namespaceid;
+    }
+
+    public getBlockInfo_args setNamespaceid(ThdfsNamespaceId namespaceid) {
+      this.namespaceid = namespaceid;
+      return this;
+    }
+
+    public void unsetNamespaceid() {
+      this.namespaceid = null;
+    }
+
+    /** Returns true if field namespaceid is set (has been assigned a value) and false otherwise */
+    public boolean isSetNamespaceid() {
+      return this.namespaceid != null;
+    }
+
+    public void setNamespaceidIsSet(boolean value) {
+      if (!value) {
+        this.namespaceid = null;
+      }
+    }
+
+    public ThdfsBlock getBlock() {
+      return this.block;
+    }
+
+    public getBlockInfo_args setBlock(ThdfsBlock block) {
+      this.block = block;
+      return this;
+    }
+
+    public void unsetBlock() {
+      this.block = null;
+    }
+
+    /** Returns true if field block is set (has been assigned a value) and false otherwise */
+    public boolean isSetBlock() {
+      return this.block != null;
+    }
+
+    public void setBlockIsSet(boolean value) {
+      if (!value) {
+        this.block = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case DATANODE:
+        if (value == null) {
+          unsetDatanode();
+        } else {
+          setDatanode((TDatanodeID)value);
+        }
+        break;
+
+      case NAMESPACEID:
+        if (value == null) {
+          unsetNamespaceid();
+        } else {
+          setNamespaceid((ThdfsNamespaceId)value);
+        }
+        break;
+
+      case BLOCK:
+        if (value == null) {
+          unsetBlock();
+        } else {
+          setBlock((ThdfsBlock)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case DATANODE:
+        return getDatanode();
+
+      case NAMESPACEID:
+        return getNamespaceid();
+
+      case BLOCK:
+        return getBlock();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case DATANODE:
+        return isSetDatanode();
+      case NAMESPACEID:
+        return isSetNamespaceid();
+      case BLOCK:
+        return isSetBlock();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getBlockInfo_args)
+        return this.equals((getBlockInfo_args)that);
+      return false;
+    }
+
+    public boolean equals(getBlockInfo_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_datanode = true && this.isSetDatanode();
+      boolean that_present_datanode = true && that.isSetDatanode();
+      if (this_present_datanode || that_present_datanode) {
+        if (!(this_present_datanode && that_present_datanode))
+          return false;
+        if (!this.datanode.equals(that.datanode))
+          return false;
+      }
+
+      boolean this_present_namespaceid = true && this.isSetNamespaceid();
+      boolean that_present_namespaceid = true && that.isSetNamespaceid();
+      if (this_present_namespaceid || that_present_namespaceid) {
+        if (!(this_present_namespaceid && that_present_namespaceid))
+          return false;
+        if (!this.namespaceid.equals(that.namespaceid))
+          return false;
+      }
+
+      boolean this_present_block = true && this.isSetBlock();
+      boolean that_present_block = true && that.isSetBlock();
+      if (this_present_block || that_present_block) {
+        if (!(this_present_block && that_present_block))
+          return false;
+        if (!this.block.equals(that.block))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getBlockInfo_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getBlockInfo_args typedOther = (getBlockInfo_args)other;
+
+      lastComparison = Boolean.valueOf(isSetDatanode()).compareTo(typedOther.isSetDatanode());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDatanode()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datanode, typedOther.datanode);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetNamespaceid()).compareTo(typedOther.isSetNamespaceid());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetNamespaceid()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.namespaceid, typedOther.namespaceid);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetBlock()).compareTo(typedOther.isSetBlock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBlock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.block, typedOther.block);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // DATANODE
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.datanode = new TDatanodeID();
+              this.datanode.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // NAMESPACEID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.namespaceid = new ThdfsNamespaceId();
+              this.namespaceid.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // BLOCK
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.block = new ThdfsBlock();
+              this.block.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.datanode != null) {
+        oprot.writeFieldBegin(DATANODE_FIELD_DESC);
+        this.datanode.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.namespaceid != null) {
+        oprot.writeFieldBegin(NAMESPACEID_FIELD_DESC);
+        this.namespaceid.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.block != null) {
+        oprot.writeFieldBegin(BLOCK_FIELD_DESC);
+        this.block.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getBlockInfo_args(");
+      boolean first = true;
+
+      sb.append("datanode:");
+      if (this.datanode == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.datanode);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("namespaceid:");
+      if (this.namespaceid == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.namespaceid);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("block:");
+      if (this.block == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.block);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getBlockInfo_result implements org.apache.thrift.TBase<getBlockInfo_result, getBlockInfo_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getBlockInfo_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThdfsBlock success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsBlock.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getBlockInfo_result.class, metaDataMap);
+    }
+
+    public getBlockInfo_result() {
+    }
+
+    public getBlockInfo_result(
+      ThdfsBlock success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getBlockInfo_result(getBlockInfo_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new ThdfsBlock(other.success);
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public getBlockInfo_result deepCopy() {
+      return new getBlockInfo_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public ThdfsBlock getSuccess() {
+      return this.success;
+    }
+
+    public getBlockInfo_result setSuccess(ThdfsBlock success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public getBlockInfo_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((ThdfsBlock)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getBlockInfo_result)
+        return this.equals((getBlockInfo_result)that);
+      return false;
+    }
+
+    public boolean equals(getBlockInfo_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getBlockInfo_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getBlockInfo_result typedOther = (getBlockInfo_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new ThdfsBlock();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getBlockInfo_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class copyBlock_args implements org.apache.thrift.TBase<copyBlock_args, copyBlock_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("copyBlock_args");
+
+    private static final org.apache.thrift.protocol.TField DATANODE_FIELD_DESC = new org.apache.thrift.protocol.TField("datanode", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField SRC_NAMESPACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("srcNamespaceId", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField SRCBLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("srcblock", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+    private static final org.apache.thrift.protocol.TField DST_NAMESPACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dstNamespaceId", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+    private static final org.apache.thrift.protocol.TField DEST_BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("destBlock", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+    private static final org.apache.thrift.protocol.TField TARGET_FIELD_DESC = new org.apache.thrift.protocol.TField("target", org.apache.thrift.protocol.TType.STRUCT, (short)6);
+    private static final org.apache.thrift.protocol.TField ASYNCHRONOUS_FIELD_DESC = new org.apache.thrift.protocol.TField("asynchronous", org.apache.thrift.protocol.TType.BOOL, (short)7);
+
+    public TDatanodeID datanode; // required
+    public ThdfsNamespaceId srcNamespaceId; // required
+    public ThdfsBlock srcblock; // required
+    public ThdfsNamespaceId dstNamespaceId; // required
+    public ThdfsBlock destBlock; // required
+    public TDatanodeID target; // required
+    public boolean asynchronous; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      DATANODE((short)1, "datanode"),
+      SRC_NAMESPACE_ID((short)2, "srcNamespaceId"),
+      SRCBLOCK((short)3, "srcblock"),
+      DST_NAMESPACE_ID((short)4, "dstNamespaceId"),
+      DEST_BLOCK((short)5, "destBlock"),
+      TARGET((short)6, "target"),
+      ASYNCHRONOUS((short)7, "asynchronous");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // DATANODE
+            return DATANODE;
+          case 2: // SRC_NAMESPACE_ID
+            return SRC_NAMESPACE_ID;
+          case 3: // SRCBLOCK
+            return SRCBLOCK;
+          case 4: // DST_NAMESPACE_ID
+            return DST_NAMESPACE_ID;
+          case 5: // DEST_BLOCK
+            return DEST_BLOCK;
+          case 6: // TARGET
+            return TARGET;
+          case 7: // ASYNCHRONOUS
+            return ASYNCHRONOUS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __ASYNCHRONOUS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.DATANODE, new org.apache.thrift.meta_data.FieldMetaData("datanode", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class)));
+      tmpMap.put(_Fields.SRC_NAMESPACE_ID, new org.apache.thrift.meta_data.FieldMetaData("srcNamespaceId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsNamespaceId.class)));
+      tmpMap.put(_Fields.SRCBLOCK, new org.apache.thrift.meta_data.FieldMetaData("srcblock", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsBlock.class)));
+      tmpMap.put(_Fields.DST_NAMESPACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dstNamespaceId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsNamespaceId.class)));
+      tmpMap.put(_Fields.DEST_BLOCK, new org.apache.thrift.meta_data.FieldMetaData("destBlock", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsBlock.class)));
+      tmpMap.put(_Fields.TARGET, new org.apache.thrift.meta_data.FieldMetaData("target", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class)));
+      tmpMap.put(_Fields.ASYNCHRONOUS, new org.apache.thrift.meta_data.FieldMetaData("asynchronous", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(copyBlock_args.class, metaDataMap);
+    }
+
+    public copyBlock_args() {
+    }
+
+    public copyBlock_args(
+      TDatanodeID datanode,
+      ThdfsNamespaceId srcNamespaceId,
+      ThdfsBlock srcblock,
+      ThdfsNamespaceId dstNamespaceId,
+      ThdfsBlock destBlock,
+      TDatanodeID target,
+      boolean asynchronous)
+    {
+      this();
+      this.datanode = datanode;
+      this.srcNamespaceId = srcNamespaceId;
+      this.srcblock = srcblock;
+      this.dstNamespaceId = dstNamespaceId;
+      this.destBlock = destBlock;
+      this.target = target;
+      this.asynchronous = asynchronous;
+      setAsynchronousIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public copyBlock_args(copyBlock_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetDatanode()) {
+        this.datanode = new TDatanodeID(other.datanode);
+      }
+      if (other.isSetSrcNamespaceId()) {
+        this.srcNamespaceId = new ThdfsNamespaceId(other.srcNamespaceId);
+      }
+      if (other.isSetSrcblock()) {
+        this.srcblock = new ThdfsBlock(other.srcblock);
+      }
+      if (other.isSetDstNamespaceId()) {
+        this.dstNamespaceId = new ThdfsNamespaceId(other.dstNamespaceId);
+      }
+      if (other.isSetDestBlock()) {
+        this.destBlock = new ThdfsBlock(other.destBlock);
+      }
+      if (other.isSetTarget()) {
+        this.target = new TDatanodeID(other.target);
+      }
+      this.asynchronous = other.asynchronous;
+    }
+
+    public copyBlock_args deepCopy() {
+      return new copyBlock_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.datanode = null;
+      this.srcNamespaceId = null;
+      this.srcblock = null;
+      this.dstNamespaceId = null;
+      this.destBlock = null;
+      this.target = null;
+      setAsynchronousIsSet(false);
+      this.asynchronous = false;
+    }
+
+    public TDatanodeID getDatanode() {
+      return this.datanode;
+    }
+
+    public copyBlock_args setDatanode(TDatanodeID datanode) {
+      this.datanode = datanode;
+      return this;
+    }
+
+    public void unsetDatanode() {
+      this.datanode = null;
+    }
+
+    /** Returns true if field datanode is set (has been assigned a value) and false otherwise */
+    public boolean isSetDatanode() {
+      return this.datanode != null;
+    }
+
+    public void setDatanodeIsSet(boolean value) {
+      if (!value) {
+        this.datanode = null;
+      }
+    }
+
+    public ThdfsNamespaceId getSrcNamespaceId() {
+      return this.srcNamespaceId;
+    }
+
+    public copyBlock_args setSrcNamespaceId(ThdfsNamespaceId srcNamespaceId) {
+      this.srcNamespaceId = srcNamespaceId;
+      return this;
+    }
+
+    public void unsetSrcNamespaceId() {
+      this.srcNamespaceId = null;
+    }
+
+    /** Returns true if field srcNamespaceId is set (has been assigned a value) and false otherwise */
+    public boolean isSetSrcNamespaceId() {
+      return this.srcNamespaceId != null;
+    }
+
+    public void setSrcNamespaceIdIsSet(boolean value) {
+      if (!value) {
+        this.srcNamespaceId = null;
+      }
+    }
+
+    public ThdfsBlock getSrcblock() {
+      return this.srcblock;
+    }
+
+    public copyBlock_args setSrcblock(ThdfsBlock srcblock) {
+      this.srcblock = srcblock;
+      return this;
+    }
+
+    public void unsetSrcblock() {
+      this.srcblock = null;
+    }
+
+    /** Returns true if field srcblock is set (has been assigned a value) and false otherwise */
+    public boolean isSetSrcblock() {
+      return this.srcblock != null;
+    }
+
+    public void setSrcblockIsSet(boolean value) {
+      if (!value) {
+        this.srcblock = null;
+      }
+    }
+
+    public ThdfsNamespaceId getDstNamespaceId() {
+      return this.dstNamespaceId;
+    }
+
+    public copyBlock_args setDstNamespaceId(ThdfsNamespaceId dstNamespaceId) {
+      this.dstNamespaceId = dstNamespaceId;
+      return this;
+    }
+
+    public void unsetDstNamespaceId() {
+      this.dstNamespaceId = null;
+    }
+
+    /** Returns true if field dstNamespaceId is set (has been assigned a value) and false otherwise */
+    public boolean isSetDstNamespaceId() {
+      return this.dstNamespaceId != null;
+    }
+
+    public void setDstNamespaceIdIsSet(boolean value) {
+      if (!value) {
+        this.dstNamespaceId = null;
+      }
+    }
+
+    public ThdfsBlock getDestBlock() {
+      return this.destBlock;
+    }
+
+    public copyBlock_args setDestBlock(ThdfsBlock destBlock) {
+      this.destBlock = destBlock;
+      return this;
+    }
+
+    public void unsetDestBlock() {
+      this.destBlock = null;
+    }
+
+    /** Returns true if field destBlock is set (has been assigned a value) and false otherwise */
+    public boolean isSetDestBlock() {
+      return this.destBlock != null;
+    }
+
+    public void setDestBlockIsSet(boolean value) {
+      if (!value) {
+        this.destBlock = null;
+      }
+    }
+
+    public TDatanodeID getTarget() {
+      return this.target;
+    }
+
+    public copyBlock_args setTarget(TDatanodeID target) {
+      this.target = target;
+      return this;
+    }
+
+    public void unsetTarget() {
+      this.target = null;
+    }
+
+    /** Returns true if field target is set (has been assigned a value) and false otherwise */
+    public boolean isSetTarget() {
+      return this.target != null;
+    }
+
+    public void setTargetIsSet(boolean value) {
+      if (!value) {
+        this.target = null;
+      }
+    }
+
+    public boolean isAsynchronous() {
+      return this.asynchronous;
+    }
+
+    public copyBlock_args setAsynchronous(boolean asynchronous) {
+      this.asynchronous = asynchronous;
+      setAsynchronousIsSet(true);
+      return this;
+    }
+
+    public void unsetAsynchronous() {
+      __isset_bit_vector.clear(__ASYNCHRONOUS_ISSET_ID);
+    }
+
+    /** Returns true if field asynchronous is set (has been assigned a value) and false otherwise */
+    public boolean isSetAsynchronous() {
+      return __isset_bit_vector.get(__ASYNCHRONOUS_ISSET_ID);
+    }
+
+    public void setAsynchronousIsSet(boolean value) {
+      __isset_bit_vector.set(__ASYNCHRONOUS_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case DATANODE:
+        if (value == null) {
+          unsetDatanode();
+        } else {
+          setDatanode((TDatanodeID)value);
+        }
+        break;
+
+      case SRC_NAMESPACE_ID:
+        if (value == null) {
+          unsetSrcNamespaceId();
+        } else {
+          setSrcNamespaceId((ThdfsNamespaceId)value);
+        }
+        break;
+
+      case SRCBLOCK:
+        if (value == null) {
+          unsetSrcblock();
+        } else {
+          setSrcblock((ThdfsBlock)value);
+        }
+        break;
+
+      case DST_NAMESPACE_ID:
+        if (value == null) {
+          unsetDstNamespaceId();
+        } else {
+          setDstNamespaceId((ThdfsNamespaceId)value);
+        }
+        break;
+
+      case DEST_BLOCK:
+        if (value == null) {
+          unsetDestBlock();
+        } else {
+          setDestBlock((ThdfsBlock)value);
+        }
+        break;
+
+      case TARGET:
+        if (value == null) {
+          unsetTarget();
+        } else {
+          setTarget((TDatanodeID)value);
+        }
+        break;
+
+      case ASYNCHRONOUS:
+        if (value == null) {
+          unsetAsynchronous();
+        } else {
+          setAsynchronous((Boolean)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case DATANODE:
+        return getDatanode();
+
+      case SRC_NAMESPACE_ID:
+        return getSrcNamespaceId();
+
+      case SRCBLOCK:
+        return getSrcblock();
+
+      case DST_NAMESPACE_ID:
+        return getDstNamespaceId();
+
+      case DEST_BLOCK:
+        return getDestBlock();
+
+      case TARGET:
+        return getTarget();
+
+      case ASYNCHRONOUS:
+        return Boolean.valueOf(isAsynchronous());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case DATANODE:
+        return isSetDatanode();
+      case SRC_NAMESPACE_ID:
+        return isSetSrcNamespaceId();
+      case SRCBLOCK:
+        return isSetSrcblock();
+      case DST_NAMESPACE_ID:
+        return isSetDstNamespaceId();
+      case DEST_BLOCK:
+        return isSetDestBlock();
+      case TARGET:
+        return isSetTarget();
+      case ASYNCHRONOUS:
+        return isSetAsynchronous();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof copyBlock_args)
+        return this.equals((copyBlock_args)that);
+      return false;
+    }
+
+    public boolean equals(copyBlock_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_datanode = true && this.isSetDatanode();
+      boolean that_present_datanode = true && that.isSetDatanode();
+      if (this_present_datanode || that_present_datanode) {
+        if (!(this_present_datanode && that_present_datanode))
+          return false;
+        if (!this.datanode.equals(that.datanode))
+          return false;
+      }
+
+      boolean this_present_srcNamespaceId = true && this.isSetSrcNamespaceId();
+      boolean that_present_srcNamespaceId = true && that.isSetSrcNamespaceId();
+      if (this_present_srcNamespaceId || that_present_srcNamespaceId) {
+        if (!(this_present_srcNamespaceId && that_present_srcNamespaceId))
+          return false;
+        if (!this.srcNamespaceId.equals(that.srcNamespaceId))
+          return false;
+      }
+
+      boolean this_present_srcblock = true && this.isSetSrcblock();
+      boolean that_present_srcblock = true && that.isSetSrcblock();
+      if (this_present_srcblock || that_present_srcblock) {
+        if (!(this_present_srcblock && that_present_srcblock))
+          return false;
+        if (!this.srcblock.equals(that.srcblock))
+          return false;
+      }
+
+      boolean this_present_dstNamespaceId = true && this.isSetDstNamespaceId();
+      boolean that_present_dstNamespaceId = true && that.isSetDstNamespaceId();
+      if (this_present_dstNamespaceId || that_present_dstNamespaceId) {
+        if (!(this_present_dstNamespaceId && that_present_dstNamespaceId))
+          return false;
+        if (!this.dstNamespaceId.equals(that.dstNamespaceId))
+          return false;
+      }
+
+      boolean this_present_destBlock = true && this.isSetDestBlock();
+      boolean that_present_destBlock = true && that.isSetDestBlock();
+      if (this_present_destBlock || that_present_destBlock) {
+        if (!(this_present_destBlock && that_present_destBlock))
+          return false;
+        if (!this.destBlock.equals(that.destBlock))
+          return false;
+      }
+
+      boolean this_present_target = true && this.isSetTarget();
+      boolean that_present_target = true && that.isSetTarget();
+      if (this_present_target || that_present_target) {
+        if (!(this_present_target && that_present_target))
+          return false;
+        if (!this.target.equals(that.target))
+          return false;
+      }
+
+      boolean this_present_asynchronous = true;
+      boolean that_present_asynchronous = true;
+      if (this_present_asynchronous || that_present_asynchronous) {
+        if (!(this_present_asynchronous && that_present_asynchronous))
+          return false;
+        if (this.asynchronous != that.asynchronous)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(copyBlock_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      copyBlock_args typedOther = (copyBlock_args)other;
+
+      lastComparison = Boolean.valueOf(isSetDatanode()).compareTo(typedOther.isSetDatanode());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDatanode()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datanode, typedOther.datanode);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetSrcNamespaceId()).compareTo(typedOther.isSetSrcNamespaceId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSrcNamespaceId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.srcNamespaceId, typedOther.srcNamespaceId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetSrcblock()).compareTo(typedOther.isSetSrcblock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSrcblock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.srcblock, typedOther.srcblock);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDstNamespaceId()).compareTo(typedOther.isSetDstNamespaceId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDstNamespaceId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dstNamespaceId, typedOther.dstNamespaceId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDestBlock()).compareTo(typedOther.isSetDestBlock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDestBlock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.destBlock, typedOther.destBlock);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetTarget()).compareTo(typedOther.isSetTarget());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTarget()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.target, typedOther.target);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetAsynchronous()).compareTo(typedOther.isSetAsynchronous());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetAsynchronous()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.asynchronous, typedOther.asynchronous);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // DATANODE
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.datanode = new TDatanodeID();
+              this.datanode.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // SRC_NAMESPACE_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.srcNamespaceId = new ThdfsNamespaceId();
+              this.srcNamespaceId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // SRCBLOCK
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.srcblock = new ThdfsBlock();
+              this.srcblock.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 4: // DST_NAMESPACE_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.dstNamespaceId = new ThdfsNamespaceId();
+              this.dstNamespaceId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 5: // DEST_BLOCK
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.destBlock = new ThdfsBlock();
+              this.destBlock.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 6: // TARGET
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.target = new TDatanodeID();
+              this.target.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 7: // ASYNCHRONOUS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.asynchronous = iprot.readBool();
+              setAsynchronousIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.datanode != null) {
+        oprot.writeFieldBegin(DATANODE_FIELD_DESC);
+        this.datanode.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.srcNamespaceId != null) {
+        oprot.writeFieldBegin(SRC_NAMESPACE_ID_FIELD_DESC);
+        this.srcNamespaceId.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.srcblock != null) {
+        oprot.writeFieldBegin(SRCBLOCK_FIELD_DESC);
+        this.srcblock.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.dstNamespaceId != null) {
+        oprot.writeFieldBegin(DST_NAMESPACE_ID_FIELD_DESC);
+        this.dstNamespaceId.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.destBlock != null) {
+        oprot.writeFieldBegin(DEST_BLOCK_FIELD_DESC);
+        this.destBlock.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.target != null) {
+        oprot.writeFieldBegin(TARGET_FIELD_DESC);
+        this.target.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(ASYNCHRONOUS_FIELD_DESC);
+      oprot.writeBool(this.asynchronous);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("copyBlock_args(");
+      boolean first = true;
+
+      sb.append("datanode:");
+      if (this.datanode == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.datanode);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("srcNamespaceId:");
+      if (this.srcNamespaceId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.srcNamespaceId);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("srcblock:");
+      if (this.srcblock == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.srcblock);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("dstNamespaceId:");
+      if (this.dstNamespaceId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.dstNamespaceId);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("destBlock:");
+      if (this.destBlock == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.destBlock);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("target:");
+      if (this.target == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.target);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("asynchronous:");
+      sb.append(this.asynchronous);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class copyBlock_result implements org.apache.thrift.TBase<copyBlock_result, copyBlock_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("copyBlock_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(copyBlock_result.class, metaDataMap);
+    }
+
+    public copyBlock_result() {
+    }
+
+    public copyBlock_result(
+      ThriftIOException ouch)
+    {
+      this();
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public copyBlock_result(copyBlock_result other) {
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public copyBlock_result deepCopy() {
+      return new copyBlock_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.ouch = null;
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public copyBlock_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof copyBlock_result)
+        return this.equals((copyBlock_result)that);
+      return false;
+    }
+
+    public boolean equals(copyBlock_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(copyBlock_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      copyBlock_result typedOther = (copyBlock_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("copyBlock_result(");
+      boolean first = true;
+
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getBlockPathInfo_args implements org.apache.thrift.TBase<getBlockPathInfo_args, getBlockPathInfo_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getBlockPathInfo_args");
+
+    private static final org.apache.thrift.protocol.TField DATANODE_FIELD_DESC = new org.apache.thrift.protocol.TField("datanode", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField NAMESPACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("namespaceId", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("block", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+
+    public TDatanodeID datanode; // required
+    public ThdfsNamespaceId namespaceId; // required
+    public ThdfsBlock block; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      DATANODE((short)1, "datanode"),
+      NAMESPACE_ID((short)2, "namespaceId"),
+      BLOCK((short)3, "block");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // DATANODE
+            return DATANODE;
+          case 2: // NAMESPACE_ID
+            return NAMESPACE_ID;
+          case 3: // BLOCK
+            return BLOCK;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.DATANODE, new org.apache.thrift.meta_data.FieldMetaData("datanode", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class)));
+      tmpMap.put(_Fields.NAMESPACE_ID, new org.apache.thrift.meta_data.FieldMetaData("namespaceId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsNamespaceId.class)));
+      tmpMap.put(_Fields.BLOCK, new org.apache.thrift.meta_data.FieldMetaData("block", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsBlock.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getBlockPathInfo_args.class, metaDataMap);
+    }
+
+    public getBlockPathInfo_args() {
+    }
+
+    public getBlockPathInfo_args(
+      TDatanodeID datanode,
+      ThdfsNamespaceId namespaceId,
+      ThdfsBlock block)
+    {
+      this();
+      this.datanode = datanode;
+      this.namespaceId = namespaceId;
+      this.block = block;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getBlockPathInfo_args(getBlockPathInfo_args other) {
+      if (other.isSetDatanode()) {
+        this.datanode = new TDatanodeID(other.datanode);
+      }
+      if (other.isSetNamespaceId()) {
+        this.namespaceId = new ThdfsNamespaceId(other.namespaceId);
+      }
+      if (other.isSetBlock()) {
+        this.block = new ThdfsBlock(other.block);
+      }
+    }
+
+    public getBlockPathInfo_args deepCopy() {
+      return new getBlockPathInfo_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.datanode = null;
+      this.namespaceId = null;
+      this.block = null;
+    }
+
+    public TDatanodeID getDatanode() {
+      return this.datanode;
+    }
+
+    public getBlockPathInfo_args setDatanode(TDatanodeID datanode) {
+      this.datanode = datanode;
+      return this;
+    }
+
+    public void unsetDatanode() {
+      this.datanode = null;
+    }
+
+    /** Returns true if field datanode is set (has been assigned a value) and false otherwise */
+    public boolean isSetDatanode() {
+      return this.datanode != null;
+    }
+
+    public void setDatanodeIsSet(boolean value) {
+      if (!value) {
+        this.datanode = null;
+      }
+    }
+
+    public ThdfsNamespaceId getNamespaceId() {
+      return this.namespaceId;
+    }
+
+    public getBlockPathInfo_args setNamespaceId(ThdfsNamespaceId namespaceId) {
+      this.namespaceId = namespaceId;
+      return this;
+    }
+
+    public void unsetNamespaceId() {
+      this.namespaceId = null;
+    }
+
+    /** Returns true if field namespaceId is set (has been assigned a value) and false otherwise */
+    public boolean isSetNamespaceId() {
+      return this.namespaceId != null;
+    }
+
+    public void setNamespaceIdIsSet(boolean value) {
+      if (!value) {
+        this.namespaceId = null;
+      }
+    }
+
+    public ThdfsBlock getBlock() {
+      return this.block;
+    }
+
+    public getBlockPathInfo_args setBlock(ThdfsBlock block) {
+      this.block = block;
+      return this;
+    }
+
+    public void unsetBlock() {
+      this.block = null;
+    }
+
+    /** Returns true if field block is set (has been assigned a value) and false otherwise */
+    public boolean isSetBlock() {
+      return this.block != null;
+    }
+
+    public void setBlockIsSet(boolean value) {
+      if (!value) {
+        this.block = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case DATANODE:
+        if (value == null) {
+          unsetDatanode();
+        } else {
+          setDatanode((TDatanodeID)value);
+        }
+        break;
+
+      case NAMESPACE_ID:
+        if (value == null) {
+          unsetNamespaceId();
+        } else {
+          setNamespaceId((ThdfsNamespaceId)value);
+        }
+        break;
+
+      case BLOCK:
+        if (value == null) {
+          unsetBlock();
+        } else {
+          setBlock((ThdfsBlock)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case DATANODE:
+        return getDatanode();
+
+      case NAMESPACE_ID:
+        return getNamespaceId();
+
+      case BLOCK:
+        return getBlock();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case DATANODE:
+        return isSetDatanode();
+      case NAMESPACE_ID:
+        return isSetNamespaceId();
+      case BLOCK:
+        return isSetBlock();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getBlockPathInfo_args)
+        return this.equals((getBlockPathInfo_args)that);
+      return false;
+    }
+
+    public boolean equals(getBlockPathInfo_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_datanode = true && this.isSetDatanode();
+      boolean that_present_datanode = true && that.isSetDatanode();
+      if (this_present_datanode || that_present_datanode) {
+        if (!(this_present_datanode && that_present_datanode))
+          return false;
+        if (!this.datanode.equals(that.datanode))
+          return false;
+      }
+
+      boolean this_present_namespaceId = true && this.isSetNamespaceId();
+      boolean that_present_namespaceId = true && that.isSetNamespaceId();
+      if (this_present_namespaceId || that_present_namespaceId) {
+        if (!(this_present_namespaceId && that_present_namespaceId))
+          return false;
+        if (!this.namespaceId.equals(that.namespaceId))
+          return false;
+      }
+
+      boolean this_present_block = true && this.isSetBlock();
+      boolean that_present_block = true && that.isSetBlock();
+      if (this_present_block || that_present_block) {
+        if (!(this_present_block && that_present_block))
+          return false;
+        if (!this.block.equals(that.block))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getBlockPathInfo_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getBlockPathInfo_args typedOther = (getBlockPathInfo_args)other;
+
+      lastComparison = Boolean.valueOf(isSetDatanode()).compareTo(typedOther.isSetDatanode());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDatanode()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datanode, typedOther.datanode);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetNamespaceId()).compareTo(typedOther.isSetNamespaceId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetNamespaceId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.namespaceId, typedOther.namespaceId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetBlock()).compareTo(typedOther.isSetBlock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBlock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.block, typedOther.block);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // DATANODE
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.datanode = new TDatanodeID();
+              this.datanode.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // NAMESPACE_ID
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.namespaceId = new ThdfsNamespaceId();
+              this.namespaceId.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // BLOCK
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.block = new ThdfsBlock();
+              this.block.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.datanode != null) {
+        oprot.writeFieldBegin(DATANODE_FIELD_DESC);
+        this.datanode.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.namespaceId != null) {
+        oprot.writeFieldBegin(NAMESPACE_ID_FIELD_DESC);
+        this.namespaceId.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.block != null) {
+        oprot.writeFieldBegin(BLOCK_FIELD_DESC);
+        this.block.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getBlockPathInfo_args(");
+      boolean first = true;
+
+      sb.append("datanode:");
+      if (this.datanode == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.datanode);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("namespaceId:");
+      if (this.namespaceId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.namespaceId);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("block:");
+      if (this.block == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.block);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getBlockPathInfo_result implements org.apache.thrift.TBase<getBlockPathInfo_result, getBlockPathInfo_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getBlockPathInfo_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThdfsBlockPath success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThdfsBlockPath.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getBlockPathInfo_result.class, metaDataMap);
+    }
+
+    public getBlockPathInfo_result() {
+    }
+
+    public getBlockPathInfo_result(
+      ThdfsBlockPath success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getBlockPathInfo_result(getBlockPathInfo_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new ThdfsBlockPath(other.success);
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public getBlockPathInfo_result deepCopy() {
+      return new getBlockPathInfo_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public ThdfsBlockPath getSuccess() {
+      return this.success;
+    }
+
+    public getBlockPathInfo_result setSuccess(ThdfsBlockPath success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public getBlockPathInfo_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((ThdfsBlockPath)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getBlockPathInfo_result)
+        return this.equals((getBlockPathInfo_result)that);
+      return false;
+    }
+
+    public boolean equals(getBlockPathInfo_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(getBlockPathInfo_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getBlockPathInfo_result typedOther = (getBlockPathInfo_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new ThdfsBlockPath();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getBlockPathInfo_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+}
diff --git a/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThriftIOException.java b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThriftIOException.java
new file mode 100644
index 00000000..cfd40132
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-java/org/apache/hadoop/thriftdatanode/api/ThriftIOException.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftdatanode.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ThriftIOException extends Exception implements org.apache.thrift.TBase<ThriftIOException, ThriftIOException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftIOException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String message; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThriftIOException.class, metaDataMap);
+  }
+
+  public ThriftIOException() {
+  }
+
+  public ThriftIOException(
+    String message)
+  {
+    this();
+    this.message = message;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public ThriftIOException(ThriftIOException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+  }
+
+  public ThriftIOException deepCopy() {
+    return new ThriftIOException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public ThriftIOException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof ThriftIOException)
+      return this.equals((ThriftIOException)that);
+    return false;
+  }
+
+  public boolean equals(ThriftIOException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(ThriftIOException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    ThriftIOException typedOther = (ThriftIOException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.message = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.message != null) {
+      oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+      oprot.writeString(this.message);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("ThriftIOException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ThriftHadoopDatanode-remote b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ThriftHadoopDatanode-remote
new file mode 100644
index 00000000..6a351d0f
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ThriftHadoopDatanode-remote
@@ -0,0 +1,106 @@
+#!/usr/bin/env python
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+import sys
+import pprint
+from urlparse import urlparse
+from thrift.transport import TTransport
+from thrift.transport import TSocket
+from thrift.transport import THttpClient
+from thrift.protocol import TBinaryProtocol
+
+import ThriftHadoopDatanode
+from ttypes import *
+
+if len(sys.argv) <= 1 or sys.argv[1] == '--help':
+  print ''
+  print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
+  print ''
+  print 'Functions:'
+  print '  ThdfsBlock recoverBlock(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block, bool keepLength,  targets, i64 deadline)'
+  print '  ThdfsBlock getBlockInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceid, ThdfsBlock block)'
+  print '  void copyBlock(TDatanodeID datanode, ThdfsNamespaceId srcNamespaceId, ThdfsBlock srcblock, ThdfsNamespaceId dstNamespaceId, ThdfsBlock destBlock, TDatanodeID target, bool asynchronous)'
+  print '  ThdfsBlockPath getBlockPathInfo(TDatanodeID datanode, ThdfsNamespaceId namespaceId, ThdfsBlock block)'
+  print ''
+  sys.exit(0)
+
+pp = pprint.PrettyPrinter(indent = 2)
+host = 'localhost'
+port = 9090
+uri = ''
+framed = False
+http = False
+argi = 1
+
+if sys.argv[argi] == '-h':
+  parts = sys.argv[argi+1].split(':')
+  host = parts[0]
+  port = int(parts[1])
+  argi += 2
+
+if sys.argv[argi] == '-u':
+  url = urlparse(sys.argv[argi+1])
+  parts = url[1].split(':')
+  host = parts[0]
+  if len(parts) > 1:
+    port = int(parts[1])
+  else:
+    port = 80
+  uri = url[2]
+  if url[4]:
+    uri += '?%s' % url[4]
+  http = True
+  argi += 2
+
+if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':
+  framed = True
+  argi += 1
+
+cmd = sys.argv[argi]
+args = sys.argv[argi+1:]
+
+if http:
+  transport = THttpClient.THttpClient(host, port, uri)
+else:
+  socket = TSocket.TSocket(host, port)
+  if framed:
+    transport = TTransport.TFramedTransport(socket)
+  else:
+    transport = TTransport.TBufferedTransport(socket)
+protocol = TBinaryProtocol.TBinaryProtocol(transport)
+client = ThriftHadoopDatanode.Client(protocol)
+transport.open()
+
+if cmd == 'recoverBlock':
+  if len(args) != 6:
+    print 'recoverBlock requires 6 args'
+    sys.exit(1)
+  pp.pprint(client.recoverBlock(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),eval(args[5]),))
+
+elif cmd == 'getBlockInfo':
+  if len(args) != 3:
+    print 'getBlockInfo requires 3 args'
+    sys.exit(1)
+  pp.pprint(client.getBlockInfo(eval(args[0]),eval(args[1]),eval(args[2]),))
+
+elif cmd == 'copyBlock':
+  if len(args) != 7:
+    print 'copyBlock requires 7 args'
+    sys.exit(1)
+  pp.pprint(client.copyBlock(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),eval(args[5]),eval(args[6]),))
+
+elif cmd == 'getBlockPathInfo':
+  if len(args) != 3:
+    print 'getBlockPathInfo requires 3 args'
+    sys.exit(1)
+  pp.pprint(client.getBlockPathInfo(eval(args[0]),eval(args[1]),eval(args[2]),))
+
+else:
+  print 'Unrecognized method %s' % cmd
+  sys.exit(1)
+
+transport.close()
diff --git a/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ThriftHadoopDatanode.py b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ThriftHadoopDatanode.py
new file mode 100644
index 00000000..8c6dfe3b
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ThriftHadoopDatanode.py
@@ -0,0 +1,1032 @@
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+from ttypes import *
+from thrift.Thrift import TProcessor
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol, TProtocol
+try:
+  from thrift.protocol import fastbinary
+except:
+  fastbinary = None
+
+
+class Iface:
+  def recoverBlock(self, datanode, namespaceId, block, keepLength, targets, deadline):
+    """
+    Parameters:
+     - datanode
+     - namespaceId
+     - block
+     - keepLength
+     - targets
+     - deadline
+    """
+    pass
+
+  def getBlockInfo(self, datanode, namespaceid, block):
+    """
+    Parameters:
+     - datanode
+     - namespaceid
+     - block
+    """
+    pass
+
+  def copyBlock(self, datanode, srcNamespaceId, srcblock, dstNamespaceId, destBlock, target, asynchronous):
+    """
+    Parameters:
+     - datanode
+     - srcNamespaceId
+     - srcblock
+     - dstNamespaceId
+     - destBlock
+     - target
+     - asynchronous
+    """
+    pass
+
+  def getBlockPathInfo(self, datanode, namespaceId, block):
+    """
+    Parameters:
+     - datanode
+     - namespaceId
+     - block
+    """
+    pass
+
+
+class Client(Iface):
+  def __init__(self, iprot, oprot=None):
+    self._iprot = self._oprot = iprot
+    if oprot is not None:
+      self._oprot = oprot
+    self._seqid = 0
+
+  def recoverBlock(self, datanode, namespaceId, block, keepLength, targets, deadline):
+    """
+    Parameters:
+     - datanode
+     - namespaceId
+     - block
+     - keepLength
+     - targets
+     - deadline
+    """
+    self.send_recoverBlock(datanode, namespaceId, block, keepLength, targets, deadline)
+    return self.recv_recoverBlock()
+
+  def send_recoverBlock(self, datanode, namespaceId, block, keepLength, targets, deadline):
+    self._oprot.writeMessageBegin('recoverBlock', TMessageType.CALL, self._seqid)
+    args = recoverBlock_args()
+    args.datanode = datanode
+    args.namespaceId = namespaceId
+    args.block = block
+    args.keepLength = keepLength
+    args.targets = targets
+    args.deadline = deadline
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_recoverBlock(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = recoverBlock_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ouch is not None:
+      raise result.ouch
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "recoverBlock failed: unknown result");
+
+  def getBlockInfo(self, datanode, namespaceid, block):
+    """
+    Parameters:
+     - datanode
+     - namespaceid
+     - block
+    """
+    self.send_getBlockInfo(datanode, namespaceid, block)
+    return self.recv_getBlockInfo()
+
+  def send_getBlockInfo(self, datanode, namespaceid, block):
+    self._oprot.writeMessageBegin('getBlockInfo', TMessageType.CALL, self._seqid)
+    args = getBlockInfo_args()
+    args.datanode = datanode
+    args.namespaceid = namespaceid
+    args.block = block
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_getBlockInfo(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = getBlockInfo_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ouch is not None:
+      raise result.ouch
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getBlockInfo failed: unknown result");
+
+  def copyBlock(self, datanode, srcNamespaceId, srcblock, dstNamespaceId, destBlock, target, asynchronous):
+    """
+    Parameters:
+     - datanode
+     - srcNamespaceId
+     - srcblock
+     - dstNamespaceId
+     - destBlock
+     - target
+     - asynchronous
+    """
+    self.send_copyBlock(datanode, srcNamespaceId, srcblock, dstNamespaceId, destBlock, target, asynchronous)
+    self.recv_copyBlock()
+
+  def send_copyBlock(self, datanode, srcNamespaceId, srcblock, dstNamespaceId, destBlock, target, asynchronous):
+    self._oprot.writeMessageBegin('copyBlock', TMessageType.CALL, self._seqid)
+    args = copyBlock_args()
+    args.datanode = datanode
+    args.srcNamespaceId = srcNamespaceId
+    args.srcblock = srcblock
+    args.dstNamespaceId = dstNamespaceId
+    args.destBlock = destBlock
+    args.target = target
+    args.asynchronous = asynchronous
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_copyBlock(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = copyBlock_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.ouch is not None:
+      raise result.ouch
+    return
+
+  def getBlockPathInfo(self, datanode, namespaceId, block):
+    """
+    Parameters:
+     - datanode
+     - namespaceId
+     - block
+    """
+    self.send_getBlockPathInfo(datanode, namespaceId, block)
+    return self.recv_getBlockPathInfo()
+
+  def send_getBlockPathInfo(self, datanode, namespaceId, block):
+    self._oprot.writeMessageBegin('getBlockPathInfo', TMessageType.CALL, self._seqid)
+    args = getBlockPathInfo_args()
+    args.datanode = datanode
+    args.namespaceId = namespaceId
+    args.block = block
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_getBlockPathInfo(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = getBlockPathInfo_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ouch is not None:
+      raise result.ouch
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getBlockPathInfo failed: unknown result");
+
+
+class Processor(Iface, TProcessor):
+  def __init__(self, handler):
+    self._handler = handler
+    self._processMap = {}
+    self._processMap["recoverBlock"] = Processor.process_recoverBlock
+    self._processMap["getBlockInfo"] = Processor.process_getBlockInfo
+    self._processMap["copyBlock"] = Processor.process_copyBlock
+    self._processMap["getBlockPathInfo"] = Processor.process_getBlockPathInfo
+
+  def process(self, iprot, oprot):
+    (name, type, seqid) = iprot.readMessageBegin()
+    if name not in self._processMap:
+      iprot.skip(TType.STRUCT)
+      iprot.readMessageEnd()
+      x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name))
+      oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)
+      x.write(oprot)
+      oprot.writeMessageEnd()
+      oprot.trans.flush()
+      return
+    else:
+      self._processMap[name](self, seqid, iprot, oprot)
+    return True
+
+  def process_recoverBlock(self, seqid, iprot, oprot):
+    args = recoverBlock_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = recoverBlock_result()
+    try:
+      result.success = self._handler.recoverBlock(args.datanode, args.namespaceId, args.block, args.keepLength, args.targets, args.deadline)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("recoverBlock", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_getBlockInfo(self, seqid, iprot, oprot):
+    args = getBlockInfo_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = getBlockInfo_result()
+    try:
+      result.success = self._handler.getBlockInfo(args.datanode, args.namespaceid, args.block)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("getBlockInfo", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_copyBlock(self, seqid, iprot, oprot):
+    args = copyBlock_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = copyBlock_result()
+    try:
+      self._handler.copyBlock(args.datanode, args.srcNamespaceId, args.srcblock, args.dstNamespaceId, args.destBlock, args.target, args.asynchronous)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("copyBlock", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_getBlockPathInfo(self, seqid, iprot, oprot):
+    args = getBlockPathInfo_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = getBlockPathInfo_result()
+    try:
+      result.success = self._handler.getBlockPathInfo(args.datanode, args.namespaceId, args.block)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("getBlockPathInfo", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+
+# HELPER FUNCTIONS AND STRUCTURES
+
+class recoverBlock_args:
+  """
+  Attributes:
+   - datanode
+   - namespaceId
+   - block
+   - keepLength
+   - targets
+   - deadline
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'datanode', (TDatanodeID, TDatanodeID.thrift_spec), None, ), # 1
+    (2, TType.STRUCT, 'namespaceId', (ThdfsNamespaceId, ThdfsNamespaceId.thrift_spec), None, ), # 2
+    (3, TType.STRUCT, 'block', (ThdfsBlock, ThdfsBlock.thrift_spec), None, ), # 3
+    (4, TType.BOOL, 'keepLength', None, None, ), # 4
+    (5, TType.LIST, 'targets', (TType.STRUCT,(TDatanodeID, TDatanodeID.thrift_spec)), None, ), # 5
+    (6, TType.I64, 'deadline', None, None, ), # 6
+  )
+
+  def __init__(self, datanode=None, namespaceId=None, block=None, keepLength=None, targets=None, deadline=None,):
+    self.datanode = datanode
+    self.namespaceId = namespaceId
+    self.block = block
+    self.keepLength = keepLength
+    self.targets = targets
+    self.deadline = deadline
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.datanode = TDatanodeID()
+          self.datanode.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRUCT:
+          self.namespaceId = ThdfsNamespaceId()
+          self.namespaceId.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRUCT:
+          self.block = ThdfsBlock()
+          self.block.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.BOOL:
+          self.keepLength = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      elif fid == 5:
+        if ftype == TType.LIST:
+          self.targets = []
+          (_etype3, _size0) = iprot.readListBegin()
+          for _i4 in xrange(_size0):
+            _elem5 = TDatanodeID()
+            _elem5.read(iprot)
+            self.targets.append(_elem5)
+          iprot.readListEnd()
+        else:
+          iprot.skip(ftype)
+      elif fid == 6:
+        if ftype == TType.I64:
+          self.deadline = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('recoverBlock_args')
+    if self.datanode is not None:
+      oprot.writeFieldBegin('datanode', TType.STRUCT, 1)
+      self.datanode.write(oprot)
+      oprot.writeFieldEnd()
+    if self.namespaceId is not None:
+      oprot.writeFieldBegin('namespaceId', TType.STRUCT, 2)
+      self.namespaceId.write(oprot)
+      oprot.writeFieldEnd()
+    if self.block is not None:
+      oprot.writeFieldBegin('block', TType.STRUCT, 3)
+      self.block.write(oprot)
+      oprot.writeFieldEnd()
+    if self.keepLength is not None:
+      oprot.writeFieldBegin('keepLength', TType.BOOL, 4)
+      oprot.writeBool(self.keepLength)
+      oprot.writeFieldEnd()
+    if self.targets is not None:
+      oprot.writeFieldBegin('targets', TType.LIST, 5)
+      oprot.writeListBegin(TType.STRUCT, len(self.targets))
+      for iter6 in self.targets:
+        iter6.write(oprot)
+      oprot.writeListEnd()
+      oprot.writeFieldEnd()
+    if self.deadline is not None:
+      oprot.writeFieldBegin('deadline', TType.I64, 6)
+      oprot.writeI64(self.deadline)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class recoverBlock_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.STRUCT, 'success', (ThdfsBlock, ThdfsBlock.thrift_spec), None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = ThdfsBlock()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('recoverBlock_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class getBlockInfo_args:
+  """
+  Attributes:
+   - datanode
+   - namespaceid
+   - block
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'datanode', (TDatanodeID, TDatanodeID.thrift_spec), None, ), # 1
+    (2, TType.STRUCT, 'namespaceid', (ThdfsNamespaceId, ThdfsNamespaceId.thrift_spec), None, ), # 2
+    (3, TType.STRUCT, 'block', (ThdfsBlock, ThdfsBlock.thrift_spec), None, ), # 3
+  )
+
+  def __init__(self, datanode=None, namespaceid=None, block=None,):
+    self.datanode = datanode
+    self.namespaceid = namespaceid
+    self.block = block
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.datanode = TDatanodeID()
+          self.datanode.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRUCT:
+          self.namespaceid = ThdfsNamespaceId()
+          self.namespaceid.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRUCT:
+          self.block = ThdfsBlock()
+          self.block.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('getBlockInfo_args')
+    if self.datanode is not None:
+      oprot.writeFieldBegin('datanode', TType.STRUCT, 1)
+      self.datanode.write(oprot)
+      oprot.writeFieldEnd()
+    if self.namespaceid is not None:
+      oprot.writeFieldBegin('namespaceid', TType.STRUCT, 2)
+      self.namespaceid.write(oprot)
+      oprot.writeFieldEnd()
+    if self.block is not None:
+      oprot.writeFieldBegin('block', TType.STRUCT, 3)
+      self.block.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class getBlockInfo_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.STRUCT, 'success', (ThdfsBlock, ThdfsBlock.thrift_spec), None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = ThdfsBlock()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('getBlockInfo_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class copyBlock_args:
+  """
+  Attributes:
+   - datanode
+   - srcNamespaceId
+   - srcblock
+   - dstNamespaceId
+   - destBlock
+   - target
+   - asynchronous
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'datanode', (TDatanodeID, TDatanodeID.thrift_spec), None, ), # 1
+    (2, TType.STRUCT, 'srcNamespaceId', (ThdfsNamespaceId, ThdfsNamespaceId.thrift_spec), None, ), # 2
+    (3, TType.STRUCT, 'srcblock', (ThdfsBlock, ThdfsBlock.thrift_spec), None, ), # 3
+    (4, TType.STRUCT, 'dstNamespaceId', (ThdfsNamespaceId, ThdfsNamespaceId.thrift_spec), None, ), # 4
+    (5, TType.STRUCT, 'destBlock', (ThdfsBlock, ThdfsBlock.thrift_spec), None, ), # 5
+    (6, TType.STRUCT, 'target', (TDatanodeID, TDatanodeID.thrift_spec), None, ), # 6
+    (7, TType.BOOL, 'asynchronous', None, None, ), # 7
+  )
+
+  def __init__(self, datanode=None, srcNamespaceId=None, srcblock=None, dstNamespaceId=None, destBlock=None, target=None, asynchronous=None,):
+    self.datanode = datanode
+    self.srcNamespaceId = srcNamespaceId
+    self.srcblock = srcblock
+    self.dstNamespaceId = dstNamespaceId
+    self.destBlock = destBlock
+    self.target = target
+    self.asynchronous = asynchronous
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.datanode = TDatanodeID()
+          self.datanode.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRUCT:
+          self.srcNamespaceId = ThdfsNamespaceId()
+          self.srcNamespaceId.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRUCT:
+          self.srcblock = ThdfsBlock()
+          self.srcblock.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.STRUCT:
+          self.dstNamespaceId = ThdfsNamespaceId()
+          self.dstNamespaceId.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 5:
+        if ftype == TType.STRUCT:
+          self.destBlock = ThdfsBlock()
+          self.destBlock.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 6:
+        if ftype == TType.STRUCT:
+          self.target = TDatanodeID()
+          self.target.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 7:
+        if ftype == TType.BOOL:
+          self.asynchronous = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('copyBlock_args')
+    if self.datanode is not None:
+      oprot.writeFieldBegin('datanode', TType.STRUCT, 1)
+      self.datanode.write(oprot)
+      oprot.writeFieldEnd()
+    if self.srcNamespaceId is not None:
+      oprot.writeFieldBegin('srcNamespaceId', TType.STRUCT, 2)
+      self.srcNamespaceId.write(oprot)
+      oprot.writeFieldEnd()
+    if self.srcblock is not None:
+      oprot.writeFieldBegin('srcblock', TType.STRUCT, 3)
+      self.srcblock.write(oprot)
+      oprot.writeFieldEnd()
+    if self.dstNamespaceId is not None:
+      oprot.writeFieldBegin('dstNamespaceId', TType.STRUCT, 4)
+      self.dstNamespaceId.write(oprot)
+      oprot.writeFieldEnd()
+    if self.destBlock is not None:
+      oprot.writeFieldBegin('destBlock', TType.STRUCT, 5)
+      self.destBlock.write(oprot)
+      oprot.writeFieldEnd()
+    if self.target is not None:
+      oprot.writeFieldBegin('target', TType.STRUCT, 6)
+      self.target.write(oprot)
+      oprot.writeFieldEnd()
+    if self.asynchronous is not None:
+      oprot.writeFieldBegin('asynchronous', TType.BOOL, 7)
+      oprot.writeBool(self.asynchronous)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class copyBlock_result:
+  """
+  Attributes:
+   - ouch
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, ouch=None,):
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('copyBlock_result')
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class getBlockPathInfo_args:
+  """
+  Attributes:
+   - datanode
+   - namespaceId
+   - block
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'datanode', (TDatanodeID, TDatanodeID.thrift_spec), None, ), # 1
+    (2, TType.STRUCT, 'namespaceId', (ThdfsNamespaceId, ThdfsNamespaceId.thrift_spec), None, ), # 2
+    (3, TType.STRUCT, 'block', (ThdfsBlock, ThdfsBlock.thrift_spec), None, ), # 3
+  )
+
+  def __init__(self, datanode=None, namespaceId=None, block=None,):
+    self.datanode = datanode
+    self.namespaceId = namespaceId
+    self.block = block
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.datanode = TDatanodeID()
+          self.datanode.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRUCT:
+          self.namespaceId = ThdfsNamespaceId()
+          self.namespaceId.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRUCT:
+          self.block = ThdfsBlock()
+          self.block.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('getBlockPathInfo_args')
+    if self.datanode is not None:
+      oprot.writeFieldBegin('datanode', TType.STRUCT, 1)
+      self.datanode.write(oprot)
+      oprot.writeFieldEnd()
+    if self.namespaceId is not None:
+      oprot.writeFieldBegin('namespaceId', TType.STRUCT, 2)
+      self.namespaceId.write(oprot)
+      oprot.writeFieldEnd()
+    if self.block is not None:
+      oprot.writeFieldBegin('block', TType.STRUCT, 3)
+      self.block.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class getBlockPathInfo_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.STRUCT, 'success', (ThdfsBlockPath, ThdfsBlockPath.thrift_spec), None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = ThdfsBlockPath()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('getBlockPathInfo_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
diff --git a/src/contrib/thriftdatanode/gen-py/hadoopdatanode/__init__.py b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/__init__.py
new file mode 100644
index 00000000..68ae609a
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/__init__.py
@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'ThriftHadoopDatanode']
diff --git a/src/contrib/thriftdatanode/gen-py/hadoopdatanode/constants.py b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/constants.py
new file mode 100644
index 00000000..732b3680
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/constants.py
@@ -0,0 +1,9 @@
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+from ttypes import *
+
diff --git a/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ttypes.py b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ttypes.py
new file mode 100644
index 00000000..61bdb253
--- /dev/null
+++ b/src/contrib/thriftdatanode/gen-py/hadoopdatanode/ttypes.py
@@ -0,0 +1,418 @@
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol, TProtocol
+try:
+  from thrift.protocol import fastbinary
+except:
+  fastbinary = None
+
+
+
+class ThdfsNamespaceId:
+  """
+  Attributes:
+   - id
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.I32, 'id', None, None, ), # 1
+  )
+
+  def __init__(self, id=None,):
+    self.id = id
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.I32:
+          self.id = iprot.readI32();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('ThdfsNamespaceId')
+    if self.id is not None:
+      oprot.writeFieldBegin('id', TType.I32, 1)
+      oprot.writeI32(self.id)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class ThdfsBlock:
+  """
+  Attributes:
+   - blockId
+   - numBytes
+   - generationStamp
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.I64, 'blockId', None, None, ), # 1
+    (2, TType.I64, 'numBytes', None, None, ), # 2
+    (3, TType.I64, 'generationStamp', None, None, ), # 3
+  )
+
+  def __init__(self, blockId=None, numBytes=None, generationStamp=None,):
+    self.blockId = blockId
+    self.numBytes = numBytes
+    self.generationStamp = generationStamp
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.I64:
+          self.blockId = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I64:
+          self.numBytes = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.I64:
+          self.generationStamp = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('ThdfsBlock')
+    if self.blockId is not None:
+      oprot.writeFieldBegin('blockId', TType.I64, 1)
+      oprot.writeI64(self.blockId)
+      oprot.writeFieldEnd()
+    if self.numBytes is not None:
+      oprot.writeFieldBegin('numBytes', TType.I64, 2)
+      oprot.writeI64(self.numBytes)
+      oprot.writeFieldEnd()
+    if self.generationStamp is not None:
+      oprot.writeFieldBegin('generationStamp', TType.I64, 3)
+      oprot.writeI64(self.generationStamp)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class ThdfsBlockPath:
+  """
+  Attributes:
+   - localBlockPath
+   - localMetaPath
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'localBlockPath', None, None, ), # 1
+    (2, TType.STRING, 'localMetaPath', None, None, ), # 2
+  )
+
+  def __init__(self, localBlockPath=None, localMetaPath=None,):
+    self.localBlockPath = localBlockPath
+    self.localMetaPath = localMetaPath
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.localBlockPath = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.localMetaPath = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('ThdfsBlockPath')
+    if self.localBlockPath is not None:
+      oprot.writeFieldBegin('localBlockPath', TType.STRING, 1)
+      oprot.writeString(self.localBlockPath)
+      oprot.writeFieldEnd()
+    if self.localMetaPath is not None:
+      oprot.writeFieldBegin('localMetaPath', TType.STRING, 2)
+      oprot.writeString(self.localMetaPath)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class TDatanodeID:
+  """
+  Attributes:
+   - name
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'name', None, None, ), # 1
+  )
+
+  def __init__(self, name=None,):
+    self.name = name
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.name = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('TDatanodeID')
+    if self.name is not None:
+      oprot.writeFieldBegin('name', TType.STRING, 1)
+      oprot.writeString(self.name)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class MalformedInputException(Exception):
+  """
+  Attributes:
+   - message
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'message', None, None, ), # 1
+  )
+
+  def __init__(self, message=None,):
+    self.message = message
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.message = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('MalformedInputException')
+    if self.message is not None:
+      oprot.writeFieldBegin('message', TType.STRING, 1)
+      oprot.writeString(self.message)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __str__(self):
+    return repr(self)
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class ThriftIOException(Exception):
+  """
+  Attributes:
+   - message
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'message', None, None, ), # 1
+  )
+
+  def __init__(self, message=None,):
+    self.message = message
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.message = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('ThriftIOException')
+    if self.message is not None:
+      oprot.writeFieldBegin('message', TType.STRING, 1)
+      oprot.writeString(self.message)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __str__(self):
+    return repr(self)
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
diff --git a/src/contrib/thriftdatanode/if/hadoopdatanode.thrift b/src/contrib/thriftdatanode/if/hadoopdatanode.thrift
new file mode 100644
index 00000000..cfc70f5e
--- /dev/null
+++ b/src/contrib/thriftdatanode/if/hadoopdatanode.thrift
@@ -0,0 +1,89 @@
+#!/usr/local/bin/thrift -java
+
+#
+# Thrift Service exported by Hadoop File System Datanodes
+# Dhruba Borthakur (dhruba@gmail.com)
+#
+
+/**
+ * The available types in Thrift:
+ *
+ *  bool        Boolean, one byte
+ *  byte        Signed byte
+ *  i16         Signed 16-bit integer
+ *  i32         Signed 32-bit integer
+ *  i64         Signed 64-bit integer
+ *  double      64-bit floating point value
+ *  string      String
+ *  map<t1,t2>  Map from one type to another
+ *  list<t1>    Ordered list of one type
+ *  set<t1>     Set of unique elements of one type
+ *
+ */
+
+namespace java org.apache.hadoop.thriftdatanode.api
+namespace php hadoopdatanode
+namespace py hadoopdatanode
+
+// namespace id for hdfs
+struct ThdfsNamespaceId {
+  1:i32 id
+}
+
+// hdfs block object
+struct ThdfsBlock {
+  1:i64 blockId,
+  2:i64 numBytes,
+  3:i64 generationStamp
+}
+
+// hdfs block-path object
+struct ThdfsBlockPath {
+  1:string localBlockPath,
+  2:string localMetaPath
+}
+
+struct TDatanodeID {
+  1:string name       // host:port for datanode
+}
+
+exception MalformedInputException {
+  1: string message
+}
+
+exception ThriftIOException {
+  1: string message
+}
+
+service ThriftHadoopDatanode
+{
+  // Start generation-stamp recovery for specified block
+  ThdfsBlock recoverBlock(1:TDatanodeID datanode,
+                          2:ThdfsNamespaceId namespaceId,
+                          3:ThdfsBlock block,
+                          4:bool keepLength,
+                          5:list<TDatanodeID> targets,
+                          6:i64 deadline) 
+                          throws (1:ThriftIOException ouch),
+
+
+  // get block info from datanode
+  ThdfsBlock getBlockInfo(1:TDatanodeID datanode,
+                          2:ThdfsNamespaceId namespaceid, 
+                          3:ThdfsBlock block)
+                          throws (1:ThriftIOException ouch), 
+
+  // Instruct the datanode to copy a block to specified target.
+  void copyBlock(1:TDatanodeID datanode,
+                 2:ThdfsNamespaceId srcNamespaceId, 3:ThdfsBlock srcblock,
+                 4:ThdfsNamespaceId dstNamespaceId, 5:ThdfsBlock destBlock,
+                 6:TDatanodeID target, 7:bool asynchronous) 
+                 throws (1:ThriftIOException ouch),
+
+  // Retrives the filename of the blockfile and the metafile from the datanode
+  ThdfsBlockPath getBlockPathInfo(1:TDatanodeID datanode,
+                                  2:ThdfsNamespaceId namespaceId, 
+                                  3:ThdfsBlock block) 
+                                  throws (1:ThriftIOException ouch),
+
+}
diff --git a/src/contrib/thriftdatanode/ivy.xml b/src/contrib/thriftdatanode/ivy.xml
new file mode 100644
index 00000000..27543611
--- /dev/null
+++ b/src/contrib/thriftdatanode/ivy.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" ?>
+<ivy-module version="1.0">
+  <info organisation="org.apache.hadoop" module="${ant.project.name}">
+    <license name="Apache 2.0"/>
+    <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
+    <description>
+        Apache Hadoop
+    </description>
+  </info>
+  <configurations defaultconfmapping="default">
+    <!--these match the Maven configurations-->
+    <conf name="default" extends="master,runtime"/>
+    <conf name="master" description="contains the artifact but no dependencies"/>
+    <conf name="runtime" description="runtime but not the artifact" />
+
+    <conf name="common" visibility="private" 
+      extends="runtime"
+      description="artifacts needed to compile/test the application"/>
+    <conf name="test" visibility="private" extends="runtime"/>
+  </configurations>
+
+  <publications>
+    <!--get the artifact from our module name-->
+    <artifact conf="master"/>
+  </publications>
+  <dependencies>
+    <dependency org="commons-logging"
+      name="commons-logging"
+      rev="${commons-logging.version}"
+      conf="common->default"/>
+    <dependency org="log4j"
+      name="log4j"
+      rev="${log4j.version}"
+      conf="common->master"/>
+    </dependencies>
+</ivy-module>
diff --git a/src/contrib/thriftdatanode/ivy/libraries.properties b/src/contrib/thriftdatanode/ivy/libraries.properties
new file mode 100644
index 00000000..179d4ed9
--- /dev/null
+++ b/src/contrib/thriftdatanode/ivy/libraries.properties
@@ -0,0 +1,5 @@
+#This properties file lists the versions of the various artifacts used by thrifts.
+#It drives ivy and the generation of a maven POM
+
+#Please list the dependencies name with version if they are different from the ones 
+#listed in the global libraries.properties file (in alphabetical order)
diff --git a/src/contrib/thriftdatanode/lib/README b/src/contrib/thriftdatanode/lib/README
new file mode 100644
index 00000000..01264758
--- /dev/null
+++ b/src/contrib/thriftdatanode/lib/README
@@ -0,0 +1 @@
+Thrift is from http://developers.facebook.com/thrift/.
diff --git a/src/contrib/thriftdatanode/lib/Thrift.LICENSE b/src/contrib/thriftdatanode/lib/Thrift.LICENSE
new file mode 100644
index 00000000..0101a7dc
--- /dev/null
+++ b/src/contrib/thriftdatanode/lib/Thrift.LICENSE
@@ -0,0 +1,24 @@
+Thrift Software License
+Copyright (c) 2006- Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/src/contrib/thriftdatanode/src/java/org/apache/hadoop/thriftdatanode/HadoopThriftDatanodeServer.java b/src/contrib/thriftdatanode/src/java/org/apache/hadoop/thriftdatanode/HadoopThriftDatanodeServer.java
new file mode 100644
index 00000000..b1fc21c7
--- /dev/null
+++ b/src/contrib/thriftdatanode/src/java/org/apache/hadoop/thriftdatanode/HadoopThriftDatanodeServer.java
@@ -0,0 +1,330 @@
+package org.apache.hadoop.thriftdatanode;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.util.Daemon;
+import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.BlockPathInfo;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.ClientDatanodeProtocol;
+import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.ipc.ProtocolProxy;
+
+import org.apache.thrift.TProcessor;
+import org.apache.thrift.TProcessorFactory;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TThreadPoolServer;
+import org.apache.thrift.transport.TServerSocket;
+import org.apache.thrift.transport.TServerTransport;
+import org.apache.thrift.transport.TTransportFactory;
+import org.apache.hadoop.thriftdatanode.api.*;
+
+
+/**
+ * ThriftHadoopDatanode
+ * A thrift wrapper around the Hadoop Datanode
+ */
+public class HadoopThriftDatanodeServer extends ThriftHadoopDatanode {
+
+  static int serverPort = 0;                    // default port
+  TServer    server = null;
+
+  public static class HadoopThriftHandler implements ThriftHadoopDatanode.Iface
+  {
+
+    public static final Log LOG = LogFactory.getLog("org.apache.hadoop.thriftdatanode");
+    public static final int timeout = 10000;
+
+    // HDFS glue
+    Configuration conf;
+    FileSystem fs;
+        
+    // stucture that maps each host:port object into an RPC object
+    private HashMap<String, ClientDatanodeProtocol> hadoopHash = 
+      new HashMap<String, ClientDatanodeProtocol>();
+
+    // Detect inactive session
+    private static volatile boolean fsRunning = true;
+    private static long now;
+
+    // allow outsider to change the hadoopthrift path
+    public void setOption(String key, String val) {
+    }
+
+    /**
+     * Current system time.
+     * @return current time in msec.
+     */
+    static long now() {
+      return System.currentTimeMillis();
+    }
+
+    /**
+    * getVersion
+    *
+    * @return current version of the interface.
+    */
+    public String getVersion() {
+      return "0.1";
+    }
+
+    /**
+     * shutdown
+     *
+     * cleanly closes everything and exit.
+     */
+    public void shutdown(int status) {
+      LOG.info("HadoopThriftDatanodeServer shutting down.");
+      try {
+        fs.close();
+      } catch (IOException e) {
+        LOG.warn("Unable to close file system");
+      }
+      Runtime.getRuntime().exit(status);
+    }
+
+    /**
+     * HadoopThriftDatanodeServer
+     *
+     * Constructor for the HadoopThriftDatanodeServer glue with Thrift Class.
+     *
+     * @param name - the name of this handler
+     */
+    public HadoopThriftHandler(String name) {
+      conf = new Configuration();
+      now = now();
+      try {
+        fs = FileSystem.get(conf);
+      } catch (IOException e) {
+        LOG.warn("Unable to open hadoop file system...");
+        Runtime.getRuntime().exit(-1);
+      }
+    }
+
+    /**
+      * printStackTrace
+      *
+      * Helper function to print an exception stack trace to the log and not stderr
+      *
+      * @param e the exception
+      *
+      */
+    static private void printStackTrace(Exception e) {
+      for(StackTraceElement s: e.getStackTrace()) {
+        LOG.error(s);
+      }
+    }
+
+    /**
+     * Parse a host:port pair and return the port name
+     */
+    static private int getPort(String name) {
+      int colon = name.indexOf(":");
+      if (colon < 0) {
+        return 50010; // default port.
+      }
+      return Integer.parseInt(name.substring(colon+1));
+    }
+
+    /**
+     * Creates one rpc object if necessary
+     */
+    private synchronized ClientDatanodeProtocol getOrCreate(String name)
+      throws IOException {
+      ClientDatanodeProtocol obj =  hadoopHash.get(name);
+      if (obj != null) {
+        return obj;
+      }
+      // connection does not exist, create a new one.
+      DatanodeID dn = new DatanodeID(name, "", -1, getPort(name));
+      ClientDatanodeProtocol instance =
+        DFSClient.createClientDatanodeProtocolProxy(dn, conf, timeout); 
+
+      // cache connection
+      hadoopHash.put(name, instance);
+      return instance;
+    }
+
+    /**
+     * Implement the API exported by this thrift server
+     */
+
+    public ThdfsBlock recoverBlock(TDatanodeID datanode,
+                          ThdfsNamespaceId namespaceId,
+                          ThdfsBlock block,
+                          boolean keepLength,
+                          List<TDatanodeID> targets,
+                          long deadline)
+                          throws ThriftIOException, TException {
+      Block blk = new Block(block.blockId, block.numBytes, 
+                            block.generationStamp);
+      DatanodeInfo[] targs = new DatanodeInfo[targets.size()];
+      for (int i = 0; i < targs.length; i++) {
+        targs[i] = new DatanodeInfo(
+           new DatanodeID(targets.get(i).name, "", -1, 
+                          getPort(targets.get(i).name)));
+      }
+      // make RPC to datanode
+      try {
+        ClientDatanodeProtocol remote = getOrCreate(datanode.name);
+        Block nblk = remote.recoverBlock(namespaceId.id, blk,
+                              keepLength, targs, deadline).getBlock();
+        return new ThdfsBlock(nblk.getBlockId(), nblk.getNumBytes(),
+                              nblk.getGenerationStamp());
+      } catch (IOException e) {
+        String msg = "Error recoverBlock datanode " + datanode.name +
+                     " namespaceid " + namespaceId.id +
+                     " block " + blk;
+        LOG.warn(msg);
+        throw new ThriftIOException(msg);
+      }
+    }
+
+    // get block info from datanode
+    public ThdfsBlock getBlockInfo(TDatanodeID datanode,
+                          ThdfsNamespaceId namespaceid,
+                          ThdfsBlock block)
+                          throws ThriftIOException, TException { 
+      Block blk = new Block(block.blockId, block.numBytes, 
+                             block.generationStamp);
+      // make RPC to datanode
+      try {
+        ClientDatanodeProtocol remote = getOrCreate(datanode.name);
+        Block nblk = remote.getBlockInfo(namespaceid.id, blk);
+        return new ThdfsBlock(nblk.getBlockId(), nblk.getNumBytes(),
+                              nblk.getGenerationStamp());
+      } catch (IOException e) {
+        String msg = "Error getBlockInfo datanode " + datanode.name +
+                     " namespaceid " + namespaceid.id +
+                     " block " + blk;
+        LOG.warn(msg);
+        throw new ThriftIOException(msg);
+      }
+    }
+
+    // Instruct the datanode to copy a block to specified target.
+    public void copyBlock(TDatanodeID datanode,
+                          ThdfsNamespaceId srcNamespaceId, ThdfsBlock srcblock,
+                          ThdfsNamespaceId dstNamespaceId, ThdfsBlock destblock,
+                          TDatanodeID target, boolean asynchronous)
+                          throws ThriftIOException, TException {
+      Block sblk = new Block(srcblock.blockId, srcblock.numBytes, 
+                             srcblock.generationStamp);
+      Block dblk = new Block(destblock.blockId, destblock.numBytes, 
+                             destblock.generationStamp);
+      DatanodeInfo targs = new DatanodeInfo(
+           new DatanodeID(target.name, "", -1, getPort(target.name)));
+
+      // make RPC to datanode
+      try {
+        ClientDatanodeProtocol remote = getOrCreate(datanode.name);
+        remote.copyBlock(srcNamespaceId.id, sblk,
+                         dstNamespaceId.id, dblk,
+                         targs, asynchronous);
+      } catch (IOException e) {
+        String msg = "Error copyBlock datanode " + datanode.name +
+                     " srcnamespaceid " + srcNamespaceId.id +
+                     " destnamespaceid " + dstNamespaceId.id +
+                     " srcblock " + sblk +
+                     " destblock " + dblk;
+        LOG.warn(msg);
+        throw new ThriftIOException(msg);
+      }
+    }
+
+    // Retrives filename of blockfile and metafile from datanode
+    public ThdfsBlockPath getBlockPathInfo(TDatanodeID datanode,
+                                  ThdfsNamespaceId namespaceId,
+                                  ThdfsBlock block)
+                                  throws ThriftIOException, TException {
+      Block blk = new Block(block.blockId, block.numBytes, 
+                            block.generationStamp);
+
+      // make RPC to datanode to find local pathnames of blocks
+      try {
+        ClientDatanodeProtocol remote = getOrCreate(datanode.name);
+        BlockPathInfo pathinfo = remote.getBlockPathInfo(namespaceId.id, blk);
+        return new ThdfsBlockPath(pathinfo.getBlockPath(), 
+                                  pathinfo.getMetaPath());
+      } catch (IOException e) {
+        String msg = "Error getBlockPathInfo datanode " + datanode.name +
+                     " namespaceid " + namespaceId.id +
+                     " block " + blk;
+        LOG.warn(msg);
+        throw new ThriftIOException(msg);
+      }
+    }
+
+  } // end of ThriftHadoopDatanode.Iface
+
+  // Bind to port. If the specified port is 0, then bind to random port.
+  private ServerSocket createServerSocket(int port) throws IOException {
+    try {
+      ServerSocket sock = new ServerSocket();
+      // Prevent 2MSL delay problem on server restarts
+      sock.setReuseAddress(true);
+      // Bind to listening port
+      if (port == 0) {
+        sock.bind(null);
+        serverPort = sock.getLocalPort();
+      } else {
+        sock.bind(new InetSocketAddress(port));
+      }
+      return sock;
+    } catch (IOException ioe) {
+      throw new IOException("Could not create ServerSocket on port " + port + "." +
+                            ioe);
+    }
+  }
+
+  /**
+   * Constructs a server object
+   */
+  public HadoopThriftDatanodeServer(String [] args) throws Exception {
+
+    if (args.length > 0) {
+      serverPort = new Integer(args[0]);
+    }
+    try {
+      ServerSocket ssock = createServerSocket(serverPort);
+      TServerTransport serverTransport = new TServerSocket(ssock);
+      Iface handler = new HadoopThriftHandler("hdfs-thriftdatanode-dhruba");
+      ThriftHadoopDatanode.Processor processor = new ThriftHadoopDatanode.Processor(handler);
+      TThreadPoolServer.Args serverArgs = new TThreadPoolServer.Args(serverTransport);
+      serverArgs.minWorkerThreads = 10;
+      serverArgs.processor(processor);
+      serverArgs.transportFactory(new TTransportFactory());
+      serverArgs.protocolFactory(new TBinaryProtocol.Factory());
+      server = new TThreadPoolServer(serverArgs);
+      System.out.println("Starting the hadoop datanode thrift server on port [" + serverPort + "]...");
+      HadoopThriftHandler.LOG.info("Starting the hadoop datanode thrift server on port [" +serverPort + "]...");
+      System.out.flush();
+
+    } catch (Exception x) {
+      HadoopThriftHandler.LOG.warn("XXX Exception in HadoopThriftDatanodeServer");
+      x.printStackTrace();
+      throw x;
+    }
+  }
+
+  public static void main(String [] args) throws Exception {
+    HadoopThriftDatanodeServer me = new HadoopThriftDatanodeServer(args);
+    me.server.serve();
+  }
+};
+
diff --git a/src/contrib/thriftfs/build.xml b/src/contrib/thriftfs/build.xml
index f6539701..45926a38 100644
--- a/src/contrib/thriftfs/build.xml
+++ b/src/contrib/thriftfs/build.xml
@@ -87,23 +87,4 @@ to call at top-level: ant deploy-contrib compile-core-test
     </copy>
 
   </target>
-
-  <!-- Run only pure-Java unit tests. superdottest -->
-  <target name="test">
-   <antcall target="hadoopbuildcontrib.test">
-     <param name="test.exclude" value="TestStreamedMerge"/>
-   </antcall>
-  </target>
-
-  <!-- Run all unit tests
-  This is not called as part of the nightly build
-  because it will only run on platforms that have standard
-  Unix utilities available.
-  -->
- <target name="test-unix">
-   <antcall target="hadoopbuildcontrib.test">
-   </antcall>
- </target>
-
-
 </project>
diff --git a/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.cpp b/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.cpp
index 78015920..092a2c98 100644
--- a/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.cpp
+++ b/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -7,28 +7,28 @@
 
 
 
-uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->periodInSeconds);
           this->__isset.periodInSeconds = true;
         } else {
@@ -47,10 +47,10 @@ uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args::read(facebook::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args");
-  xfer += oprot->writeFieldBegin("periodInSeconds", facebook::thrift::protocol::T_I64, 1);
+  xfer += oprot->writeFieldBegin("periodInSeconds", ::apache::thrift::protocol::T_I64, 1);
   xfer += oprot->writeI64(this->periodInSeconds);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -58,10 +58,10 @@ uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args::write(facebook:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_setInactivityTimeoutPeriod_pargs");
-  xfer += oprot->writeFieldBegin("periodInSeconds", facebook::thrift::protocol::T_I64, 1);
+  xfer += oprot->writeFieldBegin("periodInSeconds", ::apache::thrift::protocol::T_I64, 1);
   xfer += oprot->writeI64((*(this->periodInSeconds)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -69,22 +69,22 @@ uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_pargs::write(facebook
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
@@ -101,7 +101,7 @@ uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result::read(facebook
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
@@ -112,22 +112,22 @@ uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result::write(faceboo
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
@@ -144,28 +144,28 @@ uint32_t ThriftHadoopFileSystem_setInactivityTimeoutPeriod_presult::read(faceboo
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_shutdown_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_shutdown_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_I32) {
+        if (ftype == ::apache::thrift::protocol::T_I32) {
           xfer += iprot->readI32(this->status);
           this->__isset.status = true;
         } else {
@@ -184,10 +184,10 @@ uint32_t ThriftHadoopFileSystem_shutdown_args::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_shutdown_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_shutdown_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_shutdown_args");
-  xfer += oprot->writeFieldBegin("status", facebook::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_I32, 1);
   xfer += oprot->writeI32(this->status);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -195,10 +195,10 @@ uint32_t ThriftHadoopFileSystem_shutdown_args::write(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_shutdown_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_shutdown_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_shutdown_pargs");
-  xfer += oprot->writeFieldBegin("status", facebook::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_I32, 1);
   xfer += oprot->writeI32((*(this->status)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -206,22 +206,22 @@ uint32_t ThriftHadoopFileSystem_shutdown_pargs::write(facebook::thrift::protocol
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_shutdown_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_shutdown_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
@@ -238,7 +238,7 @@ uint32_t ThriftHadoopFileSystem_shutdown_result::read(facebook::thrift::protocol
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_shutdown_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_shutdown_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
@@ -249,22 +249,22 @@ uint32_t ThriftHadoopFileSystem_shutdown_result::write(facebook::thrift::protoco
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_shutdown_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_shutdown_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
@@ -281,28 +281,28 @@ uint32_t ThriftHadoopFileSystem_shutdown_presult::read(facebook::thrift::protoco
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_create_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_create_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -321,10 +321,10 @@ uint32_t ThriftHadoopFileSystem_create_args::read(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_create_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_create_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_create_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -332,10 +332,10 @@ uint32_t ThriftHadoopFileSystem_create_args::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_create_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_create_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_create_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -343,28 +343,28 @@ uint32_t ThriftHadoopFileSystem_create_pargs::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_create_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_create_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->success.read(iprot);
           this->__isset.success = true;
         } else {
@@ -372,7 +372,7 @@ uint32_t ThriftHadoopFileSystem_create_result::read(facebook::thrift::protocol::
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -391,18 +391,18 @@ uint32_t ThriftHadoopFileSystem_create_result::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_create_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_create_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_create_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_STRUCT, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
     xfer += this->success.write(oprot);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -411,28 +411,28 @@ uint32_t ThriftHadoopFileSystem_create_result::write(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_create_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_create_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += (*(this->success)).read(iprot);
           this->__isset.success = true;
         } else {
@@ -440,7 +440,7 @@ uint32_t ThriftHadoopFileSystem_create_presult::read(facebook::thrift::protocol:
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -459,28 +459,28 @@ uint32_t ThriftHadoopFileSystem_create_presult::read(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_createFile_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_createFile_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -488,7 +488,7 @@ uint32_t ThriftHadoopFileSystem_createFile_args::read(facebook::thrift::protocol
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_I16) {
+        if (ftype == ::apache::thrift::protocol::T_I16) {
           xfer += iprot->readI16(this->mode);
           this->__isset.mode = true;
         } else {
@@ -496,7 +496,7 @@ uint32_t ThriftHadoopFileSystem_createFile_args::read(facebook::thrift::protocol
         }
         break;
       case 3:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->overwrite);
           this->__isset.overwrite = true;
         } else {
@@ -504,7 +504,7 @@ uint32_t ThriftHadoopFileSystem_createFile_args::read(facebook::thrift::protocol
         }
         break;
       case 4:
-        if (ftype == facebook::thrift::protocol::T_I32) {
+        if (ftype == ::apache::thrift::protocol::T_I32) {
           xfer += iprot->readI32(this->bufferSize);
           this->__isset.bufferSize = true;
         } else {
@@ -512,7 +512,7 @@ uint32_t ThriftHadoopFileSystem_createFile_args::read(facebook::thrift::protocol
         }
         break;
       case 5:
-        if (ftype == facebook::thrift::protocol::T_I16) {
+        if (ftype == ::apache::thrift::protocol::T_I16) {
           xfer += iprot->readI16(this->block_replication);
           this->__isset.block_replication = true;
         } else {
@@ -520,7 +520,7 @@ uint32_t ThriftHadoopFileSystem_createFile_args::read(facebook::thrift::protocol
         }
         break;
       case 6:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->blocksize);
           this->__isset.blocksize = true;
         } else {
@@ -539,25 +539,25 @@ uint32_t ThriftHadoopFileSystem_createFile_args::read(facebook::thrift::protocol
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_createFile_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_createFile_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_createFile_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("mode", facebook::thrift::protocol::T_I16, 2);
+  xfer += oprot->writeFieldBegin("mode", ::apache::thrift::protocol::T_I16, 2);
   xfer += oprot->writeI16(this->mode);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("overwrite", facebook::thrift::protocol::T_BOOL, 3);
+  xfer += oprot->writeFieldBegin("overwrite", ::apache::thrift::protocol::T_BOOL, 3);
   xfer += oprot->writeBool(this->overwrite);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("bufferSize", facebook::thrift::protocol::T_I32, 4);
+  xfer += oprot->writeFieldBegin("bufferSize", ::apache::thrift::protocol::T_I32, 4);
   xfer += oprot->writeI32(this->bufferSize);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("block_replication", facebook::thrift::protocol::T_I16, 5);
+  xfer += oprot->writeFieldBegin("block_replication", ::apache::thrift::protocol::T_I16, 5);
   xfer += oprot->writeI16(this->block_replication);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("blocksize", facebook::thrift::protocol::T_I64, 6);
+  xfer += oprot->writeFieldBegin("blocksize", ::apache::thrift::protocol::T_I64, 6);
   xfer += oprot->writeI64(this->blocksize);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -565,25 +565,25 @@ uint32_t ThriftHadoopFileSystem_createFile_args::write(facebook::thrift::protoco
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_createFile_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_createFile_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_createFile_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("mode", facebook::thrift::protocol::T_I16, 2);
+  xfer += oprot->writeFieldBegin("mode", ::apache::thrift::protocol::T_I16, 2);
   xfer += oprot->writeI16((*(this->mode)));
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("overwrite", facebook::thrift::protocol::T_BOOL, 3);
+  xfer += oprot->writeFieldBegin("overwrite", ::apache::thrift::protocol::T_BOOL, 3);
   xfer += oprot->writeBool((*(this->overwrite)));
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("bufferSize", facebook::thrift::protocol::T_I32, 4);
+  xfer += oprot->writeFieldBegin("bufferSize", ::apache::thrift::protocol::T_I32, 4);
   xfer += oprot->writeI32((*(this->bufferSize)));
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("block_replication", facebook::thrift::protocol::T_I16, 5);
+  xfer += oprot->writeFieldBegin("block_replication", ::apache::thrift::protocol::T_I16, 5);
   xfer += oprot->writeI16((*(this->block_replication)));
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("blocksize", facebook::thrift::protocol::T_I64, 6);
+  xfer += oprot->writeFieldBegin("blocksize", ::apache::thrift::protocol::T_I64, 6);
   xfer += oprot->writeI64((*(this->blocksize)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -591,28 +591,28 @@ uint32_t ThriftHadoopFileSystem_createFile_pargs::write(facebook::thrift::protoc
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_createFile_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_createFile_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->success.read(iprot);
           this->__isset.success = true;
         } else {
@@ -620,7 +620,7 @@ uint32_t ThriftHadoopFileSystem_createFile_result::read(facebook::thrift::protoc
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -639,18 +639,18 @@ uint32_t ThriftHadoopFileSystem_createFile_result::read(facebook::thrift::protoc
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_createFile_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_createFile_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_createFile_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_STRUCT, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
     xfer += this->success.write(oprot);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -659,28 +659,28 @@ uint32_t ThriftHadoopFileSystem_createFile_result::write(facebook::thrift::proto
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_createFile_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_createFile_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += (*(this->success)).read(iprot);
           this->__isset.success = true;
         } else {
@@ -688,7 +688,7 @@ uint32_t ThriftHadoopFileSystem_createFile_presult::read(facebook::thrift::proto
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -707,28 +707,28 @@ uint32_t ThriftHadoopFileSystem_createFile_presult::read(facebook::thrift::proto
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_open_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_open_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -747,10 +747,10 @@ uint32_t ThriftHadoopFileSystem_open_args::read(facebook::thrift::protocol::TPro
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_open_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_open_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_open_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -758,10 +758,10 @@ uint32_t ThriftHadoopFileSystem_open_args::write(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_open_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_open_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_open_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -769,28 +769,28 @@ uint32_t ThriftHadoopFileSystem_open_pargs::write(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_open_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_open_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->success.read(iprot);
           this->__isset.success = true;
         } else {
@@ -798,7 +798,7 @@ uint32_t ThriftHadoopFileSystem_open_result::read(facebook::thrift::protocol::TP
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -817,18 +817,18 @@ uint32_t ThriftHadoopFileSystem_open_result::read(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_open_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_open_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_open_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_STRUCT, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
     xfer += this->success.write(oprot);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -837,28 +837,28 @@ uint32_t ThriftHadoopFileSystem_open_result::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_open_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_open_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += (*(this->success)).read(iprot);
           this->__isset.success = true;
         } else {
@@ -866,7 +866,7 @@ uint32_t ThriftHadoopFileSystem_open_presult::read(facebook::thrift::protocol::T
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -885,28 +885,28 @@ uint32_t ThriftHadoopFileSystem_open_presult::read(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_append_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_append_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -925,10 +925,10 @@ uint32_t ThriftHadoopFileSystem_append_args::read(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_append_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_append_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_append_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -936,10 +936,10 @@ uint32_t ThriftHadoopFileSystem_append_args::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_append_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_append_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_append_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -947,28 +947,28 @@ uint32_t ThriftHadoopFileSystem_append_pargs::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_append_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_append_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->success.read(iprot);
           this->__isset.success = true;
         } else {
@@ -976,7 +976,7 @@ uint32_t ThriftHadoopFileSystem_append_result::read(facebook::thrift::protocol::
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -995,18 +995,18 @@ uint32_t ThriftHadoopFileSystem_append_result::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_append_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_append_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_append_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_STRUCT, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
     xfer += this->success.write(oprot);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -1015,28 +1015,28 @@ uint32_t ThriftHadoopFileSystem_append_result::write(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_append_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_append_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += (*(this->success)).read(iprot);
           this->__isset.success = true;
         } else {
@@ -1044,7 +1044,7 @@ uint32_t ThriftHadoopFileSystem_append_presult::read(facebook::thrift::protocol:
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1063,36 +1063,36 @@ uint32_t ThriftHadoopFileSystem_append_presult::read(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_write_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_write_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->handle.read(iprot);
           this->__isset.handle = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
-      case -1:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->data);
           this->__isset.data = true;
         } else {
@@ -1111,13 +1111,13 @@ uint32_t ThriftHadoopFileSystem_write_args::read(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_write_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_write_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_write_args");
-  xfer += oprot->writeFieldBegin("handle", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("handle", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->handle.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("data", facebook::thrift::protocol::T_STRING, -1);
+  xfer += oprot->writeFieldBegin("data", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString(this->data);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1125,13 +1125,13 @@ uint32_t ThriftHadoopFileSystem_write_args::write(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_write_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_write_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_write_pargs");
-  xfer += oprot->writeFieldBegin("handle", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("handle", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->handle)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("data", facebook::thrift::protocol::T_STRING, -1);
+  xfer += oprot->writeFieldBegin("data", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString((*(this->data)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1139,28 +1139,28 @@ uint32_t ThriftHadoopFileSystem_write_pargs::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_write_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_write_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->success);
           this->__isset.success = true;
         } else {
@@ -1168,7 +1168,7 @@ uint32_t ThriftHadoopFileSystem_write_result::read(facebook::thrift::protocol::T
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1187,18 +1187,18 @@ uint32_t ThriftHadoopFileSystem_write_result::read(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_write_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_write_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_write_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
     xfer += oprot->writeBool(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -1207,28 +1207,28 @@ uint32_t ThriftHadoopFileSystem_write_result::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_write_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_write_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool((*(this->success)));
           this->__isset.success = true;
         } else {
@@ -1236,7 +1236,7 @@ uint32_t ThriftHadoopFileSystem_write_presult::read(facebook::thrift::protocol::
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1255,44 +1255,44 @@ uint32_t ThriftHadoopFileSystem_write_presult::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_read_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_read_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->handle.read(iprot);
           this->__isset.handle = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
-      case -1:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->offset);
           this->__isset.offset = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
-      case -2:
-        if (ftype == facebook::thrift::protocol::T_I32) {
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
           xfer += iprot->readI32(this->size);
           this->__isset.size = true;
         } else {
@@ -1311,16 +1311,16 @@ uint32_t ThriftHadoopFileSystem_read_args::read(facebook::thrift::protocol::TPro
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_read_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_read_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_read_args");
-  xfer += oprot->writeFieldBegin("handle", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("handle", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->handle.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("offset", facebook::thrift::protocol::T_I64, -1);
+  xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I64, 2);
   xfer += oprot->writeI64(this->offset);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("size", facebook::thrift::protocol::T_I32, -2);
+  xfer += oprot->writeFieldBegin("size", ::apache::thrift::protocol::T_I32, 3);
   xfer += oprot->writeI32(this->size);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1328,16 +1328,16 @@ uint32_t ThriftHadoopFileSystem_read_args::write(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_read_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_read_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_read_pargs");
-  xfer += oprot->writeFieldBegin("handle", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("handle", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->handle)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("offset", facebook::thrift::protocol::T_I64, -1);
+  xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I64, 2);
   xfer += oprot->writeI64((*(this->offset)));
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("size", facebook::thrift::protocol::T_I32, -2);
+  xfer += oprot->writeFieldBegin("size", ::apache::thrift::protocol::T_I32, 3);
   xfer += oprot->writeI32((*(this->size)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1345,28 +1345,28 @@ uint32_t ThriftHadoopFileSystem_read_pargs::write(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_read_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_read_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->success);
           this->__isset.success = true;
         } else {
@@ -1374,7 +1374,7 @@ uint32_t ThriftHadoopFileSystem_read_result::read(facebook::thrift::protocol::TP
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1393,18 +1393,18 @@ uint32_t ThriftHadoopFileSystem_read_result::read(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_read_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_read_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_read_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_STRING, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
     xfer += oprot->writeString(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -1413,28 +1413,28 @@ uint32_t ThriftHadoopFileSystem_read_result::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_read_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_read_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString((*(this->success)));
           this->__isset.success = true;
         } else {
@@ -1442,7 +1442,7 @@ uint32_t ThriftHadoopFileSystem_read_presult::read(facebook::thrift::protocol::T
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1461,28 +1461,28 @@ uint32_t ThriftHadoopFileSystem_read_presult::read(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_close_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_close_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->out.read(iprot);
           this->__isset.out = true;
         } else {
@@ -1501,10 +1501,10 @@ uint32_t ThriftHadoopFileSystem_close_args::read(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_close_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_close_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_close_args");
-  xfer += oprot->writeFieldBegin("out", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("out", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->out.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1512,10 +1512,10 @@ uint32_t ThriftHadoopFileSystem_close_args::write(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_close_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_close_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_close_pargs");
-  xfer += oprot->writeFieldBegin("out", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("out", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->out)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1523,28 +1523,28 @@ uint32_t ThriftHadoopFileSystem_close_pargs::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_close_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_close_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->success);
           this->__isset.success = true;
         } else {
@@ -1552,7 +1552,7 @@ uint32_t ThriftHadoopFileSystem_close_result::read(facebook::thrift::protocol::T
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1571,18 +1571,18 @@ uint32_t ThriftHadoopFileSystem_close_result::read(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_close_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_close_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_close_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
     xfer += oprot->writeBool(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -1591,28 +1591,28 @@ uint32_t ThriftHadoopFileSystem_close_result::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_close_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_close_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool((*(this->success)));
           this->__isset.success = true;
         } else {
@@ -1620,7 +1620,7 @@ uint32_t ThriftHadoopFileSystem_close_presult::read(facebook::thrift::protocol::
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1639,28 +1639,28 @@ uint32_t ThriftHadoopFileSystem_close_presult::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rm_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_rm_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -1668,7 +1668,7 @@ uint32_t ThriftHadoopFileSystem_rm_args::read(facebook::thrift::protocol::TProto
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->recursive);
           this->__isset.recursive = true;
         } else {
@@ -1687,13 +1687,13 @@ uint32_t ThriftHadoopFileSystem_rm_args::read(facebook::thrift::protocol::TProto
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rm_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_rm_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_rm_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("recursive", facebook::thrift::protocol::T_BOOL, 2);
+  xfer += oprot->writeFieldBegin("recursive", ::apache::thrift::protocol::T_BOOL, 2);
   xfer += oprot->writeBool(this->recursive);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1701,13 +1701,13 @@ uint32_t ThriftHadoopFileSystem_rm_args::write(facebook::thrift::protocol::TProt
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rm_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_rm_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_rm_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("recursive", facebook::thrift::protocol::T_BOOL, 2);
+  xfer += oprot->writeFieldBegin("recursive", ::apache::thrift::protocol::T_BOOL, 2);
   xfer += oprot->writeBool((*(this->recursive)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1715,28 +1715,28 @@ uint32_t ThriftHadoopFileSystem_rm_pargs::write(facebook::thrift::protocol::TPro
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rm_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_rm_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->success);
           this->__isset.success = true;
         } else {
@@ -1744,7 +1744,7 @@ uint32_t ThriftHadoopFileSystem_rm_result::read(facebook::thrift::protocol::TPro
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1763,18 +1763,18 @@ uint32_t ThriftHadoopFileSystem_rm_result::read(facebook::thrift::protocol::TPro
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rm_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_rm_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_rm_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
     xfer += oprot->writeBool(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -1783,28 +1783,28 @@ uint32_t ThriftHadoopFileSystem_rm_result::write(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rm_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_rm_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool((*(this->success)));
           this->__isset.success = true;
         } else {
@@ -1812,7 +1812,7 @@ uint32_t ThriftHadoopFileSystem_rm_presult::read(facebook::thrift::protocol::TPr
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1831,28 +1831,28 @@ uint32_t ThriftHadoopFileSystem_rm_presult::read(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rename_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_rename_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -1860,7 +1860,7 @@ uint32_t ThriftHadoopFileSystem_rename_args::read(facebook::thrift::protocol::TP
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->dest.read(iprot);
           this->__isset.dest = true;
         } else {
@@ -1879,13 +1879,13 @@ uint32_t ThriftHadoopFileSystem_rename_args::read(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rename_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_rename_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_rename_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("dest", facebook::thrift::protocol::T_STRUCT, 2);
+  xfer += oprot->writeFieldBegin("dest", ::apache::thrift::protocol::T_STRUCT, 2);
   xfer += this->dest.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1893,13 +1893,13 @@ uint32_t ThriftHadoopFileSystem_rename_args::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rename_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_rename_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_rename_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("dest", facebook::thrift::protocol::T_STRUCT, 2);
+  xfer += oprot->writeFieldBegin("dest", ::apache::thrift::protocol::T_STRUCT, 2);
   xfer += (*(this->dest)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -1907,28 +1907,28 @@ uint32_t ThriftHadoopFileSystem_rename_pargs::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rename_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_rename_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->success);
           this->__isset.success = true;
         } else {
@@ -1936,7 +1936,7 @@ uint32_t ThriftHadoopFileSystem_rename_result::read(facebook::thrift::protocol::
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -1955,18 +1955,18 @@ uint32_t ThriftHadoopFileSystem_rename_result::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rename_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_rename_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_rename_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
     xfer += oprot->writeBool(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -1975,28 +1975,28 @@ uint32_t ThriftHadoopFileSystem_rename_result::write(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_rename_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_rename_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool((*(this->success)));
           this->__isset.success = true;
         } else {
@@ -2004,7 +2004,7 @@ uint32_t ThriftHadoopFileSystem_rename_presult::read(facebook::thrift::protocol:
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2023,28 +2023,28 @@ uint32_t ThriftHadoopFileSystem_rename_presult::read(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_mkdirs_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_mkdirs_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -2063,10 +2063,10 @@ uint32_t ThriftHadoopFileSystem_mkdirs_args::read(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_mkdirs_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_mkdirs_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_mkdirs_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2074,10 +2074,10 @@ uint32_t ThriftHadoopFileSystem_mkdirs_args::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_mkdirs_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_mkdirs_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_mkdirs_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2085,28 +2085,28 @@ uint32_t ThriftHadoopFileSystem_mkdirs_pargs::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_mkdirs_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_mkdirs_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->success);
           this->__isset.success = true;
         } else {
@@ -2114,7 +2114,7 @@ uint32_t ThriftHadoopFileSystem_mkdirs_result::read(facebook::thrift::protocol::
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2133,18 +2133,18 @@ uint32_t ThriftHadoopFileSystem_mkdirs_result::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_mkdirs_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_mkdirs_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_mkdirs_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
     xfer += oprot->writeBool(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -2153,28 +2153,28 @@ uint32_t ThriftHadoopFileSystem_mkdirs_result::write(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_mkdirs_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_mkdirs_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool((*(this->success)));
           this->__isset.success = true;
         } else {
@@ -2182,7 +2182,7 @@ uint32_t ThriftHadoopFileSystem_mkdirs_presult::read(facebook::thrift::protocol:
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2201,28 +2201,28 @@ uint32_t ThriftHadoopFileSystem_mkdirs_presult::read(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_exists_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_exists_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -2241,10 +2241,10 @@ uint32_t ThriftHadoopFileSystem_exists_args::read(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_exists_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_exists_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_exists_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2252,10 +2252,10 @@ uint32_t ThriftHadoopFileSystem_exists_args::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_exists_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_exists_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_exists_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2263,28 +2263,28 @@ uint32_t ThriftHadoopFileSystem_exists_pargs::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_exists_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_exists_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->success);
           this->__isset.success = true;
         } else {
@@ -2292,7 +2292,7 @@ uint32_t ThriftHadoopFileSystem_exists_result::read(facebook::thrift::protocol::
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2311,18 +2311,18 @@ uint32_t ThriftHadoopFileSystem_exists_result::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_exists_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_exists_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_exists_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
     xfer += oprot->writeBool(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -2331,28 +2331,28 @@ uint32_t ThriftHadoopFileSystem_exists_result::write(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_exists_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_exists_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool((*(this->success)));
           this->__isset.success = true;
         } else {
@@ -2360,7 +2360,7 @@ uint32_t ThriftHadoopFileSystem_exists_presult::read(facebook::thrift::protocol:
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2379,28 +2379,28 @@ uint32_t ThriftHadoopFileSystem_exists_presult::read(facebook::thrift::protocol:
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_stat_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_stat_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -2419,10 +2419,10 @@ uint32_t ThriftHadoopFileSystem_stat_args::read(facebook::thrift::protocol::TPro
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_stat_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_stat_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_stat_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2430,10 +2430,10 @@ uint32_t ThriftHadoopFileSystem_stat_args::write(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_stat_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_stat_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_stat_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2441,28 +2441,28 @@ uint32_t ThriftHadoopFileSystem_stat_pargs::write(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_stat_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_stat_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->success.read(iprot);
           this->__isset.success = true;
         } else {
@@ -2470,7 +2470,7 @@ uint32_t ThriftHadoopFileSystem_stat_result::read(facebook::thrift::protocol::TP
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2489,18 +2489,18 @@ uint32_t ThriftHadoopFileSystem_stat_result::read(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_stat_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_stat_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_stat_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_STRUCT, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
     xfer += this->success.write(oprot);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -2509,28 +2509,28 @@ uint32_t ThriftHadoopFileSystem_stat_result::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_stat_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_stat_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += (*(this->success)).read(iprot);
           this->__isset.success = true;
         } else {
@@ -2538,7 +2538,7 @@ uint32_t ThriftHadoopFileSystem_stat_presult::read(facebook::thrift::protocol::T
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2557,28 +2557,28 @@ uint32_t ThriftHadoopFileSystem_stat_presult::read(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_listStatus_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_listStatus_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -2597,10 +2597,10 @@ uint32_t ThriftHadoopFileSystem_listStatus_args::read(facebook::thrift::protocol
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_listStatus_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_listStatus_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_listStatus_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2608,10 +2608,10 @@ uint32_t ThriftHadoopFileSystem_listStatus_args::write(facebook::thrift::protoco
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_listStatus_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_listStatus_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_listStatus_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2619,38 +2619,38 @@ uint32_t ThriftHadoopFileSystem_listStatus_pargs::write(facebook::thrift::protoc
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_listStatus_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_listStatus_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_LIST) {
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->success.clear();
-            uint32_t _size12;
-            facebook::thrift::protocol::TType _etype15;
-            iprot->readListBegin(_etype15, _size12);
-            this->success.resize(_size12);
-            uint32_t _i16;
-            for (_i16 = 0; _i16 < _size12; ++_i16)
+            uint32_t _size18;
+            ::apache::thrift::protocol::TType _etype21;
+            iprot->readListBegin(_etype21, _size18);
+            this->success.resize(_size18);
+            uint32_t _i22;
+            for (_i22 = 0; _i22 < _size18; ++_i22)
             {
-              xfer += this->success[_i16].read(iprot);
+              xfer += this->success[_i22].read(iprot);
             }
             iprot->readListEnd();
           }
@@ -2660,7 +2660,7 @@ uint32_t ThriftHadoopFileSystem_listStatus_result::read(facebook::thrift::protoc
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2679,26 +2679,26 @@ uint32_t ThriftHadoopFileSystem_listStatus_result::read(facebook::thrift::protoc
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_listStatus_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_listStatus_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_listStatus_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_LIST, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
-      xfer += oprot->writeListBegin(facebook::thrift::protocol::T_STRUCT, this->success.size());
-      std::vector<FileStatus> ::const_iterator _iter17;
-      for (_iter17 = this->success.begin(); _iter17 != this->success.end(); ++_iter17)
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
+      std::vector<FileStatus> ::const_iterator _iter23;
+      for (_iter23 = this->success.begin(); _iter23 != this->success.end(); ++_iter23)
       {
-        xfer += (*_iter17).write(oprot);
+        xfer += (*_iter23).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -2707,38 +2707,38 @@ uint32_t ThriftHadoopFileSystem_listStatus_result::write(facebook::thrift::proto
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_listStatus_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_listStatus_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_LIST) {
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             (*(this->success)).clear();
-            uint32_t _size18;
-            facebook::thrift::protocol::TType _etype21;
-            iprot->readListBegin(_etype21, _size18);
-            (*(this->success)).resize(_size18);
-            uint32_t _i22;
-            for (_i22 = 0; _i22 < _size18; ++_i22)
+            uint32_t _size24;
+            ::apache::thrift::protocol::TType _etype27;
+            iprot->readListBegin(_etype27, _size24);
+            (*(this->success)).resize(_size24);
+            uint32_t _i28;
+            for (_i28 = 0; _i28 < _size24; ++_i28)
             {
-              xfer += (*(this->success))[_i22].read(iprot);
+              xfer += (*(this->success))[_i28].read(iprot);
             }
             iprot->readListEnd();
           }
@@ -2748,7 +2748,7 @@ uint32_t ThriftHadoopFileSystem_listStatus_presult::read(facebook::thrift::proto
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2767,28 +2767,28 @@ uint32_t ThriftHadoopFileSystem_listStatus_presult::read(facebook::thrift::proto
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chmod_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_chmod_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -2796,7 +2796,7 @@ uint32_t ThriftHadoopFileSystem_chmod_args::read(facebook::thrift::protocol::TPr
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_I16) {
+        if (ftype == ::apache::thrift::protocol::T_I16) {
           xfer += iprot->readI16(this->mode);
           this->__isset.mode = true;
         } else {
@@ -2815,13 +2815,13 @@ uint32_t ThriftHadoopFileSystem_chmod_args::read(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chmod_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_chmod_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_chmod_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("mode", facebook::thrift::protocol::T_I16, 2);
+  xfer += oprot->writeFieldBegin("mode", ::apache::thrift::protocol::T_I16, 2);
   xfer += oprot->writeI16(this->mode);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2829,13 +2829,13 @@ uint32_t ThriftHadoopFileSystem_chmod_args::write(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chmod_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_chmod_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_chmod_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("mode", facebook::thrift::protocol::T_I16, 2);
+  xfer += oprot->writeFieldBegin("mode", ::apache::thrift::protocol::T_I16, 2);
   xfer += oprot->writeI16((*(this->mode)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -2843,28 +2843,28 @@ uint32_t ThriftHadoopFileSystem_chmod_pargs::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chmod_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_chmod_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2883,14 +2883,14 @@ uint32_t ThriftHadoopFileSystem_chmod_result::read(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chmod_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_chmod_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_chmod_result");
 
   if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -2899,28 +2899,28 @@ uint32_t ThriftHadoopFileSystem_chmod_result::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chmod_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_chmod_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -2939,28 +2939,28 @@ uint32_t ThriftHadoopFileSystem_chmod_presult::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chown_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_chown_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -2968,7 +2968,7 @@ uint32_t ThriftHadoopFileSystem_chown_args::read(facebook::thrift::protocol::TPr
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->owner);
           this->__isset.owner = true;
         } else {
@@ -2976,7 +2976,7 @@ uint32_t ThriftHadoopFileSystem_chown_args::read(facebook::thrift::protocol::TPr
         }
         break;
       case 3:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->group);
           this->__isset.group = true;
         } else {
@@ -2995,16 +2995,16 @@ uint32_t ThriftHadoopFileSystem_chown_args::read(facebook::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chown_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_chown_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_chown_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("owner", facebook::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeFieldBegin("owner", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString(this->owner);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("group", facebook::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeFieldBegin("group", ::apache::thrift::protocol::T_STRING, 3);
   xfer += oprot->writeString(this->group);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -3012,16 +3012,16 @@ uint32_t ThriftHadoopFileSystem_chown_args::write(facebook::thrift::protocol::TP
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chown_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_chown_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_chown_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("owner", facebook::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeFieldBegin("owner", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString((*(this->owner)));
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("group", facebook::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeFieldBegin("group", ::apache::thrift::protocol::T_STRING, 3);
   xfer += oprot->writeString((*(this->group)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -3029,28 +3029,28 @@ uint32_t ThriftHadoopFileSystem_chown_pargs::write(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chown_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_chown_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -3069,14 +3069,14 @@ uint32_t ThriftHadoopFileSystem_chown_result::read(facebook::thrift::protocol::T
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chown_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_chown_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_chown_result");
 
   if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -3085,28 +3085,28 @@ uint32_t ThriftHadoopFileSystem_chown_result::write(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_chown_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_chown_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -3125,28 +3125,28 @@ uint32_t ThriftHadoopFileSystem_chown_presult::read(facebook::thrift::protocol::
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setReplication_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_setReplication_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -3154,7 +3154,7 @@ uint32_t ThriftHadoopFileSystem_setReplication_args::read(facebook::thrift::prot
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_I16) {
+        if (ftype == ::apache::thrift::protocol::T_I16) {
           xfer += iprot->readI16(this->replication);
           this->__isset.replication = true;
         } else {
@@ -3173,13 +3173,13 @@ uint32_t ThriftHadoopFileSystem_setReplication_args::read(facebook::thrift::prot
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setReplication_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_setReplication_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_setReplication_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("replication", facebook::thrift::protocol::T_I16, 2);
+  xfer += oprot->writeFieldBegin("replication", ::apache::thrift::protocol::T_I16, 2);
   xfer += oprot->writeI16(this->replication);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -3187,13 +3187,13 @@ uint32_t ThriftHadoopFileSystem_setReplication_args::write(facebook::thrift::pro
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setReplication_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_setReplication_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_setReplication_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("replication", facebook::thrift::protocol::T_I16, 2);
+  xfer += oprot->writeFieldBegin("replication", ::apache::thrift::protocol::T_I16, 2);
   xfer += oprot->writeI16((*(this->replication)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -3201,28 +3201,28 @@ uint32_t ThriftHadoopFileSystem_setReplication_pargs::write(facebook::thrift::pr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setReplication_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_setReplication_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -3241,14 +3241,14 @@ uint32_t ThriftHadoopFileSystem_setReplication_result::read(facebook::thrift::pr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setReplication_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_setReplication_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_setReplication_result");
 
   if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -3257,28 +3257,28 @@ uint32_t ThriftHadoopFileSystem_setReplication_result::write(facebook::thrift::p
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_setReplication_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_setReplication_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -3297,28 +3297,28 @@ uint32_t ThriftHadoopFileSystem_setReplication_presult::read(facebook::thrift::p
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_getFileBlockLocations_args::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_getFileBlockLocations_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->path.read(iprot);
           this->__isset.path = true;
         } else {
@@ -3326,7 +3326,7 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_args::read(facebook::thrif
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->start);
           this->__isset.start = true;
         } else {
@@ -3334,7 +3334,7 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_args::read(facebook::thrif
         }
         break;
       case 3:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->length);
           this->__isset.length = true;
         } else {
@@ -3353,16 +3353,16 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_args::read(facebook::thrif
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_getFileBlockLocations_args::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_getFileBlockLocations_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_getFileBlockLocations_args");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->path.write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("start", facebook::thrift::protocol::T_I64, 2);
+  xfer += oprot->writeFieldBegin("start", ::apache::thrift::protocol::T_I64, 2);
   xfer += oprot->writeI64(this->start);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("length", facebook::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeFieldBegin("length", ::apache::thrift::protocol::T_I64, 3);
   xfer += oprot->writeI64(this->length);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -3370,16 +3370,16 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_args::write(facebook::thri
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_getFileBlockLocations_pargs::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_getFileBlockLocations_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_getFileBlockLocations_pargs");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRUCT, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->path)).write(oprot);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("start", facebook::thrift::protocol::T_I64, 2);
+  xfer += oprot->writeFieldBegin("start", ::apache::thrift::protocol::T_I64, 2);
   xfer += oprot->writeI64((*(this->start)));
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("length", facebook::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeFieldBegin("length", ::apache::thrift::protocol::T_I64, 3);
   xfer += oprot->writeI64((*(this->length)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -3387,38 +3387,38 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_pargs::write(facebook::thr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_getFileBlockLocations_result::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_getFileBlockLocations_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_LIST) {
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->success.clear();
-            uint32_t _size23;
-            facebook::thrift::protocol::TType _etype26;
-            iprot->readListBegin(_etype26, _size23);
-            this->success.resize(_size23);
-            uint32_t _i27;
-            for (_i27 = 0; _i27 < _size23; ++_i27)
+            uint32_t _size29;
+            ::apache::thrift::protocol::TType _etype32;
+            iprot->readListBegin(_etype32, _size29);
+            this->success.resize(_size29);
+            uint32_t _i33;
+            for (_i33 = 0; _i33 < _size29; ++_i33)
             {
-              xfer += this->success[_i27].read(iprot);
+              xfer += this->success[_i33].read(iprot);
             }
             iprot->readListEnd();
           }
@@ -3428,7 +3428,7 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_result::read(facebook::thr
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -3447,26 +3447,26 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_result::read(facebook::thr
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_getFileBlockLocations_result::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHadoopFileSystem_getFileBlockLocations_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
   xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_getFileBlockLocations_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", facebook::thrift::protocol::T_LIST, 0);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
-      xfer += oprot->writeListBegin(facebook::thrift::protocol::T_STRUCT, this->success.size());
-      std::vector<BlockLocation> ::const_iterator _iter28;
-      for (_iter28 = this->success.begin(); _iter28 != this->success.end(); ++_iter28)
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
+      std::vector<BlockLocation> ::const_iterator _iter34;
+      for (_iter34 = this->success.begin(); _iter34 != this->success.end(); ++_iter34)
       {
-        xfer += (*_iter28).write(oprot);
+        xfer += (*_iter34).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ouch) {
-    xfer += oprot->writeFieldBegin("ouch", facebook::thrift::protocol::T_STRUCT, 1);
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ouch.write(oprot);
     xfer += oprot->writeFieldEnd();
   }
@@ -3475,38 +3475,38 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_result::write(facebook::th
   return xfer;
 }
 
-uint32_t ThriftHadoopFileSystem_getFileBlockLocations_presult::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHadoopFileSystem_getFileBlockLocations_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 0:
-        if (ftype == facebook::thrift::protocol::T_LIST) {
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             (*(this->success)).clear();
-            uint32_t _size29;
-            facebook::thrift::protocol::TType _etype32;
-            iprot->readListBegin(_etype32, _size29);
-            (*(this->success)).resize(_size29);
-            uint32_t _i33;
-            for (_i33 = 0; _i33 < _size29; ++_i33)
+            uint32_t _size35;
+            ::apache::thrift::protocol::TType _etype38;
+            iprot->readListBegin(_etype38, _size35);
+            (*(this->success)).resize(_size35);
+            uint32_t _i39;
+            for (_i39 = 0; _i39 < _size35; ++_i39)
             {
-              xfer += (*(this->success))[_i33].read(iprot);
+              xfer += (*(this->success))[_i39].read(iprot);
             }
             iprot->readListEnd();
           }
@@ -3516,7 +3516,7 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_presult::read(facebook::th
         }
         break;
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRUCT) {
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ouch.read(iprot);
           this->__isset.ouch = true;
         } else {
@@ -3535,232 +3535,3565 @@ uint32_t ThriftHadoopFileSystem_getFileBlockLocations_presult::read(facebook::th
   return xfer;
 }
 
-void ThriftHadoopFileSystemClient::setInactivityTimeoutPeriod(const int64_t periodInSeconds)
-{
-  send_setInactivityTimeoutPeriod(periodInSeconds);
-  recv_setInactivityTimeoutPeriod();
-}
-
-void ThriftHadoopFileSystemClient::send_setInactivityTimeoutPeriod(const int64_t periodInSeconds)
-{
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("setInactivityTimeoutPeriod", facebook::thrift::protocol::T_CALL, cseqid);
+uint32_t ThriftHadoopFileSystem_hardLink_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  ThriftHadoopFileSystem_setInactivityTimeoutPeriod_pargs args;
-  args.periodInSeconds = &periodInSeconds;
-  args.write(oprot_);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
-}
+  xfer += iprot->readStructBegin(fname);
 
-void ThriftHadoopFileSystemClient::recv_setInactivityTimeoutPeriod()
-{
+  using ::apache::thrift::protocol::TProtocolException;
 
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
-  }
-  if (fname.compare("setInactivityTimeoutPeriod") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->src.read(iprot);
+          this->__isset.src = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->dest.read(iprot);
+          this->__isset.dest = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
   }
-  ThriftHadoopFileSystem_setInactivityTimeoutPeriod_presult result;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
 
-  return;
-}
+  xfer += iprot->readStructEnd();
 
-void ThriftHadoopFileSystemClient::shutdown(const int32_t status)
-{
-  send_shutdown(status);
-  recv_shutdown();
+  return xfer;
 }
 
-void ThriftHadoopFileSystemClient::send_shutdown(const int32_t status)
-{
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("shutdown", facebook::thrift::protocol::T_CALL, cseqid);
-
-  ThriftHadoopFileSystem_shutdown_pargs args;
-  args.status = &status;
-  args.write(oprot_);
+uint32_t ThriftHadoopFileSystem_hardLink_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_hardLink_args");
+  xfer += oprot->writeFieldBegin("src", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->src.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("dest", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->dest.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
+uint32_t ThriftHadoopFileSystem_hardLink_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_hardLink_pargs");
+  xfer += oprot->writeFieldBegin("src", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->src)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("dest", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->dest)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
 }
 
-void ThriftHadoopFileSystemClient::recv_shutdown()
-{
+uint32_t ThriftHadoopFileSystem_hardLink_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  int32_t rseqid = 0;
+  uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
-  }
-  if (fname.compare("shutdown") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
-  }
-  ThriftHadoopFileSystem_shutdown_presult result;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
+  xfer += iprot->readStructBegin(fname);
 
-  return;
-}
+  using ::apache::thrift::protocol::TProtocolException;
 
-void ThriftHadoopFileSystemClient::create(ThriftHandle& _return, const Pathname& path)
-{
-  send_create(path);
-  recv_create(_return);
-}
 
-void ThriftHadoopFileSystemClient::send_create(const Pathname& path)
-{
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("create", facebook::thrift::protocol::T_CALL, cseqid);
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
 
-  ThriftHadoopFileSystem_create_pargs args;
-  args.path = &path;
-  args.write(oprot_);
+  xfer += iprot->readStructEnd();
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
+  return xfer;
 }
 
-void ThriftHadoopFileSystemClient::recv_create(ThriftHandle& _return)
-{
+uint32_t ThriftHadoopFileSystem_hardLink_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  uint32_t xfer = 0;
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
-  }
-  if (fname.compare("create") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
-  }
-  ThriftHadoopFileSystem_create_presult result;
-  result.success = &_return;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_hardLink_result");
 
-  if (result.__isset.success) {
-    // _return pointer has now been filled
-    return;
-  }
-  if (result.__isset.ouch) {
-    throw result.ouch;
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeBool(this->success);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "create failed: unknown result");
-}
-
-void ThriftHadoopFileSystemClient::createFile(ThriftHandle& _return, const Pathname& path, const int16_t mode, const bool overwrite, const int32_t bufferSize, const int16_t block_replication, const int64_t blocksize)
-{
-  send_createFile(path, mode, overwrite, bufferSize, block_replication, blocksize);
-  recv_createFile(_return);
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
 }
 
-void ThriftHadoopFileSystemClient::send_createFile(const Pathname& path, const int16_t mode, const bool overwrite, const int32_t bufferSize, const int16_t block_replication, const int64_t blocksize)
-{
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("createFile", facebook::thrift::protocol::T_CALL, cseqid);
+uint32_t ThriftHadoopFileSystem_hardLink_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  ThriftHadoopFileSystem_createFile_pargs args;
-  args.path = &path;
-  args.mode = &mode;
-  args.overwrite = &overwrite;
-  args.bufferSize = &bufferSize;
-  args.block_replication = &block_replication;
-  args.blocksize = &blocksize;
-  args.write(oprot_);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
-}
+  xfer += iprot->readStructBegin(fname);
 
-void ThriftHadoopFileSystemClient::recv_createFile(ThriftHandle& _return)
-{
+  using ::apache::thrift::protocol::TProtocolException;
 
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_concat_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->target.read(iprot);
+          this->__isset.target = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->srcs.clear();
+            uint32_t _size40;
+            ::apache::thrift::protocol::TType _etype43;
+            iprot->readListBegin(_etype43, _size40);
+            this->srcs.resize(_size40);
+            uint32_t _i44;
+            for (_i44 = 0; _i44 < _size40; ++_i44)
+            {
+              xfer += this->srcs[_i44].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.srcs = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->restricted);
+          this->__isset.restricted = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_concat_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_concat_args");
+  xfer += oprot->writeFieldBegin("target", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->target.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("srcs", ::apache::thrift::protocol::T_LIST, 2);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->srcs.size()));
+    std::vector<Pathname> ::const_iterator _iter45;
+    for (_iter45 = this->srcs.begin(); _iter45 != this->srcs.end(); ++_iter45)
+    {
+      xfer += (*_iter45).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("restricted", ::apache::thrift::protocol::T_BOOL, 3);
+  xfer += oprot->writeBool(this->restricted);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_concat_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_concat_pargs");
+  xfer += oprot->writeFieldBegin("target", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->target)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("srcs", ::apache::thrift::protocol::T_LIST, 2);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->srcs)).size()));
+    std::vector<Pathname> ::const_iterator _iter46;
+    for (_iter46 = (*(this->srcs)).begin(); _iter46 != (*(this->srcs)).end(); ++_iter46)
+    {
+      xfer += (*_iter46).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("restricted", ::apache::thrift::protocol::T_BOOL, 3);
+  xfer += oprot->writeBool((*(this->restricted)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_concat_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_concat_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_concat_result");
+
+  if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_concat_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_reportBadBlocks_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->blocks.clear();
+            uint32_t _size47;
+            ::apache::thrift::protocol::TType _etype50;
+            iprot->readListBegin(_etype50, _size47);
+            this->blocks.resize(_size47);
+            uint32_t _i51;
+            for (_i51 = 0; _i51 < _size47; ++_i51)
+            {
+              xfer += this->blocks[_i51].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.blocks = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_reportBadBlocks_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_reportBadBlocks_args");
+  xfer += oprot->writeFieldBegin("blocks", ::apache::thrift::protocol::T_LIST, 1);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->blocks.size()));
+    std::vector<TLocatedBlock> ::const_iterator _iter52;
+    for (_iter52 = this->blocks.begin(); _iter52 != this->blocks.end(); ++_iter52)
+    {
+      xfer += (*_iter52).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_reportBadBlocks_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_reportBadBlocks_pargs");
+  xfer += oprot->writeFieldBegin("blocks", ::apache::thrift::protocol::T_LIST, 1);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->blocks)).size()));
+    std::vector<TLocatedBlock> ::const_iterator _iter53;
+    for (_iter53 = (*(this->blocks)).begin(); _iter53 != (*(this->blocks)).end(); ++_iter53)
+    {
+      xfer += (*_iter53).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_reportBadBlocks_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_reportBadBlocks_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_reportBadBlocks_result");
+
+  if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_reportBadBlocks_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_getDataTransferProtocolVersion_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_getDataTransferProtocolVersion_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_getDataTransferProtocolVersion_args");
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_getDataTransferProtocolVersion_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_getDataTransferProtocolVersion_pargs");
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_getDataTransferProtocolVersion_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_getDataTransferProtocolVersion_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_getDataTransferProtocolVersion_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_I32, 0);
+    xfer += oprot->writeI32(this->success);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_getDataTransferProtocolVersion_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_renewLease_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->clientName);
+          this->__isset.clientName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_renewLease_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_renewLease_args");
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->clientName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_renewLease_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_renewLease_pargs");
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->clientName)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_renewLease_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_renewLease_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_renewLease_result");
+
+  if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_renewLease_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_recoverLease_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->path.read(iprot);
+          this->__isset.path = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->clientName);
+          this->__isset.clientName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_recoverLease_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_recoverLease_args");
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->path.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->clientName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_recoverLease_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_recoverLease_pargs");
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->path)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->clientName)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_recoverLease_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_recoverLease_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_recoverLease_result");
+
+  if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_recoverLease_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_closeRecoverLease_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->path.read(iprot);
+          this->__isset.path = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->clientName);
+          this->__isset.clientName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->discardLastBlock);
+          this->__isset.discardLastBlock = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_closeRecoverLease_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_closeRecoverLease_args");
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->path.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->clientName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("discardLastBlock", ::apache::thrift::protocol::T_BOOL, 3);
+  xfer += oprot->writeBool(this->discardLastBlock);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_closeRecoverLease_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_closeRecoverLease_pargs");
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->path)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->clientName)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("discardLastBlock", ::apache::thrift::protocol::T_BOOL, 3);
+  xfer += oprot->writeBool((*(this->discardLastBlock)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_closeRecoverLease_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_closeRecoverLease_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_closeRecoverLease_result");
+
+  if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_closeRecoverLease_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonBlock_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->block.read(iprot);
+          this->__isset.block = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->pathname.read(iprot);
+          this->__isset.pathname = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->clientName);
+          this->__isset.clientName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonBlock_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_abandonBlock_args");
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->block.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->pathname.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->clientName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonBlock_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_abandonBlock_pargs");
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->block)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->pathname)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->clientName)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonBlock_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonBlock_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_abandonBlock_result");
+
+  if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonBlock_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonFile_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->pathname.read(iprot);
+          this->__isset.pathname = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->clientName);
+          this->__isset.clientName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonFile_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_abandonFile_args");
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->pathname.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->clientName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonFile_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_abandonFile_pargs");
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->pathname)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->clientName)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonFile_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonFile_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_abandonFile_result");
+
+  if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_abandonFile_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addBlock_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->pathname.read(iprot);
+          this->__isset.pathname = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->clientName);
+          this->__isset.clientName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->startOffset);
+          this->__isset.startOffset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->lastBlock.read(iprot);
+          this->__isset.lastBlock = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->excludedNodes.clear();
+            uint32_t _size54;
+            ::apache::thrift::protocol::TType _etype57;
+            iprot->readListBegin(_etype57, _size54);
+            this->excludedNodes.resize(_size54);
+            uint32_t _i58;
+            for (_i58 = 0; _i58 < _size54; ++_i58)
+            {
+              xfer += this->excludedNodes[_i58].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.excludedNodes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->favouredNodes.clear();
+            uint32_t _size59;
+            ::apache::thrift::protocol::TType _etype62;
+            iprot->readListBegin(_etype62, _size59);
+            this->favouredNodes.resize(_size59);
+            uint32_t _i63;
+            for (_i63 = 0; _i63 < _size59; ++_i63)
+            {
+              xfer += this->favouredNodes[_i63].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.favouredNodes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addBlock_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_addBlock_args");
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->pathname.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->clientName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("startOffset", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64(this->startOffset);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("lastBlock", ::apache::thrift::protocol::T_STRUCT, 4);
+  xfer += this->lastBlock.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("excludedNodes", ::apache::thrift::protocol::T_LIST, 5);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->excludedNodes.size()));
+    std::vector<TDatanodeID> ::const_iterator _iter64;
+    for (_iter64 = this->excludedNodes.begin(); _iter64 != this->excludedNodes.end(); ++_iter64)
+    {
+      xfer += (*_iter64).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("favouredNodes", ::apache::thrift::protocol::T_LIST, 6);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->favouredNodes.size()));
+    std::vector<TDatanodeID> ::const_iterator _iter65;
+    for (_iter65 = this->favouredNodes.begin(); _iter65 != this->favouredNodes.end(); ++_iter65)
+    {
+      xfer += (*_iter65).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addBlock_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_addBlock_pargs");
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->pathname)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->clientName)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("startOffset", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64((*(this->startOffset)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("lastBlock", ::apache::thrift::protocol::T_STRUCT, 4);
+  xfer += (*(this->lastBlock)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("excludedNodes", ::apache::thrift::protocol::T_LIST, 5);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->excludedNodes)).size()));
+    std::vector<TDatanodeID> ::const_iterator _iter66;
+    for (_iter66 = (*(this->excludedNodes)).begin(); _iter66 != (*(this->excludedNodes)).end(); ++_iter66)
+    {
+      xfer += (*_iter66).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("favouredNodes", ::apache::thrift::protocol::T_LIST, 6);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->favouredNodes)).size()));
+    std::vector<TDatanodeID> ::const_iterator _iter67;
+    for (_iter67 = (*(this->favouredNodes)).begin(); _iter67 != (*(this->favouredNodes)).end(); ++_iter67)
+    {
+      xfer += (*_iter67).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addBlock_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->success.read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addBlock_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_addBlock_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+    xfer += this->success.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addBlock_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += (*(this->success)).read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addFirstBlock_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->pathname.read(iprot);
+          this->__isset.pathname = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->clientName);
+          this->__isset.clientName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->excludedNodes.clear();
+            uint32_t _size68;
+            ::apache::thrift::protocol::TType _etype71;
+            iprot->readListBegin(_etype71, _size68);
+            this->excludedNodes.resize(_size68);
+            uint32_t _i72;
+            for (_i72 = 0; _i72 < _size68; ++_i72)
+            {
+              xfer += this->excludedNodes[_i72].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.excludedNodes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->favouredNodes.clear();
+            uint32_t _size73;
+            ::apache::thrift::protocol::TType _etype76;
+            iprot->readListBegin(_etype76, _size73);
+            this->favouredNodes.resize(_size73);
+            uint32_t _i77;
+            for (_i77 = 0; _i77 < _size73; ++_i77)
+            {
+              xfer += this->favouredNodes[_i77].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.favouredNodes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addFirstBlock_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_addFirstBlock_args");
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->pathname.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->clientName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("excludedNodes", ::apache::thrift::protocol::T_LIST, 3);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->excludedNodes.size()));
+    std::vector<TDatanodeID> ::const_iterator _iter78;
+    for (_iter78 = this->excludedNodes.begin(); _iter78 != this->excludedNodes.end(); ++_iter78)
+    {
+      xfer += (*_iter78).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("favouredNodes", ::apache::thrift::protocol::T_LIST, 4);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->favouredNodes.size()));
+    std::vector<TDatanodeID> ::const_iterator _iter79;
+    for (_iter79 = this->favouredNodes.begin(); _iter79 != this->favouredNodes.end(); ++_iter79)
+    {
+      xfer += (*_iter79).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addFirstBlock_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_addFirstBlock_pargs");
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->pathname)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->clientName)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("excludedNodes", ::apache::thrift::protocol::T_LIST, 3);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->excludedNodes)).size()));
+    std::vector<TDatanodeID> ::const_iterator _iter80;
+    for (_iter80 = (*(this->excludedNodes)).begin(); _iter80 != (*(this->excludedNodes)).end(); ++_iter80)
+    {
+      xfer += (*_iter80).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("favouredNodes", ::apache::thrift::protocol::T_LIST, 4);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->favouredNodes)).size()));
+    std::vector<TDatanodeID> ::const_iterator _iter81;
+    for (_iter81 = (*(this->favouredNodes)).begin(); _iter81 != (*(this->favouredNodes)).end(); ++_iter81)
+    {
+      xfer += (*_iter81).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addFirstBlock_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->success.read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addFirstBlock_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_addFirstBlock_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+    xfer += this->success.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_addFirstBlock_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += (*(this->success)).read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_complete_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->pathname.read(iprot);
+          this->__isset.pathname = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->clientName);
+          this->__isset.clientName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->fileLen);
+          this->__isset.fileLen = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->lastBlock.read(iprot);
+          this->__isset.lastBlock = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_complete_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_complete_args");
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->pathname.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->clientName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("fileLen", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64(this->fileLen);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("lastBlock", ::apache::thrift::protocol::T_STRUCT, 4);
+  xfer += this->lastBlock.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_complete_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_complete_pargs");
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->pathname)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("clientName", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->clientName)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("fileLen", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64((*(this->fileLen)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("lastBlock", ::apache::thrift::protocol::T_STRUCT, 4);
+  xfer += (*(this->lastBlock)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_complete_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_complete_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ThriftHadoopFileSystem_complete_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeBool(this->success);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ouch) {
+    xfer += oprot->writeFieldBegin("ouch", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ouch.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ThriftHadoopFileSystem_complete_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ouch.read(iprot);
+          this->__isset.ouch = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+void ThriftHadoopFileSystemClient::setInactivityTimeoutPeriod(const int64_t periodInSeconds)
+{
+  send_setInactivityTimeoutPeriod(periodInSeconds);
+  recv_setInactivityTimeoutPeriod();
+}
+
+void ThriftHadoopFileSystemClient::send_setInactivityTimeoutPeriod(const int64_t periodInSeconds)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("setInactivityTimeoutPeriod", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_setInactivityTimeoutPeriod_pargs args;
+  args.periodInSeconds = &periodInSeconds;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_setInactivityTimeoutPeriod()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("setInactivityTimeoutPeriod") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_setInactivityTimeoutPeriod_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  return;
+}
+
+void ThriftHadoopFileSystemClient::shutdown(const int32_t status)
+{
+  send_shutdown(status);
+  recv_shutdown();
+}
+
+void ThriftHadoopFileSystemClient::send_shutdown(const int32_t status)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("shutdown", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_shutdown_pargs args;
+  args.status = &status;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_shutdown()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("shutdown") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_shutdown_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  return;
+}
+
+void ThriftHadoopFileSystemClient::create(ThriftHandle& _return, const Pathname& path)
+{
+  send_create(path);
+  recv_create(_return);
+}
+
+void ThriftHadoopFileSystemClient::send_create(const Pathname& path)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("create", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_create_pargs args;
+  args.path = &path;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_create(ThriftHandle& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("create") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_create_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "create failed: unknown result");
+}
+
+void ThriftHadoopFileSystemClient::createFile(ThriftHandle& _return, const Pathname& path, const int16_t mode, const bool overwrite, const int32_t bufferSize, const int16_t block_replication, const int64_t blocksize)
+{
+  send_createFile(path, mode, overwrite, bufferSize, block_replication, blocksize);
+  recv_createFile(_return);
+}
+
+void ThriftHadoopFileSystemClient::send_createFile(const Pathname& path, const int16_t mode, const bool overwrite, const int32_t bufferSize, const int16_t block_replication, const int64_t blocksize)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("createFile", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_createFile_pargs args;
+  args.path = &path;
+  args.mode = &mode;
+  args.overwrite = &overwrite;
+  args.bufferSize = &bufferSize;
+  args.block_replication = &block_replication;
+  args.blocksize = &blocksize;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_createFile(ThriftHandle& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("createFile") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_createFile_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "createFile failed: unknown result");
+}
+
+void ThriftHadoopFileSystemClient::open(ThriftHandle& _return, const Pathname& path)
+{
+  send_open(path);
+  recv_open(_return);
+}
+
+void ThriftHadoopFileSystemClient::send_open(const Pathname& path)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("open", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_open_pargs args;
+  args.path = &path;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_open(ThriftHandle& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("open") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_open_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "open failed: unknown result");
+}
+
+void ThriftHadoopFileSystemClient::append(ThriftHandle& _return, const Pathname& path)
+{
+  send_append(path);
+  recv_append(_return);
+}
+
+void ThriftHadoopFileSystemClient::send_append(const Pathname& path)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("append", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_append_pargs args;
+  args.path = &path;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_append(ThriftHandle& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("append") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_append_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "append failed: unknown result");
+}
+
+bool ThriftHadoopFileSystemClient::write(const ThriftHandle& handle, const std::string& data)
+{
+  send_write(handle, data);
+  return recv_write();
+}
+
+void ThriftHadoopFileSystemClient::send_write(const ThriftHandle& handle, const std::string& data)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("write", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_write_pargs args;
+  args.handle = &handle;
+  args.data = &data;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+bool ThriftHadoopFileSystemClient::recv_write()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("write") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  bool _return;
+  ThriftHadoopFileSystem_write_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "write failed: unknown result");
+}
+
+void ThriftHadoopFileSystemClient::read(std::string& _return, const ThriftHandle& handle, const int64_t offset, const int32_t size)
+{
+  send_read(handle, offset, size);
+  recv_read(_return);
+}
+
+void ThriftHadoopFileSystemClient::send_read(const ThriftHandle& handle, const int64_t offset, const int32_t size)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("read", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_read_pargs args;
+  args.handle = &handle;
+  args.offset = &offset;
+  args.size = &size;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_read(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("read") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_read_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "read failed: unknown result");
+}
+
+bool ThriftHadoopFileSystemClient::close(const ThriftHandle& out)
+{
+  send_close(out);
+  return recv_close();
+}
+
+void ThriftHadoopFileSystemClient::send_close(const ThriftHandle& out)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("close", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_close_pargs args;
+  args.out = &out;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+bool ThriftHadoopFileSystemClient::recv_close()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("close") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  bool _return;
+  ThriftHadoopFileSystem_close_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "close failed: unknown result");
+}
+
+bool ThriftHadoopFileSystemClient::rm(const Pathname& path, const bool recursive)
+{
+  send_rm(path, recursive);
+  return recv_rm();
+}
+
+void ThriftHadoopFileSystemClient::send_rm(const Pathname& path, const bool recursive)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("rm", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_rm_pargs args;
+  args.path = &path;
+  args.recursive = &recursive;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+bool ThriftHadoopFileSystemClient::recv_rm()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("rm") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  bool _return;
+  ThriftHadoopFileSystem_rm_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "rm failed: unknown result");
+}
+
+bool ThriftHadoopFileSystemClient::rename(const Pathname& path, const Pathname& dest)
+{
+  send_rename(path, dest);
+  return recv_rename();
+}
+
+void ThriftHadoopFileSystemClient::send_rename(const Pathname& path, const Pathname& dest)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("rename", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_rename_pargs args;
+  args.path = &path;
+  args.dest = &dest;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+bool ThriftHadoopFileSystemClient::recv_rename()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("rename") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  bool _return;
+  ThriftHadoopFileSystem_rename_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "rename failed: unknown result");
+}
+
+bool ThriftHadoopFileSystemClient::mkdirs(const Pathname& path)
+{
+  send_mkdirs(path);
+  return recv_mkdirs();
+}
+
+void ThriftHadoopFileSystemClient::send_mkdirs(const Pathname& path)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("mkdirs", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_mkdirs_pargs args;
+  args.path = &path;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+bool ThriftHadoopFileSystemClient::recv_mkdirs()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("mkdirs") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  bool _return;
+  ThriftHadoopFileSystem_mkdirs_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "mkdirs failed: unknown result");
+}
+
+bool ThriftHadoopFileSystemClient::exists(const Pathname& path)
+{
+  send_exists(path);
+  return recv_exists();
+}
+
+void ThriftHadoopFileSystemClient::send_exists(const Pathname& path)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("exists", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_exists_pargs args;
+  args.path = &path;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+bool ThriftHadoopFileSystemClient::recv_exists()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("exists") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  bool _return;
+  ThriftHadoopFileSystem_exists_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "exists failed: unknown result");
+}
+
+void ThriftHadoopFileSystemClient::stat(FileStatus& _return, const Pathname& path)
+{
+  send_stat(path);
+  recv_stat(_return);
+}
+
+void ThriftHadoopFileSystemClient::send_stat(const Pathname& path)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("stat", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_stat_pargs args;
+  args.path = &path;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_stat(FileStatus& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("stat") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_stat_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "stat failed: unknown result");
+}
+
+void ThriftHadoopFileSystemClient::listStatus(std::vector<FileStatus> & _return, const Pathname& path)
+{
+  send_listStatus(path);
+  recv_listStatus(_return);
+}
+
+void ThriftHadoopFileSystemClient::send_listStatus(const Pathname& path)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("listStatus", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_listStatus_pargs args;
+  args.path = &path;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_listStatus(std::vector<FileStatus> & _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("listStatus") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_listStatus_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "listStatus failed: unknown result");
+}
+
+void ThriftHadoopFileSystemClient::chmod(const Pathname& path, const int16_t mode)
+{
+  send_chmod(path, mode);
+  recv_chmod();
+}
+
+void ThriftHadoopFileSystemClient::send_chmod(const Pathname& path, const int16_t mode)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("chmod", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_chmod_pargs args;
+  args.path = &path;
+  args.mode = &mode;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_chmod()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("chmod") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_chmod_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  return;
+}
+
+void ThriftHadoopFileSystemClient::chown(const Pathname& path, const std::string& owner, const std::string& group)
+{
+  send_chown(path, owner, group);
+  recv_chown();
+}
+
+void ThriftHadoopFileSystemClient::send_chown(const Pathname& path, const std::string& owner, const std::string& group)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("chown", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_chown_pargs args;
+  args.path = &path;
+  args.owner = &owner;
+  args.group = &group;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_chown()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("chown") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_chown_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  return;
+}
+
+void ThriftHadoopFileSystemClient::setReplication(const Pathname& path, const int16_t replication)
+{
+  send_setReplication(path, replication);
+  recv_setReplication();
+}
+
+void ThriftHadoopFileSystemClient::send_setReplication(const Pathname& path, const int16_t replication)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("setReplication", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_setReplication_pargs args;
+  args.path = &path;
+  args.replication = &replication;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_setReplication()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("setReplication") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_setReplication_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  return;
+}
+
+void ThriftHadoopFileSystemClient::getFileBlockLocations(std::vector<BlockLocation> & _return, const Pathname& path, const int64_t start, const int64_t length)
+{
+  send_getFileBlockLocations(path, start, length);
+  recv_getFileBlockLocations(_return);
+}
+
+void ThriftHadoopFileSystemClient::send_getFileBlockLocations(const Pathname& path, const int64_t start, const int64_t length)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getFileBlockLocations", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_getFileBlockLocations_pargs args;
+  args.path = &path;
+  args.start = &start;
+  args.length = &length;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_getFileBlockLocations(std::vector<BlockLocation> & _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("createFile") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("getFileBlockLocations") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  ThriftHadoopFileSystem_createFile_presult result;
+  ThriftHadoopFileSystem_getFileBlockLocations_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -3773,185 +7106,231 @@ void ThriftHadoopFileSystemClient::recv_createFile(ThriftHandle& _return)
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "createFile failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getFileBlockLocations failed: unknown result");
 }
 
-void ThriftHadoopFileSystemClient::open(ThriftHandle& _return, const Pathname& path)
+bool ThriftHadoopFileSystemClient::hardLink(const Pathname& src, const Pathname& dest)
 {
-  send_open(path);
-  recv_open(_return);
+  send_hardLink(src, dest);
+  return recv_hardLink();
 }
 
-void ThriftHadoopFileSystemClient::send_open(const Pathname& path)
+void ThriftHadoopFileSystemClient::send_hardLink(const Pathname& src, const Pathname& dest)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("open", facebook::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("hardLink", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ThriftHadoopFileSystem_open_pargs args;
-  args.path = &path;
+  ThriftHadoopFileSystem_hardLink_pargs args;
+  args.src = &src;
+  args.dest = &dest;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-void ThriftHadoopFileSystemClient::recv_open(ThriftHandle& _return)
+bool ThriftHadoopFileSystemClient::recv_hardLink()
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("open") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("hardLink") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  ThriftHadoopFileSystem_open_presult result;
+  bool _return;
+  ThriftHadoopFileSystem_hardLink_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
   iprot_->getTransport()->readEnd();
 
   if (result.__isset.success) {
-    // _return pointer has now been filled
-    return;
+    return _return;
   }
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "open failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "hardLink failed: unknown result");
 }
 
-void ThriftHadoopFileSystemClient::append(ThriftHandle& _return, const Pathname& path)
+void ThriftHadoopFileSystemClient::concat(const Pathname& target, const std::vector<Pathname> & srcs, const bool restricted)
 {
-  send_append(path);
-  recv_append(_return);
+  send_concat(target, srcs, restricted);
+  recv_concat();
 }
 
-void ThriftHadoopFileSystemClient::send_append(const Pathname& path)
+void ThriftHadoopFileSystemClient::send_concat(const Pathname& target, const std::vector<Pathname> & srcs, const bool restricted)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("append", facebook::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("concat", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ThriftHadoopFileSystem_append_pargs args;
-  args.path = &path;
+  ThriftHadoopFileSystem_concat_pargs args;
+  args.target = &target;
+  args.srcs = &srcs;
+  args.restricted = &restricted;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-void ThriftHadoopFileSystemClient::recv_append(ThriftHandle& _return)
+void ThriftHadoopFileSystemClient::recv_concat()
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("append") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("concat") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  ThriftHadoopFileSystem_append_presult result;
-  result.success = &_return;
+  ThriftHadoopFileSystem_concat_presult result;
   result.read(iprot_);
   iprot_->readMessageEnd();
   iprot_->getTransport()->readEnd();
 
-  if (result.__isset.success) {
-    // _return pointer has now been filled
-    return;
-  }
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "append failed: unknown result");
+  return;
 }
 
-bool ThriftHadoopFileSystemClient::write(const ThriftHandle& handle, const std::string& data)
+void ThriftHadoopFileSystemClient::reportBadBlocks(const std::vector<TLocatedBlock> & blocks)
 {
-  send_write(handle, data);
-  return recv_write();
+  send_reportBadBlocks(blocks);
+  recv_reportBadBlocks();
 }
 
-void ThriftHadoopFileSystemClient::send_write(const ThriftHandle& handle, const std::string& data)
+void ThriftHadoopFileSystemClient::send_reportBadBlocks(const std::vector<TLocatedBlock> & blocks)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("write", facebook::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("reportBadBlocks", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ThriftHadoopFileSystem_write_pargs args;
-  args.handle = &handle;
-  args.data = &data;
+  ThriftHadoopFileSystem_reportBadBlocks_pargs args;
+  args.blocks = &blocks;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
   oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_reportBadBlocks()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("reportBadBlocks") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_reportBadBlocks_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  return;
+}
+
+int32_t ThriftHadoopFileSystemClient::getDataTransferProtocolVersion()
+{
+  send_getDataTransferProtocolVersion();
+  return recv_getDataTransferProtocolVersion();
+}
+
+void ThriftHadoopFileSystemClient::send_getDataTransferProtocolVersion()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getDataTransferProtocolVersion", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_getDataTransferProtocolVersion_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-bool ThriftHadoopFileSystemClient::recv_write()
+int32_t ThriftHadoopFileSystemClient::recv_getDataTransferProtocolVersion()
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("write") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("getDataTransferProtocolVersion") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  bool _return;
-  ThriftHadoopFileSystem_write_presult result;
+  int32_t _return;
+  ThriftHadoopFileSystem_getDataTransferProtocolVersion_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -3963,377 +7342,475 @@ bool ThriftHadoopFileSystemClient::recv_write()
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "write failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getDataTransferProtocolVersion failed: unknown result");
 }
 
-void ThriftHadoopFileSystemClient::read(std::string& _return, const ThriftHandle& handle, const int64_t offset, const int32_t size)
+void ThriftHadoopFileSystemClient::renewLease(const std::string& clientName)
 {
-  send_read(handle, offset, size);
-  recv_read(_return);
+  send_renewLease(clientName);
+  recv_renewLease();
 }
 
-void ThriftHadoopFileSystemClient::send_read(const ThriftHandle& handle, const int64_t offset, const int32_t size)
+void ThriftHadoopFileSystemClient::send_renewLease(const std::string& clientName)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("read", facebook::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("renewLease", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ThriftHadoopFileSystem_read_pargs args;
-  args.handle = &handle;
-  args.offset = &offset;
-  args.size = &size;
+  ThriftHadoopFileSystem_renewLease_pargs args;
+  args.clientName = &clientName;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-void ThriftHadoopFileSystemClient::recv_read(std::string& _return)
+void ThriftHadoopFileSystemClient::recv_renewLease()
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("read") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("renewLease") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  ThriftHadoopFileSystem_read_presult result;
-  result.success = &_return;
+  ThriftHadoopFileSystem_renewLease_presult result;
   result.read(iprot_);
   iprot_->readMessageEnd();
   iprot_->getTransport()->readEnd();
 
-  if (result.__isset.success) {
-    // _return pointer has now been filled
-    return;
-  }
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "read failed: unknown result");
+  return;
 }
 
-bool ThriftHadoopFileSystemClient::close(const ThriftHandle& out)
+void ThriftHadoopFileSystemClient::recoverLease(const Pathname& path, const std::string& clientName)
 {
-  send_close(out);
-  return recv_close();
+  send_recoverLease(path, clientName);
+  recv_recoverLease();
 }
 
-void ThriftHadoopFileSystemClient::send_close(const ThriftHandle& out)
+void ThriftHadoopFileSystemClient::send_recoverLease(const Pathname& path, const std::string& clientName)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("close", facebook::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("recoverLease", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ThriftHadoopFileSystem_close_pargs args;
-  args.out = &out;
+  ThriftHadoopFileSystem_recoverLease_pargs args;
+  args.path = &path;
+  args.clientName = &clientName;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-bool ThriftHadoopFileSystemClient::recv_close()
+void ThriftHadoopFileSystemClient::recv_recoverLease()
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("close") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("recoverLease") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  bool _return;
-  ThriftHadoopFileSystem_close_presult result;
-  result.success = &_return;
+  ThriftHadoopFileSystem_recoverLease_presult result;
   result.read(iprot_);
   iprot_->readMessageEnd();
   iprot_->getTransport()->readEnd();
 
-  if (result.__isset.success) {
-    return _return;
-  }
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "close failed: unknown result");
+  return;
 }
 
-bool ThriftHadoopFileSystemClient::rm(const Pathname& path, const bool recursive)
+void ThriftHadoopFileSystemClient::closeRecoverLease(const Pathname& path, const std::string& clientName, const bool discardLastBlock)
 {
-  send_rm(path, recursive);
-  return recv_rm();
+  send_closeRecoverLease(path, clientName, discardLastBlock);
+  recv_closeRecoverLease();
 }
 
-void ThriftHadoopFileSystemClient::send_rm(const Pathname& path, const bool recursive)
+void ThriftHadoopFileSystemClient::send_closeRecoverLease(const Pathname& path, const std::string& clientName, const bool discardLastBlock)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("rm", facebook::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("closeRecoverLease", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ThriftHadoopFileSystem_rm_pargs args;
+  ThriftHadoopFileSystem_closeRecoverLease_pargs args;
   args.path = &path;
-  args.recursive = &recursive;
+  args.clientName = &clientName;
+  args.discardLastBlock = &discardLastBlock;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_closeRecoverLease()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("closeRecoverLease") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_closeRecoverLease_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  return;
+}
+
+void ThriftHadoopFileSystemClient::abandonBlock(const TBlock& block, const Pathname& pathname, const std::string& clientName)
+{
+  send_abandonBlock(block, pathname, clientName);
+  recv_abandonBlock();
+}
+
+void ThriftHadoopFileSystemClient::send_abandonBlock(const TBlock& block, const Pathname& pathname, const std::string& clientName)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("abandonBlock", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_abandonBlock_pargs args;
+  args.block = &block;
+  args.pathname = &pathname;
+  args.clientName = &clientName;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
   oprot_->getTransport()->flush();
+}
+
+void ThriftHadoopFileSystemClient::recv_abandonBlock()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("abandonBlock") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ThriftHadoopFileSystem_abandonBlock_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.ouch) {
+    throw result.ouch;
+  }
+  return;
+}
+
+void ThriftHadoopFileSystemClient::abandonFile(const Pathname& pathname, const std::string& clientName)
+{
+  send_abandonFile(pathname, clientName);
+  recv_abandonFile();
+}
+
+void ThriftHadoopFileSystemClient::send_abandonFile(const Pathname& pathname, const std::string& clientName)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("abandonFile", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_abandonFile_pargs args;
+  args.pathname = &pathname;
+  args.clientName = &clientName;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-bool ThriftHadoopFileSystemClient::recv_rm()
+void ThriftHadoopFileSystemClient::recv_abandonFile()
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("rm") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("abandonFile") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  bool _return;
-  ThriftHadoopFileSystem_rm_presult result;
-  result.success = &_return;
+  ThriftHadoopFileSystem_abandonFile_presult result;
   result.read(iprot_);
   iprot_->readMessageEnd();
   iprot_->getTransport()->readEnd();
 
-  if (result.__isset.success) {
-    return _return;
-  }
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "rm failed: unknown result");
+  return;
 }
 
-bool ThriftHadoopFileSystemClient::rename(const Pathname& path, const Pathname& dest)
+void ThriftHadoopFileSystemClient::addBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const int64_t startOffset, const TBlock& lastBlock, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes)
 {
-  send_rename(path, dest);
-  return recv_rename();
+  send_addBlock(pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes);
+  recv_addBlock(_return);
 }
 
-void ThriftHadoopFileSystemClient::send_rename(const Pathname& path, const Pathname& dest)
+void ThriftHadoopFileSystemClient::send_addBlock(const Pathname& pathname, const std::string& clientName, const int64_t startOffset, const TBlock& lastBlock, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("rename", facebook::thrift::protocol::T_CALL, cseqid);
-
-  ThriftHadoopFileSystem_rename_pargs args;
-  args.path = &path;
-  args.dest = &dest;
+  oprot_->writeMessageBegin("addBlock", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ThriftHadoopFileSystem_addBlock_pargs args;
+  args.pathname = &pathname;
+  args.clientName = &clientName;
+  args.startOffset = &startOffset;
+  args.lastBlock = &lastBlock;
+  args.excludedNodes = &excludedNodes;
+  args.favouredNodes = &favouredNodes;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-bool ThriftHadoopFileSystemClient::recv_rename()
+void ThriftHadoopFileSystemClient::recv_addBlock(TLocatedBlock& _return)
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("rename") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("addBlock") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  bool _return;
-  ThriftHadoopFileSystem_rename_presult result;
+  ThriftHadoopFileSystem_addBlock_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
   iprot_->getTransport()->readEnd();
 
   if (result.__isset.success) {
-    return _return;
+    // _return pointer has now been filled
+    return;
   }
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "rename failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addBlock failed: unknown result");
 }
 
-bool ThriftHadoopFileSystemClient::mkdirs(const Pathname& path)
+void ThriftHadoopFileSystemClient::addFirstBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes)
 {
-  send_mkdirs(path);
-  return recv_mkdirs();
+  send_addFirstBlock(pathname, clientName, excludedNodes, favouredNodes);
+  recv_addFirstBlock(_return);
 }
 
-void ThriftHadoopFileSystemClient::send_mkdirs(const Pathname& path)
+void ThriftHadoopFileSystemClient::send_addFirstBlock(const Pathname& pathname, const std::string& clientName, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("mkdirs", facebook::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("addFirstBlock", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ThriftHadoopFileSystem_mkdirs_pargs args;
-  args.path = &path;
+  ThriftHadoopFileSystem_addFirstBlock_pargs args;
+  args.pathname = &pathname;
+  args.clientName = &clientName;
+  args.excludedNodes = &excludedNodes;
+  args.favouredNodes = &favouredNodes;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-bool ThriftHadoopFileSystemClient::recv_mkdirs()
+void ThriftHadoopFileSystemClient::recv_addFirstBlock(TLocatedBlock& _return)
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("mkdirs") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("addFirstBlock") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
-  bool _return;
-  ThriftHadoopFileSystem_mkdirs_presult result;
+  ThriftHadoopFileSystem_addFirstBlock_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
   iprot_->getTransport()->readEnd();
 
   if (result.__isset.success) {
-    return _return;
+    // _return pointer has now been filled
+    return;
   }
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "mkdirs failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addFirstBlock failed: unknown result");
 }
 
-bool ThriftHadoopFileSystemClient::exists(const Pathname& path)
+bool ThriftHadoopFileSystemClient::complete(const Pathname& pathname, const std::string& clientName, const int64_t fileLen, const TBlock& lastBlock)
 {
-  send_exists(path);
-  return recv_exists();
+  send_complete(pathname, clientName, fileLen, lastBlock);
+  return recv_complete();
 }
 
-void ThriftHadoopFileSystemClient::send_exists(const Pathname& path)
+void ThriftHadoopFileSystemClient::send_complete(const Pathname& pathname, const std::string& clientName, const int64_t fileLen, const TBlock& lastBlock)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("exists", facebook::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("complete", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ThriftHadoopFileSystem_exists_pargs args;
-  args.path = &path;
+  ThriftHadoopFileSystem_complete_pargs args;
+  args.pathname = &pathname;
+  args.clientName = &clientName;
+  args.fileLen = &fileLen;
+  args.lastBlock = &lastBlock;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
   oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
 }
 
-bool ThriftHadoopFileSystemClient::recv_exists()
+bool ThriftHadoopFileSystemClient::recv_complete()
 {
 
   int32_t rseqid = 0;
   std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TMessageType mtype;
 
   iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
     x.read(iprot_);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
     throw x;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
   }
-  if (fname.compare("exists") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
+  if (fname.compare("complete") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
   }
   bool _return;
-  ThriftHadoopFileSystem_exists_presult result;
+  ThriftHadoopFileSystem_complete_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -4345,999 +7822,1801 @@ bool ThriftHadoopFileSystemClient::recv_exists()
   if (result.__isset.ouch) {
     throw result.ouch;
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "exists failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "complete failed: unknown result");
 }
 
-void ThriftHadoopFileSystemClient::stat(FileStatus& _return, const Pathname& path)
+bool ThriftHadoopFileSystemProcessor::process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* callContext) {
+
+  ::apache::thrift::protocol::TProtocol* iprot = piprot.get();
+  ::apache::thrift::protocol::TProtocol* oprot = poprot.get();
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+  int32_t seqid;
+
+  iprot->readMessageBegin(fname, mtype, seqid);
+
+  if (mtype != ::apache::thrift::protocol::T_CALL && mtype != ::apache::thrift::protocol::T_ONEWAY) {
+    iprot->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot->readMessageEnd();
+    iprot->getTransport()->readEnd();
+    ::apache::thrift::TApplicationException x(::apache::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
+    oprot->writeMessageBegin(fname, ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return false;
+  }
+
+  return process_fn(iprot, oprot, fname, seqid, callContext);
+}
+
+bool ThriftHadoopFileSystemProcessor::process_fn(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, std::string& fname, int32_t seqid, void* callContext) {
+  std::map<std::string, void (ThriftHadoopFileSystemProcessor::*)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*)>::iterator pfn;
+  pfn = processMap_.find(fname);
+  if (pfn == processMap_.end()) {
+    iprot->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot->readMessageEnd();
+    iprot->getTransport()->readEnd();
+    ::apache::thrift::TApplicationException x(::apache::thrift::TApplicationException::UNKNOWN_METHOD, "Invalid method name: '"+fname+"'");
+    oprot->writeMessageBegin(fname, ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return false;
+  }
+  (this->*(pfn->second))(seqid, iprot, oprot, callContext);
+  return true;
+}
+
+void ThriftHadoopFileSystemProcessor::process_setInactivityTimeoutPeriod(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  send_stat(path);
-  recv_stat(_return);
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.setInactivityTimeoutPeriod", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.setInactivityTimeoutPeriod");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.setInactivityTimeoutPeriod");
+  }
+
+  ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.setInactivityTimeoutPeriod", bytes);
+  }
+
+  ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result result;
+  try {
+    iface_->setInactivityTimeoutPeriod(args.periodInSeconds);
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.setInactivityTimeoutPeriod");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("setInactivityTimeoutPeriod", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.setInactivityTimeoutPeriod");
+  }
+
+  oprot->writeMessageBegin("setInactivityTimeoutPeriod", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.setInactivityTimeoutPeriod", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemClient::send_stat(const Pathname& path)
+void ThriftHadoopFileSystemProcessor::process_shutdown(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("stat", facebook::thrift::protocol::T_CALL, cseqid);
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.shutdown", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.shutdown");
 
-  ThriftHadoopFileSystem_stat_pargs args;
-  args.path = &path;
-  args.write(oprot_);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.shutdown");
+  }
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
+  ThriftHadoopFileSystem_shutdown_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.shutdown", bytes);
+  }
+
+  ThriftHadoopFileSystem_shutdown_result result;
+  try {
+    iface_->shutdown(args.status);
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.shutdown");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("shutdown", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.shutdown");
+  }
+
+  oprot->writeMessageBegin("shutdown", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.shutdown", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemClient::recv_stat(FileStatus& _return)
+void ThriftHadoopFileSystemProcessor::process_create(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.create", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.create");
 
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.create");
+  }
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
+  ThriftHadoopFileSystem_create_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.create", bytes);
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
+
+  ThriftHadoopFileSystem_create_result result;
+  try {
+    iface_->create(result.success, args.path);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.create");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("create", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
   }
-  if (fname.compare("stat") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.create");
   }
-  ThriftHadoopFileSystem_stat_presult result;
-  result.success = &_return;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
 
-  if (result.__isset.success) {
-    // _return pointer has now been filled
+  oprot->writeMessageBegin("create", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.create", bytes);
+  }
+}
+
+void ThriftHadoopFileSystemProcessor::process_createFile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.createFile", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.createFile");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.createFile");
+  }
+
+  ThriftHadoopFileSystem_createFile_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.createFile", bytes);
+  }
+
+  ThriftHadoopFileSystem_createFile_result result;
+  try {
+    iface_->createFile(result.success, args.path, args.mode, args.overwrite, args.bufferSize, args.block_replication, args.blocksize);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.createFile");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("createFile", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.createFile");
+  }
+
+  oprot->writeMessageBegin("createFile", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.createFile", bytes);
+  }
+}
+
+void ThriftHadoopFileSystemProcessor::process_open(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.open", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.open");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.open");
+  }
+
+  ThriftHadoopFileSystem_open_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.open", bytes);
+  }
+
+  ThriftHadoopFileSystem_open_result result;
+  try {
+    iface_->open(result.success, args.path);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.open");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("open", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
-  if (result.__isset.ouch) {
-    throw result.ouch;
-  }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "stat failed: unknown result");
-}
-
-void ThriftHadoopFileSystemClient::listStatus(std::vector<FileStatus> & _return, const Pathname& path)
-{
-  send_listStatus(path);
-  recv_listStatus(_return);
-}
 
-void ThriftHadoopFileSystemClient::send_listStatus(const Pathname& path)
-{
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("listStatus", facebook::thrift::protocol::T_CALL, cseqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.open");
+  }
 
-  ThriftHadoopFileSystem_listStatus_pargs args;
-  args.path = &path;
-  args.write(oprot_);
+  oprot->writeMessageBegin("open", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.open", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemClient::recv_listStatus(std::vector<FileStatus> & _return)
+void ThriftHadoopFileSystemProcessor::process_append(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
-
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.append", callContext);
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.append");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.append");
   }
-  if (fname.compare("listStatus") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
+
+  ThriftHadoopFileSystem_append_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.append", bytes);
   }
-  ThriftHadoopFileSystem_listStatus_presult result;
-  result.success = &_return;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
 
-  if (result.__isset.success) {
-    // _return pointer has now been filled
+  ThriftHadoopFileSystem_append_result result;
+  try {
+    iface_->append(result.success, args.path);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.append");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("append", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
-  if (result.__isset.ouch) {
-    throw result.ouch;
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.append");
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "listStatus failed: unknown result");
-}
 
-void ThriftHadoopFileSystemClient::chmod(const Pathname& path, const int16_t mode)
-{
-  send_chmod(path, mode);
-  recv_chmod();
+  oprot->writeMessageBegin("append", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.append", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemClient::send_chmod(const Pathname& path, const int16_t mode)
+void ThriftHadoopFileSystemProcessor::process_write(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("chmod", facebook::thrift::protocol::T_CALL, cseqid);
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.write", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.write");
 
-  ThriftHadoopFileSystem_chmod_pargs args;
-  args.path = &path;
-  args.mode = &mode;
-  args.write(oprot_);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.write");
+  }
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
-}
+  ThriftHadoopFileSystem_write_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-void ThriftHadoopFileSystemClient::recv_chmod()
-{
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.write", bytes);
+  }
 
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ThriftHadoopFileSystem_write_result result;
+  try {
+    result.success = iface_->write(args.handle, args.data);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.write");
+    }
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
-  }
-  if (fname.compare("chmod") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("write", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
   }
-  ThriftHadoopFileSystem_chmod_presult result;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
 
-  if (result.__isset.ouch) {
-    throw result.ouch;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.write");
   }
-  return;
-}
 
-void ThriftHadoopFileSystemClient::chown(const Pathname& path, const std::string& owner, const std::string& group)
-{
-  send_chown(path, owner, group);
-  recv_chown();
+  oprot->writeMessageBegin("write", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.write", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemClient::send_chown(const Pathname& path, const std::string& owner, const std::string& group)
+void ThriftHadoopFileSystemProcessor::process_read(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("chown", facebook::thrift::protocol::T_CALL, cseqid);
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.read", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.read");
 
-  ThriftHadoopFileSystem_chown_pargs args;
-  args.path = &path;
-  args.owner = &owner;
-  args.group = &group;
-  args.write(oprot_);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.read");
+  }
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
-}
+  ThriftHadoopFileSystem_read_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-void ThriftHadoopFileSystemClient::recv_chown()
-{
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.read", bytes);
+  }
 
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ThriftHadoopFileSystem_read_result result;
+  try {
+    iface_->read(result.success, args.handle, args.offset, args.size);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.read");
+    }
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
-  }
-  if (fname.compare("chown") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("read", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
   }
-  ThriftHadoopFileSystem_chown_presult result;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
 
-  if (result.__isset.ouch) {
-    throw result.ouch;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.read");
   }
-  return;
-}
 
-void ThriftHadoopFileSystemClient::setReplication(const Pathname& path, const int16_t replication)
-{
-  send_setReplication(path, replication);
-  recv_setReplication();
+  oprot->writeMessageBegin("read", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.read", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemClient::send_setReplication(const Pathname& path, const int16_t replication)
+void ThriftHadoopFileSystemProcessor::process_close(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("setReplication", facebook::thrift::protocol::T_CALL, cseqid);
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.close", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.close");
 
-  ThriftHadoopFileSystem_setReplication_pargs args;
-  args.path = &path;
-  args.replication = &replication;
-  args.write(oprot_);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.close");
+  }
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
-}
+  ThriftHadoopFileSystem_close_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-void ThriftHadoopFileSystemClient::recv_setReplication()
-{
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.close", bytes);
+  }
 
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ThriftHadoopFileSystem_close_result result;
+  try {
+    result.success = iface_->close(args.out);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.close");
+    }
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
-  }
-  if (fname.compare("setReplication") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("close", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
   }
-  ThriftHadoopFileSystem_setReplication_presult result;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
 
-  if (result.__isset.ouch) {
-    throw result.ouch;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.close");
   }
-  return;
-}
 
-void ThriftHadoopFileSystemClient::getFileBlockLocations(std::vector<BlockLocation> & _return, const Pathname& path, const int64_t start, const int64_t length)
-{
-  send_getFileBlockLocations(path, start, length);
-  recv_getFileBlockLocations(_return);
+  oprot->writeMessageBegin("close", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.close", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemClient::send_getFileBlockLocations(const Pathname& path, const int64_t start, const int64_t length)
+void ThriftHadoopFileSystemProcessor::process_rm(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("getFileBlockLocations", facebook::thrift::protocol::T_CALL, cseqid);
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.rm", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.rm");
 
-  ThriftHadoopFileSystem_getFileBlockLocations_pargs args;
-  args.path = &path;
-  args.start = &start;
-  args.length = &length;
-  args.write(oprot_);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.rm");
+  }
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
-}
+  ThriftHadoopFileSystem_rm_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-void ThriftHadoopFileSystemClient::recv_getFileBlockLocations(std::vector<BlockLocation> & _return)
-{
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.rm", bytes);
+  }
 
-  int32_t rseqid = 0;
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
+  ThriftHadoopFileSystem_rm_result result;
+  try {
+    result.success = iface_->rm(args.path, args.recursive);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.rm");
+    }
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == facebook::thrift::protocol::T_EXCEPTION) {
-    facebook::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("rm", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
   }
-  if (mtype != facebook::thrift::protocol::T_REPLY) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.rm");
   }
-  if (fname.compare("getFileBlockLocations") != 0) {
-    iprot_->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::WRONG_METHOD_NAME);
+
+  oprot->writeMessageBegin("rm", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.rm", bytes);
   }
-  ThriftHadoopFileSystem_getFileBlockLocations_presult result;
-  result.success = &_return;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
+}
 
-  if (result.__isset.success) {
-    // _return pointer has now been filled
-    return;
+void ThriftHadoopFileSystemProcessor::process_rename(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.rename", callContext);
   }
-  if (result.__isset.ouch) {
-    throw result.ouch;
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.rename");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.rename");
   }
-  throw facebook::thrift::TApplicationException(facebook::thrift::TApplicationException::MISSING_RESULT, "getFileBlockLocations failed: unknown result");
-}
 
-bool ThriftHadoopFileSystemProcessor::process(boost::shared_ptr<facebook::thrift::protocol::TProtocol> piprot, boost::shared_ptr<facebook::thrift::protocol::TProtocol> poprot) {
+  ThriftHadoopFileSystem_rename_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  facebook::thrift::protocol::TProtocol* iprot = piprot.get();
-  facebook::thrift::protocol::TProtocol* oprot = poprot.get();
-  std::string fname;
-  facebook::thrift::protocol::TMessageType mtype;
-  int32_t seqid;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.rename", bytes);
+  }
 
-  iprot->readMessageBegin(fname, mtype, seqid);
+  ThriftHadoopFileSystem_rename_result result;
+  try {
+    result.success = iface_->rename(args.path, args.dest);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.rename");
+    }
 
-  if (mtype != facebook::thrift::protocol::T_CALL) {
-    iprot->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot->readMessageEnd();
-    iprot->getTransport()->readEnd();
-    facebook::thrift::TApplicationException x(facebook::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
-    oprot->writeMessageBegin(fname, facebook::thrift::protocol::T_EXCEPTION, seqid);
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("rename", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
-    return true;
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.rename");
   }
 
-  return process_fn(iprot, oprot, fname, seqid);
+  oprot->writeMessageBegin("rename", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.rename", bytes);
+  }
 }
 
-bool ThriftHadoopFileSystemProcessor::process_fn(facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot, std::string& fname, int32_t seqid) {
-  std::map<std::string, void (ThriftHadoopFileSystemProcessor::*)(int32_t, facebook::thrift::protocol::TProtocol*, facebook::thrift::protocol::TProtocol*)>::iterator pfn;
-  pfn = processMap_.find(fname);
-  if (pfn == processMap_.end()) {
-    iprot->skip(facebook::thrift::protocol::T_STRUCT);
-    iprot->readMessageEnd();
-    iprot->getTransport()->readEnd();
-    facebook::thrift::TApplicationException x(facebook::thrift::TApplicationException::UNKNOWN_METHOD, "Invalid method name: '"+fname+"'");
-    oprot->writeMessageBegin(fname, facebook::thrift::protocol::T_EXCEPTION, seqid);
+void ThriftHadoopFileSystemProcessor::process_mkdirs(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.mkdirs", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.mkdirs");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.mkdirs");
+  }
+
+  ThriftHadoopFileSystem_mkdirs_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.mkdirs", bytes);
+  }
+
+  ThriftHadoopFileSystem_mkdirs_result result;
+  try {
+    result.success = iface_->mkdirs(args.path);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
+  } catch (const std::exception& e) {
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.mkdirs");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("mkdirs", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
-    return true;
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.mkdirs");
+  }
+
+  oprot->writeMessageBegin("mkdirs", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.mkdirs", bytes);
   }
-  (this->*(pfn->second))(seqid, iprot, oprot);
-  return true;
 }
 
-void ThriftHadoopFileSystemProcessor::process_setInactivityTimeoutPeriod(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_exists(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.exists", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.exists");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.exists");
+  }
+
+  ThriftHadoopFileSystem_exists_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.exists", bytes);
+  }
+
+  ThriftHadoopFileSystem_exists_result result;
   try {
-    iface_->setInactivityTimeoutPeriod(args.periodInSeconds);
+    result.success = iface_->exists(args.path);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("setInactivityTimeoutPeriod", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.exists");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("exists", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("setInactivityTimeoutPeriod", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.exists");
+  }
+
+  oprot->writeMessageBegin("exists", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.exists", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_shutdown(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_stat(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_shutdown_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.stat", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.stat");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.stat");
+  }
+
+  ThriftHadoopFileSystem_stat_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_shutdown_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.stat", bytes);
+  }
+
+  ThriftHadoopFileSystem_stat_result result;
   try {
-    iface_->shutdown(args.status);
+    iface_->stat(result.success, args.path);
+    result.__isset.success = true;
+  } catch (ThriftIOException &ouch) {
+    result.ouch = ouch;
+    result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("shutdown", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.stat");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("stat", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("shutdown", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.stat");
+  }
+
+  oprot->writeMessageBegin("stat", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.stat", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_create(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_listStatus(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_create_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.listStatus", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.listStatus");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.listStatus");
+  }
+
+  ThriftHadoopFileSystem_listStatus_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_create_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.listStatus", bytes);
+  }
+
+  ThriftHadoopFileSystem_listStatus_result result;
   try {
-    iface_->create(result.success, args.path);
+    iface_->listStatus(result.success, args.path);
     result.__isset.success = true;
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("create", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.listStatus");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("listStatus", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("create", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.listStatus");
+  }
+
+  oprot->writeMessageBegin("listStatus", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.listStatus", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_createFile(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_chmod(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_createFile_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.chmod", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.chmod");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.chmod");
+  }
+
+  ThriftHadoopFileSystem_chmod_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_createFile_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.chmod", bytes);
+  }
+
+  ThriftHadoopFileSystem_chmod_result result;
   try {
-    iface_->createFile(result.success, args.path, args.mode, args.overwrite, args.bufferSize, args.block_replication, args.blocksize);
-    result.__isset.success = true;
+    iface_->chmod(args.path, args.mode);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("createFile", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.chmod");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("chmod", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("createFile", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.chmod");
+  }
+
+  oprot->writeMessageBegin("chmod", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.chmod", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_open(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_chown(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_open_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.chown", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.chown");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.chown");
+  }
+
+  ThriftHadoopFileSystem_chown_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_open_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.chown", bytes);
+  }
+
+  ThriftHadoopFileSystem_chown_result result;
   try {
-    iface_->open(result.success, args.path);
-    result.__isset.success = true;
+    iface_->chown(args.path, args.owner, args.group);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("open", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.chown");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("chown", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("open", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.chown");
+  }
+
+  oprot->writeMessageBegin("chown", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.chown", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_append(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_setReplication(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_append_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.setReplication", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.setReplication");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.setReplication");
+  }
+
+  ThriftHadoopFileSystem_setReplication_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_append_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.setReplication", bytes);
+  }
+
+  ThriftHadoopFileSystem_setReplication_result result;
   try {
-    iface_->append(result.success, args.path);
-    result.__isset.success = true;
+    iface_->setReplication(args.path, args.replication);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("append", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.setReplication");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("setReplication", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("append", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.setReplication");
+  }
+
+  oprot->writeMessageBegin("setReplication", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.setReplication", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_write(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_getFileBlockLocations(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_write_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.getFileBlockLocations", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.getFileBlockLocations");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.getFileBlockLocations");
+  }
+
+  ThriftHadoopFileSystem_getFileBlockLocations_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_write_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.getFileBlockLocations", bytes);
+  }
+
+  ThriftHadoopFileSystem_getFileBlockLocations_result result;
   try {
-    result.success = iface_->write(args.handle, args.data);
+    iface_->getFileBlockLocations(result.success, args.path, args.start, args.length);
     result.__isset.success = true;
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("write", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.getFileBlockLocations");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getFileBlockLocations", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("write", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.getFileBlockLocations");
+  }
+
+  oprot->writeMessageBegin("getFileBlockLocations", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.getFileBlockLocations", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_read(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_hardLink(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_read_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.hardLink", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.hardLink");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.hardLink");
+  }
+
+  ThriftHadoopFileSystem_hardLink_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_read_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.hardLink", bytes);
+  }
+
+  ThriftHadoopFileSystem_hardLink_result result;
   try {
-    iface_->read(result.success, args.handle, args.offset, args.size);
+    result.success = iface_->hardLink(args.src, args.dest);
     result.__isset.success = true;
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("read", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.hardLink");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("hardLink", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("read", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.hardLink");
+  }
+
+  oprot->writeMessageBegin("hardLink", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.hardLink", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_close(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_concat(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_close_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.concat", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.concat");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.concat");
+  }
+
+  ThriftHadoopFileSystem_concat_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_close_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.concat", bytes);
+  }
+
+  ThriftHadoopFileSystem_concat_result result;
   try {
-    result.success = iface_->close(args.out);
-    result.__isset.success = true;
+    iface_->concat(args.target, args.srcs, args.restricted);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("close", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.concat");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("concat", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("close", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.concat");
+  }
+
+  oprot->writeMessageBegin("concat", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.concat", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_rm(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_reportBadBlocks(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_rm_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.reportBadBlocks", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.reportBadBlocks");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.reportBadBlocks");
+  }
+
+  ThriftHadoopFileSystem_reportBadBlocks_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_rm_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.reportBadBlocks", bytes);
+  }
+
+  ThriftHadoopFileSystem_reportBadBlocks_result result;
   try {
-    result.success = iface_->rm(args.path, args.recursive);
-    result.__isset.success = true;
+    iface_->reportBadBlocks(args.blocks);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("rm", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.reportBadBlocks");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("reportBadBlocks", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("rm", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.reportBadBlocks");
+  }
+
+  oprot->writeMessageBegin("reportBadBlocks", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.reportBadBlocks", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_rename(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_getDataTransferProtocolVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_rename_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.getDataTransferProtocolVersion", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.getDataTransferProtocolVersion");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.getDataTransferProtocolVersion");
+  }
+
+  ThriftHadoopFileSystem_getDataTransferProtocolVersion_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_rename_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.getDataTransferProtocolVersion", bytes);
+  }
+
+  ThriftHadoopFileSystem_getDataTransferProtocolVersion_result result;
   try {
-    result.success = iface_->rename(args.path, args.dest);
+    result.success = iface_->getDataTransferProtocolVersion();
     result.__isset.success = true;
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("rename", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.getDataTransferProtocolVersion");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getDataTransferProtocolVersion", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("rename", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.getDataTransferProtocolVersion");
+  }
+
+  oprot->writeMessageBegin("getDataTransferProtocolVersion", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.getDataTransferProtocolVersion", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_mkdirs(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_renewLease(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_mkdirs_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.renewLease", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.renewLease");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.renewLease");
+  }
+
+  ThriftHadoopFileSystem_renewLease_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_mkdirs_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.renewLease", bytes);
+  }
+
+  ThriftHadoopFileSystem_renewLease_result result;
   try {
-    result.success = iface_->mkdirs(args.path);
-    result.__isset.success = true;
+    iface_->renewLease(args.clientName);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("mkdirs", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.renewLease");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("renewLease", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("mkdirs", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.renewLease");
+  }
+
+  oprot->writeMessageBegin("renewLease", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.renewLease", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_exists(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_recoverLease(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_exists_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.recoverLease", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.recoverLease");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.recoverLease");
+  }
+
+  ThriftHadoopFileSystem_recoverLease_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_exists_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.recoverLease", bytes);
+  }
+
+  ThriftHadoopFileSystem_recoverLease_result result;
   try {
-    result.success = iface_->exists(args.path);
-    result.__isset.success = true;
+    iface_->recoverLease(args.path, args.clientName);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("exists", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.recoverLease");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("recoverLease", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("exists", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.recoverLease");
+  }
+
+  oprot->writeMessageBegin("recoverLease", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.recoverLease", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_stat(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_closeRecoverLease(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_stat_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.closeRecoverLease", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.closeRecoverLease");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.closeRecoverLease");
+  }
+
+  ThriftHadoopFileSystem_closeRecoverLease_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_stat_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.closeRecoverLease", bytes);
+  }
+
+  ThriftHadoopFileSystem_closeRecoverLease_result result;
   try {
-    iface_->stat(result.success, args.path);
-    result.__isset.success = true;
+    iface_->closeRecoverLease(args.path, args.clientName, args.discardLastBlock);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("stat", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.closeRecoverLease");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("closeRecoverLease", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("stat", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.closeRecoverLease");
+  }
+
+  oprot->writeMessageBegin("closeRecoverLease", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.closeRecoverLease", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_listStatus(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_abandonBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_listStatus_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.abandonBlock", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.abandonBlock");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.abandonBlock");
+  }
+
+  ThriftHadoopFileSystem_abandonBlock_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_listStatus_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.abandonBlock", bytes);
+  }
+
+  ThriftHadoopFileSystem_abandonBlock_result result;
   try {
-    iface_->listStatus(result.success, args.path);
-    result.__isset.success = true;
+    iface_->abandonBlock(args.block, args.pathname, args.clientName);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("listStatus", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.abandonBlock");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("abandonBlock", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("listStatus", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.abandonBlock");
+  }
+
+  oprot->writeMessageBegin("abandonBlock", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.abandonBlock", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_chmod(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_abandonFile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_chmod_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.abandonFile", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.abandonFile");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.abandonFile");
+  }
+
+  ThriftHadoopFileSystem_abandonFile_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_chmod_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.abandonFile", bytes);
+  }
+
+  ThriftHadoopFileSystem_abandonFile_result result;
   try {
-    iface_->chmod(args.path, args.mode);
+    iface_->abandonFile(args.pathname, args.clientName);
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("chmod", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.abandonFile");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("abandonFile", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("chmod", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.abandonFile");
+  }
+
+  oprot->writeMessageBegin("abandonFile", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.abandonFile", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_chown(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_addBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_chown_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.addBlock", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.addBlock");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.addBlock");
+  }
+
+  ThriftHadoopFileSystem_addBlock_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_chown_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.addBlock", bytes);
+  }
+
+  ThriftHadoopFileSystem_addBlock_result result;
   try {
-    iface_->chown(args.path, args.owner, args.group);
+    iface_->addBlock(result.success, args.pathname, args.clientName, args.startOffset, args.lastBlock, args.excludedNodes, args.favouredNodes);
+    result.__isset.success = true;
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("chown", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.addBlock");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("addBlock", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("chown", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.addBlock");
+  }
+
+  oprot->writeMessageBegin("addBlock", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.addBlock", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_setReplication(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_addFirstBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_setReplication_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.addFirstBlock", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.addFirstBlock");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.addFirstBlock");
+  }
+
+  ThriftHadoopFileSystem_addFirstBlock_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_setReplication_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.addFirstBlock", bytes);
+  }
+
+  ThriftHadoopFileSystem_addFirstBlock_result result;
   try {
-    iface_->setReplication(args.path, args.replication);
+    iface_->addFirstBlock(result.success, args.pathname, args.clientName, args.excludedNodes, args.favouredNodes);
+    result.__isset.success = true;
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("setReplication", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.addFirstBlock");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("addFirstBlock", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("setReplication", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.addFirstBlock");
+  }
+
+  oprot->writeMessageBegin("addFirstBlock", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.addFirstBlock", bytes);
+  }
 }
 
-void ThriftHadoopFileSystemProcessor::process_getFileBlockLocations(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot)
+void ThriftHadoopFileSystemProcessor::process_complete(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
-  ThriftHadoopFileSystem_getFileBlockLocations_args args;
+  void* ctx = NULL;
+  if (eventHandler_.get() != NULL) {
+    ctx = eventHandler_->getContext("ThriftHadoopFileSystem.complete", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "ThriftHadoopFileSystem.complete");
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preRead(ctx, "ThriftHadoopFileSystem.complete");
+  }
+
+  ThriftHadoopFileSystem_complete_args args;
   args.read(iprot);
   iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
 
-  ThriftHadoopFileSystem_getFileBlockLocations_result result;
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postRead(ctx, "ThriftHadoopFileSystem.complete", bytes);
+  }
+
+  ThriftHadoopFileSystem_complete_result result;
   try {
-    iface_->getFileBlockLocations(result.success, args.path, args.start, args.length);
+    result.success = iface_->complete(args.pathname, args.clientName, args.fileLen, args.lastBlock);
     result.__isset.success = true;
   } catch (ThriftIOException &ouch) {
     result.ouch = ouch;
     result.__isset.ouch = true;
   } catch (const std::exception& e) {
-    facebook::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("getFileBlockLocations", facebook::thrift::protocol::T_EXCEPTION, seqid);
+    if (eventHandler_.get() != NULL) {
+      eventHandler_->handlerError(ctx, "ThriftHadoopFileSystem.complete");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("complete", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
     oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
     return;
   }
 
-  oprot->writeMessageBegin("getFileBlockLocations", facebook::thrift::protocol::T_REPLY, seqid);
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->preWrite(ctx, "ThriftHadoopFileSystem.complete");
+  }
+
+  oprot->writeMessageBegin("complete", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
+
+  if (eventHandler_.get() != NULL) {
+    eventHandler_->postWrite(ctx, "ThriftHadoopFileSystem.complete", bytes);
+  }
 }
 
 
diff --git a/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.h b/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.h
index f823bed3..f32e259a 100644
--- a/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.h
+++ b/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -33,6 +33,18 @@ class ThriftHadoopFileSystemIf {
   virtual void chown(const Pathname& path, const std::string& owner, const std::string& group) = 0;
   virtual void setReplication(const Pathname& path, const int16_t replication) = 0;
   virtual void getFileBlockLocations(std::vector<BlockLocation> & _return, const Pathname& path, const int64_t start, const int64_t length) = 0;
+  virtual bool hardLink(const Pathname& src, const Pathname& dest) = 0;
+  virtual void concat(const Pathname& target, const std::vector<Pathname> & srcs, const bool restricted) = 0;
+  virtual void reportBadBlocks(const std::vector<TLocatedBlock> & blocks) = 0;
+  virtual int32_t getDataTransferProtocolVersion() = 0;
+  virtual void renewLease(const std::string& clientName) = 0;
+  virtual void recoverLease(const Pathname& path, const std::string& clientName) = 0;
+  virtual void closeRecoverLease(const Pathname& path, const std::string& clientName, const bool discardLastBlock) = 0;
+  virtual void abandonBlock(const TBlock& block, const Pathname& pathname, const std::string& clientName) = 0;
+  virtual void abandonFile(const Pathname& pathname, const std::string& clientName) = 0;
+  virtual void addBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const int64_t startOffset, const TBlock& lastBlock, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes) = 0;
+  virtual void addFirstBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes) = 0;
+  virtual bool complete(const Pathname& pathname, const std::string& clientName, const int64_t fileLen, const TBlock& lastBlock) = 0;
 };
 
 class ThriftHadoopFileSystemNull : virtual public ThriftHadoopFileSystemIf {
@@ -101,8 +113,52 @@ class ThriftHadoopFileSystemNull : virtual public ThriftHadoopFileSystemIf {
   void getFileBlockLocations(std::vector<BlockLocation> & /* _return */, const Pathname& /* path */, const int64_t /* start */, const int64_t /* length */) {
     return;
   }
+  bool hardLink(const Pathname& /* src */, const Pathname& /* dest */) {
+    bool _return = false;
+    return _return;
+  }
+  void concat(const Pathname& /* target */, const std::vector<Pathname> & /* srcs */, const bool /* restricted */) {
+    return;
+  }
+  void reportBadBlocks(const std::vector<TLocatedBlock> & /* blocks */) {
+    return;
+  }
+  int32_t getDataTransferProtocolVersion() {
+    int32_t _return = 0;
+    return _return;
+  }
+  void renewLease(const std::string& /* clientName */) {
+    return;
+  }
+  void recoverLease(const Pathname& /* path */, const std::string& /* clientName */) {
+    return;
+  }
+  void closeRecoverLease(const Pathname& /* path */, const std::string& /* clientName */, const bool /* discardLastBlock */) {
+    return;
+  }
+  void abandonBlock(const TBlock& /* block */, const Pathname& /* pathname */, const std::string& /* clientName */) {
+    return;
+  }
+  void abandonFile(const Pathname& /* pathname */, const std::string& /* clientName */) {
+    return;
+  }
+  void addBlock(TLocatedBlock& /* _return */, const Pathname& /* pathname */, const std::string& /* clientName */, const int64_t /* startOffset */, const TBlock& /* lastBlock */, const std::vector<TDatanodeID> & /* excludedNodes */, const std::vector<TDatanodeID> & /* favouredNodes */) {
+    return;
+  }
+  void addFirstBlock(TLocatedBlock& /* _return */, const Pathname& /* pathname */, const std::string& /* clientName */, const std::vector<TDatanodeID> & /* excludedNodes */, const std::vector<TDatanodeID> & /* favouredNodes */) {
+    return;
+  }
+  bool complete(const Pathname& /* pathname */, const std::string& /* clientName */, const int64_t /* fileLen */, const TBlock& /* lastBlock */) {
+    bool _return = false;
+    return _return;
+  }
 };
 
+typedef struct _ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args__isset {
+  _ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args__isset() : periodInSeconds(false) {}
+  bool periodInSeconds;
+} _ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args__isset;
+
 class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args {
  public:
 
@@ -113,10 +169,11 @@ class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args {
 
   int64_t periodInSeconds;
 
-  struct __isset {
-    __isset() : periodInSeconds(false) {}
-    bool periodInSeconds;
-  } __isset;
+  _ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args__isset __isset;
+
+  void __set_periodInSeconds(const int64_t val) {
+    periodInSeconds = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args & rhs) const
   {
@@ -130,11 +187,12 @@ class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args {
 
   bool operator < (const ThriftHadoopFileSystem_setInactivityTimeoutPeriod_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_pargs {
  public:
 
@@ -143,10 +201,11 @@ class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_pargs {
 
   const int64_t* periodInSeconds;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result {
  public:
 
@@ -166,11 +225,12 @@ class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result {
 
   bool operator < (const ThriftHadoopFileSystem_setInactivityTimeoutPeriod_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_presult {
  public:
 
@@ -178,10 +238,15 @@ class ThriftHadoopFileSystem_setInactivityTimeoutPeriod_presult {
   virtual ~ThriftHadoopFileSystem_setInactivityTimeoutPeriod_presult() throw() {}
 
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_shutdown_args__isset {
+  _ThriftHadoopFileSystem_shutdown_args__isset() : status(false) {}
+  bool status;
+} _ThriftHadoopFileSystem_shutdown_args__isset;
+
 class ThriftHadoopFileSystem_shutdown_args {
  public:
 
@@ -192,10 +257,11 @@ class ThriftHadoopFileSystem_shutdown_args {
 
   int32_t status;
 
-  struct __isset {
-    __isset() : status(false) {}
-    bool status;
-  } __isset;
+  _ThriftHadoopFileSystem_shutdown_args__isset __isset;
+
+  void __set_status(const int32_t val) {
+    status = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_shutdown_args & rhs) const
   {
@@ -209,11 +275,12 @@ class ThriftHadoopFileSystem_shutdown_args {
 
   bool operator < (const ThriftHadoopFileSystem_shutdown_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_shutdown_pargs {
  public:
 
@@ -222,10 +289,11 @@ class ThriftHadoopFileSystem_shutdown_pargs {
 
   const int32_t* status;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_shutdown_result {
  public:
 
@@ -245,11 +313,12 @@ class ThriftHadoopFileSystem_shutdown_result {
 
   bool operator < (const ThriftHadoopFileSystem_shutdown_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_shutdown_presult {
  public:
 
@@ -257,10 +326,15 @@ class ThriftHadoopFileSystem_shutdown_presult {
   virtual ~ThriftHadoopFileSystem_shutdown_presult() throw() {}
 
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_create_args__isset {
+  _ThriftHadoopFileSystem_create_args__isset() : path(false) {}
+  bool path;
+} _ThriftHadoopFileSystem_create_args__isset;
+
 class ThriftHadoopFileSystem_create_args {
  public:
 
@@ -271,10 +345,11 @@ class ThriftHadoopFileSystem_create_args {
 
   Pathname path;
 
-  struct __isset {
-    __isset() : path(false) {}
-    bool path;
-  } __isset;
+  _ThriftHadoopFileSystem_create_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_create_args & rhs) const
   {
@@ -288,11 +363,12 @@ class ThriftHadoopFileSystem_create_args {
 
   bool operator < (const ThriftHadoopFileSystem_create_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_create_pargs {
  public:
 
@@ -301,10 +377,16 @@ class ThriftHadoopFileSystem_create_pargs {
 
   const Pathname* path;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_create_result__isset {
+  _ThriftHadoopFileSystem_create_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_create_result__isset;
+
 class ThriftHadoopFileSystem_create_result {
  public:
 
@@ -316,11 +398,15 @@ class ThriftHadoopFileSystem_create_result {
   ThriftHandle success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_create_result__isset __isset;
+
+  void __set_success(const ThriftHandle& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_create_result & rhs) const
   {
@@ -336,11 +422,17 @@ class ThriftHadoopFileSystem_create_result {
 
   bool operator < (const ThriftHadoopFileSystem_create_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_create_presult__isset {
+  _ThriftHadoopFileSystem_create_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_create_presult__isset;
+
 class ThriftHadoopFileSystem_create_presult {
  public:
 
@@ -350,16 +442,22 @@ class ThriftHadoopFileSystem_create_presult {
   ThriftHandle* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_create_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_createFile_args__isset {
+  _ThriftHadoopFileSystem_createFile_args__isset() : path(false), mode(false), overwrite(false), bufferSize(false), block_replication(false), blocksize(false) {}
+  bool path;
+  bool mode;
+  bool overwrite;
+  bool bufferSize;
+  bool block_replication;
+  bool blocksize;
+} _ThriftHadoopFileSystem_createFile_args__isset;
+
 class ThriftHadoopFileSystem_createFile_args {
  public:
 
@@ -375,15 +473,31 @@ class ThriftHadoopFileSystem_createFile_args {
   int16_t block_replication;
   int64_t blocksize;
 
-  struct __isset {
-    __isset() : path(false), mode(false), overwrite(false), bufferSize(false), block_replication(false), blocksize(false) {}
-    bool path;
-    bool mode;
-    bool overwrite;
-    bool bufferSize;
-    bool block_replication;
-    bool blocksize;
-  } __isset;
+  _ThriftHadoopFileSystem_createFile_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_mode(const int16_t val) {
+    mode = val;
+  }
+
+  void __set_overwrite(const bool val) {
+    overwrite = val;
+  }
+
+  void __set_bufferSize(const int32_t val) {
+    bufferSize = val;
+  }
+
+  void __set_block_replication(const int16_t val) {
+    block_replication = val;
+  }
+
+  void __set_blocksize(const int64_t val) {
+    blocksize = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_createFile_args & rhs) const
   {
@@ -407,11 +521,12 @@ class ThriftHadoopFileSystem_createFile_args {
 
   bool operator < (const ThriftHadoopFileSystem_createFile_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_createFile_pargs {
  public:
 
@@ -425,10 +540,16 @@ class ThriftHadoopFileSystem_createFile_pargs {
   const int16_t* block_replication;
   const int64_t* blocksize;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_createFile_result__isset {
+  _ThriftHadoopFileSystem_createFile_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_createFile_result__isset;
+
 class ThriftHadoopFileSystem_createFile_result {
  public:
 
@@ -440,11 +561,15 @@ class ThriftHadoopFileSystem_createFile_result {
   ThriftHandle success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_createFile_result__isset __isset;
+
+  void __set_success(const ThriftHandle& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_createFile_result & rhs) const
   {
@@ -460,11 +585,17 @@ class ThriftHadoopFileSystem_createFile_result {
 
   bool operator < (const ThriftHadoopFileSystem_createFile_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_createFile_presult__isset {
+  _ThriftHadoopFileSystem_createFile_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_createFile_presult__isset;
+
 class ThriftHadoopFileSystem_createFile_presult {
  public:
 
@@ -474,16 +605,17 @@ class ThriftHadoopFileSystem_createFile_presult {
   ThriftHandle* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_createFile_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_open_args__isset {
+  _ThriftHadoopFileSystem_open_args__isset() : path(false) {}
+  bool path;
+} _ThriftHadoopFileSystem_open_args__isset;
+
 class ThriftHadoopFileSystem_open_args {
  public:
 
@@ -494,10 +626,11 @@ class ThriftHadoopFileSystem_open_args {
 
   Pathname path;
 
-  struct __isset {
-    __isset() : path(false) {}
-    bool path;
-  } __isset;
+  _ThriftHadoopFileSystem_open_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_open_args & rhs) const
   {
@@ -511,11 +644,12 @@ class ThriftHadoopFileSystem_open_args {
 
   bool operator < (const ThriftHadoopFileSystem_open_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_open_pargs {
  public:
 
@@ -524,10 +658,16 @@ class ThriftHadoopFileSystem_open_pargs {
 
   const Pathname* path;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_open_result__isset {
+  _ThriftHadoopFileSystem_open_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_open_result__isset;
+
 class ThriftHadoopFileSystem_open_result {
  public:
 
@@ -539,11 +679,15 @@ class ThriftHadoopFileSystem_open_result {
   ThriftHandle success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_open_result__isset __isset;
+
+  void __set_success(const ThriftHandle& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_open_result & rhs) const
   {
@@ -559,11 +703,17 @@ class ThriftHadoopFileSystem_open_result {
 
   bool operator < (const ThriftHadoopFileSystem_open_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_open_presult__isset {
+  _ThriftHadoopFileSystem_open_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_open_presult__isset;
+
 class ThriftHadoopFileSystem_open_presult {
  public:
 
@@ -573,16 +723,17 @@ class ThriftHadoopFileSystem_open_presult {
   ThriftHandle* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_open_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_append_args__isset {
+  _ThriftHadoopFileSystem_append_args__isset() : path(false) {}
+  bool path;
+} _ThriftHadoopFileSystem_append_args__isset;
+
 class ThriftHadoopFileSystem_append_args {
  public:
 
@@ -593,10 +744,11 @@ class ThriftHadoopFileSystem_append_args {
 
   Pathname path;
 
-  struct __isset {
-    __isset() : path(false) {}
-    bool path;
-  } __isset;
+  _ThriftHadoopFileSystem_append_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_append_args & rhs) const
   {
@@ -610,11 +762,12 @@ class ThriftHadoopFileSystem_append_args {
 
   bool operator < (const ThriftHadoopFileSystem_append_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_append_pargs {
  public:
 
@@ -623,10 +776,16 @@ class ThriftHadoopFileSystem_append_pargs {
 
   const Pathname* path;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_append_result__isset {
+  _ThriftHadoopFileSystem_append_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_append_result__isset;
+
 class ThriftHadoopFileSystem_append_result {
  public:
 
@@ -638,11 +797,15 @@ class ThriftHadoopFileSystem_append_result {
   ThriftHandle success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_append_result__isset __isset;
+
+  void __set_success(const ThriftHandle& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_append_result & rhs) const
   {
@@ -658,11 +821,17 @@ class ThriftHadoopFileSystem_append_result {
 
   bool operator < (const ThriftHadoopFileSystem_append_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_append_presult__isset {
+  _ThriftHadoopFileSystem_append_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_append_presult__isset;
+
 class ThriftHadoopFileSystem_append_presult {
  public:
 
@@ -672,16 +841,18 @@ class ThriftHadoopFileSystem_append_presult {
   ThriftHandle* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_append_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_write_args__isset {
+  _ThriftHadoopFileSystem_write_args__isset() : handle(false), data(false) {}
+  bool handle;
+  bool data;
+} _ThriftHadoopFileSystem_write_args__isset;
+
 class ThriftHadoopFileSystem_write_args {
  public:
 
@@ -693,11 +864,15 @@ class ThriftHadoopFileSystem_write_args {
   ThriftHandle handle;
   std::string data;
 
-  struct __isset {
-    __isset() : handle(false), data(false) {}
-    bool handle;
-    bool data;
-  } __isset;
+  _ThriftHadoopFileSystem_write_args__isset __isset;
+
+  void __set_handle(const ThriftHandle& val) {
+    handle = val;
+  }
+
+  void __set_data(const std::string& val) {
+    data = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_write_args & rhs) const
   {
@@ -713,11 +888,12 @@ class ThriftHadoopFileSystem_write_args {
 
   bool operator < (const ThriftHadoopFileSystem_write_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_write_pargs {
  public:
 
@@ -727,10 +903,16 @@ class ThriftHadoopFileSystem_write_pargs {
   const ThriftHandle* handle;
   const std::string* data;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_write_result__isset {
+  _ThriftHadoopFileSystem_write_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_write_result__isset;
+
 class ThriftHadoopFileSystem_write_result {
  public:
 
@@ -742,11 +924,15 @@ class ThriftHadoopFileSystem_write_result {
   bool success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_write_result__isset __isset;
+
+  void __set_success(const bool val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_write_result & rhs) const
   {
@@ -762,11 +948,17 @@ class ThriftHadoopFileSystem_write_result {
 
   bool operator < (const ThriftHadoopFileSystem_write_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_write_presult__isset {
+  _ThriftHadoopFileSystem_write_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_write_presult__isset;
+
 class ThriftHadoopFileSystem_write_presult {
  public:
 
@@ -776,16 +968,19 @@ class ThriftHadoopFileSystem_write_presult {
   bool* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_write_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_read_args__isset {
+  _ThriftHadoopFileSystem_read_args__isset() : handle(false), offset(false), size(false) {}
+  bool handle;
+  bool offset;
+  bool size;
+} _ThriftHadoopFileSystem_read_args__isset;
+
 class ThriftHadoopFileSystem_read_args {
  public:
 
@@ -798,12 +993,19 @@ class ThriftHadoopFileSystem_read_args {
   int64_t offset;
   int32_t size;
 
-  struct __isset {
-    __isset() : handle(false), offset(false), size(false) {}
-    bool handle;
-    bool offset;
-    bool size;
-  } __isset;
+  _ThriftHadoopFileSystem_read_args__isset __isset;
+
+  void __set_handle(const ThriftHandle& val) {
+    handle = val;
+  }
+
+  void __set_offset(const int64_t val) {
+    offset = val;
+  }
+
+  void __set_size(const int32_t val) {
+    size = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_read_args & rhs) const
   {
@@ -821,11 +1023,12 @@ class ThriftHadoopFileSystem_read_args {
 
   bool operator < (const ThriftHadoopFileSystem_read_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_read_pargs {
  public:
 
@@ -836,10 +1039,16 @@ class ThriftHadoopFileSystem_read_pargs {
   const int64_t* offset;
   const int32_t* size;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_read_result__isset {
+  _ThriftHadoopFileSystem_read_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_read_result__isset;
+
 class ThriftHadoopFileSystem_read_result {
  public:
 
@@ -851,11 +1060,15 @@ class ThriftHadoopFileSystem_read_result {
   std::string success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_read_result__isset __isset;
+
+  void __set_success(const std::string& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_read_result & rhs) const
   {
@@ -871,11 +1084,17 @@ class ThriftHadoopFileSystem_read_result {
 
   bool operator < (const ThriftHadoopFileSystem_read_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_read_presult__isset {
+  _ThriftHadoopFileSystem_read_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_read_presult__isset;
+
 class ThriftHadoopFileSystem_read_presult {
  public:
 
@@ -885,16 +1104,17 @@ class ThriftHadoopFileSystem_read_presult {
   std::string* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_read_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_close_args__isset {
+  _ThriftHadoopFileSystem_close_args__isset() : out(false) {}
+  bool out;
+} _ThriftHadoopFileSystem_close_args__isset;
+
 class ThriftHadoopFileSystem_close_args {
  public:
 
@@ -905,10 +1125,11 @@ class ThriftHadoopFileSystem_close_args {
 
   ThriftHandle out;
 
-  struct __isset {
-    __isset() : out(false) {}
-    bool out;
-  } __isset;
+  _ThriftHadoopFileSystem_close_args__isset __isset;
+
+  void __set_out(const ThriftHandle& val) {
+    out = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_close_args & rhs) const
   {
@@ -922,11 +1143,12 @@ class ThriftHadoopFileSystem_close_args {
 
   bool operator < (const ThriftHadoopFileSystem_close_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_close_pargs {
  public:
 
@@ -935,10 +1157,16 @@ class ThriftHadoopFileSystem_close_pargs {
 
   const ThriftHandle* out;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_close_result__isset {
+  _ThriftHadoopFileSystem_close_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_close_result__isset;
+
 class ThriftHadoopFileSystem_close_result {
  public:
 
@@ -950,11 +1178,15 @@ class ThriftHadoopFileSystem_close_result {
   bool success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_close_result__isset __isset;
+
+  void __set_success(const bool val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_close_result & rhs) const
   {
@@ -970,11 +1202,17 @@ class ThriftHadoopFileSystem_close_result {
 
   bool operator < (const ThriftHadoopFileSystem_close_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_close_presult__isset {
+  _ThriftHadoopFileSystem_close_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_close_presult__isset;
+
 class ThriftHadoopFileSystem_close_presult {
  public:
 
@@ -984,16 +1222,18 @@ class ThriftHadoopFileSystem_close_presult {
   bool* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_close_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_rm_args__isset {
+  _ThriftHadoopFileSystem_rm_args__isset() : path(false), recursive(false) {}
+  bool path;
+  bool recursive;
+} _ThriftHadoopFileSystem_rm_args__isset;
+
 class ThriftHadoopFileSystem_rm_args {
  public:
 
@@ -1005,11 +1245,15 @@ class ThriftHadoopFileSystem_rm_args {
   Pathname path;
   bool recursive;
 
-  struct __isset {
-    __isset() : path(false), recursive(false) {}
-    bool path;
-    bool recursive;
-  } __isset;
+  _ThriftHadoopFileSystem_rm_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_recursive(const bool val) {
+    recursive = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_rm_args & rhs) const
   {
@@ -1025,11 +1269,12 @@ class ThriftHadoopFileSystem_rm_args {
 
   bool operator < (const ThriftHadoopFileSystem_rm_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_rm_pargs {
  public:
 
@@ -1039,10 +1284,16 @@ class ThriftHadoopFileSystem_rm_pargs {
   const Pathname* path;
   const bool* recursive;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_rm_result__isset {
+  _ThriftHadoopFileSystem_rm_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_rm_result__isset;
+
 class ThriftHadoopFileSystem_rm_result {
  public:
 
@@ -1054,11 +1305,15 @@ class ThriftHadoopFileSystem_rm_result {
   bool success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_rm_result__isset __isset;
+
+  void __set_success(const bool val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_rm_result & rhs) const
   {
@@ -1074,11 +1329,17 @@ class ThriftHadoopFileSystem_rm_result {
 
   bool operator < (const ThriftHadoopFileSystem_rm_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_rm_presult__isset {
+  _ThriftHadoopFileSystem_rm_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_rm_presult__isset;
+
 class ThriftHadoopFileSystem_rm_presult {
  public:
 
@@ -1088,16 +1349,18 @@ class ThriftHadoopFileSystem_rm_presult {
   bool* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_rm_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_rename_args__isset {
+  _ThriftHadoopFileSystem_rename_args__isset() : path(false), dest(false) {}
+  bool path;
+  bool dest;
+} _ThriftHadoopFileSystem_rename_args__isset;
+
 class ThriftHadoopFileSystem_rename_args {
  public:
 
@@ -1109,11 +1372,15 @@ class ThriftHadoopFileSystem_rename_args {
   Pathname path;
   Pathname dest;
 
-  struct __isset {
-    __isset() : path(false), dest(false) {}
-    bool path;
-    bool dest;
-  } __isset;
+  _ThriftHadoopFileSystem_rename_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_dest(const Pathname& val) {
+    dest = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_rename_args & rhs) const
   {
@@ -1129,11 +1396,12 @@ class ThriftHadoopFileSystem_rename_args {
 
   bool operator < (const ThriftHadoopFileSystem_rename_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_rename_pargs {
  public:
 
@@ -1143,10 +1411,16 @@ class ThriftHadoopFileSystem_rename_pargs {
   const Pathname* path;
   const Pathname* dest;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_rename_result__isset {
+  _ThriftHadoopFileSystem_rename_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_rename_result__isset;
+
 class ThriftHadoopFileSystem_rename_result {
  public:
 
@@ -1158,11 +1432,15 @@ class ThriftHadoopFileSystem_rename_result {
   bool success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_rename_result__isset __isset;
+
+  void __set_success(const bool val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_rename_result & rhs) const
   {
@@ -1178,11 +1456,17 @@ class ThriftHadoopFileSystem_rename_result {
 
   bool operator < (const ThriftHadoopFileSystem_rename_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_rename_presult__isset {
+  _ThriftHadoopFileSystem_rename_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_rename_presult__isset;
+
 class ThriftHadoopFileSystem_rename_presult {
  public:
 
@@ -1192,16 +1476,17 @@ class ThriftHadoopFileSystem_rename_presult {
   bool* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_rename_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_mkdirs_args__isset {
+  _ThriftHadoopFileSystem_mkdirs_args__isset() : path(false) {}
+  bool path;
+} _ThriftHadoopFileSystem_mkdirs_args__isset;
+
 class ThriftHadoopFileSystem_mkdirs_args {
  public:
 
@@ -1212,10 +1497,11 @@ class ThriftHadoopFileSystem_mkdirs_args {
 
   Pathname path;
 
-  struct __isset {
-    __isset() : path(false) {}
-    bool path;
-  } __isset;
+  _ThriftHadoopFileSystem_mkdirs_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_mkdirs_args & rhs) const
   {
@@ -1229,11 +1515,12 @@ class ThriftHadoopFileSystem_mkdirs_args {
 
   bool operator < (const ThriftHadoopFileSystem_mkdirs_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_mkdirs_pargs {
  public:
 
@@ -1242,10 +1529,16 @@ class ThriftHadoopFileSystem_mkdirs_pargs {
 
   const Pathname* path;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_mkdirs_result__isset {
+  _ThriftHadoopFileSystem_mkdirs_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_mkdirs_result__isset;
+
 class ThriftHadoopFileSystem_mkdirs_result {
  public:
 
@@ -1257,11 +1550,15 @@ class ThriftHadoopFileSystem_mkdirs_result {
   bool success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_mkdirs_result__isset __isset;
+
+  void __set_success(const bool val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_mkdirs_result & rhs) const
   {
@@ -1277,11 +1574,17 @@ class ThriftHadoopFileSystem_mkdirs_result {
 
   bool operator < (const ThriftHadoopFileSystem_mkdirs_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_mkdirs_presult__isset {
+  _ThriftHadoopFileSystem_mkdirs_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_mkdirs_presult__isset;
+
 class ThriftHadoopFileSystem_mkdirs_presult {
  public:
 
@@ -1291,16 +1594,17 @@ class ThriftHadoopFileSystem_mkdirs_presult {
   bool* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_mkdirs_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_exists_args__isset {
+  _ThriftHadoopFileSystem_exists_args__isset() : path(false) {}
+  bool path;
+} _ThriftHadoopFileSystem_exists_args__isset;
+
 class ThriftHadoopFileSystem_exists_args {
  public:
 
@@ -1311,10 +1615,11 @@ class ThriftHadoopFileSystem_exists_args {
 
   Pathname path;
 
-  struct __isset {
-    __isset() : path(false) {}
-    bool path;
-  } __isset;
+  _ThriftHadoopFileSystem_exists_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_exists_args & rhs) const
   {
@@ -1328,11 +1633,12 @@ class ThriftHadoopFileSystem_exists_args {
 
   bool operator < (const ThriftHadoopFileSystem_exists_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_exists_pargs {
  public:
 
@@ -1341,10 +1647,16 @@ class ThriftHadoopFileSystem_exists_pargs {
 
   const Pathname* path;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_exists_result__isset {
+  _ThriftHadoopFileSystem_exists_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_exists_result__isset;
+
 class ThriftHadoopFileSystem_exists_result {
  public:
 
@@ -1356,11 +1668,15 @@ class ThriftHadoopFileSystem_exists_result {
   bool success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_exists_result__isset __isset;
+
+  void __set_success(const bool val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_exists_result & rhs) const
   {
@@ -1376,11 +1692,17 @@ class ThriftHadoopFileSystem_exists_result {
 
   bool operator < (const ThriftHadoopFileSystem_exists_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_exists_presult__isset {
+  _ThriftHadoopFileSystem_exists_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_exists_presult__isset;
+
 class ThriftHadoopFileSystem_exists_presult {
  public:
 
@@ -1390,16 +1712,17 @@ class ThriftHadoopFileSystem_exists_presult {
   bool* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_exists_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_stat_args__isset {
+  _ThriftHadoopFileSystem_stat_args__isset() : path(false) {}
+  bool path;
+} _ThriftHadoopFileSystem_stat_args__isset;
+
 class ThriftHadoopFileSystem_stat_args {
  public:
 
@@ -1410,10 +1733,11 @@ class ThriftHadoopFileSystem_stat_args {
 
   Pathname path;
 
-  struct __isset {
-    __isset() : path(false) {}
-    bool path;
-  } __isset;
+  _ThriftHadoopFileSystem_stat_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_stat_args & rhs) const
   {
@@ -1427,11 +1751,12 @@ class ThriftHadoopFileSystem_stat_args {
 
   bool operator < (const ThriftHadoopFileSystem_stat_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_stat_pargs {
  public:
 
@@ -1440,10 +1765,16 @@ class ThriftHadoopFileSystem_stat_pargs {
 
   const Pathname* path;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_stat_result__isset {
+  _ThriftHadoopFileSystem_stat_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_stat_result__isset;
+
 class ThriftHadoopFileSystem_stat_result {
  public:
 
@@ -1455,11 +1786,15 @@ class ThriftHadoopFileSystem_stat_result {
   FileStatus success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_stat_result__isset __isset;
+
+  void __set_success(const FileStatus& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_stat_result & rhs) const
   {
@@ -1475,11 +1810,17 @@ class ThriftHadoopFileSystem_stat_result {
 
   bool operator < (const ThriftHadoopFileSystem_stat_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_stat_presult__isset {
+  _ThriftHadoopFileSystem_stat_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_stat_presult__isset;
+
 class ThriftHadoopFileSystem_stat_presult {
  public:
 
@@ -1489,16 +1830,17 @@ class ThriftHadoopFileSystem_stat_presult {
   FileStatus* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_stat_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_listStatus_args__isset {
+  _ThriftHadoopFileSystem_listStatus_args__isset() : path(false) {}
+  bool path;
+} _ThriftHadoopFileSystem_listStatus_args__isset;
+
 class ThriftHadoopFileSystem_listStatus_args {
  public:
 
@@ -1509,10 +1851,11 @@ class ThriftHadoopFileSystem_listStatus_args {
 
   Pathname path;
 
-  struct __isset {
-    __isset() : path(false) {}
-    bool path;
-  } __isset;
+  _ThriftHadoopFileSystem_listStatus_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_listStatus_args & rhs) const
   {
@@ -1526,11 +1869,12 @@ class ThriftHadoopFileSystem_listStatus_args {
 
   bool operator < (const ThriftHadoopFileSystem_listStatus_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_listStatus_pargs {
  public:
 
@@ -1539,10 +1883,16 @@ class ThriftHadoopFileSystem_listStatus_pargs {
 
   const Pathname* path;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_listStatus_result__isset {
+  _ThriftHadoopFileSystem_listStatus_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_listStatus_result__isset;
+
 class ThriftHadoopFileSystem_listStatus_result {
  public:
 
@@ -1554,11 +1904,15 @@ class ThriftHadoopFileSystem_listStatus_result {
   std::vector<FileStatus>  success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_listStatus_result__isset __isset;
+
+  void __set_success(const std::vector<FileStatus> & val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_listStatus_result & rhs) const
   {
@@ -1574,11 +1928,17 @@ class ThriftHadoopFileSystem_listStatus_result {
 
   bool operator < (const ThriftHadoopFileSystem_listStatus_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_listStatus_presult__isset {
+  _ThriftHadoopFileSystem_listStatus_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_listStatus_presult__isset;
+
 class ThriftHadoopFileSystem_listStatus_presult {
  public:
 
@@ -1588,16 +1948,18 @@ class ThriftHadoopFileSystem_listStatus_presult {
   std::vector<FileStatus> * success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_listStatus_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_chmod_args__isset {
+  _ThriftHadoopFileSystem_chmod_args__isset() : path(false), mode(false) {}
+  bool path;
+  bool mode;
+} _ThriftHadoopFileSystem_chmod_args__isset;
+
 class ThriftHadoopFileSystem_chmod_args {
  public:
 
@@ -1609,11 +1971,15 @@ class ThriftHadoopFileSystem_chmod_args {
   Pathname path;
   int16_t mode;
 
-  struct __isset {
-    __isset() : path(false), mode(false) {}
-    bool path;
-    bool mode;
-  } __isset;
+  _ThriftHadoopFileSystem_chmod_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_mode(const int16_t val) {
+    mode = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_chmod_args & rhs) const
   {
@@ -1629,11 +1995,12 @@ class ThriftHadoopFileSystem_chmod_args {
 
   bool operator < (const ThriftHadoopFileSystem_chmod_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_chmod_pargs {
  public:
 
@@ -1643,10 +2010,15 @@ class ThriftHadoopFileSystem_chmod_pargs {
   const Pathname* path;
   const int16_t* mode;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_chmod_result__isset {
+  _ThriftHadoopFileSystem_chmod_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_chmod_result__isset;
+
 class ThriftHadoopFileSystem_chmod_result {
  public:
 
@@ -1657,10 +2029,11 @@ class ThriftHadoopFileSystem_chmod_result {
 
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : ouch(false) {}
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_chmod_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_chmod_result & rhs) const
   {
@@ -1674,11 +2047,16 @@ class ThriftHadoopFileSystem_chmod_result {
 
   bool operator < (const ThriftHadoopFileSystem_chmod_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_chmod_presult__isset {
+  _ThriftHadoopFileSystem_chmod_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_chmod_presult__isset;
+
 class ThriftHadoopFileSystem_chmod_presult {
  public:
 
@@ -1687,15 +2065,19 @@ class ThriftHadoopFileSystem_chmod_presult {
 
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : ouch(false) {}
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_chmod_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_chown_args__isset {
+  _ThriftHadoopFileSystem_chown_args__isset() : path(false), owner(false), group(false) {}
+  bool path;
+  bool owner;
+  bool group;
+} _ThriftHadoopFileSystem_chown_args__isset;
+
 class ThriftHadoopFileSystem_chown_args {
  public:
 
@@ -1708,12 +2090,19 @@ class ThriftHadoopFileSystem_chown_args {
   std::string owner;
   std::string group;
 
-  struct __isset {
-    __isset() : path(false), owner(false), group(false) {}
-    bool path;
-    bool owner;
-    bool group;
-  } __isset;
+  _ThriftHadoopFileSystem_chown_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_owner(const std::string& val) {
+    owner = val;
+  }
+
+  void __set_group(const std::string& val) {
+    group = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_chown_args & rhs) const
   {
@@ -1731,11 +2120,12 @@ class ThriftHadoopFileSystem_chown_args {
 
   bool operator < (const ThriftHadoopFileSystem_chown_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_chown_pargs {
  public:
 
@@ -1746,10 +2136,15 @@ class ThriftHadoopFileSystem_chown_pargs {
   const std::string* owner;
   const std::string* group;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_chown_result__isset {
+  _ThriftHadoopFileSystem_chown_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_chown_result__isset;
+
 class ThriftHadoopFileSystem_chown_result {
  public:
 
@@ -1760,10 +2155,11 @@ class ThriftHadoopFileSystem_chown_result {
 
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : ouch(false) {}
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_chown_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_chown_result & rhs) const
   {
@@ -1777,11 +2173,16 @@ class ThriftHadoopFileSystem_chown_result {
 
   bool operator < (const ThriftHadoopFileSystem_chown_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_chown_presult__isset {
+  _ThriftHadoopFileSystem_chown_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_chown_presult__isset;
+
 class ThriftHadoopFileSystem_chown_presult {
  public:
 
@@ -1790,15 +2191,18 @@ class ThriftHadoopFileSystem_chown_presult {
 
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : ouch(false) {}
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_chown_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_setReplication_args__isset {
+  _ThriftHadoopFileSystem_setReplication_args__isset() : path(false), replication(false) {}
+  bool path;
+  bool replication;
+} _ThriftHadoopFileSystem_setReplication_args__isset;
+
 class ThriftHadoopFileSystem_setReplication_args {
  public:
 
@@ -1810,11 +2214,15 @@ class ThriftHadoopFileSystem_setReplication_args {
   Pathname path;
   int16_t replication;
 
-  struct __isset {
-    __isset() : path(false), replication(false) {}
-    bool path;
-    bool replication;
-  } __isset;
+  _ThriftHadoopFileSystem_setReplication_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_replication(const int16_t val) {
+    replication = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_setReplication_args & rhs) const
   {
@@ -1830,11 +2238,12 @@ class ThriftHadoopFileSystem_setReplication_args {
 
   bool operator < (const ThriftHadoopFileSystem_setReplication_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_setReplication_pargs {
  public:
 
@@ -1844,10 +2253,15 @@ class ThriftHadoopFileSystem_setReplication_pargs {
   const Pathname* path;
   const int16_t* replication;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_setReplication_result__isset {
+  _ThriftHadoopFileSystem_setReplication_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_setReplication_result__isset;
+
 class ThriftHadoopFileSystem_setReplication_result {
  public:
 
@@ -1858,10 +2272,11 @@ class ThriftHadoopFileSystem_setReplication_result {
 
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : ouch(false) {}
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_setReplication_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_setReplication_result & rhs) const
   {
@@ -1875,11 +2290,16 @@ class ThriftHadoopFileSystem_setReplication_result {
 
   bool operator < (const ThriftHadoopFileSystem_setReplication_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_setReplication_presult__isset {
+  _ThriftHadoopFileSystem_setReplication_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_setReplication_presult__isset;
+
 class ThriftHadoopFileSystem_setReplication_presult {
  public:
 
@@ -1888,15 +2308,19 @@ class ThriftHadoopFileSystem_setReplication_presult {
 
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : ouch(false) {}
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_setReplication_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
+typedef struct _ThriftHadoopFileSystem_getFileBlockLocations_args__isset {
+  _ThriftHadoopFileSystem_getFileBlockLocations_args__isset() : path(false), start(false), length(false) {}
+  bool path;
+  bool start;
+  bool length;
+} _ThriftHadoopFileSystem_getFileBlockLocations_args__isset;
+
 class ThriftHadoopFileSystem_getFileBlockLocations_args {
  public:
 
@@ -1909,12 +2333,19 @@ class ThriftHadoopFileSystem_getFileBlockLocations_args {
   int64_t start;
   int64_t length;
 
-  struct __isset {
-    __isset() : path(false), start(false), length(false) {}
-    bool path;
-    bool start;
-    bool length;
-  } __isset;
+  _ThriftHadoopFileSystem_getFileBlockLocations_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_start(const int64_t val) {
+    start = val;
+  }
+
+  void __set_length(const int64_t val) {
+    length = val;
+  }
 
   bool operator == (const ThriftHadoopFileSystem_getFileBlockLocations_args & rhs) const
   {
@@ -1932,11 +2363,12 @@ class ThriftHadoopFileSystem_getFileBlockLocations_args {
 
   bool operator < (const ThriftHadoopFileSystem_getFileBlockLocations_args & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+
 class ThriftHadoopFileSystem_getFileBlockLocations_pargs {
  public:
 
@@ -1947,28 +2379,1260 @@ class ThriftHadoopFileSystem_getFileBlockLocations_pargs {
   const int64_t* start;
   const int64_t* length;
 
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _ThriftHadoopFileSystem_getFileBlockLocations_result__isset {
+  _ThriftHadoopFileSystem_getFileBlockLocations_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_getFileBlockLocations_result__isset;
+
 class ThriftHadoopFileSystem_getFileBlockLocations_result {
  public:
 
-  ThriftHadoopFileSystem_getFileBlockLocations_result() {
+  ThriftHadoopFileSystem_getFileBlockLocations_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_getFileBlockLocations_result() throw() {}
+
+  std::vector<BlockLocation>  success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_getFileBlockLocations_result__isset __isset;
+
+  void __set_success(const std::vector<BlockLocation> & val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_getFileBlockLocations_result & rhs) const
+  {
+    if (!(success == rhs.success))
+      return false;
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_getFileBlockLocations_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_getFileBlockLocations_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_getFileBlockLocations_presult__isset {
+  _ThriftHadoopFileSystem_getFileBlockLocations_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_getFileBlockLocations_presult__isset;
+
+class ThriftHadoopFileSystem_getFileBlockLocations_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_getFileBlockLocations_presult() throw() {}
+
+  std::vector<BlockLocation> * success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_getFileBlockLocations_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_hardLink_args__isset {
+  _ThriftHadoopFileSystem_hardLink_args__isset() : src(false), dest(false) {}
+  bool src;
+  bool dest;
+} _ThriftHadoopFileSystem_hardLink_args__isset;
+
+class ThriftHadoopFileSystem_hardLink_args {
+ public:
+
+  ThriftHadoopFileSystem_hardLink_args() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_hardLink_args() throw() {}
+
+  Pathname src;
+  Pathname dest;
+
+  _ThriftHadoopFileSystem_hardLink_args__isset __isset;
+
+  void __set_src(const Pathname& val) {
+    src = val;
+  }
+
+  void __set_dest(const Pathname& val) {
+    dest = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_hardLink_args & rhs) const
+  {
+    if (!(src == rhs.src))
+      return false;
+    if (!(dest == rhs.dest))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_hardLink_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_hardLink_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_hardLink_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_hardLink_pargs() throw() {}
+
+  const Pathname* src;
+  const Pathname* dest;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_hardLink_result__isset {
+  _ThriftHadoopFileSystem_hardLink_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_hardLink_result__isset;
+
+class ThriftHadoopFileSystem_hardLink_result {
+ public:
+
+  ThriftHadoopFileSystem_hardLink_result() : success(0) {
+  }
+
+  virtual ~ThriftHadoopFileSystem_hardLink_result() throw() {}
+
+  bool success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_hardLink_result__isset __isset;
+
+  void __set_success(const bool val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_hardLink_result & rhs) const
+  {
+    if (!(success == rhs.success))
+      return false;
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_hardLink_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_hardLink_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_hardLink_presult__isset {
+  _ThriftHadoopFileSystem_hardLink_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_hardLink_presult__isset;
+
+class ThriftHadoopFileSystem_hardLink_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_hardLink_presult() throw() {}
+
+  bool* success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_hardLink_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_concat_args__isset {
+  _ThriftHadoopFileSystem_concat_args__isset() : target(false), srcs(false), restricted(false) {}
+  bool target;
+  bool srcs;
+  bool restricted;
+} _ThriftHadoopFileSystem_concat_args__isset;
+
+class ThriftHadoopFileSystem_concat_args {
+ public:
+
+  ThriftHadoopFileSystem_concat_args() : restricted(0) {
+  }
+
+  virtual ~ThriftHadoopFileSystem_concat_args() throw() {}
+
+  Pathname target;
+  std::vector<Pathname>  srcs;
+  bool restricted;
+
+  _ThriftHadoopFileSystem_concat_args__isset __isset;
+
+  void __set_target(const Pathname& val) {
+    target = val;
+  }
+
+  void __set_srcs(const std::vector<Pathname> & val) {
+    srcs = val;
+  }
+
+  void __set_restricted(const bool val) {
+    restricted = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_concat_args & rhs) const
+  {
+    if (!(target == rhs.target))
+      return false;
+    if (!(srcs == rhs.srcs))
+      return false;
+    if (!(restricted == rhs.restricted))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_concat_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_concat_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_concat_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_concat_pargs() throw() {}
+
+  const Pathname* target;
+  const std::vector<Pathname> * srcs;
+  const bool* restricted;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_concat_result__isset {
+  _ThriftHadoopFileSystem_concat_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_concat_result__isset;
+
+class ThriftHadoopFileSystem_concat_result {
+ public:
+
+  ThriftHadoopFileSystem_concat_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_concat_result() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_concat_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_concat_result & rhs) const
+  {
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_concat_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_concat_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_concat_presult__isset {
+  _ThriftHadoopFileSystem_concat_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_concat_presult__isset;
+
+class ThriftHadoopFileSystem_concat_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_concat_presult() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_concat_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_reportBadBlocks_args__isset {
+  _ThriftHadoopFileSystem_reportBadBlocks_args__isset() : blocks(false) {}
+  bool blocks;
+} _ThriftHadoopFileSystem_reportBadBlocks_args__isset;
+
+class ThriftHadoopFileSystem_reportBadBlocks_args {
+ public:
+
+  ThriftHadoopFileSystem_reportBadBlocks_args() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_reportBadBlocks_args() throw() {}
+
+  std::vector<TLocatedBlock>  blocks;
+
+  _ThriftHadoopFileSystem_reportBadBlocks_args__isset __isset;
+
+  void __set_blocks(const std::vector<TLocatedBlock> & val) {
+    blocks = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_reportBadBlocks_args & rhs) const
+  {
+    if (!(blocks == rhs.blocks))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_reportBadBlocks_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_reportBadBlocks_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_reportBadBlocks_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_reportBadBlocks_pargs() throw() {}
+
+  const std::vector<TLocatedBlock> * blocks;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_reportBadBlocks_result__isset {
+  _ThriftHadoopFileSystem_reportBadBlocks_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_reportBadBlocks_result__isset;
+
+class ThriftHadoopFileSystem_reportBadBlocks_result {
+ public:
+
+  ThriftHadoopFileSystem_reportBadBlocks_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_reportBadBlocks_result() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_reportBadBlocks_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_reportBadBlocks_result & rhs) const
+  {
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_reportBadBlocks_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_reportBadBlocks_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_reportBadBlocks_presult__isset {
+  _ThriftHadoopFileSystem_reportBadBlocks_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_reportBadBlocks_presult__isset;
+
+class ThriftHadoopFileSystem_reportBadBlocks_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_reportBadBlocks_presult() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_reportBadBlocks_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class ThriftHadoopFileSystem_getDataTransferProtocolVersion_args {
+ public:
+
+  ThriftHadoopFileSystem_getDataTransferProtocolVersion_args() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_getDataTransferProtocolVersion_args() throw() {}
+
+
+  bool operator == (const ThriftHadoopFileSystem_getDataTransferProtocolVersion_args & /* rhs */) const
+  {
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_getDataTransferProtocolVersion_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_getDataTransferProtocolVersion_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_getDataTransferProtocolVersion_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_getDataTransferProtocolVersion_pargs() throw() {}
+
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_getDataTransferProtocolVersion_result__isset {
+  _ThriftHadoopFileSystem_getDataTransferProtocolVersion_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_getDataTransferProtocolVersion_result__isset;
+
+class ThriftHadoopFileSystem_getDataTransferProtocolVersion_result {
+ public:
+
+  ThriftHadoopFileSystem_getDataTransferProtocolVersion_result() : success(0) {
+  }
+
+  virtual ~ThriftHadoopFileSystem_getDataTransferProtocolVersion_result() throw() {}
+
+  int32_t success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_getDataTransferProtocolVersion_result__isset __isset;
+
+  void __set_success(const int32_t val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_getDataTransferProtocolVersion_result & rhs) const
+  {
+    if (!(success == rhs.success))
+      return false;
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_getDataTransferProtocolVersion_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_getDataTransferProtocolVersion_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_getDataTransferProtocolVersion_presult__isset {
+  _ThriftHadoopFileSystem_getDataTransferProtocolVersion_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_getDataTransferProtocolVersion_presult__isset;
+
+class ThriftHadoopFileSystem_getDataTransferProtocolVersion_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_getDataTransferProtocolVersion_presult() throw() {}
+
+  int32_t* success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_getDataTransferProtocolVersion_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_renewLease_args__isset {
+  _ThriftHadoopFileSystem_renewLease_args__isset() : clientName(false) {}
+  bool clientName;
+} _ThriftHadoopFileSystem_renewLease_args__isset;
+
+class ThriftHadoopFileSystem_renewLease_args {
+ public:
+
+  ThriftHadoopFileSystem_renewLease_args() : clientName("") {
+  }
+
+  virtual ~ThriftHadoopFileSystem_renewLease_args() throw() {}
+
+  std::string clientName;
+
+  _ThriftHadoopFileSystem_renewLease_args__isset __isset;
+
+  void __set_clientName(const std::string& val) {
+    clientName = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_renewLease_args & rhs) const
+  {
+    if (!(clientName == rhs.clientName))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_renewLease_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_renewLease_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_renewLease_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_renewLease_pargs() throw() {}
+
+  const std::string* clientName;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_renewLease_result__isset {
+  _ThriftHadoopFileSystem_renewLease_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_renewLease_result__isset;
+
+class ThriftHadoopFileSystem_renewLease_result {
+ public:
+
+  ThriftHadoopFileSystem_renewLease_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_renewLease_result() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_renewLease_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_renewLease_result & rhs) const
+  {
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_renewLease_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_renewLease_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_renewLease_presult__isset {
+  _ThriftHadoopFileSystem_renewLease_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_renewLease_presult__isset;
+
+class ThriftHadoopFileSystem_renewLease_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_renewLease_presult() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_renewLease_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_recoverLease_args__isset {
+  _ThriftHadoopFileSystem_recoverLease_args__isset() : path(false), clientName(false) {}
+  bool path;
+  bool clientName;
+} _ThriftHadoopFileSystem_recoverLease_args__isset;
+
+class ThriftHadoopFileSystem_recoverLease_args {
+ public:
+
+  ThriftHadoopFileSystem_recoverLease_args() : clientName("") {
+  }
+
+  virtual ~ThriftHadoopFileSystem_recoverLease_args() throw() {}
+
+  Pathname path;
+  std::string clientName;
+
+  _ThriftHadoopFileSystem_recoverLease_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_clientName(const std::string& val) {
+    clientName = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_recoverLease_args & rhs) const
+  {
+    if (!(path == rhs.path))
+      return false;
+    if (!(clientName == rhs.clientName))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_recoverLease_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_recoverLease_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_recoverLease_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_recoverLease_pargs() throw() {}
+
+  const Pathname* path;
+  const std::string* clientName;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_recoverLease_result__isset {
+  _ThriftHadoopFileSystem_recoverLease_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_recoverLease_result__isset;
+
+class ThriftHadoopFileSystem_recoverLease_result {
+ public:
+
+  ThriftHadoopFileSystem_recoverLease_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_recoverLease_result() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_recoverLease_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_recoverLease_result & rhs) const
+  {
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_recoverLease_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_recoverLease_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_recoverLease_presult__isset {
+  _ThriftHadoopFileSystem_recoverLease_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_recoverLease_presult__isset;
+
+class ThriftHadoopFileSystem_recoverLease_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_recoverLease_presult() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_recoverLease_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_closeRecoverLease_args__isset {
+  _ThriftHadoopFileSystem_closeRecoverLease_args__isset() : path(false), clientName(false), discardLastBlock(false) {}
+  bool path;
+  bool clientName;
+  bool discardLastBlock;
+} _ThriftHadoopFileSystem_closeRecoverLease_args__isset;
+
+class ThriftHadoopFileSystem_closeRecoverLease_args {
+ public:
+
+  ThriftHadoopFileSystem_closeRecoverLease_args() : clientName(""), discardLastBlock(0) {
+  }
+
+  virtual ~ThriftHadoopFileSystem_closeRecoverLease_args() throw() {}
+
+  Pathname path;
+  std::string clientName;
+  bool discardLastBlock;
+
+  _ThriftHadoopFileSystem_closeRecoverLease_args__isset __isset;
+
+  void __set_path(const Pathname& val) {
+    path = val;
+  }
+
+  void __set_clientName(const std::string& val) {
+    clientName = val;
+  }
+
+  void __set_discardLastBlock(const bool val) {
+    discardLastBlock = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_closeRecoverLease_args & rhs) const
+  {
+    if (!(path == rhs.path))
+      return false;
+    if (!(clientName == rhs.clientName))
+      return false;
+    if (!(discardLastBlock == rhs.discardLastBlock))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_closeRecoverLease_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_closeRecoverLease_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_closeRecoverLease_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_closeRecoverLease_pargs() throw() {}
+
+  const Pathname* path;
+  const std::string* clientName;
+  const bool* discardLastBlock;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_closeRecoverLease_result__isset {
+  _ThriftHadoopFileSystem_closeRecoverLease_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_closeRecoverLease_result__isset;
+
+class ThriftHadoopFileSystem_closeRecoverLease_result {
+ public:
+
+  ThriftHadoopFileSystem_closeRecoverLease_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_closeRecoverLease_result() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_closeRecoverLease_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_closeRecoverLease_result & rhs) const
+  {
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_closeRecoverLease_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_closeRecoverLease_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_closeRecoverLease_presult__isset {
+  _ThriftHadoopFileSystem_closeRecoverLease_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_closeRecoverLease_presult__isset;
+
+class ThriftHadoopFileSystem_closeRecoverLease_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_closeRecoverLease_presult() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_closeRecoverLease_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_abandonBlock_args__isset {
+  _ThriftHadoopFileSystem_abandonBlock_args__isset() : block(false), pathname(false), clientName(false) {}
+  bool block;
+  bool pathname;
+  bool clientName;
+} _ThriftHadoopFileSystem_abandonBlock_args__isset;
+
+class ThriftHadoopFileSystem_abandonBlock_args {
+ public:
+
+  ThriftHadoopFileSystem_abandonBlock_args() : clientName("") {
+  }
+
+  virtual ~ThriftHadoopFileSystem_abandonBlock_args() throw() {}
+
+  TBlock block;
+  Pathname pathname;
+  std::string clientName;
+
+  _ThriftHadoopFileSystem_abandonBlock_args__isset __isset;
+
+  void __set_block(const TBlock& val) {
+    block = val;
+  }
+
+  void __set_pathname(const Pathname& val) {
+    pathname = val;
+  }
+
+  void __set_clientName(const std::string& val) {
+    clientName = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_abandonBlock_args & rhs) const
+  {
+    if (!(block == rhs.block))
+      return false;
+    if (!(pathname == rhs.pathname))
+      return false;
+    if (!(clientName == rhs.clientName))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_abandonBlock_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_abandonBlock_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_abandonBlock_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_abandonBlock_pargs() throw() {}
+
+  const TBlock* block;
+  const Pathname* pathname;
+  const std::string* clientName;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_abandonBlock_result__isset {
+  _ThriftHadoopFileSystem_abandonBlock_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_abandonBlock_result__isset;
+
+class ThriftHadoopFileSystem_abandonBlock_result {
+ public:
+
+  ThriftHadoopFileSystem_abandonBlock_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_abandonBlock_result() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_abandonBlock_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_abandonBlock_result & rhs) const
+  {
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_abandonBlock_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_abandonBlock_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_abandonBlock_presult__isset {
+  _ThriftHadoopFileSystem_abandonBlock_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_abandonBlock_presult__isset;
+
+class ThriftHadoopFileSystem_abandonBlock_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_abandonBlock_presult() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_abandonBlock_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_abandonFile_args__isset {
+  _ThriftHadoopFileSystem_abandonFile_args__isset() : pathname(false), clientName(false) {}
+  bool pathname;
+  bool clientName;
+} _ThriftHadoopFileSystem_abandonFile_args__isset;
+
+class ThriftHadoopFileSystem_abandonFile_args {
+ public:
+
+  ThriftHadoopFileSystem_abandonFile_args() : clientName("") {
+  }
+
+  virtual ~ThriftHadoopFileSystem_abandonFile_args() throw() {}
+
+  Pathname pathname;
+  std::string clientName;
+
+  _ThriftHadoopFileSystem_abandonFile_args__isset __isset;
+
+  void __set_pathname(const Pathname& val) {
+    pathname = val;
+  }
+
+  void __set_clientName(const std::string& val) {
+    clientName = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_abandonFile_args & rhs) const
+  {
+    if (!(pathname == rhs.pathname))
+      return false;
+    if (!(clientName == rhs.clientName))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_abandonFile_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_abandonFile_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_abandonFile_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_abandonFile_pargs() throw() {}
+
+  const Pathname* pathname;
+  const std::string* clientName;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_abandonFile_result__isset {
+  _ThriftHadoopFileSystem_abandonFile_result__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_abandonFile_result__isset;
+
+class ThriftHadoopFileSystem_abandonFile_result {
+ public:
+
+  ThriftHadoopFileSystem_abandonFile_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_abandonFile_result() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_abandonFile_result__isset __isset;
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_abandonFile_result & rhs) const
+  {
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_abandonFile_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_abandonFile_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_abandonFile_presult__isset {
+  _ThriftHadoopFileSystem_abandonFile_presult__isset() : ouch(false) {}
+  bool ouch;
+} _ThriftHadoopFileSystem_abandonFile_presult__isset;
+
+class ThriftHadoopFileSystem_abandonFile_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_abandonFile_presult() throw() {}
+
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_abandonFile_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_addBlock_args__isset {
+  _ThriftHadoopFileSystem_addBlock_args__isset() : pathname(false), clientName(false), startOffset(false), lastBlock(false), excludedNodes(false), favouredNodes(false) {}
+  bool pathname;
+  bool clientName;
+  bool startOffset;
+  bool lastBlock;
+  bool excludedNodes;
+  bool favouredNodes;
+} _ThriftHadoopFileSystem_addBlock_args__isset;
+
+class ThriftHadoopFileSystem_addBlock_args {
+ public:
+
+  ThriftHadoopFileSystem_addBlock_args() : clientName(""), startOffset(0) {
+  }
+
+  virtual ~ThriftHadoopFileSystem_addBlock_args() throw() {}
+
+  Pathname pathname;
+  std::string clientName;
+  int64_t startOffset;
+  TBlock lastBlock;
+  std::vector<TDatanodeID>  excludedNodes;
+  std::vector<TDatanodeID>  favouredNodes;
+
+  _ThriftHadoopFileSystem_addBlock_args__isset __isset;
+
+  void __set_pathname(const Pathname& val) {
+    pathname = val;
+  }
+
+  void __set_clientName(const std::string& val) {
+    clientName = val;
+  }
+
+  void __set_startOffset(const int64_t val) {
+    startOffset = val;
+  }
+
+  void __set_lastBlock(const TBlock& val) {
+    lastBlock = val;
+  }
+
+  void __set_excludedNodes(const std::vector<TDatanodeID> & val) {
+    excludedNodes = val;
+  }
+
+  void __set_favouredNodes(const std::vector<TDatanodeID> & val) {
+    favouredNodes = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_addBlock_args & rhs) const
+  {
+    if (!(pathname == rhs.pathname))
+      return false;
+    if (!(clientName == rhs.clientName))
+      return false;
+    if (!(startOffset == rhs.startOffset))
+      return false;
+    if (!(lastBlock == rhs.lastBlock))
+      return false;
+    if (!(excludedNodes == rhs.excludedNodes))
+      return false;
+    if (!(favouredNodes == rhs.favouredNodes))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_addBlock_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_addBlock_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_addBlock_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_addBlock_pargs() throw() {}
+
+  const Pathname* pathname;
+  const std::string* clientName;
+  const int64_t* startOffset;
+  const TBlock* lastBlock;
+  const std::vector<TDatanodeID> * excludedNodes;
+  const std::vector<TDatanodeID> * favouredNodes;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_addBlock_result__isset {
+  _ThriftHadoopFileSystem_addBlock_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_addBlock_result__isset;
+
+class ThriftHadoopFileSystem_addBlock_result {
+ public:
+
+  ThriftHadoopFileSystem_addBlock_result() {
   }
 
-  virtual ~ThriftHadoopFileSystem_getFileBlockLocations_result() throw() {}
+  virtual ~ThriftHadoopFileSystem_addBlock_result() throw() {}
 
-  std::vector<BlockLocation>  success;
+  TLocatedBlock success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_addBlock_result__isset __isset;
 
-  bool operator == (const ThriftHadoopFileSystem_getFileBlockLocations_result & rhs) const
+  void __set_success(const TLocatedBlock& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_addBlock_result & rhs) const
   {
     if (!(success == rhs.success))
       return false;
@@ -1976,54 +3640,346 @@ class ThriftHadoopFileSystem_getFileBlockLocations_result {
       return false;
     return true;
   }
-  bool operator != (const ThriftHadoopFileSystem_getFileBlockLocations_result &rhs) const {
+  bool operator != (const ThriftHadoopFileSystem_addBlock_result &rhs) const {
     return !(*this == rhs);
   }
 
-  bool operator < (const ThriftHadoopFileSystem_getFileBlockLocations_result & ) const;
+  bool operator < (const ThriftHadoopFileSystem_addBlock_result & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
-class ThriftHadoopFileSystem_getFileBlockLocations_presult {
+typedef struct _ThriftHadoopFileSystem_addBlock_presult__isset {
+  _ThriftHadoopFileSystem_addBlock_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_addBlock_presult__isset;
+
+class ThriftHadoopFileSystem_addBlock_presult {
  public:
 
 
-  virtual ~ThriftHadoopFileSystem_getFileBlockLocations_presult() throw() {}
+  virtual ~ThriftHadoopFileSystem_addBlock_presult() throw() {}
 
-  std::vector<BlockLocation> * success;
+  TLocatedBlock* success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_addBlock_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_addFirstBlock_args__isset {
+  _ThriftHadoopFileSystem_addFirstBlock_args__isset() : pathname(false), clientName(false), excludedNodes(false), favouredNodes(false) {}
+  bool pathname;
+  bool clientName;
+  bool excludedNodes;
+  bool favouredNodes;
+} _ThriftHadoopFileSystem_addFirstBlock_args__isset;
+
+class ThriftHadoopFileSystem_addFirstBlock_args {
+ public:
+
+  ThriftHadoopFileSystem_addFirstBlock_args() : clientName("") {
+  }
+
+  virtual ~ThriftHadoopFileSystem_addFirstBlock_args() throw() {}
+
+  Pathname pathname;
+  std::string clientName;
+  std::vector<TDatanodeID>  excludedNodes;
+  std::vector<TDatanodeID>  favouredNodes;
+
+  _ThriftHadoopFileSystem_addFirstBlock_args__isset __isset;
+
+  void __set_pathname(const Pathname& val) {
+    pathname = val;
+  }
+
+  void __set_clientName(const std::string& val) {
+    clientName = val;
+  }
+
+  void __set_excludedNodes(const std::vector<TDatanodeID> & val) {
+    excludedNodes = val;
+  }
+
+  void __set_favouredNodes(const std::vector<TDatanodeID> & val) {
+    favouredNodes = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_addFirstBlock_args & rhs) const
+  {
+    if (!(pathname == rhs.pathname))
+      return false;
+    if (!(clientName == rhs.clientName))
+      return false;
+    if (!(excludedNodes == rhs.excludedNodes))
+      return false;
+    if (!(favouredNodes == rhs.favouredNodes))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_addFirstBlock_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_addFirstBlock_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_addFirstBlock_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_addFirstBlock_pargs() throw() {}
+
+  const Pathname* pathname;
+  const std::string* clientName;
+  const std::vector<TDatanodeID> * excludedNodes;
+  const std::vector<TDatanodeID> * favouredNodes;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_addFirstBlock_result__isset {
+  _ThriftHadoopFileSystem_addFirstBlock_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_addFirstBlock_result__isset;
+
+class ThriftHadoopFileSystem_addFirstBlock_result {
+ public:
+
+  ThriftHadoopFileSystem_addFirstBlock_result() {
+  }
+
+  virtual ~ThriftHadoopFileSystem_addFirstBlock_result() throw() {}
+
+  TLocatedBlock success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_addFirstBlock_result__isset __isset;
+
+  void __set_success(const TLocatedBlock& val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_addFirstBlock_result & rhs) const
+  {
+    if (!(success == rhs.success))
+      return false;
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_addFirstBlock_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_addFirstBlock_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_addFirstBlock_presult__isset {
+  _ThriftHadoopFileSystem_addFirstBlock_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_addFirstBlock_presult__isset;
+
+class ThriftHadoopFileSystem_addFirstBlock_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_addFirstBlock_presult() throw() {}
+
+  TLocatedBlock* success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_addFirstBlock_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _ThriftHadoopFileSystem_complete_args__isset {
+  _ThriftHadoopFileSystem_complete_args__isset() : pathname(false), clientName(false), fileLen(false), lastBlock(false) {}
+  bool pathname;
+  bool clientName;
+  bool fileLen;
+  bool lastBlock;
+} _ThriftHadoopFileSystem_complete_args__isset;
+
+class ThriftHadoopFileSystem_complete_args {
+ public:
+
+  ThriftHadoopFileSystem_complete_args() : clientName(""), fileLen(0) {
+  }
+
+  virtual ~ThriftHadoopFileSystem_complete_args() throw() {}
+
+  Pathname pathname;
+  std::string clientName;
+  int64_t fileLen;
+  TBlock lastBlock;
+
+  _ThriftHadoopFileSystem_complete_args__isset __isset;
+
+  void __set_pathname(const Pathname& val) {
+    pathname = val;
+  }
+
+  void __set_clientName(const std::string& val) {
+    clientName = val;
+  }
+
+  void __set_fileLen(const int64_t val) {
+    fileLen = val;
+  }
+
+  void __set_lastBlock(const TBlock& val) {
+    lastBlock = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_complete_args & rhs) const
+  {
+    if (!(pathname == rhs.pathname))
+      return false;
+    if (!(clientName == rhs.clientName))
+      return false;
+    if (!(fileLen == rhs.fileLen))
+      return false;
+    if (!(lastBlock == rhs.lastBlock))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_complete_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_complete_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class ThriftHadoopFileSystem_complete_pargs {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_complete_pargs() throw() {}
+
+  const Pathname* pathname;
+  const std::string* clientName;
+  const int64_t* fileLen;
+  const TBlock* lastBlock;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_complete_result__isset {
+  _ThriftHadoopFileSystem_complete_result__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_complete_result__isset;
+
+class ThriftHadoopFileSystem_complete_result {
+ public:
+
+  ThriftHadoopFileSystem_complete_result() : success(0) {
+  }
+
+  virtual ~ThriftHadoopFileSystem_complete_result() throw() {}
+
+  bool success;
+  ThriftIOException ouch;
+
+  _ThriftHadoopFileSystem_complete_result__isset __isset;
+
+  void __set_success(const bool val) {
+    success = val;
+  }
+
+  void __set_ouch(const ThriftIOException& val) {
+    ouch = val;
+  }
+
+  bool operator == (const ThriftHadoopFileSystem_complete_result & rhs) const
+  {
+    if (!(success == rhs.success))
+      return false;
+    if (!(ouch == rhs.ouch))
+      return false;
+    return true;
+  }
+  bool operator != (const ThriftHadoopFileSystem_complete_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ThriftHadoopFileSystem_complete_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _ThriftHadoopFileSystem_complete_presult__isset {
+  _ThriftHadoopFileSystem_complete_presult__isset() : success(false), ouch(false) {}
+  bool success;
+  bool ouch;
+} _ThriftHadoopFileSystem_complete_presult__isset;
+
+class ThriftHadoopFileSystem_complete_presult {
+ public:
+
+
+  virtual ~ThriftHadoopFileSystem_complete_presult() throw() {}
+
+  bool* success;
   ThriftIOException ouch;
 
-  struct __isset {
-    __isset() : success(false), ouch(false) {}
-    bool success;
-    bool ouch;
-  } __isset;
+  _ThriftHadoopFileSystem_complete_presult__isset __isset;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
 };
 
 class ThriftHadoopFileSystemClient : virtual public ThriftHadoopFileSystemIf {
  public:
-  ThriftHadoopFileSystemClient(boost::shared_ptr<facebook::thrift::protocol::TProtocol> prot) :
+  ThriftHadoopFileSystemClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) :
     piprot_(prot),
     poprot_(prot) {
     iprot_ = prot.get();
     oprot_ = prot.get();
   }
-  ThriftHadoopFileSystemClient(boost::shared_ptr<facebook::thrift::protocol::TProtocol> iprot, boost::shared_ptr<facebook::thrift::protocol::TProtocol> oprot) :
+  ThriftHadoopFileSystemClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) :
     piprot_(iprot),
     poprot_(oprot) {
     iprot_ = iprot.get();
     oprot_ = oprot.get();
   }
-  boost::shared_ptr<facebook::thrift::protocol::TProtocol> getInputProtocol() {
+  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
     return piprot_;
   }
-  boost::shared_ptr<facebook::thrift::protocol::TProtocol> getOutputProtocol() {
+  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
     return poprot_;
   }
   void setInactivityTimeoutPeriod(const int64_t periodInSeconds);
@@ -2083,38 +4039,86 @@ class ThriftHadoopFileSystemClient : virtual public ThriftHadoopFileSystemIf {
   void getFileBlockLocations(std::vector<BlockLocation> & _return, const Pathname& path, const int64_t start, const int64_t length);
   void send_getFileBlockLocations(const Pathname& path, const int64_t start, const int64_t length);
   void recv_getFileBlockLocations(std::vector<BlockLocation> & _return);
+  bool hardLink(const Pathname& src, const Pathname& dest);
+  void send_hardLink(const Pathname& src, const Pathname& dest);
+  bool recv_hardLink();
+  void concat(const Pathname& target, const std::vector<Pathname> & srcs, const bool restricted);
+  void send_concat(const Pathname& target, const std::vector<Pathname> & srcs, const bool restricted);
+  void recv_concat();
+  void reportBadBlocks(const std::vector<TLocatedBlock> & blocks);
+  void send_reportBadBlocks(const std::vector<TLocatedBlock> & blocks);
+  void recv_reportBadBlocks();
+  int32_t getDataTransferProtocolVersion();
+  void send_getDataTransferProtocolVersion();
+  int32_t recv_getDataTransferProtocolVersion();
+  void renewLease(const std::string& clientName);
+  void send_renewLease(const std::string& clientName);
+  void recv_renewLease();
+  void recoverLease(const Pathname& path, const std::string& clientName);
+  void send_recoverLease(const Pathname& path, const std::string& clientName);
+  void recv_recoverLease();
+  void closeRecoverLease(const Pathname& path, const std::string& clientName, const bool discardLastBlock);
+  void send_closeRecoverLease(const Pathname& path, const std::string& clientName, const bool discardLastBlock);
+  void recv_closeRecoverLease();
+  void abandonBlock(const TBlock& block, const Pathname& pathname, const std::string& clientName);
+  void send_abandonBlock(const TBlock& block, const Pathname& pathname, const std::string& clientName);
+  void recv_abandonBlock();
+  void abandonFile(const Pathname& pathname, const std::string& clientName);
+  void send_abandonFile(const Pathname& pathname, const std::string& clientName);
+  void recv_abandonFile();
+  void addBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const int64_t startOffset, const TBlock& lastBlock, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes);
+  void send_addBlock(const Pathname& pathname, const std::string& clientName, const int64_t startOffset, const TBlock& lastBlock, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes);
+  void recv_addBlock(TLocatedBlock& _return);
+  void addFirstBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes);
+  void send_addFirstBlock(const Pathname& pathname, const std::string& clientName, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes);
+  void recv_addFirstBlock(TLocatedBlock& _return);
+  bool complete(const Pathname& pathname, const std::string& clientName, const int64_t fileLen, const TBlock& lastBlock);
+  void send_complete(const Pathname& pathname, const std::string& clientName, const int64_t fileLen, const TBlock& lastBlock);
+  bool recv_complete();
  protected:
-  boost::shared_ptr<facebook::thrift::protocol::TProtocol> piprot_;
-  boost::shared_ptr<facebook::thrift::protocol::TProtocol> poprot_;
-  facebook::thrift::protocol::TProtocol* iprot_;
-  facebook::thrift::protocol::TProtocol* oprot_;
+  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+  ::apache::thrift::protocol::TProtocol* iprot_;
+  ::apache::thrift::protocol::TProtocol* oprot_;
 };
 
-class ThriftHadoopFileSystemProcessor : virtual public facebook::thrift::TProcessor {
+class ThriftHadoopFileSystemProcessor : virtual public ::apache::thrift::TProcessor {
  protected:
   boost::shared_ptr<ThriftHadoopFileSystemIf> iface_;
-  virtual bool process_fn(facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot, std::string& fname, int32_t seqid);
+  virtual bool process_fn(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, std::string& fname, int32_t seqid, void* callContext);
  private:
-  std::map<std::string, void (ThriftHadoopFileSystemProcessor::*)(int32_t, facebook::thrift::protocol::TProtocol*, facebook::thrift::protocol::TProtocol*)> processMap_;
-  void process_setInactivityTimeoutPeriod(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_shutdown(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_create(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_createFile(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_open(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_append(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_write(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_read(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_close(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_rm(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_rename(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_mkdirs(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_exists(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_stat(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_listStatus(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_chmod(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_chown(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_setReplication(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
-  void process_getFileBlockLocations(int32_t seqid, facebook::thrift::protocol::TProtocol* iprot, facebook::thrift::protocol::TProtocol* oprot);
+  std::map<std::string, void (ThriftHadoopFileSystemProcessor::*)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*)> processMap_;
+  void process_setInactivityTimeoutPeriod(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_shutdown(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_create(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_createFile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_open(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_append(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_write(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_read(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_close(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_rm(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_rename(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_mkdirs(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_exists(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_stat(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_listStatus(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_chmod(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_chown(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_setReplication(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getFileBlockLocations(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_hardLink(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_concat(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_reportBadBlocks(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getDataTransferProtocolVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_renewLease(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_recoverLease(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_closeRecoverLease(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_abandonBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_abandonFile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_addBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_addFirstBlock(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_complete(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
  public:
   ThriftHadoopFileSystemProcessor(boost::shared_ptr<ThriftHadoopFileSystemIf> iface) :
     iface_(iface) {
@@ -2137,9 +4141,21 @@ class ThriftHadoopFileSystemProcessor : virtual public facebook::thrift::TProces
     processMap_["chown"] = &ThriftHadoopFileSystemProcessor::process_chown;
     processMap_["setReplication"] = &ThriftHadoopFileSystemProcessor::process_setReplication;
     processMap_["getFileBlockLocations"] = &ThriftHadoopFileSystemProcessor::process_getFileBlockLocations;
-  }
-
-  virtual bool process(boost::shared_ptr<facebook::thrift::protocol::TProtocol> piprot, boost::shared_ptr<facebook::thrift::protocol::TProtocol> poprot);
+    processMap_["hardLink"] = &ThriftHadoopFileSystemProcessor::process_hardLink;
+    processMap_["concat"] = &ThriftHadoopFileSystemProcessor::process_concat;
+    processMap_["reportBadBlocks"] = &ThriftHadoopFileSystemProcessor::process_reportBadBlocks;
+    processMap_["getDataTransferProtocolVersion"] = &ThriftHadoopFileSystemProcessor::process_getDataTransferProtocolVersion;
+    processMap_["renewLease"] = &ThriftHadoopFileSystemProcessor::process_renewLease;
+    processMap_["recoverLease"] = &ThriftHadoopFileSystemProcessor::process_recoverLease;
+    processMap_["closeRecoverLease"] = &ThriftHadoopFileSystemProcessor::process_closeRecoverLease;
+    processMap_["abandonBlock"] = &ThriftHadoopFileSystemProcessor::process_abandonBlock;
+    processMap_["abandonFile"] = &ThriftHadoopFileSystemProcessor::process_abandonFile;
+    processMap_["addBlock"] = &ThriftHadoopFileSystemProcessor::process_addBlock;
+    processMap_["addFirstBlock"] = &ThriftHadoopFileSystemProcessor::process_addFirstBlock;
+    processMap_["complete"] = &ThriftHadoopFileSystemProcessor::process_complete;
+  }
+
+  virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* callContext);
   virtual ~ThriftHadoopFileSystemProcessor() {}
 };
 
@@ -2156,22 +4172,22 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
  public:
   void setInactivityTimeoutPeriod(const int64_t periodInSeconds) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       ifaces_[i]->setInactivityTimeoutPeriod(periodInSeconds);
     }
   }
 
   void shutdown(const int32_t status) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       ifaces_[i]->shutdown(status);
     }
   }
 
   void create(ThriftHandle& _return, const Pathname& path) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         ifaces_[i]->create(_return, path);
         return;
@@ -2182,8 +4198,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   void createFile(ThriftHandle& _return, const Pathname& path, const int16_t mode, const bool overwrite, const int32_t bufferSize, const int16_t block_replication, const int64_t blocksize) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         ifaces_[i]->createFile(_return, path, mode, overwrite, bufferSize, block_replication, blocksize);
         return;
@@ -2194,8 +4210,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   void open(ThriftHandle& _return, const Pathname& path) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         ifaces_[i]->open(_return, path);
         return;
@@ -2206,8 +4222,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   void append(ThriftHandle& _return, const Pathname& path) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         ifaces_[i]->append(_return, path);
         return;
@@ -2218,8 +4234,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   bool write(const ThriftHandle& handle, const std::string& data) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         return ifaces_[i]->write(handle, data);
       } else {
@@ -2229,8 +4245,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   void read(std::string& _return, const ThriftHandle& handle, const int64_t offset, const int32_t size) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         ifaces_[i]->read(_return, handle, offset, size);
         return;
@@ -2241,8 +4257,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   bool close(const ThriftHandle& out) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         return ifaces_[i]->close(out);
       } else {
@@ -2252,8 +4268,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   bool rm(const Pathname& path, const bool recursive) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         return ifaces_[i]->rm(path, recursive);
       } else {
@@ -2263,8 +4279,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   bool rename(const Pathname& path, const Pathname& dest) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         return ifaces_[i]->rename(path, dest);
       } else {
@@ -2274,8 +4290,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   bool mkdirs(const Pathname& path) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         return ifaces_[i]->mkdirs(path);
       } else {
@@ -2285,8 +4301,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   bool exists(const Pathname& path) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         return ifaces_[i]->exists(path);
       } else {
@@ -2296,8 +4312,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   void stat(FileStatus& _return, const Pathname& path) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         ifaces_[i]->stat(_return, path);
         return;
@@ -2308,8 +4324,8 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   void listStatus(std::vector<FileStatus> & _return, const Pathname& path) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         ifaces_[i]->listStatus(_return, path);
         return;
@@ -2320,29 +4336,29 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
   }
 
   void chmod(const Pathname& path, const int16_t mode) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       ifaces_[i]->chmod(path, mode);
     }
   }
 
   void chown(const Pathname& path, const std::string& owner, const std::string& group) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       ifaces_[i]->chown(path, owner, group);
     }
   }
 
   void setReplication(const Pathname& path, const int16_t replication) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       ifaces_[i]->setReplication(path, replication);
     }
   }
 
   void getFileBlockLocations(std::vector<BlockLocation> & _return, const Pathname& path, const int64_t start, const int64_t length) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
         ifaces_[i]->getFileBlockLocations(_return, path, start, length);
         return;
@@ -2352,6 +4368,112 @@ class ThriftHadoopFileSystemMultiface : virtual public ThriftHadoopFileSystemIf
     }
   }
 
+  bool hardLink(const Pathname& src, const Pathname& dest) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      if (i == sz - 1) {
+        return ifaces_[i]->hardLink(src, dest);
+      } else {
+        ifaces_[i]->hardLink(src, dest);
+      }
+    }
+  }
+
+  void concat(const Pathname& target, const std::vector<Pathname> & srcs, const bool restricted) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      ifaces_[i]->concat(target, srcs, restricted);
+    }
+  }
+
+  void reportBadBlocks(const std::vector<TLocatedBlock> & blocks) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      ifaces_[i]->reportBadBlocks(blocks);
+    }
+  }
+
+  int32_t getDataTransferProtocolVersion() {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      if (i == sz - 1) {
+        return ifaces_[i]->getDataTransferProtocolVersion();
+      } else {
+        ifaces_[i]->getDataTransferProtocolVersion();
+      }
+    }
+  }
+
+  void renewLease(const std::string& clientName) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      ifaces_[i]->renewLease(clientName);
+    }
+  }
+
+  void recoverLease(const Pathname& path, const std::string& clientName) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      ifaces_[i]->recoverLease(path, clientName);
+    }
+  }
+
+  void closeRecoverLease(const Pathname& path, const std::string& clientName, const bool discardLastBlock) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      ifaces_[i]->closeRecoverLease(path, clientName, discardLastBlock);
+    }
+  }
+
+  void abandonBlock(const TBlock& block, const Pathname& pathname, const std::string& clientName) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      ifaces_[i]->abandonBlock(block, pathname, clientName);
+    }
+  }
+
+  void abandonFile(const Pathname& pathname, const std::string& clientName) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      ifaces_[i]->abandonFile(pathname, clientName);
+    }
+  }
+
+  void addBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const int64_t startOffset, const TBlock& lastBlock, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      if (i == sz - 1) {
+        ifaces_[i]->addBlock(_return, pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes);
+        return;
+      } else {
+        ifaces_[i]->addBlock(_return, pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes);
+      }
+    }
+  }
+
+  void addFirstBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      if (i == sz - 1) {
+        ifaces_[i]->addFirstBlock(_return, pathname, clientName, excludedNodes, favouredNodes);
+        return;
+      } else {
+        ifaces_[i]->addFirstBlock(_return, pathname, clientName, excludedNodes, favouredNodes);
+      }
+    }
+  }
+
+  bool complete(const Pathname& pathname, const std::string& clientName, const int64_t fileLen, const TBlock& lastBlock) {
+    size_t sz = ifaces_.size();
+    for (size_t i = 0; i < sz; ++i) {
+      if (i == sz - 1) {
+        return ifaces_[i]->complete(pathname, clientName, fileLen, lastBlock);
+      } else {
+        ifaces_[i]->complete(pathname, clientName, fileLen, lastBlock);
+      }
+    }
+  }
+
 };
 
 
diff --git a/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem_server.skeleton.cpp b/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem_server.skeleton.cpp
index bcda5118..3ca1fc36 100644
--- a/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem_server.skeleton.cpp
+++ b/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem_server.skeleton.cpp
@@ -7,10 +7,10 @@
 #include <transport/TServerSocket.h>
 #include <transport/TBufferTransports.h>
 
-using namespace facebook::thrift;
-using namespace facebook::thrift::protocol;
-using namespace facebook::thrift::transport;
-using namespace facebook::thrift::server;
+using namespace ::apache::thrift;
+using namespace ::apache::thrift::protocol;
+using namespace ::apache::thrift::transport;
+using namespace ::apache::thrift::server;
 
 using boost::shared_ptr;
 
@@ -115,6 +115,66 @@ class ThriftHadoopFileSystemHandler : virtual public ThriftHadoopFileSystemIf {
     printf("getFileBlockLocations\n");
   }
 
+  bool hardLink(const Pathname& src, const Pathname& dest) {
+    // Your implementation goes here
+    printf("hardLink\n");
+  }
+
+  void concat(const Pathname& target, const std::vector<Pathname> & srcs, const bool restricted) {
+    // Your implementation goes here
+    printf("concat\n");
+  }
+
+  void reportBadBlocks(const std::vector<TLocatedBlock> & blocks) {
+    // Your implementation goes here
+    printf("reportBadBlocks\n");
+  }
+
+  int32_t getDataTransferProtocolVersion() {
+    // Your implementation goes here
+    printf("getDataTransferProtocolVersion\n");
+  }
+
+  void renewLease(const std::string& clientName) {
+    // Your implementation goes here
+    printf("renewLease\n");
+  }
+
+  void recoverLease(const Pathname& path, const std::string& clientName) {
+    // Your implementation goes here
+    printf("recoverLease\n");
+  }
+
+  void closeRecoverLease(const Pathname& path, const std::string& clientName, const bool discardLastBlock) {
+    // Your implementation goes here
+    printf("closeRecoverLease\n");
+  }
+
+  void abandonBlock(const TBlock& block, const Pathname& pathname, const std::string& clientName) {
+    // Your implementation goes here
+    printf("abandonBlock\n");
+  }
+
+  void abandonFile(const Pathname& pathname, const std::string& clientName) {
+    // Your implementation goes here
+    printf("abandonFile\n");
+  }
+
+  void addBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const int64_t startOffset, const TBlock& lastBlock, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes) {
+    // Your implementation goes here
+    printf("addBlock\n");
+  }
+
+  void addFirstBlock(TLocatedBlock& _return, const Pathname& pathname, const std::string& clientName, const std::vector<TDatanodeID> & excludedNodes, const std::vector<TDatanodeID> & favouredNodes) {
+    // Your implementation goes here
+    printf("addFirstBlock\n");
+  }
+
+  bool complete(const Pathname& pathname, const std::string& clientName, const int64_t fileLen, const TBlock& lastBlock) {
+    // Your implementation goes here
+    printf("complete\n");
+  }
+
 };
 
 int main(int argc, char **argv) {
diff --git a/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.cpp b/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.cpp
index d1863c37..b8a632dc 100644
--- a/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.cpp
+++ b/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
diff --git a/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.h b/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.h
index df6995ec..810e2064 100644
--- a/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.h
+++ b/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
diff --git a/src/contrib/thriftfs/gen-cpp/hadoopfs_types.cpp b/src/contrib/thriftfs/gen-cpp/hadoopfs_types.cpp
index 4cef7666..8b611967 100644
--- a/src/contrib/thriftfs/gen-cpp/hadoopfs_types.cpp
+++ b/src/contrib/thriftfs/gen-cpp/hadoopfs_types.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -7,31 +7,31 @@
 
 
 
-const char* ThriftHandle::ascii_fingerprint = "2317B51D4172A111734AAB85F990F7C6";
-const uint8_t ThriftHandle::binary_fingerprint[16] = {0x23,0x17,0xB5,0x1D,0x41,0x72,0xA1,0x11,0x73,0x4A,0xAB,0x85,0xF9,0x90,0xF7,0xC6};
+const char* ThriftHandle::ascii_fingerprint = "56A59CE7FFAF82BCA8A19FAACDE4FB75";
+const uint8_t ThriftHandle::binary_fingerprint[16] = {0x56,0xA5,0x9C,0xE7,0xFF,0xAF,0x82,0xBC,0xA8,0xA1,0x9F,0xAA,0xCD,0xE4,0xFB,0x75};
 
-uint32_t ThriftHandle::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftHandle::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
-      case -1:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->id);
           this->__isset.id = true;
         } else {
@@ -50,10 +50,10 @@ uint32_t ThriftHandle::read(facebook::thrift::protocol::TProtocol* iprot) {
   return xfer;
 }
 
-uint32_t ThriftHandle::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftHandle::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHandle");
-  xfer += oprot->writeFieldBegin("id", facebook::thrift::protocol::T_I64, -1);
+  xfer += oprot->writeFieldBegin("id", ::apache::thrift::protocol::T_I64, 1);
   xfer += oprot->writeI64(this->id);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -61,31 +61,31 @@ uint32_t ThriftHandle::write(facebook::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-const char* Pathname::ascii_fingerprint = "E2167DA91A8F7459A2FE1B5F56D14B5D";
-const uint8_t Pathname::binary_fingerprint[16] = {0xE2,0x16,0x7D,0xA9,0x1A,0x8F,0x74,0x59,0xA2,0xFE,0x1B,0x5F,0x56,0xD1,0x4B,0x5D};
+const char* Pathname::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1";
+const uint8_t Pathname::binary_fingerprint[16] = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
 
-uint32_t Pathname::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t Pathname::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
-      case -1:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->pathname);
           this->__isset.pathname = true;
         } else {
@@ -104,10 +104,10 @@ uint32_t Pathname::read(facebook::thrift::protocol::TProtocol* iprot) {
   return xfer;
 }
 
-uint32_t Pathname::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t Pathname::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Pathname");
-  xfer += oprot->writeFieldBegin("pathname", facebook::thrift::protocol::T_STRING, -1);
+  xfer += oprot->writeFieldBegin("pathname", ::apache::thrift::protocol::T_STRING, 1);
   xfer += oprot->writeString(this->pathname);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -118,28 +118,28 @@ uint32_t Pathname::write(facebook::thrift::protocol::TProtocol* oprot) const {
 const char* FileStatus::ascii_fingerprint = "68FE7242A6727149B291A86FB9570D2B";
 const uint8_t FileStatus::binary_fingerprint[16] = {0x68,0xFE,0x72,0x42,0xA6,0x72,0x71,0x49,0xB2,0x91,0xA8,0x6F,0xB9,0x57,0x0D,0x2B};
 
-uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t FileStatus::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->path);
           this->__isset.path = true;
         } else {
@@ -147,7 +147,7 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->length);
           this->__isset.length = true;
         } else {
@@ -155,7 +155,7 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 3:
-        if (ftype == facebook::thrift::protocol::T_BOOL) {
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
           xfer += iprot->readBool(this->isdir);
           this->__isset.isdir = true;
         } else {
@@ -163,7 +163,7 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 4:
-        if (ftype == facebook::thrift::protocol::T_I16) {
+        if (ftype == ::apache::thrift::protocol::T_I16) {
           xfer += iprot->readI16(this->block_replication);
           this->__isset.block_replication = true;
         } else {
@@ -171,7 +171,7 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 5:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->blocksize);
           this->__isset.blocksize = true;
         } else {
@@ -179,7 +179,7 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 6:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->modification_time);
           this->__isset.modification_time = true;
         } else {
@@ -187,7 +187,7 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 7:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->permission);
           this->__isset.permission = true;
         } else {
@@ -195,7 +195,7 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 8:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->owner);
           this->__isset.owner = true;
         } else {
@@ -203,7 +203,7 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 9:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->group);
           this->__isset.group = true;
         } else {
@@ -222,34 +222,34 @@ uint32_t FileStatus::read(facebook::thrift::protocol::TProtocol* iprot) {
   return xfer;
 }
 
-uint32_t FileStatus::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t FileStatus::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("FileStatus");
-  xfer += oprot->writeFieldBegin("path", facebook::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeFieldBegin("path", ::apache::thrift::protocol::T_STRING, 1);
   xfer += oprot->writeString(this->path);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("length", facebook::thrift::protocol::T_I64, 2);
+  xfer += oprot->writeFieldBegin("length", ::apache::thrift::protocol::T_I64, 2);
   xfer += oprot->writeI64(this->length);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("isdir", facebook::thrift::protocol::T_BOOL, 3);
+  xfer += oprot->writeFieldBegin("isdir", ::apache::thrift::protocol::T_BOOL, 3);
   xfer += oprot->writeBool(this->isdir);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("block_replication", facebook::thrift::protocol::T_I16, 4);
+  xfer += oprot->writeFieldBegin("block_replication", ::apache::thrift::protocol::T_I16, 4);
   xfer += oprot->writeI16(this->block_replication);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("blocksize", facebook::thrift::protocol::T_I64, 5);
+  xfer += oprot->writeFieldBegin("blocksize", ::apache::thrift::protocol::T_I64, 5);
   xfer += oprot->writeI64(this->blocksize);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("modification_time", facebook::thrift::protocol::T_I64, 6);
+  xfer += oprot->writeFieldBegin("modification_time", ::apache::thrift::protocol::T_I64, 6);
   xfer += oprot->writeI64(this->modification_time);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("permission", facebook::thrift::protocol::T_STRING, 7);
+  xfer += oprot->writeFieldBegin("permission", ::apache::thrift::protocol::T_STRING, 7);
   xfer += oprot->writeString(this->permission);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("owner", facebook::thrift::protocol::T_STRING, 8);
+  xfer += oprot->writeFieldBegin("owner", ::apache::thrift::protocol::T_STRING, 8);
   xfer += oprot->writeString(this->owner);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("group", facebook::thrift::protocol::T_STRING, 9);
+  xfer += oprot->writeFieldBegin("group", ::apache::thrift::protocol::T_STRING, 9);
   xfer += oprot->writeString(this->group);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -260,32 +260,32 @@ uint32_t FileStatus::write(facebook::thrift::protocol::TProtocol* oprot) const {
 const char* BlockLocation::ascii_fingerprint = "8BF3B16BED96367B21783389BDF8B1C0";
 const uint8_t BlockLocation::binary_fingerprint[16] = {0x8B,0xF3,0xB1,0x6B,0xED,0x96,0x36,0x7B,0x21,0x78,0x33,0x89,0xBD,0xF8,0xB1,0xC0};
 
-uint32_t BlockLocation::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t BlockLocation::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
       case 1:
-        if (ftype == facebook::thrift::protocol::T_LIST) {
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->hosts.clear();
             uint32_t _size0;
-            facebook::thrift::protocol::TType _etype3;
+            ::apache::thrift::protocol::TType _etype3;
             iprot->readListBegin(_etype3, _size0);
             this->hosts.resize(_size0);
             uint32_t _i4;
@@ -301,11 +301,11 @@ uint32_t BlockLocation::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 2:
-        if (ftype == facebook::thrift::protocol::T_LIST) {
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->names.clear();
             uint32_t _size5;
-            facebook::thrift::protocol::TType _etype8;
+            ::apache::thrift::protocol::TType _etype8;
             iprot->readListBegin(_etype8, _size5);
             this->names.resize(_size5);
             uint32_t _i9;
@@ -321,7 +321,7 @@ uint32_t BlockLocation::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 3:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->offset);
           this->__isset.offset = true;
         } else {
@@ -329,7 +329,7 @@ uint32_t BlockLocation::read(facebook::thrift::protocol::TProtocol* iprot) {
         }
         break;
       case 4:
-        if (ftype == facebook::thrift::protocol::T_I64) {
+        if (ftype == ::apache::thrift::protocol::T_I64) {
           xfer += iprot->readI64(this->length);
           this->__isset.length = true;
         } else {
@@ -348,12 +348,12 @@ uint32_t BlockLocation::read(facebook::thrift::protocol::TProtocol* iprot) {
   return xfer;
 }
 
-uint32_t BlockLocation::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t BlockLocation::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("BlockLocation");
-  xfer += oprot->writeFieldBegin("hosts", facebook::thrift::protocol::T_LIST, 1);
+  xfer += oprot->writeFieldBegin("hosts", ::apache::thrift::protocol::T_LIST, 1);
   {
-    xfer += oprot->writeListBegin(facebook::thrift::protocol::T_STRING, this->hosts.size());
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->hosts.size()));
     std::vector<std::string> ::const_iterator _iter10;
     for (_iter10 = this->hosts.begin(); _iter10 != this->hosts.end(); ++_iter10)
     {
@@ -362,9 +362,9 @@ uint32_t BlockLocation::write(facebook::thrift::protocol::TProtocol* oprot) cons
     xfer += oprot->writeListEnd();
   }
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("names", facebook::thrift::protocol::T_LIST, 2);
+  xfer += oprot->writeFieldBegin("names", ::apache::thrift::protocol::T_LIST, 2);
   {
-    xfer += oprot->writeListBegin(facebook::thrift::protocol::T_STRING, this->names.size());
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->names.size()));
     std::vector<std::string> ::const_iterator _iter11;
     for (_iter11 = this->names.begin(); _iter11 != this->names.end(); ++_iter11)
     {
@@ -373,10 +373,10 @@ uint32_t BlockLocation::write(facebook::thrift::protocol::TProtocol* oprot) cons
     xfer += oprot->writeListEnd();
   }
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("offset", facebook::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I64, 3);
   xfer += oprot->writeI64(this->offset);
   xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("length", facebook::thrift::protocol::T_I64, 4);
+  xfer += oprot->writeFieldBegin("length", ::apache::thrift::protocol::T_I64, 4);
   xfer += oprot->writeI64(this->length);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -384,31 +384,268 @@ uint32_t BlockLocation::write(facebook::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-const char* MalformedInputException::ascii_fingerprint = "E2167DA91A8F7459A2FE1B5F56D14B5D";
-const uint8_t MalformedInputException::binary_fingerprint[16] = {0xE2,0x16,0x7D,0xA9,0x1A,0x8F,0x74,0x59,0xA2,0xFE,0x1B,0x5F,0x56,0xD1,0x4B,0x5D};
+const char* TBlock::ascii_fingerprint = "EA2D65F1E0BB78760205682082304B41";
+const uint8_t TBlock::binary_fingerprint[16] = {0xEA,0x2D,0x65,0xF1,0xE0,0xBB,0x78,0x76,0x02,0x05,0x68,0x20,0x82,0x30,0x4B,0x41};
+
+uint32_t TBlock::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->blockId);
+          this->__isset.blockId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->numBytes);
+          this->__isset.numBytes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->generationStamp);
+          this->__isset.generationStamp = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t TBlock::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("TBlock");
+  xfer += oprot->writeFieldBegin("blockId", ::apache::thrift::protocol::T_I64, 1);
+  xfer += oprot->writeI64(this->blockId);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("numBytes", ::apache::thrift::protocol::T_I64, 2);
+  xfer += oprot->writeI64(this->numBytes);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("generationStamp", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64(this->generationStamp);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* TDatanodeID::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1";
+const uint8_t TDatanodeID::binary_fingerprint[16] = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
 
-uint32_t MalformedInputException::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t TDatanodeID::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
-      case -1:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->name);
+          this->__isset.name = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t TDatanodeID::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("TDatanodeID");
+  xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->name);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* TLocatedBlock::ascii_fingerprint = "0E6FCDC9A70E2B8DA64F3D5FD23D3D55";
+const uint8_t TLocatedBlock::binary_fingerprint[16] = {0x0E,0x6F,0xCD,0xC9,0xA7,0x0E,0x2B,0x8D,0xA6,0x4F,0x3D,0x5F,0xD2,0x3D,0x3D,0x55};
+
+uint32_t TLocatedBlock::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->block.read(iprot);
+          this->__isset.block = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->namespaceId);
+          this->__isset.namespaceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->dataTransferVersion);
+          this->__isset.dataTransferVersion = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->location.clear();
+            uint32_t _size12;
+            ::apache::thrift::protocol::TType _etype15;
+            iprot->readListBegin(_etype15, _size12);
+            this->location.resize(_size12);
+            uint32_t _i16;
+            for (_i16 = 0; _i16 < _size12; ++_i16)
+            {
+              xfer += this->location[_i16].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.location = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t TLocatedBlock::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("TLocatedBlock");
+  xfer += oprot->writeFieldBegin("block", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->block.write(oprot);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("namespaceId", ::apache::thrift::protocol::T_I32, 2);
+  xfer += oprot->writeI32(this->namespaceId);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("dataTransferVersion", ::apache::thrift::protocol::T_I32, 3);
+  xfer += oprot->writeI32(this->dataTransferVersion);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("location", ::apache::thrift::protocol::T_LIST, 4);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->location.size()));
+    std::vector<TDatanodeID> ::const_iterator _iter17;
+    for (_iter17 = this->location.begin(); _iter17 != this->location.end(); ++_iter17)
+    {
+      xfer += (*_iter17).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* MalformedInputException::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1";
+const uint8_t MalformedInputException::binary_fingerprint[16] = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+
+uint32_t MalformedInputException::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->message);
           this->__isset.message = true;
         } else {
@@ -427,10 +664,10 @@ uint32_t MalformedInputException::read(facebook::thrift::protocol::TProtocol* ip
   return xfer;
 }
 
-uint32_t MalformedInputException::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t MalformedInputException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("MalformedInputException");
-  xfer += oprot->writeFieldBegin("message", facebook::thrift::protocol::T_STRING, -1);
+  xfer += oprot->writeFieldBegin("message", ::apache::thrift::protocol::T_STRING, 1);
   xfer += oprot->writeString(this->message);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -438,31 +675,31 @@ uint32_t MalformedInputException::write(facebook::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-const char* ThriftIOException::ascii_fingerprint = "E2167DA91A8F7459A2FE1B5F56D14B5D";
-const uint8_t ThriftIOException::binary_fingerprint[16] = {0xE2,0x16,0x7D,0xA9,0x1A,0x8F,0x74,0x59,0xA2,0xFE,0x1B,0x5F,0x56,0xD1,0x4B,0x5D};
+const char* ThriftIOException::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1";
+const uint8_t ThriftIOException::binary_fingerprint[16] = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
 
-uint32_t ThriftIOException::read(facebook::thrift::protocol::TProtocol* iprot) {
+uint32_t ThriftIOException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
-  facebook::thrift::protocol::TType ftype;
+  ::apache::thrift::protocol::TType ftype;
   int16_t fid;
 
   xfer += iprot->readStructBegin(fname);
 
-  using facebook::thrift::protocol::TProtocolException;
+  using ::apache::thrift::protocol::TProtocolException;
 
 
   while (true)
   {
     xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == facebook::thrift::protocol::T_STOP) {
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
       break;
     }
     switch (fid)
     {
-      case -1:
-        if (ftype == facebook::thrift::protocol::T_STRING) {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->message);
           this->__isset.message = true;
         } else {
@@ -481,10 +718,10 @@ uint32_t ThriftIOException::read(facebook::thrift::protocol::TProtocol* iprot) {
   return xfer;
 }
 
-uint32_t ThriftIOException::write(facebook::thrift::protocol::TProtocol* oprot) const {
+uint32_t ThriftIOException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftIOException");
-  xfer += oprot->writeFieldBegin("message", facebook::thrift::protocol::T_STRING, -1);
+  xfer += oprot->writeFieldBegin("message", ::apache::thrift::protocol::T_STRING, 1);
   xfer += oprot->writeString(this->message);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
diff --git a/src/contrib/thriftfs/gen-cpp/hadoopfs_types.h b/src/contrib/thriftfs/gen-cpp/hadoopfs_types.h
index eaa8232b..55047571 100644
--- a/src/contrib/thriftfs/gen-cpp/hadoopfs_types.h
+++ b/src/contrib/thriftfs/gen-cpp/hadoopfs_types.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -7,7 +7,7 @@
 #define hadoopfs_TYPES_H
 
 #include <Thrift.h>
-#include <reflection_limited_types.h>
+#include <TApplicationException.h>
 #include <protocol/TProtocol.h>
 #include <transport/TTransport.h>
 
@@ -15,11 +15,16 @@
 
 
 
+typedef struct _ThriftHandle__isset {
+  _ThriftHandle__isset() : id(false) {}
+  bool id;
+} _ThriftHandle__isset;
+
 class ThriftHandle {
  public:
 
-  static const char* ascii_fingerprint; // = "2317B51D4172A111734AAB85F990F7C6";
-  static const uint8_t binary_fingerprint[16]; // = {0x23,0x17,0xB5,0x1D,0x41,0x72,0xA1,0x11,0x73,0x4A,0xAB,0x85,0xF9,0x90,0xF7,0xC6};
+  static const char* ascii_fingerprint; // = "56A59CE7FFAF82BCA8A19FAACDE4FB75";
+  static const uint8_t binary_fingerprint[16]; // = {0x56,0xA5,0x9C,0xE7,0xFF,0xAF,0x82,0xBC,0xA8,0xA1,0x9F,0xAA,0xCD,0xE4,0xFB,0x75};
 
   ThriftHandle() : id(0) {
   }
@@ -28,10 +33,11 @@ class ThriftHandle {
 
   int64_t id;
 
-  struct __isset {
-    __isset() : id(false) {}
-    bool id;
-  } __isset;
+  _ThriftHandle__isset __isset;
+
+  void __set_id(const int64_t val) {
+    id = val;
+  }
 
   bool operator == (const ThriftHandle & rhs) const
   {
@@ -45,16 +51,21 @@ class ThriftHandle {
 
   bool operator < (const ThriftHandle & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _Pathname__isset {
+  _Pathname__isset() : pathname(false) {}
+  bool pathname;
+} _Pathname__isset;
+
 class Pathname {
  public:
 
-  static const char* ascii_fingerprint; // = "E2167DA91A8F7459A2FE1B5F56D14B5D";
-  static const uint8_t binary_fingerprint[16]; // = {0xE2,0x16,0x7D,0xA9,0x1A,0x8F,0x74,0x59,0xA2,0xFE,0x1B,0x5F,0x56,0xD1,0x4B,0x5D};
+  static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
+  static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
 
   Pathname() : pathname("") {
   }
@@ -63,10 +74,11 @@ class Pathname {
 
   std::string pathname;
 
-  struct __isset {
-    __isset() : pathname(false) {}
-    bool pathname;
-  } __isset;
+  _Pathname__isset __isset;
+
+  void __set_pathname(const std::string& val) {
+    pathname = val;
+  }
 
   bool operator == (const Pathname & rhs) const
   {
@@ -80,11 +92,24 @@ class Pathname {
 
   bool operator < (const Pathname & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _FileStatus__isset {
+  _FileStatus__isset() : path(false), length(false), isdir(false), block_replication(false), blocksize(false), modification_time(false), permission(false), owner(false), group(false) {}
+  bool path;
+  bool length;
+  bool isdir;
+  bool block_replication;
+  bool blocksize;
+  bool modification_time;
+  bool permission;
+  bool owner;
+  bool group;
+} _FileStatus__isset;
+
 class FileStatus {
  public:
 
@@ -106,18 +131,43 @@ class FileStatus {
   std::string owner;
   std::string group;
 
-  struct __isset {
-    __isset() : path(false), length(false), isdir(false), block_replication(false), blocksize(false), modification_time(false), permission(false), owner(false), group(false) {}
-    bool path;
-    bool length;
-    bool isdir;
-    bool block_replication;
-    bool blocksize;
-    bool modification_time;
-    bool permission;
-    bool owner;
-    bool group;
-  } __isset;
+  _FileStatus__isset __isset;
+
+  void __set_path(const std::string& val) {
+    path = val;
+  }
+
+  void __set_length(const int64_t val) {
+    length = val;
+  }
+
+  void __set_isdir(const bool val) {
+    isdir = val;
+  }
+
+  void __set_block_replication(const int16_t val) {
+    block_replication = val;
+  }
+
+  void __set_blocksize(const int64_t val) {
+    blocksize = val;
+  }
+
+  void __set_modification_time(const int64_t val) {
+    modification_time = val;
+  }
+
+  void __set_permission(const std::string& val) {
+    permission = val;
+  }
+
+  void __set_owner(const std::string& val) {
+    owner = val;
+  }
+
+  void __set_group(const std::string& val) {
+    group = val;
+  }
 
   bool operator == (const FileStatus & rhs) const
   {
@@ -147,11 +197,19 @@ class FileStatus {
 
   bool operator < (const FileStatus & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
+typedef struct _BlockLocation__isset {
+  _BlockLocation__isset() : hosts(false), names(false), offset(false), length(false) {}
+  bool hosts;
+  bool names;
+  bool offset;
+  bool length;
+} _BlockLocation__isset;
+
 class BlockLocation {
  public:
 
@@ -168,13 +226,23 @@ class BlockLocation {
   int64_t offset;
   int64_t length;
 
-  struct __isset {
-    __isset() : hosts(false), names(false), offset(false), length(false) {}
-    bool hosts;
-    bool names;
-    bool offset;
-    bool length;
-  } __isset;
+  _BlockLocation__isset __isset;
+
+  void __set_hosts(const std::vector<std::string> & val) {
+    hosts = val;
+  }
+
+  void __set_names(const std::vector<std::string> & val) {
+    names = val;
+  }
+
+  void __set_offset(const int64_t val) {
+    offset = val;
+  }
+
+  void __set_length(const int64_t val) {
+    length = val;
+  }
 
   bool operator == (const BlockLocation & rhs) const
   {
@@ -194,16 +262,184 @@ class BlockLocation {
 
   bool operator < (const BlockLocation & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _TBlock__isset {
+  _TBlock__isset() : blockId(false), numBytes(false), generationStamp(false) {}
+  bool blockId;
+  bool numBytes;
+  bool generationStamp;
+} _TBlock__isset;
+
+class TBlock {
+ public:
+
+  static const char* ascii_fingerprint; // = "EA2D65F1E0BB78760205682082304B41";
+  static const uint8_t binary_fingerprint[16]; // = {0xEA,0x2D,0x65,0xF1,0xE0,0xBB,0x78,0x76,0x02,0x05,0x68,0x20,0x82,0x30,0x4B,0x41};
+
+  TBlock() : blockId(0), numBytes(0), generationStamp(0) {
+  }
+
+  virtual ~TBlock() throw() {}
+
+  int64_t blockId;
+  int64_t numBytes;
+  int64_t generationStamp;
+
+  _TBlock__isset __isset;
+
+  void __set_blockId(const int64_t val) {
+    blockId = val;
+  }
+
+  void __set_numBytes(const int64_t val) {
+    numBytes = val;
+  }
+
+  void __set_generationStamp(const int64_t val) {
+    generationStamp = val;
+  }
+
+  bool operator == (const TBlock & rhs) const
+  {
+    if (!(blockId == rhs.blockId))
+      return false;
+    if (!(numBytes == rhs.numBytes))
+      return false;
+    if (!(generationStamp == rhs.generationStamp))
+      return false;
+    return true;
+  }
+  bool operator != (const TBlock &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const TBlock & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
-class MalformedInputException : public facebook::thrift::TException {
+typedef struct _TDatanodeID__isset {
+  _TDatanodeID__isset() : name(false) {}
+  bool name;
+} _TDatanodeID__isset;
+
+class TDatanodeID {
  public:
 
-  static const char* ascii_fingerprint; // = "E2167DA91A8F7459A2FE1B5F56D14B5D";
-  static const uint8_t binary_fingerprint[16]; // = {0xE2,0x16,0x7D,0xA9,0x1A,0x8F,0x74,0x59,0xA2,0xFE,0x1B,0x5F,0x56,0xD1,0x4B,0x5D};
+  static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
+  static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+
+  TDatanodeID() : name("") {
+  }
+
+  virtual ~TDatanodeID() throw() {}
+
+  std::string name;
+
+  _TDatanodeID__isset __isset;
+
+  void __set_name(const std::string& val) {
+    name = val;
+  }
+
+  bool operator == (const TDatanodeID & rhs) const
+  {
+    if (!(name == rhs.name))
+      return false;
+    return true;
+  }
+  bool operator != (const TDatanodeID &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const TDatanodeID & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _TLocatedBlock__isset {
+  _TLocatedBlock__isset() : block(false), namespaceId(false), dataTransferVersion(false), location(false) {}
+  bool block;
+  bool namespaceId;
+  bool dataTransferVersion;
+  bool location;
+} _TLocatedBlock__isset;
+
+class TLocatedBlock {
+ public:
+
+  static const char* ascii_fingerprint; // = "0E6FCDC9A70E2B8DA64F3D5FD23D3D55";
+  static const uint8_t binary_fingerprint[16]; // = {0x0E,0x6F,0xCD,0xC9,0xA7,0x0E,0x2B,0x8D,0xA6,0x4F,0x3D,0x5F,0xD2,0x3D,0x3D,0x55};
+
+  TLocatedBlock() : namespaceId(0), dataTransferVersion(0) {
+  }
+
+  virtual ~TLocatedBlock() throw() {}
+
+  TBlock block;
+  int32_t namespaceId;
+  int32_t dataTransferVersion;
+  std::vector<TDatanodeID>  location;
+
+  _TLocatedBlock__isset __isset;
+
+  void __set_block(const TBlock& val) {
+    block = val;
+  }
+
+  void __set_namespaceId(const int32_t val) {
+    namespaceId = val;
+  }
+
+  void __set_dataTransferVersion(const int32_t val) {
+    dataTransferVersion = val;
+  }
+
+  void __set_location(const std::vector<TDatanodeID> & val) {
+    location = val;
+  }
+
+  bool operator == (const TLocatedBlock & rhs) const
+  {
+    if (!(block == rhs.block))
+      return false;
+    if (!(namespaceId == rhs.namespaceId))
+      return false;
+    if (!(dataTransferVersion == rhs.dataTransferVersion))
+      return false;
+    if (!(location == rhs.location))
+      return false;
+    return true;
+  }
+  bool operator != (const TLocatedBlock &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const TLocatedBlock & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _MalformedInputException__isset {
+  _MalformedInputException__isset() : message(false) {}
+  bool message;
+} _MalformedInputException__isset;
+
+class MalformedInputException : public ::apache::thrift::TException {
+ public:
+
+  static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
+  static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
 
   MalformedInputException() : message("") {
   }
@@ -212,10 +448,11 @@ class MalformedInputException : public facebook::thrift::TException {
 
   std::string message;
 
-  struct __isset {
-    __isset() : message(false) {}
-    bool message;
-  } __isset;
+  _MalformedInputException__isset __isset;
+
+  void __set_message(const std::string& val) {
+    message = val;
+  }
 
   bool operator == (const MalformedInputException & rhs) const
   {
@@ -229,16 +466,21 @@ class MalformedInputException : public facebook::thrift::TException {
 
   bool operator < (const MalformedInputException & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
-class ThriftIOException : public facebook::thrift::TException {
+typedef struct _ThriftIOException__isset {
+  _ThriftIOException__isset() : message(false) {}
+  bool message;
+} _ThriftIOException__isset;
+
+class ThriftIOException : public ::apache::thrift::TException {
  public:
 
-  static const char* ascii_fingerprint; // = "E2167DA91A8F7459A2FE1B5F56D14B5D";
-  static const uint8_t binary_fingerprint[16]; // = {0xE2,0x16,0x7D,0xA9,0x1A,0x8F,0x74,0x59,0xA2,0xFE,0x1B,0x5F,0x56,0xD1,0x4B,0x5D};
+  static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
+  static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
 
   ThriftIOException() : message("") {
   }
@@ -247,10 +489,11 @@ class ThriftIOException : public facebook::thrift::TException {
 
   std::string message;
 
-  struct __isset {
-    __isset() : message(false) {}
-    bool message;
-  } __isset;
+  _ThriftIOException__isset __isset;
+
+  void __set_message(const std::string& val) {
+    message = val;
+  }
 
   bool operator == (const ThriftIOException & rhs) const
   {
@@ -264,8 +507,8 @@ class ThriftIOException : public facebook::thrift::TException {
 
   bool operator < (const ThriftIOException & ) const;
 
-  uint32_t read(facebook::thrift::protocol::TProtocol* iprot);
-  uint32_t write(facebook::thrift::protocol::TProtocol* oprot) const;
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
 };
 
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/BlockLocation.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/BlockLocation.java
index 4b603b9e..1793c16a 100644
--- a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/BlockLocation.java
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/BlockLocation.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -9,52 +9,117 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Collections;
-import org.apache.log4j.Logger;
-
-import org.apache.thrift.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.protocol.*;
-
-public class BlockLocation implements TBase, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("BlockLocation");
-  private static final TField HOSTS_FIELD_DESC = new TField("hosts", TType.LIST, (short)1);
-  private static final TField NAMES_FIELD_DESC = new TField("names", TType.LIST, (short)2);
-  private static final TField OFFSET_FIELD_DESC = new TField("offset", TType.I64, (short)3);
-  private static final TField LENGTH_FIELD_DESC = new TField("length", TType.I64, (short)4);
-
-  public List<String> hosts;
-  public static final int HOSTS = 1;
-  public List<String> names;
-  public static final int NAMES = 2;
-  public long offset;
-  public static final int OFFSET = 3;
-  public long length;
-  public static final int LENGTH = 4;
-
-  private final Isset __isset = new Isset();
-  private static final class Isset implements java.io.Serializable {
-    public boolean offset = false;
-    public boolean length = false;
-  }
-
-  public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-    put(HOSTS, new FieldMetaData("hosts", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new FieldValueMetaData(TType.STRING))));
-    put(NAMES, new FieldMetaData("names", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new FieldValueMetaData(TType.STRING))));
-    put(OFFSET, new FieldMetaData("offset", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-    put(LENGTH, new FieldMetaData("length", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-  }});
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BlockLocation implements org.apache.thrift.TBase<BlockLocation, BlockLocation._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BlockLocation");
+
+  private static final org.apache.thrift.protocol.TField HOSTS_FIELD_DESC = new org.apache.thrift.protocol.TField("hosts", org.apache.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.thrift.protocol.TField NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("names", org.apache.thrift.protocol.TType.LIST, (short)2);
+  private static final org.apache.thrift.protocol.TField OFFSET_FIELD_DESC = new org.apache.thrift.protocol.TField("offset", org.apache.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.thrift.protocol.TField LENGTH_FIELD_DESC = new org.apache.thrift.protocol.TField("length", org.apache.thrift.protocol.TType.I64, (short)4);
+
+  public List<String> hosts; // required
+  public List<String> names; // required
+  public long offset; // required
+  public long length; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    HOSTS((short)1, "hosts"),
+    NAMES((short)2, "names"),
+    OFFSET((short)3, "offset"),
+    LENGTH((short)4, "length");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // HOSTS
+          return HOSTS;
+        case 2: // NAMES
+          return NAMES;
+        case 3: // OFFSET
+          return OFFSET;
+        case 4: // LENGTH
+          return LENGTH;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
 
+  // isset id assignments
+  private static final int __OFFSET_ISSET_ID = 0;
+  private static final int __LENGTH_ISSET_ID = 1;
+  private BitSet __isset_bit_vector = new BitSet(2);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    FieldMetaData.addStructMetaDataMap(BlockLocation.class, metaDataMap);
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.HOSTS, new org.apache.thrift.meta_data.FieldMetaData("hosts", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.NAMES, new org.apache.thrift.meta_data.FieldMetaData("names", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.LENGTH, new org.apache.thrift.meta_data.FieldMetaData("length", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BlockLocation.class, metaDataMap);
   }
 
   public BlockLocation() {
@@ -70,15 +135,17 @@ public BlockLocation(
     this.hosts = hosts;
     this.names = names;
     this.offset = offset;
-    this.__isset.offset = true;
+    setOffsetIsSet(true);
     this.length = length;
-    this.__isset.length = true;
+    setLengthIsSet(true);
   }
 
   /**
    * Performs a deep copy on <i>other</i>.
    */
   public BlockLocation(BlockLocation other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
     if (other.isSetHosts()) {
       List<String> __this__hosts = new ArrayList<String>();
       for (String other_element : other.hosts) {
@@ -93,17 +160,24 @@ public BlockLocation(BlockLocation other) {
       }
       this.names = __this__names;
     }
-    __isset.offset = other.__isset.offset;
     this.offset = other.offset;
-    __isset.length = other.__isset.length;
     this.length = other.length;
   }
 
-  @Override
-  public BlockLocation clone() {
+  public BlockLocation deepCopy() {
     return new BlockLocation(this);
   }
 
+  @Override
+  public void clear() {
+    this.hosts = null;
+    this.names = null;
+    setOffsetIsSet(false);
+    this.offset = 0;
+    setLengthIsSet(false);
+    this.length = 0;
+  }
+
   public int getHostsSize() {
     return (this.hosts == null) ? 0 : this.hosts.size();
   }
@@ -123,15 +197,16 @@ public List<String> getHosts() {
     return this.hosts;
   }
 
-  public void setHosts(List<String> hosts) {
+  public BlockLocation setHosts(List<String> hosts) {
     this.hosts = hosts;
+    return this;
   }
 
   public void unsetHosts() {
     this.hosts = null;
   }
 
-  // Returns true if field hosts is set (has been asigned a value) and false otherwise
+  /** Returns true if field hosts is set (has been assigned a value) and false otherwise */
   public boolean isSetHosts() {
     return this.hosts != null;
   }
@@ -161,15 +236,16 @@ public List<String> getNames() {
     return this.names;
   }
 
-  public void setNames(List<String> names) {
+  public BlockLocation setNames(List<String> names) {
     this.names = names;
+    return this;
   }
 
   public void unsetNames() {
     this.names = null;
   }
 
-  // Returns true if field names is set (has been asigned a value) and false otherwise
+  /** Returns true if field names is set (has been assigned a value) and false otherwise */
   public boolean isSetNames() {
     return this.names != null;
   }
@@ -184,48 +260,50 @@ public long getOffset() {
     return this.offset;
   }
 
-  public void setOffset(long offset) {
+  public BlockLocation setOffset(long offset) {
     this.offset = offset;
-    this.__isset.offset = true;
+    setOffsetIsSet(true);
+    return this;
   }
 
   public void unsetOffset() {
-    this.__isset.offset = false;
+    __isset_bit_vector.clear(__OFFSET_ISSET_ID);
   }
 
-  // Returns true if field offset is set (has been asigned a value) and false otherwise
+  /** Returns true if field offset is set (has been assigned a value) and false otherwise */
   public boolean isSetOffset() {
-    return this.__isset.offset;
+    return __isset_bit_vector.get(__OFFSET_ISSET_ID);
   }
 
   public void setOffsetIsSet(boolean value) {
-    this.__isset.offset = value;
+    __isset_bit_vector.set(__OFFSET_ISSET_ID, value);
   }
 
   public long getLength() {
     return this.length;
   }
 
-  public void setLength(long length) {
+  public BlockLocation setLength(long length) {
     this.length = length;
-    this.__isset.length = true;
+    setLengthIsSet(true);
+    return this;
   }
 
   public void unsetLength() {
-    this.__isset.length = false;
+    __isset_bit_vector.clear(__LENGTH_ISSET_ID);
   }
 
-  // Returns true if field length is set (has been asigned a value) and false otherwise
+  /** Returns true if field length is set (has been assigned a value) and false otherwise */
   public boolean isSetLength() {
-    return this.__isset.length;
+    return __isset_bit_vector.get(__LENGTH_ISSET_ID);
   }
 
   public void setLengthIsSet(boolean value) {
-    this.__isset.length = value;
+    __isset_bit_vector.set(__LENGTH_ISSET_ID, value);
   }
 
-  public void setFieldValue(int fieldID, Object value) {
-    switch (fieldID) {
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
     case HOSTS:
       if (value == null) {
         unsetHosts();
@@ -258,13 +336,11 @@ public void setFieldValue(int fieldID, Object value) {
       }
       break;
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
   }
 
-  public Object getFieldValue(int fieldID) {
-    switch (fieldID) {
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
     case HOSTS:
       return getHosts();
 
@@ -272,19 +348,22 @@ public Object getFieldValue(int fieldID) {
       return getNames();
 
     case OFFSET:
-      return new Long(getOffset());
+      return Long.valueOf(getOffset());
 
     case LENGTH:
-      return new Long(getLength());
+      return Long.valueOf(getLength());
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
-  // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-  public boolean isSet(int fieldID) {
-    switch (fieldID) {
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
     case HOSTS:
       return isSetHosts();
     case NAMES:
@@ -293,9 +372,8 @@ public boolean isSet(int fieldID) {
       return isSetOffset();
     case LENGTH:
       return isSetLength();
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
   @Override
@@ -355,89 +433,142 @@ public int hashCode() {
     return 0;
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public int compareTo(BlockLocation other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    BlockLocation typedOther = (BlockLocation)other;
+
+    lastComparison = Boolean.valueOf(isSetHosts()).compareTo(typedOther.isSetHosts());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetHosts()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hosts, typedOther.hosts);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetNames()).compareTo(typedOther.isSetNames());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetNames()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.names, typedOther.names);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetOffset()).compareTo(typedOther.isSetOffset());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetOffset()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.offset, typedOther.offset);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLength()).compareTo(typedOther.isSetLength());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLength()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.length, typedOther.length);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
-      switch (field.id)
-      {
-        case HOSTS:
-          if (field.type == TType.LIST) {
+      switch (field.id) {
+        case 1: // HOSTS
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list0 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
               this.hosts = new ArrayList<String>(_list0.size);
               for (int _i1 = 0; _i1 < _list0.size; ++_i1)
               {
-                String _elem2;
+                String _elem2; // required
                 _elem2 = iprot.readString();
                 this.hosts.add(_elem2);
               }
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case NAMES:
-          if (field.type == TType.LIST) {
+        case 2: // NAMES
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list3 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
               this.names = new ArrayList<String>(_list3.size);
               for (int _i4 = 0; _i4 < _list3.size; ++_i4)
               {
-                String _elem5;
+                String _elem5; // required
                 _elem5 = iprot.readString();
                 this.names.add(_elem5);
               }
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case OFFSET:
-          if (field.type == TType.I64) {
+        case 3: // OFFSET
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
             this.offset = iprot.readI64();
-            this.__isset.offset = true;
+            setOffsetIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case LENGTH:
-          if (field.type == TType.I64) {
+        case 4: // LENGTH
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
             this.length = iprot.readI64();
-            this.__isset.length = true;
+            setLengthIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
 
-
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
     if (this.hosts != null) {
       oprot.writeFieldBegin(HOSTS_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRING, this.hosts.size()));
-        for (String _iter6 : this.hosts)        {
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.hosts.size()));
+        for (String _iter6 : this.hosts)
+        {
           oprot.writeString(_iter6);
         }
         oprot.writeListEnd();
@@ -447,8 +578,9 @@ public void write(TProtocol oprot) throws TException {
     if (this.names != null) {
       oprot.writeFieldBegin(NAMES_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRING, this.names.size()));
-        for (String _iter7 : this.names)        {
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.names.size()));
+        for (String _iter7 : this.names)
+        {
           oprot.writeString(_iter7);
         }
         oprot.writeListEnd();
@@ -497,9 +629,26 @@ public String toString() {
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
-    // check that fields of type enum have valid values
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
   }
 
 }
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/FileStatus.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/FileStatus.java
index 494fffe7..c8a0533f 100644
--- a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/FileStatus.java
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/FileStatus.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -9,78 +9,153 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Collections;
-import org.apache.log4j.Logger;
-
-import org.apache.thrift.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.protocol.*;
-
-public class FileStatus implements TBase, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("FileStatus");
-  private static final TField PATH_FIELD_DESC = new TField("path", TType.STRING, (short)1);
-  private static final TField LENGTH_FIELD_DESC = new TField("length", TType.I64, (short)2);
-  private static final TField ISDIR_FIELD_DESC = new TField("isdir", TType.BOOL, (short)3);
-  private static final TField BLOCK_REPLICATION_FIELD_DESC = new TField("block_replication", TType.I16, (short)4);
-  private static final TField BLOCKSIZE_FIELD_DESC = new TField("blocksize", TType.I64, (short)5);
-  private static final TField MODIFICATION_TIME_FIELD_DESC = new TField("modification_time", TType.I64, (short)6);
-  private static final TField PERMISSION_FIELD_DESC = new TField("permission", TType.STRING, (short)7);
-  private static final TField OWNER_FIELD_DESC = new TField("owner", TType.STRING, (short)8);
-  private static final TField GROUP_FIELD_DESC = new TField("group", TType.STRING, (short)9);
-
-  public String path;
-  public static final int PATH = 1;
-  public long length;
-  public static final int LENGTH = 2;
-  public boolean isdir;
-  public static final int ISDIR = 3;
-  public short block_replication;
-  public static final int BLOCK_REPLICATION = 4;
-  public long blocksize;
-  public static final int BLOCKSIZE = 5;
-  public long modification_time;
-  public static final int MODIFICATION_TIME = 6;
-  public String permission;
-  public static final int PERMISSION = 7;
-  public String owner;
-  public static final int OWNER = 8;
-  public String group;
-  public static final int GROUP = 9;
-
-  private final Isset __isset = new Isset();
-  private static final class Isset implements java.io.Serializable {
-    public boolean length = false;
-    public boolean isdir = false;
-    public boolean block_replication = false;
-    public boolean blocksize = false;
-    public boolean modification_time = false;
-  }
-
-  public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-    put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    put(LENGTH, new FieldMetaData("length", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-    put(ISDIR, new FieldMetaData("isdir", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
-    put(BLOCK_REPLICATION, new FieldMetaData("block_replication", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I16)));
-    put(BLOCKSIZE, new FieldMetaData("blocksize", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-    put(MODIFICATION_TIME, new FieldMetaData("modification_time", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-    put(PERMISSION, new FieldMetaData("permission", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    put(OWNER, new FieldMetaData("owner", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    put(GROUP, new FieldMetaData("group", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-  }});
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FileStatus implements org.apache.thrift.TBase<FileStatus, FileStatus._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FileStatus");
+
+  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField LENGTH_FIELD_DESC = new org.apache.thrift.protocol.TField("length", org.apache.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.thrift.protocol.TField ISDIR_FIELD_DESC = new org.apache.thrift.protocol.TField("isdir", org.apache.thrift.protocol.TType.BOOL, (short)3);
+  private static final org.apache.thrift.protocol.TField BLOCK_REPLICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("block_replication", org.apache.thrift.protocol.TType.I16, (short)4);
+  private static final org.apache.thrift.protocol.TField BLOCKSIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("blocksize", org.apache.thrift.protocol.TType.I64, (short)5);
+  private static final org.apache.thrift.protocol.TField MODIFICATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("modification_time", org.apache.thrift.protocol.TType.I64, (short)6);
+  private static final org.apache.thrift.protocol.TField PERMISSION_FIELD_DESC = new org.apache.thrift.protocol.TField("permission", org.apache.thrift.protocol.TType.STRING, (short)7);
+  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.thrift.protocol.TField GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("group", org.apache.thrift.protocol.TType.STRING, (short)9);
+
+  public String path; // required
+  public long length; // required
+  public boolean isdir; // required
+  public short block_replication; // required
+  public long blocksize; // required
+  public long modification_time; // required
+  public String permission; // required
+  public String owner; // required
+  public String group; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    PATH((short)1, "path"),
+    LENGTH((short)2, "length"),
+    ISDIR((short)3, "isdir"),
+    BLOCK_REPLICATION((short)4, "block_replication"),
+    BLOCKSIZE((short)5, "blocksize"),
+    MODIFICATION_TIME((short)6, "modification_time"),
+    PERMISSION((short)7, "permission"),
+    OWNER((short)8, "owner"),
+    GROUP((short)9, "group");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // PATH
+          return PATH;
+        case 2: // LENGTH
+          return LENGTH;
+        case 3: // ISDIR
+          return ISDIR;
+        case 4: // BLOCK_REPLICATION
+          return BLOCK_REPLICATION;
+        case 5: // BLOCKSIZE
+          return BLOCKSIZE;
+        case 6: // MODIFICATION_TIME
+          return MODIFICATION_TIME;
+        case 7: // PERMISSION
+          return PERMISSION;
+        case 8: // OWNER
+          return OWNER;
+        case 9: // GROUP
+          return GROUP;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
 
+  // isset id assignments
+  private static final int __LENGTH_ISSET_ID = 0;
+  private static final int __ISDIR_ISSET_ID = 1;
+  private static final int __BLOCK_REPLICATION_ISSET_ID = 2;
+  private static final int __BLOCKSIZE_ISSET_ID = 3;
+  private static final int __MODIFICATION_TIME_ISSET_ID = 4;
+  private BitSet __isset_bit_vector = new BitSet(5);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    FieldMetaData.addStructMetaDataMap(FileStatus.class, metaDataMap);
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.LENGTH, new org.apache.thrift.meta_data.FieldMetaData("length", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.ISDIR, new org.apache.thrift.meta_data.FieldMetaData("isdir", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.BLOCK_REPLICATION, new org.apache.thrift.meta_data.FieldMetaData("block_replication", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
+    tmpMap.put(_Fields.BLOCKSIZE, new org.apache.thrift.meta_data.FieldMetaData("blocksize", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.MODIFICATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("modification_time", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.PERMISSION, new org.apache.thrift.meta_data.FieldMetaData("permission", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GROUP, new org.apache.thrift.meta_data.FieldMetaData("group", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FileStatus.class, metaDataMap);
   }
 
   public FileStatus() {
@@ -100,15 +175,15 @@ public FileStatus(
     this();
     this.path = path;
     this.length = length;
-    this.__isset.length = true;
+    setLengthIsSet(true);
     this.isdir = isdir;
-    this.__isset.isdir = true;
+    setIsdirIsSet(true);
     this.block_replication = block_replication;
-    this.__isset.block_replication = true;
+    setBlock_replicationIsSet(true);
     this.blocksize = blocksize;
-    this.__isset.blocksize = true;
+    setBlocksizeIsSet(true);
     this.modification_time = modification_time;
-    this.__isset.modification_time = true;
+    setModification_timeIsSet(true);
     this.permission = permission;
     this.owner = owner;
     this.group = group;
@@ -118,18 +193,15 @@ public FileStatus(
    * Performs a deep copy on <i>other</i>.
    */
   public FileStatus(FileStatus other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
     if (other.isSetPath()) {
       this.path = other.path;
     }
-    __isset.length = other.__isset.length;
     this.length = other.length;
-    __isset.isdir = other.__isset.isdir;
     this.isdir = other.isdir;
-    __isset.block_replication = other.__isset.block_replication;
     this.block_replication = other.block_replication;
-    __isset.blocksize = other.__isset.blocksize;
     this.blocksize = other.blocksize;
-    __isset.modification_time = other.__isset.modification_time;
     this.modification_time = other.modification_time;
     if (other.isSetPermission()) {
       this.permission = other.permission;
@@ -142,24 +214,42 @@ public FileStatus(FileStatus other) {
     }
   }
 
-  @Override
-  public FileStatus clone() {
+  public FileStatus deepCopy() {
     return new FileStatus(this);
   }
 
+  @Override
+  public void clear() {
+    this.path = null;
+    setLengthIsSet(false);
+    this.length = 0;
+    setIsdirIsSet(false);
+    this.isdir = false;
+    setBlock_replicationIsSet(false);
+    this.block_replication = 0;
+    setBlocksizeIsSet(false);
+    this.blocksize = 0;
+    setModification_timeIsSet(false);
+    this.modification_time = 0;
+    this.permission = null;
+    this.owner = null;
+    this.group = null;
+  }
+
   public String getPath() {
     return this.path;
   }
 
-  public void setPath(String path) {
+  public FileStatus setPath(String path) {
     this.path = path;
+    return this;
   }
 
   public void unsetPath() {
     this.path = null;
   }
 
-  // Returns true if field path is set (has been asigned a value) and false otherwise
+  /** Returns true if field path is set (has been assigned a value) and false otherwise */
   public boolean isSetPath() {
     return this.path != null;
   }
@@ -174,125 +264,131 @@ public long getLength() {
     return this.length;
   }
 
-  public void setLength(long length) {
+  public FileStatus setLength(long length) {
     this.length = length;
-    this.__isset.length = true;
+    setLengthIsSet(true);
+    return this;
   }
 
   public void unsetLength() {
-    this.__isset.length = false;
+    __isset_bit_vector.clear(__LENGTH_ISSET_ID);
   }
 
-  // Returns true if field length is set (has been asigned a value) and false otherwise
+  /** Returns true if field length is set (has been assigned a value) and false otherwise */
   public boolean isSetLength() {
-    return this.__isset.length;
+    return __isset_bit_vector.get(__LENGTH_ISSET_ID);
   }
 
   public void setLengthIsSet(boolean value) {
-    this.__isset.length = value;
+    __isset_bit_vector.set(__LENGTH_ISSET_ID, value);
   }
 
   public boolean isIsdir() {
     return this.isdir;
   }
 
-  public void setIsdir(boolean isdir) {
+  public FileStatus setIsdir(boolean isdir) {
     this.isdir = isdir;
-    this.__isset.isdir = true;
+    setIsdirIsSet(true);
+    return this;
   }
 
   public void unsetIsdir() {
-    this.__isset.isdir = false;
+    __isset_bit_vector.clear(__ISDIR_ISSET_ID);
   }
 
-  // Returns true if field isdir is set (has been asigned a value) and false otherwise
+  /** Returns true if field isdir is set (has been assigned a value) and false otherwise */
   public boolean isSetIsdir() {
-    return this.__isset.isdir;
+    return __isset_bit_vector.get(__ISDIR_ISSET_ID);
   }
 
   public void setIsdirIsSet(boolean value) {
-    this.__isset.isdir = value;
+    __isset_bit_vector.set(__ISDIR_ISSET_ID, value);
   }
 
   public short getBlock_replication() {
     return this.block_replication;
   }
 
-  public void setBlock_replication(short block_replication) {
+  public FileStatus setBlock_replication(short block_replication) {
     this.block_replication = block_replication;
-    this.__isset.block_replication = true;
+    setBlock_replicationIsSet(true);
+    return this;
   }
 
   public void unsetBlock_replication() {
-    this.__isset.block_replication = false;
+    __isset_bit_vector.clear(__BLOCK_REPLICATION_ISSET_ID);
   }
 
-  // Returns true if field block_replication is set (has been asigned a value) and false otherwise
+  /** Returns true if field block_replication is set (has been assigned a value) and false otherwise */
   public boolean isSetBlock_replication() {
-    return this.__isset.block_replication;
+    return __isset_bit_vector.get(__BLOCK_REPLICATION_ISSET_ID);
   }
 
   public void setBlock_replicationIsSet(boolean value) {
-    this.__isset.block_replication = value;
+    __isset_bit_vector.set(__BLOCK_REPLICATION_ISSET_ID, value);
   }
 
   public long getBlocksize() {
     return this.blocksize;
   }
 
-  public void setBlocksize(long blocksize) {
+  public FileStatus setBlocksize(long blocksize) {
     this.blocksize = blocksize;
-    this.__isset.blocksize = true;
+    setBlocksizeIsSet(true);
+    return this;
   }
 
   public void unsetBlocksize() {
-    this.__isset.blocksize = false;
+    __isset_bit_vector.clear(__BLOCKSIZE_ISSET_ID);
   }
 
-  // Returns true if field blocksize is set (has been asigned a value) and false otherwise
+  /** Returns true if field blocksize is set (has been assigned a value) and false otherwise */
   public boolean isSetBlocksize() {
-    return this.__isset.blocksize;
+    return __isset_bit_vector.get(__BLOCKSIZE_ISSET_ID);
   }
 
   public void setBlocksizeIsSet(boolean value) {
-    this.__isset.blocksize = value;
+    __isset_bit_vector.set(__BLOCKSIZE_ISSET_ID, value);
   }
 
   public long getModification_time() {
     return this.modification_time;
   }
 
-  public void setModification_time(long modification_time) {
+  public FileStatus setModification_time(long modification_time) {
     this.modification_time = modification_time;
-    this.__isset.modification_time = true;
+    setModification_timeIsSet(true);
+    return this;
   }
 
   public void unsetModification_time() {
-    this.__isset.modification_time = false;
+    __isset_bit_vector.clear(__MODIFICATION_TIME_ISSET_ID);
   }
 
-  // Returns true if field modification_time is set (has been asigned a value) and false otherwise
+  /** Returns true if field modification_time is set (has been assigned a value) and false otherwise */
   public boolean isSetModification_time() {
-    return this.__isset.modification_time;
+    return __isset_bit_vector.get(__MODIFICATION_TIME_ISSET_ID);
   }
 
   public void setModification_timeIsSet(boolean value) {
-    this.__isset.modification_time = value;
+    __isset_bit_vector.set(__MODIFICATION_TIME_ISSET_ID, value);
   }
 
   public String getPermission() {
     return this.permission;
   }
 
-  public void setPermission(String permission) {
+  public FileStatus setPermission(String permission) {
     this.permission = permission;
+    return this;
   }
 
   public void unsetPermission() {
     this.permission = null;
   }
 
-  // Returns true if field permission is set (has been asigned a value) and false otherwise
+  /** Returns true if field permission is set (has been assigned a value) and false otherwise */
   public boolean isSetPermission() {
     return this.permission != null;
   }
@@ -307,15 +403,16 @@ public String getOwner() {
     return this.owner;
   }
 
-  public void setOwner(String owner) {
+  public FileStatus setOwner(String owner) {
     this.owner = owner;
+    return this;
   }
 
   public void unsetOwner() {
     this.owner = null;
   }
 
-  // Returns true if field owner is set (has been asigned a value) and false otherwise
+  /** Returns true if field owner is set (has been assigned a value) and false otherwise */
   public boolean isSetOwner() {
     return this.owner != null;
   }
@@ -330,15 +427,16 @@ public String getGroup() {
     return this.group;
   }
 
-  public void setGroup(String group) {
+  public FileStatus setGroup(String group) {
     this.group = group;
+    return this;
   }
 
   public void unsetGroup() {
     this.group = null;
   }
 
-  // Returns true if field group is set (has been asigned a value) and false otherwise
+  /** Returns true if field group is set (has been assigned a value) and false otherwise */
   public boolean isSetGroup() {
     return this.group != null;
   }
@@ -349,8 +447,8 @@ public void setGroupIsSet(boolean value) {
     }
   }
 
-  public void setFieldValue(int fieldID, Object value) {
-    switch (fieldID) {
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
     case PATH:
       if (value == null) {
         unsetPath();
@@ -423,30 +521,28 @@ public void setFieldValue(int fieldID, Object value) {
       }
       break;
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
   }
 
-  public Object getFieldValue(int fieldID) {
-    switch (fieldID) {
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
     case PATH:
       return getPath();
 
     case LENGTH:
-      return new Long(getLength());
+      return Long.valueOf(getLength());
 
     case ISDIR:
-      return new Boolean(isIsdir());
+      return Boolean.valueOf(isIsdir());
 
     case BLOCK_REPLICATION:
-      return new Short(getBlock_replication());
+      return Short.valueOf(getBlock_replication());
 
     case BLOCKSIZE:
-      return new Long(getBlocksize());
+      return Long.valueOf(getBlocksize());
 
     case MODIFICATION_TIME:
-      return new Long(getModification_time());
+      return Long.valueOf(getModification_time());
 
     case PERMISSION:
       return getPermission();
@@ -457,14 +553,17 @@ public Object getFieldValue(int fieldID) {
     case GROUP:
       return getGroup();
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
-  // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-  public boolean isSet(int fieldID) {
-    switch (fieldID) {
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
     case PATH:
       return isSetPath();
     case LENGTH:
@@ -483,9 +582,8 @@ public boolean isSet(int fieldID) {
       return isSetOwner();
     case GROUP:
       return isSetGroup();
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
   @Override
@@ -590,99 +688,201 @@ public int hashCode() {
     return 0;
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public int compareTo(FileStatus other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    FileStatus typedOther = (FileStatus)other;
+
+    lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPath()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLength()).compareTo(typedOther.isSetLength());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLength()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.length, typedOther.length);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetIsdir()).compareTo(typedOther.isSetIsdir());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetIsdir()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isdir, typedOther.isdir);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetBlock_replication()).compareTo(typedOther.isSetBlock_replication());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetBlock_replication()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.block_replication, typedOther.block_replication);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetBlocksize()).compareTo(typedOther.isSetBlocksize());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetBlocksize()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blocksize, typedOther.blocksize);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetModification_time()).compareTo(typedOther.isSetModification_time());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetModification_time()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.modification_time, typedOther.modification_time);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetPermission()).compareTo(typedOther.isSetPermission());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPermission()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.permission, typedOther.permission);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetOwner()).compareTo(typedOther.isSetOwner());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetOwner()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, typedOther.owner);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetGroup()).compareTo(typedOther.isSetGroup());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGroup()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.group, typedOther.group);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
-      switch (field.id)
-      {
-        case PATH:
-          if (field.type == TType.STRING) {
+      switch (field.id) {
+        case 1: // PATH
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.path = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case LENGTH:
-          if (field.type == TType.I64) {
+        case 2: // LENGTH
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
             this.length = iprot.readI64();
-            this.__isset.length = true;
+            setLengthIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case ISDIR:
-          if (field.type == TType.BOOL) {
+        case 3: // ISDIR
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.isdir = iprot.readBool();
-            this.__isset.isdir = true;
+            setIsdirIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case BLOCK_REPLICATION:
-          if (field.type == TType.I16) {
+        case 4: // BLOCK_REPLICATION
+          if (field.type == org.apache.thrift.protocol.TType.I16) {
             this.block_replication = iprot.readI16();
-            this.__isset.block_replication = true;
+            setBlock_replicationIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case BLOCKSIZE:
-          if (field.type == TType.I64) {
+        case 5: // BLOCKSIZE
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
             this.blocksize = iprot.readI64();
-            this.__isset.blocksize = true;
+            setBlocksizeIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case MODIFICATION_TIME:
-          if (field.type == TType.I64) {
+        case 6: // MODIFICATION_TIME
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
             this.modification_time = iprot.readI64();
-            this.__isset.modification_time = true;
+            setModification_timeIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case PERMISSION:
-          if (field.type == TType.STRING) {
+        case 7: // PERMISSION
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.permission = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case OWNER:
-          if (field.type == TType.STRING) {
+        case 8: // OWNER
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.owner = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case GROUP:
-          if (field.type == TType.STRING) {
+        case 9: // GROUP
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.group = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
 
-
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -785,9 +985,26 @@ public String toString() {
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
-    // check that fields of type enum have valid values
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
   }
 
 }
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/MalformedInputException.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/MalformedInputException.java
index ea8bd721..09e3f4ea 100644
--- a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/MalformedInputException.java
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/MalformedInputException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -9,33 +9,91 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Collections;
-import org.apache.log4j.Logger;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.protocol.*;
+public class MalformedInputException extends Exception implements org.apache.thrift.TBase<MalformedInputException, MalformedInputException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MalformedInputException");
 
-public class MalformedInputException extends Exception implements TBase, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("MalformedInputException");
-  private static final TField MESSAGE_FIELD_DESC = new TField("message", TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-  public String message;
-  public static final int MESSAGE = 1;
+  public String message; // required
 
-  private final Isset __isset = new Isset();
-  private static final class Isset implements java.io.Serializable {
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
   }
 
-  public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-    put(MESSAGE, new FieldMetaData("message", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-  }});
+  // isset id assignments
 
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    FieldMetaData.addStructMetaDataMap(MalformedInputException.class, metaDataMap);
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MalformedInputException.class, metaDataMap);
   }
 
   public MalformedInputException() {
@@ -57,24 +115,29 @@ public MalformedInputException(MalformedInputException other) {
     }
   }
 
-  @Override
-  public MalformedInputException clone() {
+  public MalformedInputException deepCopy() {
     return new MalformedInputException(this);
   }
 
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
   public String getMessage() {
     return this.message;
   }
 
-  public void setMessage(String message) {
+  public MalformedInputException setMessage(String message) {
     this.message = message;
+    return this;
   }
 
   public void unsetMessage() {
     this.message = null;
   }
 
-  // Returns true if field message is set (has been asigned a value) and false otherwise
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
   public boolean isSetMessage() {
     return this.message != null;
   }
@@ -85,8 +148,8 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
-  public void setFieldValue(int fieldID, Object value) {
-    switch (fieldID) {
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
     case MESSAGE:
       if (value == null) {
         unsetMessage();
@@ -95,29 +158,29 @@ public void setFieldValue(int fieldID, Object value) {
       }
       break;
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
   }
 
-  public Object getFieldValue(int fieldID) {
-    switch (fieldID) {
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
     case MESSAGE:
       return getMessage();
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
-  // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-  public boolean isSet(int fieldID) {
-    switch (fieldID) {
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
     case MESSAGE:
       return isSetMessage();
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
   @Override
@@ -150,38 +213,60 @@ public int hashCode() {
     return 0;
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public int compareTo(MalformedInputException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    MalformedInputException typedOther = (MalformedInputException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
-      switch (field.id)
-      {
-        case MESSAGE:
-          if (field.type == TType.STRING) {
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.message = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
 
-
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -210,9 +295,24 @@ public String toString() {
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
-    // check that fields of type enum have valid values
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
   }
 
 }
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/Pathname.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/Pathname.java
index ada5bb2f..a8ac7e87 100644
--- a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/Pathname.java
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/Pathname.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -9,33 +9,91 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Collections;
-import org.apache.log4j.Logger;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.protocol.*;
+public class Pathname implements org.apache.thrift.TBase<Pathname, Pathname._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pathname");
 
-public class Pathname implements TBase, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Pathname");
-  private static final TField PATHNAME_FIELD_DESC = new TField("pathname", TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField PATHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("pathname", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-  public String pathname;
-  public static final int PATHNAME = 1;
+  public String pathname; // required
 
-  private final Isset __isset = new Isset();
-  private static final class Isset implements java.io.Serializable {
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    PATHNAME((short)1, "pathname");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // PATHNAME
+          return PATHNAME;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
   }
 
-  public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-    put(PATHNAME, new FieldMetaData("pathname", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-  }});
+  // isset id assignments
 
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    FieldMetaData.addStructMetaDataMap(Pathname.class, metaDataMap);
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.PATHNAME, new org.apache.thrift.meta_data.FieldMetaData("pathname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Pathname.class, metaDataMap);
   }
 
   public Pathname() {
@@ -57,24 +115,29 @@ public Pathname(Pathname other) {
     }
   }
 
-  @Override
-  public Pathname clone() {
+  public Pathname deepCopy() {
     return new Pathname(this);
   }
 
+  @Override
+  public void clear() {
+    this.pathname = null;
+  }
+
   public String getPathname() {
     return this.pathname;
   }
 
-  public void setPathname(String pathname) {
+  public Pathname setPathname(String pathname) {
     this.pathname = pathname;
+    return this;
   }
 
   public void unsetPathname() {
     this.pathname = null;
   }
 
-  // Returns true if field pathname is set (has been asigned a value) and false otherwise
+  /** Returns true if field pathname is set (has been assigned a value) and false otherwise */
   public boolean isSetPathname() {
     return this.pathname != null;
   }
@@ -85,8 +148,8 @@ public void setPathnameIsSet(boolean value) {
     }
   }
 
-  public void setFieldValue(int fieldID, Object value) {
-    switch (fieldID) {
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
     case PATHNAME:
       if (value == null) {
         unsetPathname();
@@ -95,29 +158,29 @@ public void setFieldValue(int fieldID, Object value) {
       }
       break;
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
   }
 
-  public Object getFieldValue(int fieldID) {
-    switch (fieldID) {
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
     case PATHNAME:
       return getPathname();
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
-  // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-  public boolean isSet(int fieldID) {
-    switch (fieldID) {
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
     case PATHNAME:
       return isSetPathname();
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
   @Override
@@ -150,38 +213,60 @@ public int hashCode() {
     return 0;
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public int compareTo(Pathname other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    Pathname typedOther = (Pathname)other;
+
+    lastComparison = Boolean.valueOf(isSetPathname()).compareTo(typedOther.isSetPathname());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPathname()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.pathname, typedOther.pathname);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
-      switch (field.id)
-      {
-        case PATHNAME:
-          if (field.type == TType.STRING) {
+      switch (field.id) {
+        case 1: // PATHNAME
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.pathname = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
 
-
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -210,9 +295,24 @@ public String toString() {
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
-    // check that fields of type enum have valid values
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
   }
 
 }
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TBlock.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TBlock.java
new file mode 100644
index 00000000..f3aa493a
--- /dev/null
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TBlock.java
@@ -0,0 +1,487 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftfs.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TBlock implements org.apache.thrift.TBase<TBlock, TBlock._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TBlock");
+
+  private static final org.apache.thrift.protocol.TField BLOCK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("blockId", org.apache.thrift.protocol.TType.I64, (short)1);
+  private static final org.apache.thrift.protocol.TField NUM_BYTES_FIELD_DESC = new org.apache.thrift.protocol.TField("numBytes", org.apache.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.thrift.protocol.TField GENERATION_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("generationStamp", org.apache.thrift.protocol.TType.I64, (short)3);
+
+  public long blockId; // required
+  public long numBytes; // required
+  public long generationStamp; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    BLOCK_ID((short)1, "blockId"),
+    NUM_BYTES((short)2, "numBytes"),
+    GENERATION_STAMP((short)3, "generationStamp");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // BLOCK_ID
+          return BLOCK_ID;
+        case 2: // NUM_BYTES
+          return NUM_BYTES;
+        case 3: // GENERATION_STAMP
+          return GENERATION_STAMP;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __BLOCKID_ISSET_ID = 0;
+  private static final int __NUMBYTES_ISSET_ID = 1;
+  private static final int __GENERATIONSTAMP_ISSET_ID = 2;
+  private BitSet __isset_bit_vector = new BitSet(3);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.BLOCK_ID, new org.apache.thrift.meta_data.FieldMetaData("blockId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.NUM_BYTES, new org.apache.thrift.meta_data.FieldMetaData("numBytes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.GENERATION_STAMP, new org.apache.thrift.meta_data.FieldMetaData("generationStamp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TBlock.class, metaDataMap);
+  }
+
+  public TBlock() {
+  }
+
+  public TBlock(
+    long blockId,
+    long numBytes,
+    long generationStamp)
+  {
+    this();
+    this.blockId = blockId;
+    setBlockIdIsSet(true);
+    this.numBytes = numBytes;
+    setNumBytesIsSet(true);
+    this.generationStamp = generationStamp;
+    setGenerationStampIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public TBlock(TBlock other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    this.blockId = other.blockId;
+    this.numBytes = other.numBytes;
+    this.generationStamp = other.generationStamp;
+  }
+
+  public TBlock deepCopy() {
+    return new TBlock(this);
+  }
+
+  @Override
+  public void clear() {
+    setBlockIdIsSet(false);
+    this.blockId = 0;
+    setNumBytesIsSet(false);
+    this.numBytes = 0;
+    setGenerationStampIsSet(false);
+    this.generationStamp = 0;
+  }
+
+  public long getBlockId() {
+    return this.blockId;
+  }
+
+  public TBlock setBlockId(long blockId) {
+    this.blockId = blockId;
+    setBlockIdIsSet(true);
+    return this;
+  }
+
+  public void unsetBlockId() {
+    __isset_bit_vector.clear(__BLOCKID_ISSET_ID);
+  }
+
+  /** Returns true if field blockId is set (has been assigned a value) and false otherwise */
+  public boolean isSetBlockId() {
+    return __isset_bit_vector.get(__BLOCKID_ISSET_ID);
+  }
+
+  public void setBlockIdIsSet(boolean value) {
+    __isset_bit_vector.set(__BLOCKID_ISSET_ID, value);
+  }
+
+  public long getNumBytes() {
+    return this.numBytes;
+  }
+
+  public TBlock setNumBytes(long numBytes) {
+    this.numBytes = numBytes;
+    setNumBytesIsSet(true);
+    return this;
+  }
+
+  public void unsetNumBytes() {
+    __isset_bit_vector.clear(__NUMBYTES_ISSET_ID);
+  }
+
+  /** Returns true if field numBytes is set (has been assigned a value) and false otherwise */
+  public boolean isSetNumBytes() {
+    return __isset_bit_vector.get(__NUMBYTES_ISSET_ID);
+  }
+
+  public void setNumBytesIsSet(boolean value) {
+    __isset_bit_vector.set(__NUMBYTES_ISSET_ID, value);
+  }
+
+  public long getGenerationStamp() {
+    return this.generationStamp;
+  }
+
+  public TBlock setGenerationStamp(long generationStamp) {
+    this.generationStamp = generationStamp;
+    setGenerationStampIsSet(true);
+    return this;
+  }
+
+  public void unsetGenerationStamp() {
+    __isset_bit_vector.clear(__GENERATIONSTAMP_ISSET_ID);
+  }
+
+  /** Returns true if field generationStamp is set (has been assigned a value) and false otherwise */
+  public boolean isSetGenerationStamp() {
+    return __isset_bit_vector.get(__GENERATIONSTAMP_ISSET_ID);
+  }
+
+  public void setGenerationStampIsSet(boolean value) {
+    __isset_bit_vector.set(__GENERATIONSTAMP_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case BLOCK_ID:
+      if (value == null) {
+        unsetBlockId();
+      } else {
+        setBlockId((Long)value);
+      }
+      break;
+
+    case NUM_BYTES:
+      if (value == null) {
+        unsetNumBytes();
+      } else {
+        setNumBytes((Long)value);
+      }
+      break;
+
+    case GENERATION_STAMP:
+      if (value == null) {
+        unsetGenerationStamp();
+      } else {
+        setGenerationStamp((Long)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case BLOCK_ID:
+      return Long.valueOf(getBlockId());
+
+    case NUM_BYTES:
+      return Long.valueOf(getNumBytes());
+
+    case GENERATION_STAMP:
+      return Long.valueOf(getGenerationStamp());
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case BLOCK_ID:
+      return isSetBlockId();
+    case NUM_BYTES:
+      return isSetNumBytes();
+    case GENERATION_STAMP:
+      return isSetGenerationStamp();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof TBlock)
+      return this.equals((TBlock)that);
+    return false;
+  }
+
+  public boolean equals(TBlock that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_blockId = true;
+    boolean that_present_blockId = true;
+    if (this_present_blockId || that_present_blockId) {
+      if (!(this_present_blockId && that_present_blockId))
+        return false;
+      if (this.blockId != that.blockId)
+        return false;
+    }
+
+    boolean this_present_numBytes = true;
+    boolean that_present_numBytes = true;
+    if (this_present_numBytes || that_present_numBytes) {
+      if (!(this_present_numBytes && that_present_numBytes))
+        return false;
+      if (this.numBytes != that.numBytes)
+        return false;
+    }
+
+    boolean this_present_generationStamp = true;
+    boolean that_present_generationStamp = true;
+    if (this_present_generationStamp || that_present_generationStamp) {
+      if (!(this_present_generationStamp && that_present_generationStamp))
+        return false;
+      if (this.generationStamp != that.generationStamp)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(TBlock other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    TBlock typedOther = (TBlock)other;
+
+    lastComparison = Boolean.valueOf(isSetBlockId()).compareTo(typedOther.isSetBlockId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetBlockId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockId, typedOther.blockId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetNumBytes()).compareTo(typedOther.isSetNumBytes());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetNumBytes()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numBytes, typedOther.numBytes);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetGenerationStamp()).compareTo(typedOther.isSetGenerationStamp());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGenerationStamp()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.generationStamp, typedOther.generationStamp);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // BLOCK_ID
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.blockId = iprot.readI64();
+            setBlockIdIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // NUM_BYTES
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.numBytes = iprot.readI64();
+            setNumBytesIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 3: // GENERATION_STAMP
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
+            this.generationStamp = iprot.readI64();
+            setGenerationStampIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldBegin(BLOCK_ID_FIELD_DESC);
+    oprot.writeI64(this.blockId);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(NUM_BYTES_FIELD_DESC);
+    oprot.writeI64(this.numBytes);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(GENERATION_STAMP_FIELD_DESC);
+    oprot.writeI64(this.generationStamp);
+    oprot.writeFieldEnd();
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("TBlock(");
+    boolean first = true;
+
+    sb.append("blockId:");
+    sb.append(this.blockId);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("numBytes:");
+    sb.append(this.numBytes);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("generationStamp:");
+    sb.append(this.generationStamp);
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TDatanodeID.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TDatanodeID.java
new file mode 100644
index 00000000..f230b4a2
--- /dev/null
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TDatanodeID.java
@@ -0,0 +1,319 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftfs.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TDatanodeID implements org.apache.thrift.TBase<TDatanodeID, TDatanodeID._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDatanodeID");
+
+  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  public String name; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    NAME((short)1, "name");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // NAME
+          return NAME;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TDatanodeID.class, metaDataMap);
+  }
+
+  public TDatanodeID() {
+  }
+
+  public TDatanodeID(
+    String name)
+  {
+    this();
+    this.name = name;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public TDatanodeID(TDatanodeID other) {
+    if (other.isSetName()) {
+      this.name = other.name;
+    }
+  }
+
+  public TDatanodeID deepCopy() {
+    return new TDatanodeID(this);
+  }
+
+  @Override
+  public void clear() {
+    this.name = null;
+  }
+
+  public String getName() {
+    return this.name;
+  }
+
+  public TDatanodeID setName(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public void unsetName() {
+    this.name = null;
+  }
+
+  /** Returns true if field name is set (has been assigned a value) and false otherwise */
+  public boolean isSetName() {
+    return this.name != null;
+  }
+
+  public void setNameIsSet(boolean value) {
+    if (!value) {
+      this.name = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case NAME:
+      if (value == null) {
+        unsetName();
+      } else {
+        setName((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case NAME:
+      return getName();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case NAME:
+      return isSetName();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof TDatanodeID)
+      return this.equals((TDatanodeID)that);
+    return false;
+  }
+
+  public boolean equals(TDatanodeID that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_name = true && this.isSetName();
+    boolean that_present_name = true && that.isSetName();
+    if (this_present_name || that_present_name) {
+      if (!(this_present_name && that_present_name))
+        return false;
+      if (!this.name.equals(that.name))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(TDatanodeID other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    TDatanodeID typedOther = (TDatanodeID)other;
+
+    lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // NAME
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.name = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.name != null) {
+      oprot.writeFieldBegin(NAME_FIELD_DESC);
+      oprot.writeString(this.name);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("TDatanodeID(");
+    boolean first = true;
+
+    sb.append("name:");
+    if (this.name == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.name);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TLocatedBlock.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TLocatedBlock.java
new file mode 100644
index 00000000..e0b99725
--- /dev/null
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/TLocatedBlock.java
@@ -0,0 +1,620 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.thriftfs.api;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TLocatedBlock implements org.apache.thrift.TBase<TLocatedBlock, TLocatedBlock._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TLocatedBlock");
+
+  private static final org.apache.thrift.protocol.TField BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("block", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.thrift.protocol.TField NAMESPACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("namespaceId", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField DATA_TRANSFER_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("dataTransferVersion", org.apache.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.thrift.protocol.TField LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("location", org.apache.thrift.protocol.TType.LIST, (short)4);
+
+  public TBlock block; // required
+  public int namespaceId; // required
+  public int dataTransferVersion; // required
+  public List<TDatanodeID> location; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    BLOCK((short)1, "block"),
+    NAMESPACE_ID((short)2, "namespaceId"),
+    DATA_TRANSFER_VERSION((short)3, "dataTransferVersion"),
+    LOCATION((short)4, "location");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // BLOCK
+          return BLOCK;
+        case 2: // NAMESPACE_ID
+          return NAMESPACE_ID;
+        case 3: // DATA_TRANSFER_VERSION
+          return DATA_TRANSFER_VERSION;
+        case 4: // LOCATION
+          return LOCATION;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __NAMESPACEID_ISSET_ID = 0;
+  private static final int __DATATRANSFERVERSION_ISSET_ID = 1;
+  private BitSet __isset_bit_vector = new BitSet(2);
+
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.BLOCK, new org.apache.thrift.meta_data.FieldMetaData("block", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TBlock.class)));
+    tmpMap.put(_Fields.NAMESPACE_ID, new org.apache.thrift.meta_data.FieldMetaData("namespaceId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.DATA_TRANSFER_VERSION, new org.apache.thrift.meta_data.FieldMetaData("dataTransferVersion", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.LOCATION, new org.apache.thrift.meta_data.FieldMetaData("location", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class))));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TLocatedBlock.class, metaDataMap);
+  }
+
+  public TLocatedBlock() {
+  }
+
+  public TLocatedBlock(
+    TBlock block,
+    int namespaceId,
+    int dataTransferVersion,
+    List<TDatanodeID> location)
+  {
+    this();
+    this.block = block;
+    this.namespaceId = namespaceId;
+    setNamespaceIdIsSet(true);
+    this.dataTransferVersion = dataTransferVersion;
+    setDataTransferVersionIsSet(true);
+    this.location = location;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public TLocatedBlock(TLocatedBlock other) {
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
+    if (other.isSetBlock()) {
+      this.block = new TBlock(other.block);
+    }
+    this.namespaceId = other.namespaceId;
+    this.dataTransferVersion = other.dataTransferVersion;
+    if (other.isSetLocation()) {
+      List<TDatanodeID> __this__location = new ArrayList<TDatanodeID>();
+      for (TDatanodeID other_element : other.location) {
+        __this__location.add(new TDatanodeID(other_element));
+      }
+      this.location = __this__location;
+    }
+  }
+
+  public TLocatedBlock deepCopy() {
+    return new TLocatedBlock(this);
+  }
+
+  @Override
+  public void clear() {
+    this.block = null;
+    setNamespaceIdIsSet(false);
+    this.namespaceId = 0;
+    setDataTransferVersionIsSet(false);
+    this.dataTransferVersion = 0;
+    this.location = null;
+  }
+
+  public TBlock getBlock() {
+    return this.block;
+  }
+
+  public TLocatedBlock setBlock(TBlock block) {
+    this.block = block;
+    return this;
+  }
+
+  public void unsetBlock() {
+    this.block = null;
+  }
+
+  /** Returns true if field block is set (has been assigned a value) and false otherwise */
+  public boolean isSetBlock() {
+    return this.block != null;
+  }
+
+  public void setBlockIsSet(boolean value) {
+    if (!value) {
+      this.block = null;
+    }
+  }
+
+  public int getNamespaceId() {
+    return this.namespaceId;
+  }
+
+  public TLocatedBlock setNamespaceId(int namespaceId) {
+    this.namespaceId = namespaceId;
+    setNamespaceIdIsSet(true);
+    return this;
+  }
+
+  public void unsetNamespaceId() {
+    __isset_bit_vector.clear(__NAMESPACEID_ISSET_ID);
+  }
+
+  /** Returns true if field namespaceId is set (has been assigned a value) and false otherwise */
+  public boolean isSetNamespaceId() {
+    return __isset_bit_vector.get(__NAMESPACEID_ISSET_ID);
+  }
+
+  public void setNamespaceIdIsSet(boolean value) {
+    __isset_bit_vector.set(__NAMESPACEID_ISSET_ID, value);
+  }
+
+  public int getDataTransferVersion() {
+    return this.dataTransferVersion;
+  }
+
+  public TLocatedBlock setDataTransferVersion(int dataTransferVersion) {
+    this.dataTransferVersion = dataTransferVersion;
+    setDataTransferVersionIsSet(true);
+    return this;
+  }
+
+  public void unsetDataTransferVersion() {
+    __isset_bit_vector.clear(__DATATRANSFERVERSION_ISSET_ID);
+  }
+
+  /** Returns true if field dataTransferVersion is set (has been assigned a value) and false otherwise */
+  public boolean isSetDataTransferVersion() {
+    return __isset_bit_vector.get(__DATATRANSFERVERSION_ISSET_ID);
+  }
+
+  public void setDataTransferVersionIsSet(boolean value) {
+    __isset_bit_vector.set(__DATATRANSFERVERSION_ISSET_ID, value);
+  }
+
+  public int getLocationSize() {
+    return (this.location == null) ? 0 : this.location.size();
+  }
+
+  public java.util.Iterator<TDatanodeID> getLocationIterator() {
+    return (this.location == null) ? null : this.location.iterator();
+  }
+
+  public void addToLocation(TDatanodeID elem) {
+    if (this.location == null) {
+      this.location = new ArrayList<TDatanodeID>();
+    }
+    this.location.add(elem);
+  }
+
+  public List<TDatanodeID> getLocation() {
+    return this.location;
+  }
+
+  public TLocatedBlock setLocation(List<TDatanodeID> location) {
+    this.location = location;
+    return this;
+  }
+
+  public void unsetLocation() {
+    this.location = null;
+  }
+
+  /** Returns true if field location is set (has been assigned a value) and false otherwise */
+  public boolean isSetLocation() {
+    return this.location != null;
+  }
+
+  public void setLocationIsSet(boolean value) {
+    if (!value) {
+      this.location = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case BLOCK:
+      if (value == null) {
+        unsetBlock();
+      } else {
+        setBlock((TBlock)value);
+      }
+      break;
+
+    case NAMESPACE_ID:
+      if (value == null) {
+        unsetNamespaceId();
+      } else {
+        setNamespaceId((Integer)value);
+      }
+      break;
+
+    case DATA_TRANSFER_VERSION:
+      if (value == null) {
+        unsetDataTransferVersion();
+      } else {
+        setDataTransferVersion((Integer)value);
+      }
+      break;
+
+    case LOCATION:
+      if (value == null) {
+        unsetLocation();
+      } else {
+        setLocation((List<TDatanodeID>)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case BLOCK:
+      return getBlock();
+
+    case NAMESPACE_ID:
+      return Integer.valueOf(getNamespaceId());
+
+    case DATA_TRANSFER_VERSION:
+      return Integer.valueOf(getDataTransferVersion());
+
+    case LOCATION:
+      return getLocation();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case BLOCK:
+      return isSetBlock();
+    case NAMESPACE_ID:
+      return isSetNamespaceId();
+    case DATA_TRANSFER_VERSION:
+      return isSetDataTransferVersion();
+    case LOCATION:
+      return isSetLocation();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof TLocatedBlock)
+      return this.equals((TLocatedBlock)that);
+    return false;
+  }
+
+  public boolean equals(TLocatedBlock that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_block = true && this.isSetBlock();
+    boolean that_present_block = true && that.isSetBlock();
+    if (this_present_block || that_present_block) {
+      if (!(this_present_block && that_present_block))
+        return false;
+      if (!this.block.equals(that.block))
+        return false;
+    }
+
+    boolean this_present_namespaceId = true;
+    boolean that_present_namespaceId = true;
+    if (this_present_namespaceId || that_present_namespaceId) {
+      if (!(this_present_namespaceId && that_present_namespaceId))
+        return false;
+      if (this.namespaceId != that.namespaceId)
+        return false;
+    }
+
+    boolean this_present_dataTransferVersion = true;
+    boolean that_present_dataTransferVersion = true;
+    if (this_present_dataTransferVersion || that_present_dataTransferVersion) {
+      if (!(this_present_dataTransferVersion && that_present_dataTransferVersion))
+        return false;
+      if (this.dataTransferVersion != that.dataTransferVersion)
+        return false;
+    }
+
+    boolean this_present_location = true && this.isSetLocation();
+    boolean that_present_location = true && that.isSetLocation();
+    if (this_present_location || that_present_location) {
+      if (!(this_present_location && that_present_location))
+        return false;
+      if (!this.location.equals(that.location))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(TLocatedBlock other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    TLocatedBlock typedOther = (TLocatedBlock)other;
+
+    lastComparison = Boolean.valueOf(isSetBlock()).compareTo(typedOther.isSetBlock());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetBlock()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.block, typedOther.block);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetNamespaceId()).compareTo(typedOther.isSetNamespaceId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetNamespaceId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.namespaceId, typedOther.namespaceId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetDataTransferVersion()).compareTo(typedOther.isSetDataTransferVersion());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetDataTransferVersion()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataTransferVersion, typedOther.dataTransferVersion);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLocation()).compareTo(typedOther.isSetLocation());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLocation()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.location, typedOther.location);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        case 1: // BLOCK
+          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+            this.block = new TBlock();
+            this.block.read(iprot);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // NAMESPACE_ID
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
+            this.namespaceId = iprot.readI32();
+            setNamespaceIdIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 3: // DATA_TRANSFER_VERSION
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
+            this.dataTransferVersion = iprot.readI32();
+            setDataTransferVersionIsSet(true);
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 4: // LOCATION
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
+            {
+              org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
+              this.location = new ArrayList<TDatanodeID>(_list8.size);
+              for (int _i9 = 0; _i9 < _list8.size; ++_i9)
+              {
+                TDatanodeID _elem10; // required
+                _elem10 = new TDatanodeID();
+                _elem10.read(iprot);
+                this.location.add(_elem10);
+              }
+              iprot.readListEnd();
+            }
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        default:
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    if (this.block != null) {
+      oprot.writeFieldBegin(BLOCK_FIELD_DESC);
+      this.block.write(oprot);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldBegin(NAMESPACE_ID_FIELD_DESC);
+    oprot.writeI32(this.namespaceId);
+    oprot.writeFieldEnd();
+    oprot.writeFieldBegin(DATA_TRANSFER_VERSION_FIELD_DESC);
+    oprot.writeI32(this.dataTransferVersion);
+    oprot.writeFieldEnd();
+    if (this.location != null) {
+      oprot.writeFieldBegin(LOCATION_FIELD_DESC);
+      {
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.location.size()));
+        for (TDatanodeID _iter11 : this.location)
+        {
+          _iter11.write(oprot);
+        }
+        oprot.writeListEnd();
+      }
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("TLocatedBlock(");
+    boolean first = true;
+
+    sb.append("block:");
+    if (this.block == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.block);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("namespaceId:");
+    sb.append(this.namespaceId);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("dataTransferVersion:");
+    sb.append(this.dataTransferVersion);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("location:");
+    if (this.location == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.location);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+}
+
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHadoopFileSystem.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHadoopFileSystem.java
index ee981f58..575cf962 100644
--- a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHadoopFileSystem.java
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHadoopFileSystem.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -9,1454 +9,12320 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Collections;
-import org.apache.log4j.Logger;
-
-import org.apache.thrift.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.protocol.*;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ThriftHadoopFileSystem {
 
   public interface Iface {
 
-    public void setInactivityTimeoutPeriod(long periodInSeconds) throws TException;
+    public void setInactivityTimeoutPeriod(long periodInSeconds) throws org.apache.thrift.TException;
+
+    public void shutdown(int status) throws org.apache.thrift.TException;
+
+    public ThriftHandle create(Pathname path) throws ThriftIOException, org.apache.thrift.TException;
+
+    public ThriftHandle createFile(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize) throws ThriftIOException, org.apache.thrift.TException;
+
+    public ThriftHandle open(Pathname path) throws ThriftIOException, org.apache.thrift.TException;
+
+    public ThriftHandle append(Pathname path) throws ThriftIOException, org.apache.thrift.TException;
+
+    public boolean write(ThriftHandle handle, String data) throws ThriftIOException, org.apache.thrift.TException;
+
+    public String read(ThriftHandle handle, long offset, int size) throws ThriftIOException, org.apache.thrift.TException;
 
-    public void shutdown(int status) throws TException;
+    public boolean close(ThriftHandle out) throws ThriftIOException, org.apache.thrift.TException;
 
-    public ThriftHandle create(Pathname path) throws ThriftIOException, TException;
+    public boolean rm(Pathname path, boolean recursive) throws ThriftIOException, org.apache.thrift.TException;
 
-    public ThriftHandle createFile(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize) throws ThriftIOException, TException;
+    public boolean rename(Pathname path, Pathname dest) throws ThriftIOException, org.apache.thrift.TException;
 
-    public ThriftHandle open(Pathname path) throws ThriftIOException, TException;
+    public boolean mkdirs(Pathname path) throws ThriftIOException, org.apache.thrift.TException;
 
-    public ThriftHandle append(Pathname path) throws ThriftIOException, TException;
+    public boolean exists(Pathname path) throws ThriftIOException, org.apache.thrift.TException;
 
-    public boolean write(ThriftHandle handle, String data) throws ThriftIOException, TException;
+    public FileStatus stat(Pathname path) throws ThriftIOException, org.apache.thrift.TException;
 
-    public String read(ThriftHandle handle, long offset, int size) throws ThriftIOException, TException;
+    public List<FileStatus> listStatus(Pathname path) throws ThriftIOException, org.apache.thrift.TException;
 
-    public boolean close(ThriftHandle out) throws ThriftIOException, TException;
+    public void chmod(Pathname path, short mode) throws ThriftIOException, org.apache.thrift.TException;
 
-    public boolean rm(Pathname path, boolean recursive) throws ThriftIOException, TException;
+    public void chown(Pathname path, String owner, String group) throws ThriftIOException, org.apache.thrift.TException;
 
-    public boolean rename(Pathname path, Pathname dest) throws ThriftIOException, TException;
+    public void setReplication(Pathname path, short replication) throws ThriftIOException, org.apache.thrift.TException;
 
-    public boolean mkdirs(Pathname path) throws ThriftIOException, TException;
+    public List<BlockLocation> getFileBlockLocations(Pathname path, long start, long length) throws ThriftIOException, org.apache.thrift.TException;
 
-    public boolean exists(Pathname path) throws ThriftIOException, TException;
+    public boolean hardLink(Pathname src, Pathname dest) throws ThriftIOException, org.apache.thrift.TException;
 
-    public FileStatus stat(Pathname path) throws ThriftIOException, TException;
+    public void concat(Pathname target, List<Pathname> srcs, boolean restricted) throws ThriftIOException, org.apache.thrift.TException;
 
-    public List<FileStatus> listStatus(Pathname path) throws ThriftIOException, TException;
+    public void reportBadBlocks(List<TLocatedBlock> blocks) throws ThriftIOException, org.apache.thrift.TException;
 
-    public void chmod(Pathname path, short mode) throws ThriftIOException, TException;
+    /**
+     * The following methods are typically used by native C++ hdfs client and
+     * are not used by hdfs applications themselves
+     */
+    public int getDataTransferProtocolVersion() throws ThriftIOException, org.apache.thrift.TException;
+
+    public void renewLease(String clientName) throws ThriftIOException, org.apache.thrift.TException;
+
+    public void recoverLease(Pathname path, String clientName) throws ThriftIOException, org.apache.thrift.TException;
 
-    public void chown(Pathname path, String owner, String group) throws ThriftIOException, TException;
+    public void closeRecoverLease(Pathname path, String clientName, boolean discardLastBlock) throws ThriftIOException, org.apache.thrift.TException;
 
-    public void setReplication(Pathname path, short replication) throws ThriftIOException, TException;
+    public void abandonBlock(TBlock block, Pathname pathname, String clientName) throws ThriftIOException, org.apache.thrift.TException;
 
-    public List<BlockLocation> getFileBlockLocations(Pathname path, long start, long length) throws ThriftIOException, TException;
+    public void abandonFile(Pathname pathname, String clientName) throws ThriftIOException, org.apache.thrift.TException;
+
+    public TLocatedBlock addBlock(Pathname pathname, String clientName, long startOffset, TBlock lastBlock, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes) throws ThriftIOException, org.apache.thrift.TException;
+
+    public TLocatedBlock addFirstBlock(Pathname pathname, String clientName, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes) throws ThriftIOException, org.apache.thrift.TException;
+
+    public boolean complete(Pathname pathname, String clientName, long fileLen, TBlock lastBlock) throws ThriftIOException, org.apache.thrift.TException;
 
   }
 
-  public static class Client implements Iface {
-    public Client(TProtocol prot)
-    {
-      this(prot, prot);
-    }
+  public interface AsyncIface {
 
-    public Client(TProtocol iprot, TProtocol oprot)
-    {
-      iprot_ = iprot;
-      oprot_ = oprot;
-    }
+    public void setInactivityTimeoutPeriod(long periodInSeconds, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.setInactivityTimeoutPeriod_call> resultHandler) throws org.apache.thrift.TException;
 
-    protected TProtocol iprot_;
-    protected TProtocol oprot_;
+    public void shutdown(int status, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.shutdown_call> resultHandler) throws org.apache.thrift.TException;
 
-    protected int seqid_;
+    public void create(Pathname path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.create_call> resultHandler) throws org.apache.thrift.TException;
 
-    public TProtocol getInputProtocol()
-    {
-      return this.iprot_;
+    public void createFile(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.createFile_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void open(Pathname path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.open_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void append(Pathname path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.append_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void write(ThriftHandle handle, String data, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.write_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void read(ThriftHandle handle, long offset, int size, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.read_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void close(ThriftHandle out, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.close_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void rm(Pathname path, boolean recursive, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.rm_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void rename(Pathname path, Pathname dest, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.rename_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void mkdirs(Pathname path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.mkdirs_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void exists(Pathname path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.exists_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void stat(Pathname path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.stat_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void listStatus(Pathname path, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.listStatus_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void chmod(Pathname path, short mode, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.chmod_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void chown(Pathname path, String owner, String group, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.chown_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void setReplication(Pathname path, short replication, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.setReplication_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void getFileBlockLocations(Pathname path, long start, long length, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getFileBlockLocations_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void hardLink(Pathname src, Pathname dest, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.hardLink_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void concat(Pathname target, List<Pathname> srcs, boolean restricted, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.concat_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void reportBadBlocks(List<TLocatedBlock> blocks, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.reportBadBlocks_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void getDataTransferProtocolVersion(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getDataTransferProtocolVersion_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void renewLease(String clientName, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.renewLease_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void recoverLease(Pathname path, String clientName, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.recoverLease_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void closeRecoverLease(Pathname path, String clientName, boolean discardLastBlock, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.closeRecoverLease_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void abandonBlock(TBlock block, Pathname pathname, String clientName, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.abandonBlock_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void abandonFile(Pathname pathname, String clientName, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.abandonFile_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void addBlock(Pathname pathname, String clientName, long startOffset, TBlock lastBlock, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.addBlock_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void addFirstBlock(Pathname pathname, String clientName, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.addFirstBlock_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void complete(Pathname pathname, String clientName, long fileLen, TBlock lastBlock, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.complete_call> resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+      public Factory() {}
+      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+        return new Client(prot);
+      }
+      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+        return new Client(iprot, oprot);
+      }
     }
 
-    public TProtocol getOutputProtocol()
+    public Client(org.apache.thrift.protocol.TProtocol prot)
     {
-      return this.oprot_;
+      super(prot, prot);
     }
 
-    public void setInactivityTimeoutPeriod(long periodInSeconds) throws TException
+    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      super(iprot, oprot);
+    }
+
+    public void setInactivityTimeoutPeriod(long periodInSeconds) throws org.apache.thrift.TException
     {
       send_setInactivityTimeoutPeriod(periodInSeconds);
       recv_setInactivityTimeoutPeriod();
     }
 
-    public void send_setInactivityTimeoutPeriod(long periodInSeconds) throws TException
+    public void send_setInactivityTimeoutPeriod(long periodInSeconds) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("setInactivityTimeoutPeriod", TMessageType.CALL, seqid_));
       setInactivityTimeoutPeriod_args args = new setInactivityTimeoutPeriod_args();
-      args.periodInSeconds = periodInSeconds;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPeriodInSeconds(periodInSeconds);
+      sendBase("setInactivityTimeoutPeriod", args);
     }
 
-    public void recv_setInactivityTimeoutPeriod() throws TException
+    public void recv_setInactivityTimeoutPeriod() throws org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       setInactivityTimeoutPeriod_result result = new setInactivityTimeoutPeriod_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "setInactivityTimeoutPeriod");
       return;
     }
 
-    public void shutdown(int status) throws TException
+    public void shutdown(int status) throws org.apache.thrift.TException
     {
       send_shutdown(status);
       recv_shutdown();
     }
 
-    public void send_shutdown(int status) throws TException
+    public void send_shutdown(int status) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("shutdown", TMessageType.CALL, seqid_));
       shutdown_args args = new shutdown_args();
-      args.status = status;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setStatus(status);
+      sendBase("shutdown", args);
     }
 
-    public void recv_shutdown() throws TException
+    public void recv_shutdown() throws org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       shutdown_result result = new shutdown_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "shutdown");
       return;
     }
 
-    public ThriftHandle create(Pathname path) throws ThriftIOException, TException
+    public ThriftHandle create(Pathname path) throws ThriftIOException, org.apache.thrift.TException
     {
       send_create(path);
       return recv_create();
     }
 
-    public void send_create(Pathname path) throws TException
+    public void send_create(Pathname path) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("create", TMessageType.CALL, seqid_));
       create_args args = new create_args();
-      args.path = path;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      sendBase("create", args);
     }
 
-    public ThriftHandle recv_create() throws ThriftIOException, TException
+    public ThriftHandle recv_create() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       create_result result = new create_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "create");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "create failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "create failed: unknown result");
     }
 
-    public ThriftHandle createFile(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize) throws ThriftIOException, TException
+    public ThriftHandle createFile(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize) throws ThriftIOException, org.apache.thrift.TException
     {
       send_createFile(path, mode, overwrite, bufferSize, block_replication, blocksize);
       return recv_createFile();
     }
 
-    public void send_createFile(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize) throws TException
+    public void send_createFile(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("createFile", TMessageType.CALL, seqid_));
       createFile_args args = new createFile_args();
-      args.path = path;
-      args.mode = mode;
-      args.overwrite = overwrite;
-      args.bufferSize = bufferSize;
-      args.block_replication = block_replication;
-      args.blocksize = blocksize;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      args.setMode(mode);
+      args.setOverwrite(overwrite);
+      args.setBufferSize(bufferSize);
+      args.setBlock_replication(block_replication);
+      args.setBlocksize(blocksize);
+      sendBase("createFile", args);
     }
 
-    public ThriftHandle recv_createFile() throws ThriftIOException, TException
+    public ThriftHandle recv_createFile() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       createFile_result result = new createFile_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "createFile");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "createFile failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createFile failed: unknown result");
     }
 
-    public ThriftHandle open(Pathname path) throws ThriftIOException, TException
+    public ThriftHandle open(Pathname path) throws ThriftIOException, org.apache.thrift.TException
     {
       send_open(path);
       return recv_open();
     }
 
-    public void send_open(Pathname path) throws TException
+    public void send_open(Pathname path) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("open", TMessageType.CALL, seqid_));
       open_args args = new open_args();
-      args.path = path;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      sendBase("open", args);
     }
 
-    public ThriftHandle recv_open() throws ThriftIOException, TException
+    public ThriftHandle recv_open() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       open_result result = new open_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "open");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "open failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "open failed: unknown result");
     }
 
-    public ThriftHandle append(Pathname path) throws ThriftIOException, TException
+    public ThriftHandle append(Pathname path) throws ThriftIOException, org.apache.thrift.TException
     {
       send_append(path);
       return recv_append();
     }
 
-    public void send_append(Pathname path) throws TException
+    public void send_append(Pathname path) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("append", TMessageType.CALL, seqid_));
       append_args args = new append_args();
-      args.path = path;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      sendBase("append", args);
     }
 
-    public ThriftHandle recv_append() throws ThriftIOException, TException
+    public ThriftHandle recv_append() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       append_result result = new append_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "append");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "append failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "append failed: unknown result");
     }
 
-    public boolean write(ThriftHandle handle, String data) throws ThriftIOException, TException
+    public boolean write(ThriftHandle handle, String data) throws ThriftIOException, org.apache.thrift.TException
     {
       send_write(handle, data);
       return recv_write();
     }
 
-    public void send_write(ThriftHandle handle, String data) throws TException
+    public void send_write(ThriftHandle handle, String data) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("write", TMessageType.CALL, seqid_));
       write_args args = new write_args();
-      args.handle = handle;
-      args.data = data;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setHandle(handle);
+      args.setData(data);
+      sendBase("write", args);
     }
 
-    public boolean recv_write() throws ThriftIOException, TException
+    public boolean recv_write() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       write_result result = new write_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "write");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "write failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "write failed: unknown result");
     }
 
-    public String read(ThriftHandle handle, long offset, int size) throws ThriftIOException, TException
+    public String read(ThriftHandle handle, long offset, int size) throws ThriftIOException, org.apache.thrift.TException
     {
       send_read(handle, offset, size);
       return recv_read();
     }
 
-    public void send_read(ThriftHandle handle, long offset, int size) throws TException
+    public void send_read(ThriftHandle handle, long offset, int size) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("read", TMessageType.CALL, seqid_));
       read_args args = new read_args();
-      args.handle = handle;
-      args.offset = offset;
-      args.size = size;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setHandle(handle);
+      args.setOffset(offset);
+      args.setSize(size);
+      sendBase("read", args);
     }
 
-    public String recv_read() throws ThriftIOException, TException
+    public String recv_read() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       read_result result = new read_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "read");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "read failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "read failed: unknown result");
     }
 
-    public boolean close(ThriftHandle out) throws ThriftIOException, TException
+    public boolean close(ThriftHandle out) throws ThriftIOException, org.apache.thrift.TException
     {
       send_close(out);
       return recv_close();
     }
 
-    public void send_close(ThriftHandle out) throws TException
+    public void send_close(ThriftHandle out) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("close", TMessageType.CALL, seqid_));
       close_args args = new close_args();
-      args.out = out;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setOut(out);
+      sendBase("close", args);
     }
 
-    public boolean recv_close() throws ThriftIOException, TException
+    public boolean recv_close() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       close_result result = new close_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "close");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "close failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "close failed: unknown result");
     }
 
-    public boolean rm(Pathname path, boolean recursive) throws ThriftIOException, TException
+    public boolean rm(Pathname path, boolean recursive) throws ThriftIOException, org.apache.thrift.TException
     {
       send_rm(path, recursive);
       return recv_rm();
     }
 
-    public void send_rm(Pathname path, boolean recursive) throws TException
+    public void send_rm(Pathname path, boolean recursive) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("rm", TMessageType.CALL, seqid_));
       rm_args args = new rm_args();
-      args.path = path;
-      args.recursive = recursive;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      args.setRecursive(recursive);
+      sendBase("rm", args);
     }
 
-    public boolean recv_rm() throws ThriftIOException, TException
+    public boolean recv_rm() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       rm_result result = new rm_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "rm");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "rm failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "rm failed: unknown result");
     }
 
-    public boolean rename(Pathname path, Pathname dest) throws ThriftIOException, TException
+    public boolean rename(Pathname path, Pathname dest) throws ThriftIOException, org.apache.thrift.TException
     {
       send_rename(path, dest);
       return recv_rename();
     }
 
-    public void send_rename(Pathname path, Pathname dest) throws TException
+    public void send_rename(Pathname path, Pathname dest) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("rename", TMessageType.CALL, seqid_));
       rename_args args = new rename_args();
-      args.path = path;
-      args.dest = dest;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      args.setDest(dest);
+      sendBase("rename", args);
     }
 
-    public boolean recv_rename() throws ThriftIOException, TException
+    public boolean recv_rename() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       rename_result result = new rename_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "rename");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "rename failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "rename failed: unknown result");
     }
 
-    public boolean mkdirs(Pathname path) throws ThriftIOException, TException
+    public boolean mkdirs(Pathname path) throws ThriftIOException, org.apache.thrift.TException
     {
       send_mkdirs(path);
       return recv_mkdirs();
     }
 
-    public void send_mkdirs(Pathname path) throws TException
+    public void send_mkdirs(Pathname path) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("mkdirs", TMessageType.CALL, seqid_));
       mkdirs_args args = new mkdirs_args();
-      args.path = path;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      sendBase("mkdirs", args);
     }
 
-    public boolean recv_mkdirs() throws ThriftIOException, TException
+    public boolean recv_mkdirs() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       mkdirs_result result = new mkdirs_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "mkdirs");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "mkdirs failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "mkdirs failed: unknown result");
     }
 
-    public boolean exists(Pathname path) throws ThriftIOException, TException
+    public boolean exists(Pathname path) throws ThriftIOException, org.apache.thrift.TException
     {
       send_exists(path);
       return recv_exists();
     }
 
-    public void send_exists(Pathname path) throws TException
+    public void send_exists(Pathname path) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("exists", TMessageType.CALL, seqid_));
       exists_args args = new exists_args();
-      args.path = path;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      sendBase("exists", args);
     }
 
-    public boolean recv_exists() throws ThriftIOException, TException
+    public boolean recv_exists() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       exists_result result = new exists_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "exists");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "exists failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "exists failed: unknown result");
     }
 
-    public FileStatus stat(Pathname path) throws ThriftIOException, TException
+    public FileStatus stat(Pathname path) throws ThriftIOException, org.apache.thrift.TException
     {
       send_stat(path);
       return recv_stat();
     }
 
-    public void send_stat(Pathname path) throws TException
+    public void send_stat(Pathname path) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("stat", TMessageType.CALL, seqid_));
       stat_args args = new stat_args();
-      args.path = path;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      sendBase("stat", args);
     }
 
-    public FileStatus recv_stat() throws ThriftIOException, TException
+    public FileStatus recv_stat() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       stat_result result = new stat_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "stat");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "stat failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "stat failed: unknown result");
     }
 
-    public List<FileStatus> listStatus(Pathname path) throws ThriftIOException, TException
+    public List<FileStatus> listStatus(Pathname path) throws ThriftIOException, org.apache.thrift.TException
     {
       send_listStatus(path);
       return recv_listStatus();
     }
 
-    public void send_listStatus(Pathname path) throws TException
+    public void send_listStatus(Pathname path) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("listStatus", TMessageType.CALL, seqid_));
       listStatus_args args = new listStatus_args();
-      args.path = path;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      sendBase("listStatus", args);
     }
 
-    public List<FileStatus> recv_listStatus() throws ThriftIOException, TException
+    public List<FileStatus> recv_listStatus() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       listStatus_result result = new listStatus_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "listStatus");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "listStatus failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listStatus failed: unknown result");
     }
 
-    public void chmod(Pathname path, short mode) throws ThriftIOException, TException
+    public void chmod(Pathname path, short mode) throws ThriftIOException, org.apache.thrift.TException
     {
       send_chmod(path, mode);
       recv_chmod();
     }
 
-    public void send_chmod(Pathname path, short mode) throws TException
+    public void send_chmod(Pathname path, short mode) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("chmod", TMessageType.CALL, seqid_));
       chmod_args args = new chmod_args();
-      args.path = path;
-      args.mode = mode;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      args.setMode(mode);
+      sendBase("chmod", args);
     }
 
-    public void recv_chmod() throws ThriftIOException, TException
+    public void recv_chmod() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       chmod_result result = new chmod_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "chmod");
       if (result.ouch != null) {
         throw result.ouch;
       }
       return;
     }
 
-    public void chown(Pathname path, String owner, String group) throws ThriftIOException, TException
+    public void chown(Pathname path, String owner, String group) throws ThriftIOException, org.apache.thrift.TException
     {
       send_chown(path, owner, group);
       recv_chown();
     }
 
-    public void send_chown(Pathname path, String owner, String group) throws TException
+    public void send_chown(Pathname path, String owner, String group) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("chown", TMessageType.CALL, seqid_));
       chown_args args = new chown_args();
-      args.path = path;
-      args.owner = owner;
-      args.group = group;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      args.setOwner(owner);
+      args.setGroup(group);
+      sendBase("chown", args);
     }
 
-    public void recv_chown() throws ThriftIOException, TException
+    public void recv_chown() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       chown_result result = new chown_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "chown");
       if (result.ouch != null) {
         throw result.ouch;
       }
       return;
     }
 
-    public void setReplication(Pathname path, short replication) throws ThriftIOException, TException
+    public void setReplication(Pathname path, short replication) throws ThriftIOException, org.apache.thrift.TException
     {
       send_setReplication(path, replication);
       recv_setReplication();
     }
 
-    public void send_setReplication(Pathname path, short replication) throws TException
+    public void send_setReplication(Pathname path, short replication) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("setReplication", TMessageType.CALL, seqid_));
       setReplication_args args = new setReplication_args();
-      args.path = path;
-      args.replication = replication;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      args.setReplication(replication);
+      sendBase("setReplication", args);
     }
 
-    public void recv_setReplication() throws ThriftIOException, TException
+    public void recv_setReplication() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       setReplication_result result = new setReplication_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "setReplication");
       if (result.ouch != null) {
         throw result.ouch;
       }
       return;
     }
 
-    public List<BlockLocation> getFileBlockLocations(Pathname path, long start, long length) throws ThriftIOException, TException
+    public List<BlockLocation> getFileBlockLocations(Pathname path, long start, long length) throws ThriftIOException, org.apache.thrift.TException
     {
       send_getFileBlockLocations(path, start, length);
       return recv_getFileBlockLocations();
     }
 
-    public void send_getFileBlockLocations(Pathname path, long start, long length) throws TException
+    public void send_getFileBlockLocations(Pathname path, long start, long length) throws org.apache.thrift.TException
     {
-      oprot_.writeMessageBegin(new TMessage("getFileBlockLocations", TMessageType.CALL, seqid_));
       getFileBlockLocations_args args = new getFileBlockLocations_args();
-      args.path = path;
-      args.start = start;
-      args.length = length;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
+      args.setPath(path);
+      args.setStart(start);
+      args.setLength(length);
+      sendBase("getFileBlockLocations", args);
     }
 
-    public List<BlockLocation> recv_getFileBlockLocations() throws ThriftIOException, TException
+    public List<BlockLocation> recv_getFileBlockLocations() throws ThriftIOException, org.apache.thrift.TException
     {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
       getFileBlockLocations_result result = new getFileBlockLocations_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
+      receiveBase(result, "getFileBlockLocations");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch != null) {
         throw result.ouch;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "getFileBlockLocations failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getFileBlockLocations failed: unknown result");
     }
 
-  }
-  public static class Processor implements TProcessor {
-    private static final Logger LOGGER = Logger.getLogger(Processor.class.getName());
-    public Processor(Iface iface)
-    {
-      iface_ = iface;
-      processMap_.put("setInactivityTimeoutPeriod", new setInactivityTimeoutPeriod());
-      processMap_.put("shutdown", new shutdown());
-      processMap_.put("create", new create());
-      processMap_.put("createFile", new createFile());
-      processMap_.put("open", new open());
-      processMap_.put("append", new append());
-      processMap_.put("write", new write());
-      processMap_.put("read", new read());
-      processMap_.put("close", new close());
-      processMap_.put("rm", new rm());
-      processMap_.put("rename", new rename());
-      processMap_.put("mkdirs", new mkdirs());
-      processMap_.put("exists", new exists());
-      processMap_.put("stat", new stat());
-      processMap_.put("listStatus", new listStatus());
-      processMap_.put("chmod", new chmod());
-      processMap_.put("chown", new chown());
-      processMap_.put("setReplication", new setReplication());
-      processMap_.put("getFileBlockLocations", new getFileBlockLocations());
-    }
-
-    protected static interface ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException;
-    }
-
-    private Iface iface_;
-    protected final HashMap<String,ProcessFunction> processMap_ = new HashMap<String,ProcessFunction>();
-
-    public boolean process(TProtocol iprot, TProtocol oprot) throws TException
-    {
-      TMessage msg = iprot.readMessageBegin();
-      ProcessFunction fn = processMap_.get(msg.name);
-      if (fn == null) {
-        TProtocolUtil.skip(iprot, TType.STRUCT);
-        iprot.readMessageEnd();
-        TApplicationException x = new TApplicationException(TApplicationException.UNKNOWN_METHOD, "Invalid method name: '"+msg.name+"'");
-        oprot.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));
-        x.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-        return true;
-      }
-      fn.process(msg.seqid, iprot, oprot);
-      return true;
+    public boolean hardLink(Pathname src, Pathname dest) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_hardLink(src, dest);
+      return recv_hardLink();
     }
 
-    private class setInactivityTimeoutPeriod implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        setInactivityTimeoutPeriod_args args = new setInactivityTimeoutPeriod_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        setInactivityTimeoutPeriod_result result = new setInactivityTimeoutPeriod_result();
-        iface_.setInactivityTimeoutPeriod(args.periodInSeconds);
-        oprot.writeMessageBegin(new TMessage("setInactivityTimeoutPeriod", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
-
+    public void send_hardLink(Pathname src, Pathname dest) throws org.apache.thrift.TException
+    {
+      hardLink_args args = new hardLink_args();
+      args.setSrc(src);
+      args.setDest(dest);
+      sendBase("hardLink", args);
     }
 
-    private class shutdown implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        shutdown_args args = new shutdown_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        shutdown_result result = new shutdown_result();
-        iface_.shutdown(args.status);
-        oprot.writeMessageBegin(new TMessage("shutdown", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public boolean recv_hardLink() throws ThriftIOException, org.apache.thrift.TException
+    {
+      hardLink_result result = new hardLink_result();
+      receiveBase(result, "hardLink");
+      if (result.isSetSuccess()) {
+        return result.success;
       }
-
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "hardLink failed: unknown result");
     }
 
-    private class create implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        create_args args = new create_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        create_result result = new create_result();
-        try {
-          result.success = iface_.create(args.path);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing create", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing create");
-          oprot.writeMessageBegin(new TMessage("create", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("create", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
+    public void concat(Pathname target, List<Pathname> srcs, boolean restricted) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_concat(target, srcs, restricted);
+      recv_concat();
+    }
 
+    public void send_concat(Pathname target, List<Pathname> srcs, boolean restricted) throws org.apache.thrift.TException
+    {
+      concat_args args = new concat_args();
+      args.setTarget(target);
+      args.setSrcs(srcs);
+      args.setRestricted(restricted);
+      sendBase("concat", args);
     }
 
-    private class createFile implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        createFile_args args = new createFile_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        createFile_result result = new createFile_result();
-        try {
-          result.success = iface_.createFile(args.path, args.mode, args.overwrite, args.bufferSize, args.block_replication, args.blocksize);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing createFile", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing createFile");
-          oprot.writeMessageBegin(new TMessage("createFile", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("createFile", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public void recv_concat() throws ThriftIOException, org.apache.thrift.TException
+    {
+      concat_result result = new concat_result();
+      receiveBase(result, "concat");
+      if (result.ouch != null) {
+        throw result.ouch;
       }
-
+      return;
     }
 
-    private class open implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        open_args args = new open_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        open_result result = new open_result();
-        try {
-          result.success = iface_.open(args.path);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing open", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing open");
-          oprot.writeMessageBegin(new TMessage("open", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("open", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
+    public void reportBadBlocks(List<TLocatedBlock> blocks) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_reportBadBlocks(blocks);
+      recv_reportBadBlocks();
+    }
 
+    public void send_reportBadBlocks(List<TLocatedBlock> blocks) throws org.apache.thrift.TException
+    {
+      reportBadBlocks_args args = new reportBadBlocks_args();
+      args.setBlocks(blocks);
+      sendBase("reportBadBlocks", args);
     }
 
-    private class append implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        append_args args = new append_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        append_result result = new append_result();
-        try {
-          result.success = iface_.append(args.path);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing append", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing append");
-          oprot.writeMessageBegin(new TMessage("append", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("append", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public void recv_reportBadBlocks() throws ThriftIOException, org.apache.thrift.TException
+    {
+      reportBadBlocks_result result = new reportBadBlocks_result();
+      receiveBase(result, "reportBadBlocks");
+      if (result.ouch != null) {
+        throw result.ouch;
       }
-
+      return;
     }
 
-    private class write implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        write_args args = new write_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        write_result result = new write_result();
-        try {
-          result.success = iface_.write(args.handle, args.data);
-          result.__isset.success = true;
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing write", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing write");
-          oprot.writeMessageBegin(new TMessage("write", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("write", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
+    public int getDataTransferProtocolVersion() throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_getDataTransferProtocolVersion();
+      return recv_getDataTransferProtocolVersion();
+    }
 
+    public void send_getDataTransferProtocolVersion() throws org.apache.thrift.TException
+    {
+      getDataTransferProtocolVersion_args args = new getDataTransferProtocolVersion_args();
+      sendBase("getDataTransferProtocolVersion", args);
     }
 
-    private class read implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        read_args args = new read_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        read_result result = new read_result();
-        try {
-          result.success = iface_.read(args.handle, args.offset, args.size);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing read", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing read");
-          oprot.writeMessageBegin(new TMessage("read", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("read", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public int recv_getDataTransferProtocolVersion() throws ThriftIOException, org.apache.thrift.TException
+    {
+      getDataTransferProtocolVersion_result result = new getDataTransferProtocolVersion_result();
+      receiveBase(result, "getDataTransferProtocolVersion");
+      if (result.isSetSuccess()) {
+        return result.success;
       }
-
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getDataTransferProtocolVersion failed: unknown result");
     }
 
-    private class close implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        close_args args = new close_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        close_result result = new close_result();
-        try {
-          result.success = iface_.close(args.out);
-          result.__isset.success = true;
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing close", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing close");
-          oprot.writeMessageBegin(new TMessage("close", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("close", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
+    public void renewLease(String clientName) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_renewLease(clientName);
+      recv_renewLease();
+    }
 
+    public void send_renewLease(String clientName) throws org.apache.thrift.TException
+    {
+      renewLease_args args = new renewLease_args();
+      args.setClientName(clientName);
+      sendBase("renewLease", args);
     }
 
-    private class rm implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        rm_args args = new rm_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        rm_result result = new rm_result();
-        try {
-          result.success = iface_.rm(args.path, args.recursive);
-          result.__isset.success = true;
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing rm", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing rm");
-          oprot.writeMessageBegin(new TMessage("rm", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("rm", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public void recv_renewLease() throws ThriftIOException, org.apache.thrift.TException
+    {
+      renewLease_result result = new renewLease_result();
+      receiveBase(result, "renewLease");
+      if (result.ouch != null) {
+        throw result.ouch;
       }
-
+      return;
     }
 
-    private class rename implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        rename_args args = new rename_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        rename_result result = new rename_result();
-        try {
-          result.success = iface_.rename(args.path, args.dest);
-          result.__isset.success = true;
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing rename", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing rename");
-          oprot.writeMessageBegin(new TMessage("rename", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("rename", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
+    public void recoverLease(Pathname path, String clientName) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_recoverLease(path, clientName);
+      recv_recoverLease();
+    }
 
+    public void send_recoverLease(Pathname path, String clientName) throws org.apache.thrift.TException
+    {
+      recoverLease_args args = new recoverLease_args();
+      args.setPath(path);
+      args.setClientName(clientName);
+      sendBase("recoverLease", args);
     }
 
-    private class mkdirs implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        mkdirs_args args = new mkdirs_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        mkdirs_result result = new mkdirs_result();
-        try {
-          result.success = iface_.mkdirs(args.path);
-          result.__isset.success = true;
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing mkdirs", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing mkdirs");
-          oprot.writeMessageBegin(new TMessage("mkdirs", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("mkdirs", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public void recv_recoverLease() throws ThriftIOException, org.apache.thrift.TException
+    {
+      recoverLease_result result = new recoverLease_result();
+      receiveBase(result, "recoverLease");
+      if (result.ouch != null) {
+        throw result.ouch;
       }
-
+      return;
     }
 
-    private class exists implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        exists_args args = new exists_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        exists_result result = new exists_result();
-        try {
-          result.success = iface_.exists(args.path);
-          result.__isset.success = true;
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing exists", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing exists");
-          oprot.writeMessageBegin(new TMessage("exists", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("exists", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
+    public void closeRecoverLease(Pathname path, String clientName, boolean discardLastBlock) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_closeRecoverLease(path, clientName, discardLastBlock);
+      recv_closeRecoverLease();
+    }
 
+    public void send_closeRecoverLease(Pathname path, String clientName, boolean discardLastBlock) throws org.apache.thrift.TException
+    {
+      closeRecoverLease_args args = new closeRecoverLease_args();
+      args.setPath(path);
+      args.setClientName(clientName);
+      args.setDiscardLastBlock(discardLastBlock);
+      sendBase("closeRecoverLease", args);
     }
 
-    private class stat implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        stat_args args = new stat_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        stat_result result = new stat_result();
-        try {
-          result.success = iface_.stat(args.path);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing stat", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing stat");
-          oprot.writeMessageBegin(new TMessage("stat", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("stat", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public void recv_closeRecoverLease() throws ThriftIOException, org.apache.thrift.TException
+    {
+      closeRecoverLease_result result = new closeRecoverLease_result();
+      receiveBase(result, "closeRecoverLease");
+      if (result.ouch != null) {
+        throw result.ouch;
       }
-
+      return;
     }
 
-    private class listStatus implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        listStatus_args args = new listStatus_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        listStatus_result result = new listStatus_result();
-        try {
-          result.success = iface_.listStatus(args.path);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing listStatus", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing listStatus");
-          oprot.writeMessageBegin(new TMessage("listStatus", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("listStatus", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
+    public void abandonBlock(TBlock block, Pathname pathname, String clientName) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_abandonBlock(block, pathname, clientName);
+      recv_abandonBlock();
+    }
 
+    public void send_abandonBlock(TBlock block, Pathname pathname, String clientName) throws org.apache.thrift.TException
+    {
+      abandonBlock_args args = new abandonBlock_args();
+      args.setBlock(block);
+      args.setPathname(pathname);
+      args.setClientName(clientName);
+      sendBase("abandonBlock", args);
     }
 
-    private class chmod implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        chmod_args args = new chmod_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        chmod_result result = new chmod_result();
-        try {
-          iface_.chmod(args.path, args.mode);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing chmod", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing chmod");
-          oprot.writeMessageBegin(new TMessage("chmod", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("chmod", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public void recv_abandonBlock() throws ThriftIOException, org.apache.thrift.TException
+    {
+      abandonBlock_result result = new abandonBlock_result();
+      receiveBase(result, "abandonBlock");
+      if (result.ouch != null) {
+        throw result.ouch;
       }
+      return;
+    }
 
+    public void abandonFile(Pathname pathname, String clientName) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_abandonFile(pathname, clientName);
+      recv_abandonFile();
     }
 
-    private class chown implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
+    public void send_abandonFile(Pathname pathname, String clientName) throws org.apache.thrift.TException
+    {
+      abandonFile_args args = new abandonFile_args();
+      args.setPathname(pathname);
+      args.setClientName(clientName);
+      sendBase("abandonFile", args);
+    }
+
+    public void recv_abandonFile() throws ThriftIOException, org.apache.thrift.TException
+    {
+      abandonFile_result result = new abandonFile_result();
+      receiveBase(result, "abandonFile");
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      return;
+    }
+
+    public TLocatedBlock addBlock(Pathname pathname, String clientName, long startOffset, TBlock lastBlock, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_addBlock(pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes);
+      return recv_addBlock();
+    }
+
+    public void send_addBlock(Pathname pathname, String clientName, long startOffset, TBlock lastBlock, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes) throws org.apache.thrift.TException
+    {
+      addBlock_args args = new addBlock_args();
+      args.setPathname(pathname);
+      args.setClientName(clientName);
+      args.setStartOffset(startOffset);
+      args.setLastBlock(lastBlock);
+      args.setExcludedNodes(excludedNodes);
+      args.setFavouredNodes(favouredNodes);
+      sendBase("addBlock", args);
+    }
+
+    public TLocatedBlock recv_addBlock() throws ThriftIOException, org.apache.thrift.TException
+    {
+      addBlock_result result = new addBlock_result();
+      receiveBase(result, "addBlock");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addBlock failed: unknown result");
+    }
+
+    public TLocatedBlock addFirstBlock(Pathname pathname, String clientName, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_addFirstBlock(pathname, clientName, excludedNodes, favouredNodes);
+      return recv_addFirstBlock();
+    }
+
+    public void send_addFirstBlock(Pathname pathname, String clientName, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes) throws org.apache.thrift.TException
+    {
+      addFirstBlock_args args = new addFirstBlock_args();
+      args.setPathname(pathname);
+      args.setClientName(clientName);
+      args.setExcludedNodes(excludedNodes);
+      args.setFavouredNodes(favouredNodes);
+      sendBase("addFirstBlock", args);
+    }
+
+    public TLocatedBlock recv_addFirstBlock() throws ThriftIOException, org.apache.thrift.TException
+    {
+      addFirstBlock_result result = new addFirstBlock_result();
+      receiveBase(result, "addFirstBlock");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addFirstBlock failed: unknown result");
+    }
+
+    public boolean complete(Pathname pathname, String clientName, long fileLen, TBlock lastBlock) throws ThriftIOException, org.apache.thrift.TException
+    {
+      send_complete(pathname, clientName, fileLen, lastBlock);
+      return recv_complete();
+    }
+
+    public void send_complete(Pathname pathname, String clientName, long fileLen, TBlock lastBlock) throws org.apache.thrift.TException
+    {
+      complete_args args = new complete_args();
+      args.setPathname(pathname);
+      args.setClientName(clientName);
+      args.setFileLen(fileLen);
+      args.setLastBlock(lastBlock);
+      sendBase("complete", args);
+    }
+
+    public boolean recv_complete() throws ThriftIOException, org.apache.thrift.TException
+    {
+      complete_result result = new complete_result();
+      receiveBase(result, "complete");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.ouch != null) {
+        throw result.ouch;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "complete failed: unknown result");
+    }
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+        this.clientManager = clientManager;
+        this.protocolFactory = protocolFactory;
+      }
+      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+        return new AsyncClient(protocolFactory, clientManager, transport);
+      }
+    }
+
+    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+      super(protocolFactory, clientManager, transport);
+    }
+
+    public void setInactivityTimeoutPeriod(long periodInSeconds, org.apache.thrift.async.AsyncMethodCallback<setInactivityTimeoutPeriod_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      setInactivityTimeoutPeriod_call method_call = new setInactivityTimeoutPeriod_call(periodInSeconds, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class setInactivityTimeoutPeriod_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private long periodInSeconds;
+      public setInactivityTimeoutPeriod_call(long periodInSeconds, org.apache.thrift.async.AsyncMethodCallback<setInactivityTimeoutPeriod_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.periodInSeconds = periodInSeconds;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setInactivityTimeoutPeriod", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        setInactivityTimeoutPeriod_args args = new setInactivityTimeoutPeriod_args();
+        args.setPeriodInSeconds(periodInSeconds);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_setInactivityTimeoutPeriod();
+      }
+    }
+
+    public void shutdown(int status, org.apache.thrift.async.AsyncMethodCallback<shutdown_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      shutdown_call method_call = new shutdown_call(status, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class shutdown_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private int status;
+      public shutdown_call(int status, org.apache.thrift.async.AsyncMethodCallback<shutdown_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.status = status;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("shutdown", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        shutdown_args args = new shutdown_args();
+        args.setStatus(status);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_shutdown();
+      }
+    }
+
+    public void create(Pathname path, org.apache.thrift.async.AsyncMethodCallback<create_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      create_call method_call = new create_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class create_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      public create_call(Pathname path, org.apache.thrift.async.AsyncMethodCallback<create_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        create_args args = new create_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ThriftHandle getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_create();
+      }
+    }
+
+    public void createFile(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize, org.apache.thrift.async.AsyncMethodCallback<createFile_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      createFile_call method_call = new createFile_call(path, mode, overwrite, bufferSize, block_replication, blocksize, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class createFile_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private short mode;
+      private boolean overwrite;
+      private int bufferSize;
+      private short block_replication;
+      private long blocksize;
+      public createFile_call(Pathname path, short mode, boolean overwrite, int bufferSize, short block_replication, long blocksize, org.apache.thrift.async.AsyncMethodCallback<createFile_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.mode = mode;
+        this.overwrite = overwrite;
+        this.bufferSize = bufferSize;
+        this.block_replication = block_replication;
+        this.blocksize = blocksize;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("createFile", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        createFile_args args = new createFile_args();
+        args.setPath(path);
+        args.setMode(mode);
+        args.setOverwrite(overwrite);
+        args.setBufferSize(bufferSize);
+        args.setBlock_replication(block_replication);
+        args.setBlocksize(blocksize);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ThriftHandle getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_createFile();
+      }
+    }
+
+    public void open(Pathname path, org.apache.thrift.async.AsyncMethodCallback<open_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      open_call method_call = new open_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class open_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      public open_call(Pathname path, org.apache.thrift.async.AsyncMethodCallback<open_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("open", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        open_args args = new open_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ThriftHandle getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_open();
+      }
+    }
+
+    public void append(Pathname path, org.apache.thrift.async.AsyncMethodCallback<append_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      append_call method_call = new append_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class append_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      public append_call(Pathname path, org.apache.thrift.async.AsyncMethodCallback<append_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("append", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        append_args args = new append_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ThriftHandle getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_append();
+      }
+    }
+
+    public void write(ThriftHandle handle, String data, org.apache.thrift.async.AsyncMethodCallback<write_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      write_call method_call = new write_call(handle, data, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class write_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private ThriftHandle handle;
+      private String data;
+      public write_call(ThriftHandle handle, String data, org.apache.thrift.async.AsyncMethodCallback<write_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.handle = handle;
+        this.data = data;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("write", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        write_args args = new write_args();
+        args.setHandle(handle);
+        args.setData(data);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_write();
+      }
+    }
+
+    public void read(ThriftHandle handle, long offset, int size, org.apache.thrift.async.AsyncMethodCallback<read_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      read_call method_call = new read_call(handle, offset, size, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class read_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private ThriftHandle handle;
+      private long offset;
+      private int size;
+      public read_call(ThriftHandle handle, long offset, int size, org.apache.thrift.async.AsyncMethodCallback<read_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.handle = handle;
+        this.offset = offset;
+        this.size = size;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("read", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        read_args args = new read_args();
+        args.setHandle(handle);
+        args.setOffset(offset);
+        args.setSize(size);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public String getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_read();
+      }
+    }
+
+    public void close(ThriftHandle out, org.apache.thrift.async.AsyncMethodCallback<close_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      close_call method_call = new close_call(out, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class close_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private ThriftHandle out;
+      public close_call(ThriftHandle out, org.apache.thrift.async.AsyncMethodCallback<close_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.out = out;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("close", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        close_args args = new close_args();
+        args.setOut(out);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_close();
+      }
+    }
+
+    public void rm(Pathname path, boolean recursive, org.apache.thrift.async.AsyncMethodCallback<rm_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      rm_call method_call = new rm_call(path, recursive, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class rm_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private boolean recursive;
+      public rm_call(Pathname path, boolean recursive, org.apache.thrift.async.AsyncMethodCallback<rm_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.recursive = recursive;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("rm", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        rm_args args = new rm_args();
+        args.setPath(path);
+        args.setRecursive(recursive);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_rm();
+      }
+    }
+
+    public void rename(Pathname path, Pathname dest, org.apache.thrift.async.AsyncMethodCallback<rename_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      rename_call method_call = new rename_call(path, dest, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class rename_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private Pathname dest;
+      public rename_call(Pathname path, Pathname dest, org.apache.thrift.async.AsyncMethodCallback<rename_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.dest = dest;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("rename", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        rename_args args = new rename_args();
+        args.setPath(path);
+        args.setDest(dest);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_rename();
+      }
+    }
+
+    public void mkdirs(Pathname path, org.apache.thrift.async.AsyncMethodCallback<mkdirs_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      mkdirs_call method_call = new mkdirs_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class mkdirs_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      public mkdirs_call(Pathname path, org.apache.thrift.async.AsyncMethodCallback<mkdirs_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mkdirs", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        mkdirs_args args = new mkdirs_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_mkdirs();
+      }
+    }
+
+    public void exists(Pathname path, org.apache.thrift.async.AsyncMethodCallback<exists_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      exists_call method_call = new exists_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class exists_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      public exists_call(Pathname path, org.apache.thrift.async.AsyncMethodCallback<exists_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("exists", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        exists_args args = new exists_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_exists();
+      }
+    }
+
+    public void stat(Pathname path, org.apache.thrift.async.AsyncMethodCallback<stat_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      stat_call method_call = new stat_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class stat_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      public stat_call(Pathname path, org.apache.thrift.async.AsyncMethodCallback<stat_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("stat", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        stat_args args = new stat_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public FileStatus getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_stat();
+      }
+    }
+
+    public void listStatus(Pathname path, org.apache.thrift.async.AsyncMethodCallback<listStatus_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      listStatus_call method_call = new listStatus_call(path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class listStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      public listStatus_call(Pathname path, org.apache.thrift.async.AsyncMethodCallback<listStatus_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("listStatus", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        listStatus_args args = new listStatus_args();
+        args.setPath(path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public List<FileStatus> getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_listStatus();
+      }
+    }
+
+    public void chmod(Pathname path, short mode, org.apache.thrift.async.AsyncMethodCallback<chmod_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      chmod_call method_call = new chmod_call(path, mode, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class chmod_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private short mode;
+      public chmod_call(Pathname path, short mode, org.apache.thrift.async.AsyncMethodCallback<chmod_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.mode = mode;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("chmod", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        chmod_args args = new chmod_args();
+        args.setPath(path);
+        args.setMode(mode);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_chmod();
+      }
+    }
+
+    public void chown(Pathname path, String owner, String group, org.apache.thrift.async.AsyncMethodCallback<chown_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      chown_call method_call = new chown_call(path, owner, group, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class chown_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private String owner;
+      private String group;
+      public chown_call(Pathname path, String owner, String group, org.apache.thrift.async.AsyncMethodCallback<chown_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.owner = owner;
+        this.group = group;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("chown", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        chown_args args = new chown_args();
+        args.setPath(path);
+        args.setOwner(owner);
+        args.setGroup(group);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_chown();
+      }
+    }
+
+    public void setReplication(Pathname path, short replication, org.apache.thrift.async.AsyncMethodCallback<setReplication_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      setReplication_call method_call = new setReplication_call(path, replication, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class setReplication_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private short replication;
+      public setReplication_call(Pathname path, short replication, org.apache.thrift.async.AsyncMethodCallback<setReplication_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.replication = replication;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setReplication", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        setReplication_args args = new setReplication_args();
+        args.setPath(path);
+        args.setReplication(replication);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_setReplication();
+      }
+    }
+
+    public void getFileBlockLocations(Pathname path, long start, long length, org.apache.thrift.async.AsyncMethodCallback<getFileBlockLocations_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getFileBlockLocations_call method_call = new getFileBlockLocations_call(path, start, length, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getFileBlockLocations_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private long start;
+      private long length;
+      public getFileBlockLocations_call(Pathname path, long start, long length, org.apache.thrift.async.AsyncMethodCallback<getFileBlockLocations_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.start = start;
+        this.length = length;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getFileBlockLocations", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getFileBlockLocations_args args = new getFileBlockLocations_args();
+        args.setPath(path);
+        args.setStart(start);
+        args.setLength(length);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public List<BlockLocation> getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getFileBlockLocations();
+      }
+    }
+
+    public void hardLink(Pathname src, Pathname dest, org.apache.thrift.async.AsyncMethodCallback<hardLink_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      hardLink_call method_call = new hardLink_call(src, dest, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class hardLink_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname src;
+      private Pathname dest;
+      public hardLink_call(Pathname src, Pathname dest, org.apache.thrift.async.AsyncMethodCallback<hardLink_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.src = src;
+        this.dest = dest;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("hardLink", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        hardLink_args args = new hardLink_args();
+        args.setSrc(src);
+        args.setDest(dest);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_hardLink();
+      }
+    }
+
+    public void concat(Pathname target, List<Pathname> srcs, boolean restricted, org.apache.thrift.async.AsyncMethodCallback<concat_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      concat_call method_call = new concat_call(target, srcs, restricted, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class concat_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname target;
+      private List<Pathname> srcs;
+      private boolean restricted;
+      public concat_call(Pathname target, List<Pathname> srcs, boolean restricted, org.apache.thrift.async.AsyncMethodCallback<concat_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.target = target;
+        this.srcs = srcs;
+        this.restricted = restricted;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("concat", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        concat_args args = new concat_args();
+        args.setTarget(target);
+        args.setSrcs(srcs);
+        args.setRestricted(restricted);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_concat();
+      }
+    }
+
+    public void reportBadBlocks(List<TLocatedBlock> blocks, org.apache.thrift.async.AsyncMethodCallback<reportBadBlocks_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      reportBadBlocks_call method_call = new reportBadBlocks_call(blocks, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class reportBadBlocks_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private List<TLocatedBlock> blocks;
+      public reportBadBlocks_call(List<TLocatedBlock> blocks, org.apache.thrift.async.AsyncMethodCallback<reportBadBlocks_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.blocks = blocks;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("reportBadBlocks", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        reportBadBlocks_args args = new reportBadBlocks_args();
+        args.setBlocks(blocks);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_reportBadBlocks();
+      }
+    }
+
+    public void getDataTransferProtocolVersion(org.apache.thrift.async.AsyncMethodCallback<getDataTransferProtocolVersion_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getDataTransferProtocolVersion_call method_call = new getDataTransferProtocolVersion_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getDataTransferProtocolVersion_call extends org.apache.thrift.async.TAsyncMethodCall {
+      public getDataTransferProtocolVersion_call(org.apache.thrift.async.AsyncMethodCallback<getDataTransferProtocolVersion_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getDataTransferProtocolVersion", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getDataTransferProtocolVersion_args args = new getDataTransferProtocolVersion_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public int getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getDataTransferProtocolVersion();
+      }
+    }
+
+    public void renewLease(String clientName, org.apache.thrift.async.AsyncMethodCallback<renewLease_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      renewLease_call method_call = new renewLease_call(clientName, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class renewLease_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String clientName;
+      public renewLease_call(String clientName, org.apache.thrift.async.AsyncMethodCallback<renewLease_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.clientName = clientName;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("renewLease", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        renewLease_args args = new renewLease_args();
+        args.setClientName(clientName);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_renewLease();
+      }
+    }
+
+    public void recoverLease(Pathname path, String clientName, org.apache.thrift.async.AsyncMethodCallback<recoverLease_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      recoverLease_call method_call = new recoverLease_call(path, clientName, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class recoverLease_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private String clientName;
+      public recoverLease_call(Pathname path, String clientName, org.apache.thrift.async.AsyncMethodCallback<recoverLease_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.clientName = clientName;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("recoverLease", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        recoverLease_args args = new recoverLease_args();
+        args.setPath(path);
+        args.setClientName(clientName);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_recoverLease();
+      }
+    }
+
+    public void closeRecoverLease(Pathname path, String clientName, boolean discardLastBlock, org.apache.thrift.async.AsyncMethodCallback<closeRecoverLease_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      closeRecoverLease_call method_call = new closeRecoverLease_call(path, clientName, discardLastBlock, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class closeRecoverLease_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname path;
+      private String clientName;
+      private boolean discardLastBlock;
+      public closeRecoverLease_call(Pathname path, String clientName, boolean discardLastBlock, org.apache.thrift.async.AsyncMethodCallback<closeRecoverLease_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.path = path;
+        this.clientName = clientName;
+        this.discardLastBlock = discardLastBlock;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("closeRecoverLease", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        closeRecoverLease_args args = new closeRecoverLease_args();
+        args.setPath(path);
+        args.setClientName(clientName);
+        args.setDiscardLastBlock(discardLastBlock);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_closeRecoverLease();
+      }
+    }
+
+    public void abandonBlock(TBlock block, Pathname pathname, String clientName, org.apache.thrift.async.AsyncMethodCallback<abandonBlock_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      abandonBlock_call method_call = new abandonBlock_call(block, pathname, clientName, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class abandonBlock_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private TBlock block;
+      private Pathname pathname;
+      private String clientName;
+      public abandonBlock_call(TBlock block, Pathname pathname, String clientName, org.apache.thrift.async.AsyncMethodCallback<abandonBlock_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.block = block;
+        this.pathname = pathname;
+        this.clientName = clientName;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("abandonBlock", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        abandonBlock_args args = new abandonBlock_args();
+        args.setBlock(block);
+        args.setPathname(pathname);
+        args.setClientName(clientName);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_abandonBlock();
+      }
+    }
+
+    public void abandonFile(Pathname pathname, String clientName, org.apache.thrift.async.AsyncMethodCallback<abandonFile_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      abandonFile_call method_call = new abandonFile_call(pathname, clientName, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class abandonFile_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname pathname;
+      private String clientName;
+      public abandonFile_call(Pathname pathname, String clientName, org.apache.thrift.async.AsyncMethodCallback<abandonFile_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.pathname = pathname;
+        this.clientName = clientName;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("abandonFile", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        abandonFile_args args = new abandonFile_args();
+        args.setPathname(pathname);
+        args.setClientName(clientName);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_abandonFile();
+      }
+    }
+
+    public void addBlock(Pathname pathname, String clientName, long startOffset, TBlock lastBlock, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes, org.apache.thrift.async.AsyncMethodCallback<addBlock_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      addBlock_call method_call = new addBlock_call(pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class addBlock_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname pathname;
+      private String clientName;
+      private long startOffset;
+      private TBlock lastBlock;
+      private List<TDatanodeID> excludedNodes;
+      private List<TDatanodeID> favouredNodes;
+      public addBlock_call(Pathname pathname, String clientName, long startOffset, TBlock lastBlock, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes, org.apache.thrift.async.AsyncMethodCallback<addBlock_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.pathname = pathname;
+        this.clientName = clientName;
+        this.startOffset = startOffset;
+        this.lastBlock = lastBlock;
+        this.excludedNodes = excludedNodes;
+        this.favouredNodes = favouredNodes;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addBlock", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        addBlock_args args = new addBlock_args();
+        args.setPathname(pathname);
+        args.setClientName(clientName);
+        args.setStartOffset(startOffset);
+        args.setLastBlock(lastBlock);
+        args.setExcludedNodes(excludedNodes);
+        args.setFavouredNodes(favouredNodes);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public TLocatedBlock getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_addBlock();
+      }
+    }
+
+    public void addFirstBlock(Pathname pathname, String clientName, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes, org.apache.thrift.async.AsyncMethodCallback<addFirstBlock_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      addFirstBlock_call method_call = new addFirstBlock_call(pathname, clientName, excludedNodes, favouredNodes, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class addFirstBlock_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname pathname;
+      private String clientName;
+      private List<TDatanodeID> excludedNodes;
+      private List<TDatanodeID> favouredNodes;
+      public addFirstBlock_call(Pathname pathname, String clientName, List<TDatanodeID> excludedNodes, List<TDatanodeID> favouredNodes, org.apache.thrift.async.AsyncMethodCallback<addFirstBlock_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.pathname = pathname;
+        this.clientName = clientName;
+        this.excludedNodes = excludedNodes;
+        this.favouredNodes = favouredNodes;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addFirstBlock", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        addFirstBlock_args args = new addFirstBlock_args();
+        args.setPathname(pathname);
+        args.setClientName(clientName);
+        args.setExcludedNodes(excludedNodes);
+        args.setFavouredNodes(favouredNodes);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public TLocatedBlock getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_addFirstBlock();
+      }
+    }
+
+    public void complete(Pathname pathname, String clientName, long fileLen, TBlock lastBlock, org.apache.thrift.async.AsyncMethodCallback<complete_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      complete_call method_call = new complete_call(pathname, clientName, fileLen, lastBlock, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class complete_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Pathname pathname;
+      private String clientName;
+      private long fileLen;
+      private TBlock lastBlock;
+      public complete_call(Pathname pathname, String clientName, long fileLen, TBlock lastBlock, org.apache.thrift.async.AsyncMethodCallback<complete_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.pathname = pathname;
+        this.clientName = clientName;
+        this.fileLen = fileLen;
+        this.lastBlock = lastBlock;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("complete", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        complete_args args = new complete_args();
+        args.setPathname(pathname);
+        args.setClientName(clientName);
+        args.setFileLen(fileLen);
+        args.setLastBlock(lastBlock);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws ThriftIOException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_complete();
+      }
+    }
+
+  }
+
+  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
+    public Processor(I iface) {
+      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+    }
+
+    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+      processMap.put("setInactivityTimeoutPeriod", new setInactivityTimeoutPeriod());
+      processMap.put("shutdown", new shutdown());
+      processMap.put("create", new create());
+      processMap.put("createFile", new createFile());
+      processMap.put("open", new open());
+      processMap.put("append", new append());
+      processMap.put("write", new write());
+      processMap.put("read", new read());
+      processMap.put("close", new close());
+      processMap.put("rm", new rm());
+      processMap.put("rename", new rename());
+      processMap.put("mkdirs", new mkdirs());
+      processMap.put("exists", new exists());
+      processMap.put("stat", new stat());
+      processMap.put("listStatus", new listStatus());
+      processMap.put("chmod", new chmod());
+      processMap.put("chown", new chown());
+      processMap.put("setReplication", new setReplication());
+      processMap.put("getFileBlockLocations", new getFileBlockLocations());
+      processMap.put("hardLink", new hardLink());
+      processMap.put("concat", new concat());
+      processMap.put("reportBadBlocks", new reportBadBlocks());
+      processMap.put("getDataTransferProtocolVersion", new getDataTransferProtocolVersion());
+      processMap.put("renewLease", new renewLease());
+      processMap.put("recoverLease", new recoverLease());
+      processMap.put("closeRecoverLease", new closeRecoverLease());
+      processMap.put("abandonBlock", new abandonBlock());
+      processMap.put("abandonFile", new abandonFile());
+      processMap.put("addBlock", new addBlock());
+      processMap.put("addFirstBlock", new addFirstBlock());
+      processMap.put("complete", new complete());
+      return processMap;
+    }
+
+    private static class setInactivityTimeoutPeriod<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setInactivityTimeoutPeriod_args> {
+      public setInactivityTimeoutPeriod() {
+        super("setInactivityTimeoutPeriod");
+      }
+
+      protected setInactivityTimeoutPeriod_args getEmptyArgsInstance() {
+        return new setInactivityTimeoutPeriod_args();
+      }
+
+      protected setInactivityTimeoutPeriod_result getResult(I iface, setInactivityTimeoutPeriod_args args) throws org.apache.thrift.TException {
+        setInactivityTimeoutPeriod_result result = new setInactivityTimeoutPeriod_result();
+        iface.setInactivityTimeoutPeriod(args.periodInSeconds);
+        return result;
+      }
+    }
+
+    private static class shutdown<I extends Iface> extends org.apache.thrift.ProcessFunction<I, shutdown_args> {
+      public shutdown() {
+        super("shutdown");
+      }
+
+      protected shutdown_args getEmptyArgsInstance() {
+        return new shutdown_args();
+      }
+
+      protected shutdown_result getResult(I iface, shutdown_args args) throws org.apache.thrift.TException {
+        shutdown_result result = new shutdown_result();
+        iface.shutdown(args.status);
+        return result;
+      }
+    }
+
+    private static class create<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_args> {
+      public create() {
+        super("create");
+      }
+
+      protected create_args getEmptyArgsInstance() {
+        return new create_args();
+      }
+
+      protected create_result getResult(I iface, create_args args) throws org.apache.thrift.TException {
+        create_result result = new create_result();
+        try {
+          result.success = iface.create(args.path);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class createFile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createFile_args> {
+      public createFile() {
+        super("createFile");
+      }
+
+      protected createFile_args getEmptyArgsInstance() {
+        return new createFile_args();
+      }
+
+      protected createFile_result getResult(I iface, createFile_args args) throws org.apache.thrift.TException {
+        createFile_result result = new createFile_result();
+        try {
+          result.success = iface.createFile(args.path, args.mode, args.overwrite, args.bufferSize, args.block_replication, args.blocksize);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class open<I extends Iface> extends org.apache.thrift.ProcessFunction<I, open_args> {
+      public open() {
+        super("open");
+      }
+
+      protected open_args getEmptyArgsInstance() {
+        return new open_args();
+      }
+
+      protected open_result getResult(I iface, open_args args) throws org.apache.thrift.TException {
+        open_result result = new open_result();
+        try {
+          result.success = iface.open(args.path);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class append<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_args> {
+      public append() {
+        super("append");
+      }
+
+      protected append_args getEmptyArgsInstance() {
+        return new append_args();
+      }
+
+      protected append_result getResult(I iface, append_args args) throws org.apache.thrift.TException {
+        append_result result = new append_result();
+        try {
+          result.success = iface.append(args.path);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class write<I extends Iface> extends org.apache.thrift.ProcessFunction<I, write_args> {
+      public write() {
+        super("write");
+      }
+
+      protected write_args getEmptyArgsInstance() {
+        return new write_args();
+      }
+
+      protected write_result getResult(I iface, write_args args) throws org.apache.thrift.TException {
+        write_result result = new write_result();
+        try {
+          result.success = iface.write(args.handle, args.data);
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class read<I extends Iface> extends org.apache.thrift.ProcessFunction<I, read_args> {
+      public read() {
+        super("read");
+      }
+
+      protected read_args getEmptyArgsInstance() {
+        return new read_args();
+      }
+
+      protected read_result getResult(I iface, read_args args) throws org.apache.thrift.TException {
+        read_result result = new read_result();
+        try {
+          result.success = iface.read(args.handle, args.offset, args.size);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class close<I extends Iface> extends org.apache.thrift.ProcessFunction<I, close_args> {
+      public close() {
+        super("close");
+      }
+
+      protected close_args getEmptyArgsInstance() {
+        return new close_args();
+      }
+
+      protected close_result getResult(I iface, close_args args) throws org.apache.thrift.TException {
+        close_result result = new close_result();
+        try {
+          result.success = iface.close(args.out);
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class rm<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rm_args> {
+      public rm() {
+        super("rm");
+      }
+
+      protected rm_args getEmptyArgsInstance() {
+        return new rm_args();
+      }
+
+      protected rm_result getResult(I iface, rm_args args) throws org.apache.thrift.TException {
+        rm_result result = new rm_result();
+        try {
+          result.success = iface.rm(args.path, args.recursive);
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class rename<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rename_args> {
+      public rename() {
+        super("rename");
+      }
+
+      protected rename_args getEmptyArgsInstance() {
+        return new rename_args();
+      }
+
+      protected rename_result getResult(I iface, rename_args args) throws org.apache.thrift.TException {
+        rename_result result = new rename_result();
+        try {
+          result.success = iface.rename(args.path, args.dest);
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class mkdirs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mkdirs_args> {
+      public mkdirs() {
+        super("mkdirs");
+      }
+
+      protected mkdirs_args getEmptyArgsInstance() {
+        return new mkdirs_args();
+      }
+
+      protected mkdirs_result getResult(I iface, mkdirs_args args) throws org.apache.thrift.TException {
+        mkdirs_result result = new mkdirs_result();
+        try {
+          result.success = iface.mkdirs(args.path);
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class exists<I extends Iface> extends org.apache.thrift.ProcessFunction<I, exists_args> {
+      public exists() {
+        super("exists");
+      }
+
+      protected exists_args getEmptyArgsInstance() {
+        return new exists_args();
+      }
+
+      protected exists_result getResult(I iface, exists_args args) throws org.apache.thrift.TException {
+        exists_result result = new exists_result();
+        try {
+          result.success = iface.exists(args.path);
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class stat<I extends Iface> extends org.apache.thrift.ProcessFunction<I, stat_args> {
+      public stat() {
+        super("stat");
+      }
+
+      protected stat_args getEmptyArgsInstance() {
+        return new stat_args();
+      }
+
+      protected stat_result getResult(I iface, stat_args args) throws org.apache.thrift.TException {
+        stat_result result = new stat_result();
+        try {
+          result.success = iface.stat(args.path);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class listStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, listStatus_args> {
+      public listStatus() {
+        super("listStatus");
+      }
+
+      protected listStatus_args getEmptyArgsInstance() {
+        return new listStatus_args();
+      }
+
+      protected listStatus_result getResult(I iface, listStatus_args args) throws org.apache.thrift.TException {
+        listStatus_result result = new listStatus_result();
+        try {
+          result.success = iface.listStatus(args.path);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class chmod<I extends Iface> extends org.apache.thrift.ProcessFunction<I, chmod_args> {
+      public chmod() {
+        super("chmod");
+      }
+
+      protected chmod_args getEmptyArgsInstance() {
+        return new chmod_args();
+      }
+
+      protected chmod_result getResult(I iface, chmod_args args) throws org.apache.thrift.TException {
+        chmod_result result = new chmod_result();
+        try {
+          iface.chmod(args.path, args.mode);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class chown<I extends Iface> extends org.apache.thrift.ProcessFunction<I, chown_args> {
+      public chown() {
+        super("chown");
+      }
+
+      protected chown_args getEmptyArgsInstance() {
+        return new chown_args();
+      }
+
+      protected chown_result getResult(I iface, chown_args args) throws org.apache.thrift.TException {
+        chown_result result = new chown_result();
+        try {
+          iface.chown(args.path, args.owner, args.group);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class setReplication<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setReplication_args> {
+      public setReplication() {
+        super("setReplication");
+      }
+
+      protected setReplication_args getEmptyArgsInstance() {
+        return new setReplication_args();
+      }
+
+      protected setReplication_result getResult(I iface, setReplication_args args) throws org.apache.thrift.TException {
+        setReplication_result result = new setReplication_result();
+        try {
+          iface.setReplication(args.path, args.replication);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class getFileBlockLocations<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getFileBlockLocations_args> {
+      public getFileBlockLocations() {
+        super("getFileBlockLocations");
+      }
+
+      protected getFileBlockLocations_args getEmptyArgsInstance() {
+        return new getFileBlockLocations_args();
+      }
+
+      protected getFileBlockLocations_result getResult(I iface, getFileBlockLocations_args args) throws org.apache.thrift.TException {
+        getFileBlockLocations_result result = new getFileBlockLocations_result();
+        try {
+          result.success = iface.getFileBlockLocations(args.path, args.start, args.length);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class hardLink<I extends Iface> extends org.apache.thrift.ProcessFunction<I, hardLink_args> {
+      public hardLink() {
+        super("hardLink");
+      }
+
+      protected hardLink_args getEmptyArgsInstance() {
+        return new hardLink_args();
+      }
+
+      protected hardLink_result getResult(I iface, hardLink_args args) throws org.apache.thrift.TException {
+        hardLink_result result = new hardLink_result();
+        try {
+          result.success = iface.hardLink(args.src, args.dest);
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class concat<I extends Iface> extends org.apache.thrift.ProcessFunction<I, concat_args> {
+      public concat() {
+        super("concat");
+      }
+
+      protected concat_args getEmptyArgsInstance() {
+        return new concat_args();
+      }
+
+      protected concat_result getResult(I iface, concat_args args) throws org.apache.thrift.TException {
+        concat_result result = new concat_result();
+        try {
+          iface.concat(args.target, args.srcs, args.restricted);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class reportBadBlocks<I extends Iface> extends org.apache.thrift.ProcessFunction<I, reportBadBlocks_args> {
+      public reportBadBlocks() {
+        super("reportBadBlocks");
+      }
+
+      protected reportBadBlocks_args getEmptyArgsInstance() {
+        return new reportBadBlocks_args();
+      }
+
+      protected reportBadBlocks_result getResult(I iface, reportBadBlocks_args args) throws org.apache.thrift.TException {
+        reportBadBlocks_result result = new reportBadBlocks_result();
+        try {
+          iface.reportBadBlocks(args.blocks);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class getDataTransferProtocolVersion<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getDataTransferProtocolVersion_args> {
+      public getDataTransferProtocolVersion() {
+        super("getDataTransferProtocolVersion");
+      }
+
+      protected getDataTransferProtocolVersion_args getEmptyArgsInstance() {
+        return new getDataTransferProtocolVersion_args();
+      }
+
+      protected getDataTransferProtocolVersion_result getResult(I iface, getDataTransferProtocolVersion_args args) throws org.apache.thrift.TException {
+        getDataTransferProtocolVersion_result result = new getDataTransferProtocolVersion_result();
+        try {
+          result.success = iface.getDataTransferProtocolVersion();
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class renewLease<I extends Iface> extends org.apache.thrift.ProcessFunction<I, renewLease_args> {
+      public renewLease() {
+        super("renewLease");
+      }
+
+      protected renewLease_args getEmptyArgsInstance() {
+        return new renewLease_args();
+      }
+
+      protected renewLease_result getResult(I iface, renewLease_args args) throws org.apache.thrift.TException {
+        renewLease_result result = new renewLease_result();
+        try {
+          iface.renewLease(args.clientName);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class recoverLease<I extends Iface> extends org.apache.thrift.ProcessFunction<I, recoverLease_args> {
+      public recoverLease() {
+        super("recoverLease");
+      }
+
+      protected recoverLease_args getEmptyArgsInstance() {
+        return new recoverLease_args();
+      }
+
+      protected recoverLease_result getResult(I iface, recoverLease_args args) throws org.apache.thrift.TException {
+        recoverLease_result result = new recoverLease_result();
+        try {
+          iface.recoverLease(args.path, args.clientName);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class closeRecoverLease<I extends Iface> extends org.apache.thrift.ProcessFunction<I, closeRecoverLease_args> {
+      public closeRecoverLease() {
+        super("closeRecoverLease");
+      }
+
+      protected closeRecoverLease_args getEmptyArgsInstance() {
+        return new closeRecoverLease_args();
+      }
+
+      protected closeRecoverLease_result getResult(I iface, closeRecoverLease_args args) throws org.apache.thrift.TException {
+        closeRecoverLease_result result = new closeRecoverLease_result();
+        try {
+          iface.closeRecoverLease(args.path, args.clientName, args.discardLastBlock);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class abandonBlock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, abandonBlock_args> {
+      public abandonBlock() {
+        super("abandonBlock");
+      }
+
+      protected abandonBlock_args getEmptyArgsInstance() {
+        return new abandonBlock_args();
+      }
+
+      protected abandonBlock_result getResult(I iface, abandonBlock_args args) throws org.apache.thrift.TException {
+        abandonBlock_result result = new abandonBlock_result();
+        try {
+          iface.abandonBlock(args.block, args.pathname, args.clientName);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class abandonFile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, abandonFile_args> {
+      public abandonFile() {
+        super("abandonFile");
+      }
+
+      protected abandonFile_args getEmptyArgsInstance() {
+        return new abandonFile_args();
+      }
+
+      protected abandonFile_result getResult(I iface, abandonFile_args args) throws org.apache.thrift.TException {
+        abandonFile_result result = new abandonFile_result();
+        try {
+          iface.abandonFile(args.pathname, args.clientName);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class addBlock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addBlock_args> {
+      public addBlock() {
+        super("addBlock");
+      }
+
+      protected addBlock_args getEmptyArgsInstance() {
+        return new addBlock_args();
+      }
+
+      protected addBlock_result getResult(I iface, addBlock_args args) throws org.apache.thrift.TException {
+        addBlock_result result = new addBlock_result();
+        try {
+          result.success = iface.addBlock(args.pathname, args.clientName, args.startOffset, args.lastBlock, args.excludedNodes, args.favouredNodes);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class addFirstBlock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addFirstBlock_args> {
+      public addFirstBlock() {
+        super("addFirstBlock");
+      }
+
+      protected addFirstBlock_args getEmptyArgsInstance() {
+        return new addFirstBlock_args();
+      }
+
+      protected addFirstBlock_result getResult(I iface, addFirstBlock_args args) throws org.apache.thrift.TException {
+        addFirstBlock_result result = new addFirstBlock_result();
+        try {
+          result.success = iface.addFirstBlock(args.pathname, args.clientName, args.excludedNodes, args.favouredNodes);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+    private static class complete<I extends Iface> extends org.apache.thrift.ProcessFunction<I, complete_args> {
+      public complete() {
+        super("complete");
+      }
+
+      protected complete_args getEmptyArgsInstance() {
+        return new complete_args();
+      }
+
+      protected complete_result getResult(I iface, complete_args args) throws org.apache.thrift.TException {
+        complete_result result = new complete_result();
+        try {
+          result.success = iface.complete(args.pathname, args.clientName, args.fileLen, args.lastBlock);
+          result.setSuccessIsSet(true);
+        } catch (ThriftIOException ouch) {
+          result.ouch = ouch;
+        }
+        return result;
+      }
+    }
+
+  }
+
+  public static class setInactivityTimeoutPeriod_args implements org.apache.thrift.TBase<setInactivityTimeoutPeriod_args, setInactivityTimeoutPeriod_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setInactivityTimeoutPeriod_args");
+
+    private static final org.apache.thrift.protocol.TField PERIOD_IN_SECONDS_FIELD_DESC = new org.apache.thrift.protocol.TField("periodInSeconds", org.apache.thrift.protocol.TType.I64, (short)1);
+
+    public long periodInSeconds; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PERIOD_IN_SECONDS((short)1, "periodInSeconds");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PERIOD_IN_SECONDS
+            return PERIOD_IN_SECONDS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __PERIODINSECONDS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PERIOD_IN_SECONDS, new org.apache.thrift.meta_data.FieldMetaData("periodInSeconds", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setInactivityTimeoutPeriod_args.class, metaDataMap);
+    }
+
+    public setInactivityTimeoutPeriod_args() {
+    }
+
+    public setInactivityTimeoutPeriod_args(
+      long periodInSeconds)
+    {
+      this();
+      this.periodInSeconds = periodInSeconds;
+      setPeriodInSecondsIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public setInactivityTimeoutPeriod_args(setInactivityTimeoutPeriod_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.periodInSeconds = other.periodInSeconds;
+    }
+
+    public setInactivityTimeoutPeriod_args deepCopy() {
+      return new setInactivityTimeoutPeriod_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setPeriodInSecondsIsSet(false);
+      this.periodInSeconds = 0;
+    }
+
+    public long getPeriodInSeconds() {
+      return this.periodInSeconds;
+    }
+
+    public setInactivityTimeoutPeriod_args setPeriodInSeconds(long periodInSeconds) {
+      this.periodInSeconds = periodInSeconds;
+      setPeriodInSecondsIsSet(true);
+      return this;
+    }
+
+    public void unsetPeriodInSeconds() {
+      __isset_bit_vector.clear(__PERIODINSECONDS_ISSET_ID);
+    }
+
+    /** Returns true if field periodInSeconds is set (has been assigned a value) and false otherwise */
+    public boolean isSetPeriodInSeconds() {
+      return __isset_bit_vector.get(__PERIODINSECONDS_ISSET_ID);
+    }
+
+    public void setPeriodInSecondsIsSet(boolean value) {
+      __isset_bit_vector.set(__PERIODINSECONDS_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PERIOD_IN_SECONDS:
+        if (value == null) {
+          unsetPeriodInSeconds();
+        } else {
+          setPeriodInSeconds((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PERIOD_IN_SECONDS:
+        return Long.valueOf(getPeriodInSeconds());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PERIOD_IN_SECONDS:
+        return isSetPeriodInSeconds();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof setInactivityTimeoutPeriod_args)
+        return this.equals((setInactivityTimeoutPeriod_args)that);
+      return false;
+    }
+
+    public boolean equals(setInactivityTimeoutPeriod_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_periodInSeconds = true;
+      boolean that_present_periodInSeconds = true;
+      if (this_present_periodInSeconds || that_present_periodInSeconds) {
+        if (!(this_present_periodInSeconds && that_present_periodInSeconds))
+          return false;
+        if (this.periodInSeconds != that.periodInSeconds)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(setInactivityTimeoutPeriod_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      setInactivityTimeoutPeriod_args typedOther = (setInactivityTimeoutPeriod_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPeriodInSeconds()).compareTo(typedOther.isSetPeriodInSeconds());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPeriodInSeconds()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.periodInSeconds, typedOther.periodInSeconds);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PERIOD_IN_SECONDS
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.periodInSeconds = iprot.readI64();
+              setPeriodInSecondsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(PERIOD_IN_SECONDS_FIELD_DESC);
+      oprot.writeI64(this.periodInSeconds);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("setInactivityTimeoutPeriod_args(");
+      boolean first = true;
+
+      sb.append("periodInSeconds:");
+      sb.append(this.periodInSeconds);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class setInactivityTimeoutPeriod_result implements org.apache.thrift.TBase<setInactivityTimeoutPeriod_result, setInactivityTimeoutPeriod_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setInactivityTimeoutPeriod_result");
+
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setInactivityTimeoutPeriod_result.class, metaDataMap);
+    }
+
+    public setInactivityTimeoutPeriod_result() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public setInactivityTimeoutPeriod_result(setInactivityTimeoutPeriod_result other) {
+    }
+
+    public setInactivityTimeoutPeriod_result deepCopy() {
+      return new setInactivityTimeoutPeriod_result(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof setInactivityTimeoutPeriod_result)
+        return this.equals((setInactivityTimeoutPeriod_result)that);
+      return false;
+    }
+
+    public boolean equals(setInactivityTimeoutPeriod_result that) {
+      if (that == null)
+        return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(setInactivityTimeoutPeriod_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      setInactivityTimeoutPeriod_result typedOther = (setInactivityTimeoutPeriod_result)other;
+
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("setInactivityTimeoutPeriod_result(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class shutdown_args implements org.apache.thrift.TBase<shutdown_args, shutdown_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdown_args");
+
+    private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.I32, (short)1);
+
+    public int status; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      STATUS((short)1, "status");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // STATUS
+            return STATUS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __STATUS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdown_args.class, metaDataMap);
+    }
+
+    public shutdown_args() {
+    }
+
+    public shutdown_args(
+      int status)
+    {
+      this();
+      this.status = status;
+      setStatusIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public shutdown_args(shutdown_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.status = other.status;
+    }
+
+    public shutdown_args deepCopy() {
+      return new shutdown_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setStatusIsSet(false);
+      this.status = 0;
+    }
+
+    public int getStatus() {
+      return this.status;
+    }
+
+    public shutdown_args setStatus(int status) {
+      this.status = status;
+      setStatusIsSet(true);
+      return this;
+    }
+
+    public void unsetStatus() {
+      __isset_bit_vector.clear(__STATUS_ISSET_ID);
+    }
+
+    /** Returns true if field status is set (has been assigned a value) and false otherwise */
+    public boolean isSetStatus() {
+      return __isset_bit_vector.get(__STATUS_ISSET_ID);
+    }
+
+    public void setStatusIsSet(boolean value) {
+      __isset_bit_vector.set(__STATUS_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case STATUS:
+        if (value == null) {
+          unsetStatus();
+        } else {
+          setStatus((Integer)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case STATUS:
+        return Integer.valueOf(getStatus());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case STATUS:
+        return isSetStatus();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof shutdown_args)
+        return this.equals((shutdown_args)that);
+      return false;
+    }
+
+    public boolean equals(shutdown_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_status = true;
+      boolean that_present_status = true;
+      if (this_present_status || that_present_status) {
+        if (!(this_present_status && that_present_status))
+          return false;
+        if (this.status != that.status)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(shutdown_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      shutdown_args typedOther = (shutdown_args)other;
+
+      lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetStatus()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // STATUS
+            if (field.type == org.apache.thrift.protocol.TType.I32) {
+              this.status = iprot.readI32();
+              setStatusIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(STATUS_FIELD_DESC);
+      oprot.writeI32(this.status);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("shutdown_args(");
+      boolean first = true;
+
+      sb.append("status:");
+      sb.append(this.status);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class shutdown_result implements org.apache.thrift.TBase<shutdown_result, shutdown_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdown_result");
+
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdown_result.class, metaDataMap);
+    }
+
+    public shutdown_result() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public shutdown_result(shutdown_result other) {
+    }
+
+    public shutdown_result deepCopy() {
+      return new shutdown_result(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof shutdown_result)
+        return this.equals((shutdown_result)that);
+      return false;
+    }
+
+    public boolean equals(shutdown_result that) {
+      if (that == null)
+        return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(shutdown_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      shutdown_result typedOther = (shutdown_result)other;
+
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("shutdown_result(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class create_args implements org.apache.thrift.TBase<create_args, create_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public Pathname path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_args.class, metaDataMap);
+    }
+
+    public create_args() {
+    }
+
+    public create_args(
+      Pathname path)
+    {
+      this();
+      this.path = path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public create_args(create_args other) {
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+    }
+
+    public create_args deepCopy() {
+      return new create_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public create_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((Pathname)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof create_args)
+        return this.equals((create_args)that);
+      return false;
+    }
+
+    public boolean equals(create_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(create_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      create_args typedOther = (create_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("create_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class create_result implements org.apache.thrift.TBase<create_result, create_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftHandle success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftHandle.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_result.class, metaDataMap);
+    }
+
+    public create_result() {
+    }
+
+    public create_result(
+      ThriftHandle success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public create_result(create_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new ThriftHandle(other.success);
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public create_result deepCopy() {
+      return new create_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public ThriftHandle getSuccess() {
+      return this.success;
+    }
+
+    public create_result setSuccess(ThriftHandle success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public create_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((ThriftHandle)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof create_result)
+        return this.equals((create_result)that);
+      return false;
+    }
+
+    public boolean equals(create_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(create_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      create_result typedOther = (create_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new ThriftHandle();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("create_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class createFile_args implements org.apache.thrift.TBase<createFile_args, createFile_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createFile_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("mode", org.apache.thrift.protocol.TType.I16, (short)2);
+    private static final org.apache.thrift.protocol.TField OVERWRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("overwrite", org.apache.thrift.protocol.TType.BOOL, (short)3);
+    private static final org.apache.thrift.protocol.TField BUFFER_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("bufferSize", org.apache.thrift.protocol.TType.I32, (short)4);
+    private static final org.apache.thrift.protocol.TField BLOCK_REPLICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("block_replication", org.apache.thrift.protocol.TType.I16, (short)5);
+    private static final org.apache.thrift.protocol.TField BLOCKSIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("blocksize", org.apache.thrift.protocol.TType.I64, (short)6);
+
+    public Pathname path; // required
+    public short mode; // required
+    public boolean overwrite; // required
+    public int bufferSize; // required
+    public short block_replication; // required
+    public long blocksize; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      MODE((short)2, "mode"),
+      OVERWRITE((short)3, "overwrite"),
+      BUFFER_SIZE((short)4, "bufferSize"),
+      BLOCK_REPLICATION((short)5, "block_replication"),
+      BLOCKSIZE((short)6, "blocksize");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // MODE
+            return MODE;
+          case 3: // OVERWRITE
+            return OVERWRITE;
+          case 4: // BUFFER_SIZE
+            return BUFFER_SIZE;
+          case 5: // BLOCK_REPLICATION
+            return BLOCK_REPLICATION;
+          case 6: // BLOCKSIZE
+            return BLOCKSIZE;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __MODE_ISSET_ID = 0;
+    private static final int __OVERWRITE_ISSET_ID = 1;
+    private static final int __BUFFERSIZE_ISSET_ID = 2;
+    private static final int __BLOCK_REPLICATION_ISSET_ID = 3;
+    private static final int __BLOCKSIZE_ISSET_ID = 4;
+    private BitSet __isset_bit_vector = new BitSet(5);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.MODE, new org.apache.thrift.meta_data.FieldMetaData("mode", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
+      tmpMap.put(_Fields.OVERWRITE, new org.apache.thrift.meta_data.FieldMetaData("overwrite", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.BUFFER_SIZE, new org.apache.thrift.meta_data.FieldMetaData("bufferSize", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      tmpMap.put(_Fields.BLOCK_REPLICATION, new org.apache.thrift.meta_data.FieldMetaData("block_replication", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
+      tmpMap.put(_Fields.BLOCKSIZE, new org.apache.thrift.meta_data.FieldMetaData("blocksize", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createFile_args.class, metaDataMap);
+    }
+
+    public createFile_args() {
+    }
+
+    public createFile_args(
+      Pathname path,
+      short mode,
+      boolean overwrite,
+      int bufferSize,
+      short block_replication,
+      long blocksize)
+    {
+      this();
+      this.path = path;
+      this.mode = mode;
+      setModeIsSet(true);
+      this.overwrite = overwrite;
+      setOverwriteIsSet(true);
+      this.bufferSize = bufferSize;
+      setBufferSizeIsSet(true);
+      this.block_replication = block_replication;
+      setBlock_replicationIsSet(true);
+      this.blocksize = blocksize;
+      setBlocksizeIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public createFile_args(createFile_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+      this.mode = other.mode;
+      this.overwrite = other.overwrite;
+      this.bufferSize = other.bufferSize;
+      this.block_replication = other.block_replication;
+      this.blocksize = other.blocksize;
+    }
+
+    public createFile_args deepCopy() {
+      return new createFile_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+      setModeIsSet(false);
+      this.mode = 0;
+      setOverwriteIsSet(false);
+      this.overwrite = false;
+      setBufferSizeIsSet(false);
+      this.bufferSize = 0;
+      setBlock_replicationIsSet(false);
+      this.block_replication = 0;
+      setBlocksizeIsSet(false);
+      this.blocksize = 0;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public createFile_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public short getMode() {
+      return this.mode;
+    }
+
+    public createFile_args setMode(short mode) {
+      this.mode = mode;
+      setModeIsSet(true);
+      return this;
+    }
+
+    public void unsetMode() {
+      __isset_bit_vector.clear(__MODE_ISSET_ID);
+    }
+
+    /** Returns true if field mode is set (has been assigned a value) and false otherwise */
+    public boolean isSetMode() {
+      return __isset_bit_vector.get(__MODE_ISSET_ID);
+    }
+
+    public void setModeIsSet(boolean value) {
+      __isset_bit_vector.set(__MODE_ISSET_ID, value);
+    }
+
+    public boolean isOverwrite() {
+      return this.overwrite;
+    }
+
+    public createFile_args setOverwrite(boolean overwrite) {
+      this.overwrite = overwrite;
+      setOverwriteIsSet(true);
+      return this;
+    }
+
+    public void unsetOverwrite() {
+      __isset_bit_vector.clear(__OVERWRITE_ISSET_ID);
+    }
+
+    /** Returns true if field overwrite is set (has been assigned a value) and false otherwise */
+    public boolean isSetOverwrite() {
+      return __isset_bit_vector.get(__OVERWRITE_ISSET_ID);
+    }
+
+    public void setOverwriteIsSet(boolean value) {
+      __isset_bit_vector.set(__OVERWRITE_ISSET_ID, value);
+    }
+
+    public int getBufferSize() {
+      return this.bufferSize;
+    }
+
+    public createFile_args setBufferSize(int bufferSize) {
+      this.bufferSize = bufferSize;
+      setBufferSizeIsSet(true);
+      return this;
+    }
+
+    public void unsetBufferSize() {
+      __isset_bit_vector.clear(__BUFFERSIZE_ISSET_ID);
+    }
+
+    /** Returns true if field bufferSize is set (has been assigned a value) and false otherwise */
+    public boolean isSetBufferSize() {
+      return __isset_bit_vector.get(__BUFFERSIZE_ISSET_ID);
+    }
+
+    public void setBufferSizeIsSet(boolean value) {
+      __isset_bit_vector.set(__BUFFERSIZE_ISSET_ID, value);
+    }
+
+    public short getBlock_replication() {
+      return this.block_replication;
+    }
+
+    public createFile_args setBlock_replication(short block_replication) {
+      this.block_replication = block_replication;
+      setBlock_replicationIsSet(true);
+      return this;
+    }
+
+    public void unsetBlock_replication() {
+      __isset_bit_vector.clear(__BLOCK_REPLICATION_ISSET_ID);
+    }
+
+    /** Returns true if field block_replication is set (has been assigned a value) and false otherwise */
+    public boolean isSetBlock_replication() {
+      return __isset_bit_vector.get(__BLOCK_REPLICATION_ISSET_ID);
+    }
+
+    public void setBlock_replicationIsSet(boolean value) {
+      __isset_bit_vector.set(__BLOCK_REPLICATION_ISSET_ID, value);
+    }
+
+    public long getBlocksize() {
+      return this.blocksize;
+    }
+
+    public createFile_args setBlocksize(long blocksize) {
+      this.blocksize = blocksize;
+      setBlocksizeIsSet(true);
+      return this;
+    }
+
+    public void unsetBlocksize() {
+      __isset_bit_vector.clear(__BLOCKSIZE_ISSET_ID);
+    }
+
+    /** Returns true if field blocksize is set (has been assigned a value) and false otherwise */
+    public boolean isSetBlocksize() {
+      return __isset_bit_vector.get(__BLOCKSIZE_ISSET_ID);
+    }
+
+    public void setBlocksizeIsSet(boolean value) {
+      __isset_bit_vector.set(__BLOCKSIZE_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((Pathname)value);
+        }
+        break;
+
+      case MODE:
+        if (value == null) {
+          unsetMode();
+        } else {
+          setMode((Short)value);
+        }
+        break;
+
+      case OVERWRITE:
+        if (value == null) {
+          unsetOverwrite();
+        } else {
+          setOverwrite((Boolean)value);
+        }
+        break;
+
+      case BUFFER_SIZE:
+        if (value == null) {
+          unsetBufferSize();
+        } else {
+          setBufferSize((Integer)value);
+        }
+        break;
+
+      case BLOCK_REPLICATION:
+        if (value == null) {
+          unsetBlock_replication();
+        } else {
+          setBlock_replication((Short)value);
+        }
+        break;
+
+      case BLOCKSIZE:
+        if (value == null) {
+          unsetBlocksize();
+        } else {
+          setBlocksize((Long)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      case MODE:
+        return Short.valueOf(getMode());
+
+      case OVERWRITE:
+        return Boolean.valueOf(isOverwrite());
+
+      case BUFFER_SIZE:
+        return Integer.valueOf(getBufferSize());
+
+      case BLOCK_REPLICATION:
+        return Short.valueOf(getBlock_replication());
+
+      case BLOCKSIZE:
+        return Long.valueOf(getBlocksize());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      case MODE:
+        return isSetMode();
+      case OVERWRITE:
+        return isSetOverwrite();
+      case BUFFER_SIZE:
+        return isSetBufferSize();
+      case BLOCK_REPLICATION:
+        return isSetBlock_replication();
+      case BLOCKSIZE:
+        return isSetBlocksize();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof createFile_args)
+        return this.equals((createFile_args)that);
+      return false;
+    }
+
+    public boolean equals(createFile_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      boolean this_present_mode = true;
+      boolean that_present_mode = true;
+      if (this_present_mode || that_present_mode) {
+        if (!(this_present_mode && that_present_mode))
+          return false;
+        if (this.mode != that.mode)
+          return false;
+      }
+
+      boolean this_present_overwrite = true;
+      boolean that_present_overwrite = true;
+      if (this_present_overwrite || that_present_overwrite) {
+        if (!(this_present_overwrite && that_present_overwrite))
+          return false;
+        if (this.overwrite != that.overwrite)
+          return false;
+      }
+
+      boolean this_present_bufferSize = true;
+      boolean that_present_bufferSize = true;
+      if (this_present_bufferSize || that_present_bufferSize) {
+        if (!(this_present_bufferSize && that_present_bufferSize))
+          return false;
+        if (this.bufferSize != that.bufferSize)
+          return false;
+      }
+
+      boolean this_present_block_replication = true;
+      boolean that_present_block_replication = true;
+      if (this_present_block_replication || that_present_block_replication) {
+        if (!(this_present_block_replication && that_present_block_replication))
+          return false;
+        if (this.block_replication != that.block_replication)
+          return false;
+      }
+
+      boolean this_present_blocksize = true;
+      boolean that_present_blocksize = true;
+      if (this_present_blocksize || that_present_blocksize) {
+        if (!(this_present_blocksize && that_present_blocksize))
+          return false;
+        if (this.blocksize != that.blocksize)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(createFile_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      createFile_args typedOther = (createFile_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetMode()).compareTo(typedOther.isSetMode());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetMode()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mode, typedOther.mode);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOverwrite()).compareTo(typedOther.isSetOverwrite());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOverwrite()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.overwrite, typedOther.overwrite);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetBufferSize()).compareTo(typedOther.isSetBufferSize());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBufferSize()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bufferSize, typedOther.bufferSize);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetBlock_replication()).compareTo(typedOther.isSetBlock_replication());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBlock_replication()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.block_replication, typedOther.block_replication);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetBlocksize()).compareTo(typedOther.isSetBlocksize());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBlocksize()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blocksize, typedOther.blocksize);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // MODE
+            if (field.type == org.apache.thrift.protocol.TType.I16) {
+              this.mode = iprot.readI16();
+              setModeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // OVERWRITE
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.overwrite = iprot.readBool();
+              setOverwriteIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 4: // BUFFER_SIZE
+            if (field.type == org.apache.thrift.protocol.TType.I32) {
+              this.bufferSize = iprot.readI32();
+              setBufferSizeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 5: // BLOCK_REPLICATION
+            if (field.type == org.apache.thrift.protocol.TType.I16) {
+              this.block_replication = iprot.readI16();
+              setBlock_replicationIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 6: // BLOCKSIZE
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.blocksize = iprot.readI64();
+              setBlocksizeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(MODE_FIELD_DESC);
+      oprot.writeI16(this.mode);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(OVERWRITE_FIELD_DESC);
+      oprot.writeBool(this.overwrite);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(BUFFER_SIZE_FIELD_DESC);
+      oprot.writeI32(this.bufferSize);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(BLOCK_REPLICATION_FIELD_DESC);
+      oprot.writeI16(this.block_replication);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(BLOCKSIZE_FIELD_DESC);
+      oprot.writeI64(this.blocksize);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("createFile_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("mode:");
+      sb.append(this.mode);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("overwrite:");
+      sb.append(this.overwrite);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("bufferSize:");
+      sb.append(this.bufferSize);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("block_replication:");
+      sb.append(this.block_replication);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("blocksize:");
+      sb.append(this.blocksize);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class createFile_result implements org.apache.thrift.TBase<createFile_result, createFile_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createFile_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftHandle success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftHandle.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createFile_result.class, metaDataMap);
+    }
+
+    public createFile_result() {
+    }
+
+    public createFile_result(
+      ThriftHandle success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public createFile_result(createFile_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new ThriftHandle(other.success);
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public createFile_result deepCopy() {
+      return new createFile_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public ThriftHandle getSuccess() {
+      return this.success;
+    }
+
+    public createFile_result setSuccess(ThriftHandle success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public createFile_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((ThriftHandle)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof createFile_result)
+        return this.equals((createFile_result)that);
+      return false;
+    }
+
+    public boolean equals(createFile_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(createFile_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      createFile_result typedOther = (createFile_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new ThriftHandle();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("createFile_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class open_args implements org.apache.thrift.TBase<open_args, open_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("open_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public Pathname path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(open_args.class, metaDataMap);
+    }
+
+    public open_args() {
+    }
+
+    public open_args(
+      Pathname path)
+    {
+      this();
+      this.path = path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public open_args(open_args other) {
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+    }
+
+    public open_args deepCopy() {
+      return new open_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public open_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((Pathname)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof open_args)
+        return this.equals((open_args)that);
+      return false;
+    }
+
+    public boolean equals(open_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(open_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      open_args typedOther = (open_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("open_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class open_result implements org.apache.thrift.TBase<open_result, open_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("open_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftHandle success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftHandle.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(open_result.class, metaDataMap);
+    }
+
+    public open_result() {
+    }
+
+    public open_result(
+      ThriftHandle success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public open_result(open_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new ThriftHandle(other.success);
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public open_result deepCopy() {
+      return new open_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public ThriftHandle getSuccess() {
+      return this.success;
+    }
+
+    public open_result setSuccess(ThriftHandle success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public open_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((ThriftHandle)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof open_result)
+        return this.equals((open_result)that);
+      return false;
+    }
+
+    public boolean equals(open_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(open_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      open_result typedOther = (open_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new ThriftHandle();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("open_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class append_args implements org.apache.thrift.TBase<append_args, append_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public Pathname path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(append_args.class, metaDataMap);
+    }
+
+    public append_args() {
+    }
+
+    public append_args(
+      Pathname path)
+    {
+      this();
+      this.path = path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public append_args(append_args other) {
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+    }
+
+    public append_args deepCopy() {
+      return new append_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public append_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((Pathname)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof append_args)
+        return this.equals((append_args)that);
+      return false;
+    }
+
+    public boolean equals(append_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(append_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      append_args typedOther = (append_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("append_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class append_result implements org.apache.thrift.TBase<append_result, append_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftHandle success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftHandle.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(append_result.class, metaDataMap);
+    }
+
+    public append_result() {
+    }
+
+    public append_result(
+      ThriftHandle success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public append_result(append_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new ThriftHandle(other.success);
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public append_result deepCopy() {
+      return new append_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public ThriftHandle getSuccess() {
+      return this.success;
+    }
+
+    public append_result setSuccess(ThriftHandle success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public append_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((ThriftHandle)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof append_result)
+        return this.equals((append_result)that);
+      return false;
+    }
+
+    public boolean equals(append_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(append_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      append_result typedOther = (append_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new ThriftHandle();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("append_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class write_args implements org.apache.thrift.TBase<write_args, write_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("write_args");
+
+    private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("data", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+    public ThriftHandle handle; // required
+    public String data; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      HANDLE((short)1, "handle"),
+      DATA((short)2, "data");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // HANDLE
+            return HANDLE;
+          case 2: // DATA
+            return DATA;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftHandle.class)));
+      tmpMap.put(_Fields.DATA, new org.apache.thrift.meta_data.FieldMetaData("data", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(write_args.class, metaDataMap);
+    }
+
+    public write_args() {
+    }
+
+    public write_args(
+      ThriftHandle handle,
+      String data)
+    {
+      this();
+      this.handle = handle;
+      this.data = data;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public write_args(write_args other) {
+      if (other.isSetHandle()) {
+        this.handle = new ThriftHandle(other.handle);
+      }
+      if (other.isSetData()) {
+        this.data = other.data;
+      }
+    }
+
+    public write_args deepCopy() {
+      return new write_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.handle = null;
+      this.data = null;
+    }
+
+    public ThriftHandle getHandle() {
+      return this.handle;
+    }
+
+    public write_args setHandle(ThriftHandle handle) {
+      this.handle = handle;
+      return this;
+    }
+
+    public void unsetHandle() {
+      this.handle = null;
+    }
+
+    /** Returns true if field handle is set (has been assigned a value) and false otherwise */
+    public boolean isSetHandle() {
+      return this.handle != null;
+    }
+
+    public void setHandleIsSet(boolean value) {
+      if (!value) {
+        this.handle = null;
+      }
+    }
+
+    public String getData() {
+      return this.data;
+    }
+
+    public write_args setData(String data) {
+      this.data = data;
+      return this;
+    }
+
+    public void unsetData() {
+      this.data = null;
+    }
+
+    /** Returns true if field data is set (has been assigned a value) and false otherwise */
+    public boolean isSetData() {
+      return this.data != null;
+    }
+
+    public void setDataIsSet(boolean value) {
+      if (!value) {
+        this.data = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case HANDLE:
+        if (value == null) {
+          unsetHandle();
+        } else {
+          setHandle((ThriftHandle)value);
+        }
+        break;
+
+      case DATA:
+        if (value == null) {
+          unsetData();
+        } else {
+          setData((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case HANDLE:
+        return getHandle();
+
+      case DATA:
+        return getData();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case HANDLE:
+        return isSetHandle();
+      case DATA:
+        return isSetData();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof write_args)
+        return this.equals((write_args)that);
+      return false;
+    }
+
+    public boolean equals(write_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_handle = true && this.isSetHandle();
+      boolean that_present_handle = true && that.isSetHandle();
+      if (this_present_handle || that_present_handle) {
+        if (!(this_present_handle && that_present_handle))
+          return false;
+        if (!this.handle.equals(that.handle))
+          return false;
+      }
+
+      boolean this_present_data = true && this.isSetData();
+      boolean that_present_data = true && that.isSetData();
+      if (this_present_data || that_present_data) {
+        if (!(this_present_data && that_present_data))
+          return false;
+        if (!this.data.equals(that.data))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(write_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      write_args typedOther = (write_args)other;
+
+      lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetHandle()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.handle, typedOther.handle);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetData()).compareTo(typedOther.isSetData());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetData()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, typedOther.data);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // HANDLE
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.handle = new ThriftHandle();
+              this.handle.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // DATA
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.data = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.handle != null) {
+        oprot.writeFieldBegin(HANDLE_FIELD_DESC);
+        this.handle.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.data != null) {
+        oprot.writeFieldBegin(DATA_FIELD_DESC);
+        oprot.writeString(this.data);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("write_args(");
+      boolean first = true;
+
+      sb.append("handle:");
+      if (this.handle == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.handle);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("data:");
+      if (this.data == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.data);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class write_result implements org.apache.thrift.TBase<write_result, write_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("write_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(write_result.class, metaDataMap);
+    }
+
+    public write_result() {
+    }
+
+    public write_result(
+      boolean success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public write_result(write_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public write_result deepCopy() {
+      return new write_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.ouch = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public write_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public write_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof write_result)
+        return this.equals((write_result)that);
+      return false;
+    }
+
+    public boolean equals(write_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(write_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      write_result typedOther = (write_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("write_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class read_args implements org.apache.thrift.TBase<read_args, read_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("read_args");
+
+    private static final org.apache.thrift.protocol.TField HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("handle", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField OFFSET_FIELD_DESC = new org.apache.thrift.protocol.TField("offset", org.apache.thrift.protocol.TType.I64, (short)2);
+    private static final org.apache.thrift.protocol.TField SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("size", org.apache.thrift.protocol.TType.I32, (short)3);
+
+    public ThriftHandle handle; // required
+    public long offset; // required
+    public int size; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      HANDLE((short)1, "handle"),
+      OFFSET((short)2, "offset"),
+      SIZE((short)3, "size");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // HANDLE
+            return HANDLE;
+          case 2: // OFFSET
+            return OFFSET;
+          case 3: // SIZE
+            return SIZE;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __OFFSET_ISSET_ID = 0;
+    private static final int __SIZE_ISSET_ID = 1;
+    private BitSet __isset_bit_vector = new BitSet(2);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.HANDLE, new org.apache.thrift.meta_data.FieldMetaData("handle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftHandle.class)));
+      tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.SIZE, new org.apache.thrift.meta_data.FieldMetaData("size", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(read_args.class, metaDataMap);
+    }
+
+    public read_args() {
+    }
+
+    public read_args(
+      ThriftHandle handle,
+      long offset,
+      int size)
+    {
+      this();
+      this.handle = handle;
+      this.offset = offset;
+      setOffsetIsSet(true);
+      this.size = size;
+      setSizeIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public read_args(read_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetHandle()) {
+        this.handle = new ThriftHandle(other.handle);
+      }
+      this.offset = other.offset;
+      this.size = other.size;
+    }
+
+    public read_args deepCopy() {
+      return new read_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.handle = null;
+      setOffsetIsSet(false);
+      this.offset = 0;
+      setSizeIsSet(false);
+      this.size = 0;
+    }
+
+    public ThriftHandle getHandle() {
+      return this.handle;
+    }
+
+    public read_args setHandle(ThriftHandle handle) {
+      this.handle = handle;
+      return this;
+    }
+
+    public void unsetHandle() {
+      this.handle = null;
+    }
+
+    /** Returns true if field handle is set (has been assigned a value) and false otherwise */
+    public boolean isSetHandle() {
+      return this.handle != null;
+    }
+
+    public void setHandleIsSet(boolean value) {
+      if (!value) {
+        this.handle = null;
+      }
+    }
+
+    public long getOffset() {
+      return this.offset;
+    }
+
+    public read_args setOffset(long offset) {
+      this.offset = offset;
+      setOffsetIsSet(true);
+      return this;
+    }
+
+    public void unsetOffset() {
+      __isset_bit_vector.clear(__OFFSET_ISSET_ID);
+    }
+
+    /** Returns true if field offset is set (has been assigned a value) and false otherwise */
+    public boolean isSetOffset() {
+      return __isset_bit_vector.get(__OFFSET_ISSET_ID);
+    }
+
+    public void setOffsetIsSet(boolean value) {
+      __isset_bit_vector.set(__OFFSET_ISSET_ID, value);
+    }
+
+    public int getSize() {
+      return this.size;
+    }
+
+    public read_args setSize(int size) {
+      this.size = size;
+      setSizeIsSet(true);
+      return this;
+    }
+
+    public void unsetSize() {
+      __isset_bit_vector.clear(__SIZE_ISSET_ID);
+    }
+
+    /** Returns true if field size is set (has been assigned a value) and false otherwise */
+    public boolean isSetSize() {
+      return __isset_bit_vector.get(__SIZE_ISSET_ID);
+    }
+
+    public void setSizeIsSet(boolean value) {
+      __isset_bit_vector.set(__SIZE_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case HANDLE:
+        if (value == null) {
+          unsetHandle();
+        } else {
+          setHandle((ThriftHandle)value);
+        }
+        break;
+
+      case OFFSET:
+        if (value == null) {
+          unsetOffset();
+        } else {
+          setOffset((Long)value);
+        }
+        break;
+
+      case SIZE:
+        if (value == null) {
+          unsetSize();
+        } else {
+          setSize((Integer)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case HANDLE:
+        return getHandle();
+
+      case OFFSET:
+        return Long.valueOf(getOffset());
+
+      case SIZE:
+        return Integer.valueOf(getSize());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case HANDLE:
+        return isSetHandle();
+      case OFFSET:
+        return isSetOffset();
+      case SIZE:
+        return isSetSize();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof read_args)
+        return this.equals((read_args)that);
+      return false;
+    }
+
+    public boolean equals(read_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_handle = true && this.isSetHandle();
+      boolean that_present_handle = true && that.isSetHandle();
+      if (this_present_handle || that_present_handle) {
+        if (!(this_present_handle && that_present_handle))
+          return false;
+        if (!this.handle.equals(that.handle))
+          return false;
+      }
+
+      boolean this_present_offset = true;
+      boolean that_present_offset = true;
+      if (this_present_offset || that_present_offset) {
+        if (!(this_present_offset && that_present_offset))
+          return false;
+        if (this.offset != that.offset)
+          return false;
+      }
+
+      boolean this_present_size = true;
+      boolean that_present_size = true;
+      if (this_present_size || that_present_size) {
+        if (!(this_present_size && that_present_size))
+          return false;
+        if (this.size != that.size)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(read_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      read_args typedOther = (read_args)other;
+
+      lastComparison = Boolean.valueOf(isSetHandle()).compareTo(typedOther.isSetHandle());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetHandle()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.handle, typedOther.handle);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOffset()).compareTo(typedOther.isSetOffset());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOffset()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.offset, typedOther.offset);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetSize()).compareTo(typedOther.isSetSize());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSize()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.size, typedOther.size);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // HANDLE
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.handle = new ThriftHandle();
+              this.handle.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // OFFSET
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.offset = iprot.readI64();
+              setOffsetIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // SIZE
+            if (field.type == org.apache.thrift.protocol.TType.I32) {
+              this.size = iprot.readI32();
+              setSizeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.handle != null) {
+        oprot.writeFieldBegin(HANDLE_FIELD_DESC);
+        this.handle.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(OFFSET_FIELD_DESC);
+      oprot.writeI64(this.offset);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(SIZE_FIELD_DESC);
+      oprot.writeI32(this.size);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("read_args(");
+      boolean first = true;
+
+      sb.append("handle:");
+      if (this.handle == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.handle);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("offset:");
+      sb.append(this.offset);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("size:");
+      sb.append(this.size);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class read_result implements org.apache.thrift.TBase<read_result, read_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("read_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public String success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(read_result.class, metaDataMap);
+    }
+
+    public read_result() {
+    }
+
+    public read_result(
+      String success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public read_result(read_result other) {
+      if (other.isSetSuccess()) {
+        this.success = other.success;
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public read_result deepCopy() {
+      return new read_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public String getSuccess() {
+      return this.success;
+    }
+
+    public read_result setSuccess(String success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public read_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((String)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof read_result)
+        return this.equals((read_result)that);
+      return false;
+    }
+
+    public boolean equals(read_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(read_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      read_result typedOther = (read_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.success = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeString(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("read_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class close_args implements org.apache.thrift.TBase<close_args, close_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("close_args");
+
+    private static final org.apache.thrift.protocol.TField OUT_FIELD_DESC = new org.apache.thrift.protocol.TField("out", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftHandle out; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUT((short)1, "out");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUT
+            return OUT;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUT, new org.apache.thrift.meta_data.FieldMetaData("out", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftHandle.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(close_args.class, metaDataMap);
+    }
+
+    public close_args() {
+    }
+
+    public close_args(
+      ThriftHandle out)
+    {
+      this();
+      this.out = out;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public close_args(close_args other) {
+      if (other.isSetOut()) {
+        this.out = new ThriftHandle(other.out);
+      }
+    }
+
+    public close_args deepCopy() {
+      return new close_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.out = null;
+    }
+
+    public ThriftHandle getOut() {
+      return this.out;
+    }
+
+    public close_args setOut(ThriftHandle out) {
+      this.out = out;
+      return this;
+    }
+
+    public void unsetOut() {
+      this.out = null;
+    }
+
+    /** Returns true if field out is set (has been assigned a value) and false otherwise */
+    public boolean isSetOut() {
+      return this.out != null;
+    }
+
+    public void setOutIsSet(boolean value) {
+      if (!value) {
+        this.out = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case OUT:
+        if (value == null) {
+          unsetOut();
+        } else {
+          setOut((ThriftHandle)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case OUT:
+        return getOut();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case OUT:
+        return isSetOut();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof close_args)
+        return this.equals((close_args)that);
+      return false;
+    }
+
+    public boolean equals(close_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_out = true && this.isSetOut();
+      boolean that_present_out = true && that.isSetOut();
+      if (this_present_out || that_present_out) {
+        if (!(this_present_out && that_present_out))
+          return false;
+        if (!this.out.equals(that.out))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(close_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      close_args typedOther = (close_args)other;
+
+      lastComparison = Boolean.valueOf(isSetOut()).compareTo(typedOther.isSetOut());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOut()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.out, typedOther.out);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // OUT
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.out = new ThriftHandle();
+              this.out.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.out != null) {
+        oprot.writeFieldBegin(OUT_FIELD_DESC);
+        this.out.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("close_args(");
+      boolean first = true;
+
+      sb.append("out:");
+      if (this.out == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.out);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class close_result implements org.apache.thrift.TBase<close_result, close_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("close_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(close_result.class, metaDataMap);
+    }
+
+    public close_result() {
+    }
+
+    public close_result(
+      boolean success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public close_result(close_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public close_result deepCopy() {
+      return new close_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.ouch = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public close_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public close_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof close_result)
+        return this.equals((close_result)that);
+      return false;
+    }
+
+    public boolean equals(close_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(close_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      close_result typedOther = (close_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("close_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class rm_args implements org.apache.thrift.TBase<rm_args, rm_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rm_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField RECURSIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("recursive", org.apache.thrift.protocol.TType.BOOL, (short)2);
+
+    public Pathname path; // required
+    public boolean recursive; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      RECURSIVE((short)2, "recursive");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // RECURSIVE
+            return RECURSIVE;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __RECURSIVE_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.RECURSIVE, new org.apache.thrift.meta_data.FieldMetaData("recursive", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(rm_args.class, metaDataMap);
+    }
+
+    public rm_args() {
+    }
+
+    public rm_args(
+      Pathname path,
+      boolean recursive)
+    {
+      this();
+      this.path = path;
+      this.recursive = recursive;
+      setRecursiveIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public rm_args(rm_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+      this.recursive = other.recursive;
+    }
+
+    public rm_args deepCopy() {
+      return new rm_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+      setRecursiveIsSet(false);
+      this.recursive = false;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public rm_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public boolean isRecursive() {
+      return this.recursive;
+    }
+
+    public rm_args setRecursive(boolean recursive) {
+      this.recursive = recursive;
+      setRecursiveIsSet(true);
+      return this;
+    }
+
+    public void unsetRecursive() {
+      __isset_bit_vector.clear(__RECURSIVE_ISSET_ID);
+    }
+
+    /** Returns true if field recursive is set (has been assigned a value) and false otherwise */
+    public boolean isSetRecursive() {
+      return __isset_bit_vector.get(__RECURSIVE_ISSET_ID);
+    }
+
+    public void setRecursiveIsSet(boolean value) {
+      __isset_bit_vector.set(__RECURSIVE_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((Pathname)value);
+        }
+        break;
+
+      case RECURSIVE:
+        if (value == null) {
+          unsetRecursive();
+        } else {
+          setRecursive((Boolean)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      case RECURSIVE:
+        return Boolean.valueOf(isRecursive());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      case RECURSIVE:
+        return isSetRecursive();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof rm_args)
+        return this.equals((rm_args)that);
+      return false;
+    }
+
+    public boolean equals(rm_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      boolean this_present_recursive = true;
+      boolean that_present_recursive = true;
+      if (this_present_recursive || that_present_recursive) {
+        if (!(this_present_recursive && that_present_recursive))
+          return false;
+        if (this.recursive != that.recursive)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(rm_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      rm_args typedOther = (rm_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetRecursive()).compareTo(typedOther.isSetRecursive());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetRecursive()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.recursive, typedOther.recursive);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // RECURSIVE
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.recursive = iprot.readBool();
+              setRecursiveIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(RECURSIVE_FIELD_DESC);
+      oprot.writeBool(this.recursive);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("rm_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("recursive:");
+      sb.append(this.recursive);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class rm_result implements org.apache.thrift.TBase<rm_result, rm_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rm_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(rm_result.class, metaDataMap);
+    }
+
+    public rm_result() {
+    }
+
+    public rm_result(
+      boolean success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public rm_result(rm_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public rm_result deepCopy() {
+      return new rm_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.ouch = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public rm_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public rm_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof rm_result)
+        return this.equals((rm_result)that);
+      return false;
+    }
+
+    public boolean equals(rm_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(rm_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      rm_result typedOther = (rm_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("rm_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class rename_args implements org.apache.thrift.TBase<rename_args, rename_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rename_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField DEST_FIELD_DESC = new org.apache.thrift.protocol.TField("dest", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public Pathname path; // required
+    public Pathname dest; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      DEST((short)2, "dest");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // DEST
+            return DEST;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.DEST, new org.apache.thrift.meta_data.FieldMetaData("dest", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(rename_args.class, metaDataMap);
+    }
+
+    public rename_args() {
+    }
+
+    public rename_args(
+      Pathname path,
+      Pathname dest)
+    {
+      this();
+      this.path = path;
+      this.dest = dest;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public rename_args(rename_args other) {
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+      if (other.isSetDest()) {
+        this.dest = new Pathname(other.dest);
+      }
+    }
+
+    public rename_args deepCopy() {
+      return new rename_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+      this.dest = null;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public rename_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public Pathname getDest() {
+      return this.dest;
+    }
+
+    public rename_args setDest(Pathname dest) {
+      this.dest = dest;
+      return this;
+    }
+
+    public void unsetDest() {
+      this.dest = null;
+    }
+
+    /** Returns true if field dest is set (has been assigned a value) and false otherwise */
+    public boolean isSetDest() {
+      return this.dest != null;
+    }
+
+    public void setDestIsSet(boolean value) {
+      if (!value) {
+        this.dest = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((Pathname)value);
+        }
+        break;
+
+      case DEST:
+        if (value == null) {
+          unsetDest();
+        } else {
+          setDest((Pathname)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      case DEST:
+        return getDest();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      case DEST:
+        return isSetDest();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof rename_args)
+        return this.equals((rename_args)that);
+      return false;
+    }
+
+    public boolean equals(rename_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      boolean this_present_dest = true && this.isSetDest();
+      boolean that_present_dest = true && that.isSetDest();
+      if (this_present_dest || that_present_dest) {
+        if (!(this_present_dest && that_present_dest))
+          return false;
+        if (!this.dest.equals(that.dest))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(rename_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      rename_args typedOther = (rename_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDest()).compareTo(typedOther.isSetDest());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDest()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dest, typedOther.dest);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 2: // DEST
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.dest = new Pathname();
+              this.dest.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.dest != null) {
+        oprot.writeFieldBegin(DEST_FIELD_DESC);
+        this.dest.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("rename_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("dest:");
+      if (this.dest == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.dest);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class rename_result implements org.apache.thrift.TBase<rename_result, rename_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rename_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(rename_result.class, metaDataMap);
+    }
+
+    public rename_result() {
+    }
+
+    public rename_result(
+      boolean success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public rename_result(rename_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public rename_result deepCopy() {
+      return new rename_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.ouch = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public rename_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public rename_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof rename_result)
+        return this.equals((rename_result)that);
+      return false;
+    }
+
+    public boolean equals(rename_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(rename_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      rename_result typedOther = (rename_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("rename_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class mkdirs_args implements org.apache.thrift.TBase<mkdirs_args, mkdirs_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mkdirs_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public Pathname path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mkdirs_args.class, metaDataMap);
+    }
+
+    public mkdirs_args() {
+    }
+
+    public mkdirs_args(
+      Pathname path)
+    {
+      this();
+      this.path = path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public mkdirs_args(mkdirs_args other) {
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+    }
+
+    public mkdirs_args deepCopy() {
+      return new mkdirs_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public mkdirs_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((Pathname)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof mkdirs_args)
+        return this.equals((mkdirs_args)that);
+      return false;
+    }
+
+    public boolean equals(mkdirs_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(mkdirs_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      mkdirs_args typedOther = (mkdirs_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("mkdirs_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class mkdirs_result implements org.apache.thrift.TBase<mkdirs_result, mkdirs_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mkdirs_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mkdirs_result.class, metaDataMap);
+    }
+
+    public mkdirs_result() {
+    }
+
+    public mkdirs_result(
+      boolean success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public mkdirs_result(mkdirs_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public mkdirs_result deepCopy() {
+      return new mkdirs_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.ouch = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public mkdirs_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public mkdirs_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof mkdirs_result)
+        return this.equals((mkdirs_result)that);
+      return false;
+    }
+
+    public boolean equals(mkdirs_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(mkdirs_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      mkdirs_result typedOther = (mkdirs_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("mkdirs_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class exists_args implements org.apache.thrift.TBase<exists_args, exists_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exists_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public Pathname path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(exists_args.class, metaDataMap);
+    }
+
+    public exists_args() {
+    }
+
+    public exists_args(
+      Pathname path)
+    {
+      this();
+      this.path = path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public exists_args(exists_args other) {
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+    }
+
+    public exists_args deepCopy() {
+      return new exists_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public exists_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((Pathname)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof exists_args)
+        return this.equals((exists_args)that);
+      return false;
+    }
+
+    public boolean equals(exists_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(exists_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      exists_args typedOther = (exists_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("exists_args(");
+      boolean first = true;
+
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class exists_result implements org.apache.thrift.TBase<exists_result, exists_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exists_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(exists_result.class, metaDataMap);
+    }
+
+    public exists_result() {
+    }
+
+    public exists_result(
+      boolean success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+      this.ouch = ouch;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public exists_result(exists_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
+    }
+
+    public exists_result deepCopy() {
+      return new exists_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.ouch = null;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public exists_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+    }
+
+    public ThriftIOException getOuch() {
+      return this.ouch;
+    }
+
+    public exists_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
+    }
+
+    public void unsetOuch() {
+      this.ouch = null;
+    }
+
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
+    }
+
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      case OUCH:
+        if (value == null) {
+          unsetOuch();
+        } else {
+          setOuch((ThriftIOException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      case OUCH:
+        return getOuch();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof exists_result)
+        return this.equals((exists_result)that);
+      return false;
+    }
+
+    public boolean equals(exists_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(exists_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      exists_result typedOther = (exists_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
       {
-        chown_args args = new chown_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        chown_result result = new chown_result();
-        try {
-          iface_.chown(args.path, args.owner, args.group);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing chown", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing chown");
-          oprot.writeMessageBegin(new TMessage("chown", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
-        oprot.writeMessageBegin(new TMessage("chown", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+        iprot.readFieldEnd();
       }
+      iprot.readStructEnd();
 
+      // check for required fields of primitive type, which can't be checked in the validate method
+      validate();
     }
 
-    private class setReplication implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        setReplication_args args = new setReplication_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        setReplication_result result = new setReplication_result();
-        try {
-          iface_.setReplication(args.path, args.replication);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing setReplication", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing setReplication");
-          oprot.writeMessageBegin(new TMessage("setReplication", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("setReplication", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        oprot.writeBool(this.success);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("exists_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
       }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
 
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
     }
 
-    private class getFileBlockLocations implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        getFileBlockLocations_args args = new getFileBlockLocations_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        getFileBlockLocations_result result = new getFileBlockLocations_result();
-        try {
-          result.success = iface_.getFileBlockLocations(args.path, args.start, args.length);
-        } catch (ThriftIOException ouch) {
-          result.ouch = ouch;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing getFileBlockLocations", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getFileBlockLocations");
-          oprot.writeMessageBegin(new TMessage("getFileBlockLocations", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("getFileBlockLocations", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
       }
+    }
 
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class setInactivityTimeoutPeriod_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("setInactivityTimeoutPeriod_args");
-    private static final TField PERIOD_IN_SECONDS_FIELD_DESC = new TField("periodInSeconds", TType.I64, (short)1);
+  public static class stat_args implements org.apache.thrift.TBase<stat_args, stat_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("stat_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public Pathname path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public long periodInSeconds;
-    public static final int PERIODINSECONDS = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean periodInSeconds = false;
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PERIODINSECONDS, new FieldMetaData("periodInSeconds", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I64)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(setInactivityTimeoutPeriod_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(stat_args.class, metaDataMap);
     }
 
-    public setInactivityTimeoutPeriod_args() {
+    public stat_args() {
     }
 
-    public setInactivityTimeoutPeriod_args(
-      long periodInSeconds)
+    public stat_args(
+      Pathname path)
     {
       this();
-      this.periodInSeconds = periodInSeconds;
-      this.__isset.periodInSeconds = true;
+      this.path = path;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public setInactivityTimeoutPeriod_args(setInactivityTimeoutPeriod_args other) {
-      __isset.periodInSeconds = other.__isset.periodInSeconds;
-      this.periodInSeconds = other.periodInSeconds;
+    public stat_args(stat_args other) {
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
+      }
+    }
+
+    public stat_args deepCopy() {
+      return new stat_args(this);
     }
 
     @Override
-    public setInactivityTimeoutPeriod_args clone() {
-      return new setInactivityTimeoutPeriod_args(this);
+    public void clear() {
+      this.path = null;
     }
 
-    public long getPeriodInSeconds() {
-      return this.periodInSeconds;
+    public Pathname getPath() {
+      return this.path;
     }
 
-    public void setPeriodInSeconds(long periodInSeconds) {
-      this.periodInSeconds = periodInSeconds;
-      this.__isset.periodInSeconds = true;
+    public stat_args setPath(Pathname path) {
+      this.path = path;
+      return this;
     }
 
-    public void unsetPeriodInSeconds() {
-      this.__isset.periodInSeconds = false;
+    public void unsetPath() {
+      this.path = null;
     }
 
-    // Returns true if field periodInSeconds is set (has been asigned a value) and false otherwise
-    public boolean isSetPeriodInSeconds() {
-      return this.__isset.periodInSeconds;
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
     }
 
-    public void setPeriodInSecondsIsSet(boolean value) {
-      this.__isset.periodInSeconds = value;
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PERIODINSECONDS:
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
         if (value == null) {
-          unsetPeriodInSeconds();
+          unsetPath();
         } else {
-          setPeriodInSeconds((Long)value);
+          setPath((Pathname)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PERIODINSECONDS:
-        return new Long(getPeriodInSeconds());
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PERIODINSECONDS:
-        return isSetPeriodInSeconds();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof setInactivityTimeoutPeriod_args)
-        return this.equals((setInactivityTimeoutPeriod_args)that);
+      if (that instanceof stat_args)
+        return this.equals((stat_args)that);
       return false;
     }
 
-    public boolean equals(setInactivityTimeoutPeriod_args that) {
+    public boolean equals(stat_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_periodInSeconds = true;
-      boolean that_present_periodInSeconds = true;
-      if (this_present_periodInSeconds || that_present_periodInSeconds) {
-        if (!(this_present_periodInSeconds && that_present_periodInSeconds))
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
           return false;
-        if (this.periodInSeconds != that.periodInSeconds)
+        if (!this.path.equals(that.path))
           return false;
       }
 
@@ -1468,303 +12334,352 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(stat_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      stat_args typedOther = (stat_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PERIODINSECONDS:
-            if (field.type == TType.I64) {
-              this.periodInSeconds = iprot.readI64();
-              this.__isset.periodInSeconds = true;
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldBegin(PERIOD_IN_SECONDS_FIELD_DESC);
-      oprot.writeI64(this.periodInSeconds);
-      oprot.writeFieldEnd();
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("setInactivityTimeoutPeriod_args(");
+      StringBuilder sb = new StringBuilder("stat_args(");
       boolean first = true;
 
-      sb.append("periodInSeconds:");
-      sb.append(this.periodInSeconds);
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class setInactivityTimeoutPeriod_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("setInactivityTimeoutPeriod_result");
+  public static class stat_result implements org.apache.thrift.TBase<stat_result, stat_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("stat_result");
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-    }});
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    static {
-      FieldMetaData.addStructMetaDataMap(setInactivityTimeoutPeriod_result.class, metaDataMap);
-    }
+    public FileStatus success; // required
+    public ThriftIOException ouch; // required
 
-    public setInactivityTimeoutPeriod_result() {
-    }
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
 
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public setInactivityTimeoutPeriod_result(setInactivityTimeoutPeriod_result other) {
-    }
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
-    @Override
-    public setInactivityTimeoutPeriod_result clone() {
-      return new setInactivityTimeoutPeriod_result(this);
-    }
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
       }
-    }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
       }
-    }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
       }
-    }
 
-    @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
-      if (that instanceof setInactivityTimeoutPeriod_result)
-        return this.equals((setInactivityTimeoutPeriod_result)that);
-      return false;
-    }
+      private final short _thriftId;
+      private final String _fieldName;
 
-    public boolean equals(setInactivityTimeoutPeriod_result that) {
-      if (that == null)
-        return false;
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-      return true;
-    }
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    @Override
-    public int hashCode() {
-      return 0;
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
-      iprot.readStructBegin();
-      while (true)
-      {
-        field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
-          break;
-        }
-        switch (field.id)
-        {
-          default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FileStatus.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(stat_result.class, metaDataMap);
+    }
 
-      // check for required fields of primitive type, which can't be checked in the validate method
-      validate();
+    public stat_result() {
     }
 
-    public void write(TProtocol oprot) throws TException {
-      oprot.writeStructBegin(STRUCT_DESC);
+    public stat_result(
+      FileStatus success,
+      ThriftIOException ouch)
+    {
+      this();
+      this.success = success;
+      this.ouch = ouch;
+    }
 
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public stat_result(stat_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new FileStatus(other.success);
+      }
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
     }
 
-    @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setInactivityTimeoutPeriod_result(");
-      boolean first = true;
-
-      sb.append(")");
-      return sb.toString();
+    public stat_result deepCopy() {
+      return new stat_result(this);
     }
 
-    public void validate() throws TException {
-      // check for required fields
-      // check that fields of type enum have valid values
+    @Override
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
     }
 
-  }
-
-  public static class shutdown_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("shutdown_args");
-    private static final TField STATUS_FIELD_DESC = new TField("status", TType.I32, (short)1);
-
-    public int status;
-    public static final int STATUS = 1;
-
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean status = false;
+    public FileStatus getSuccess() {
+      return this.success;
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(STATUS, new FieldMetaData("status", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I32)));
-    }});
-
-    static {
-      FieldMetaData.addStructMetaDataMap(shutdown_args.class, metaDataMap);
+    public stat_result setSuccess(FileStatus success) {
+      this.success = success;
+      return this;
     }
 
-    public shutdown_args() {
+    public void unsetSuccess() {
+      this.success = null;
     }
 
-    public shutdown_args(
-      int status)
-    {
-      this();
-      this.status = status;
-      this.__isset.status = true;
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
     }
 
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public shutdown_args(shutdown_args other) {
-      __isset.status = other.__isset.status;
-      this.status = other.status;
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
     }
 
-    @Override
-    public shutdown_args clone() {
-      return new shutdown_args(this);
+    public ThriftIOException getOuch() {
+      return this.ouch;
     }
 
-    public int getStatus() {
-      return this.status;
+    public stat_result setOuch(ThriftIOException ouch) {
+      this.ouch = ouch;
+      return this;
     }
 
-    public void setStatus(int status) {
-      this.status = status;
-      this.__isset.status = true;
+    public void unsetOuch() {
+      this.ouch = null;
     }
 
-    public void unsetStatus() {
-      this.__isset.status = false;
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
+    public boolean isSetOuch() {
+      return this.ouch != null;
     }
 
-    // Returns true if field status is set (has been asigned a value) and false otherwise
-    public boolean isSetStatus() {
-      return this.__isset.status;
+    public void setOuchIsSet(boolean value) {
+      if (!value) {
+        this.ouch = null;
+      }
     }
 
-    public void setStatusIsSet(boolean value) {
-      this.__isset.status = value;
-    }
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((FileStatus)value);
+        }
+        break;
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case STATUS:
+      case OUCH:
         if (value == null) {
-          unsetStatus();
+          unsetOuch();
         } else {
-          setStatus((Integer)value);
+          setOuch((ThriftIOException)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case STATUS:
-        return new Integer(getStatus());
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case OUCH:
+        return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case STATUS:
-        return isSetStatus();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case OUCH:
+        return isSetOuch();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof shutdown_args)
-        return this.equals((shutdown_args)that);
+      if (that instanceof stat_result)
+        return this.equals((stat_result)that);
       return false;
     }
 
-    public boolean equals(shutdown_args that) {
+    public boolean equals(stat_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_status = true;
-      boolean that_present_status = true;
-      if (this_present_status || that_present_status) {
-        if (!(this_present_status && that_present_status))
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
           return false;
-        if (this.status != that.status)
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_ouch = true && this.isSetOuch();
+      boolean that_present_ouch = true && that.isSetOuch();
+      if (this_present_ouch || that_present_ouch) {
+        if (!(this_present_ouch && that_present_ouch))
+          return false;
+        if (!this.ouch.equals(that.ouch))
           return false;
       }
 
@@ -1776,206 +12691,220 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(stat_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      stat_result typedOther = (stat_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case STATUS:
-            if (field.type == TType.I32) {
-              this.status = iprot.readI32();
-              this.__isset.status = true;
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new FileStatus();
+              this.success.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ouch = new ThriftIOException();
+              this.ouch.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
-      validate();
-
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldBegin(STATUS_FIELD_DESC);
-      oprot.writeI32(this.status);
-      oprot.writeFieldEnd();
+
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
+        oprot.writeFieldBegin(OUCH_FIELD_DESC);
+        this.ouch.write(oprot);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("shutdown_args(");
+      StringBuilder sb = new StringBuilder("stat_result(");
       boolean first = true;
 
-      sb.append("status:");
-      sb.append(this.status);
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
-    }
-
-  }
-
-  public static class shutdown_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("shutdown_result");
-
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-    }});
-
-    static {
-      FieldMetaData.addStructMetaDataMap(shutdown_result.class, metaDataMap);
-    }
-
-    public shutdown_result() {
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public shutdown_result(shutdown_result other) {
-    }
-
-    @Override
-    public shutdown_result clone() {
-      return new shutdown_result(this);
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
       }
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
-      }
-    }
+  }
 
-    @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
-      if (that instanceof shutdown_result)
-        return this.equals((shutdown_result)that);
-      return false;
-    }
+  public static class listStatus_args implements org.apache.thrift.TBase<listStatus_args, listStatus_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("listStatus_args");
 
-    public boolean equals(shutdown_result that) {
-      if (that == null)
-        return false;
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-      return true;
-    }
+    public Pathname path; // required
 
-    @Override
-    public int hashCode() {
-      return 0;
-    }
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path");
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
-      iprot.readStructBegin();
-      while (true)
-      {
-        field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
-          break;
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
         }
-        switch (field.id)
-        {
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            return null;
         }
-        iprot.readFieldEnd();
       }
-      iprot.readStructEnd();
-
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      validate();
-    }
-
-    public void write(TProtocol oprot) throws TException {
-      oprot.writeStructBegin(STRUCT_DESC);
-
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("shutdown_result(");
-      boolean first = true;
 
-      sb.append(")");
-      return sb.toString();
-    }
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
 
-    public void validate() throws TException {
-      // check for required fields
-      // check that fields of type enum have valid values
-    }
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
 
-  }
+      private final short _thriftId;
+      private final String _fieldName;
 
-  public static class create_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("create_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public Pathname path;
-    public static final int PATH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(create_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(listStatus_args.class, metaDataMap);
     }
 
-    public create_args() {
+    public listStatus_args() {
     }
 
-    public create_args(
+    public listStatus_args(
       Pathname path)
     {
       this();
@@ -1985,30 +12914,35 @@ public create_args(
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public create_args(create_args other) {
+    public listStatus_args(listStatus_args other) {
       if (other.isSetPath()) {
         this.path = new Pathname(other.path);
       }
     }
 
+    public listStatus_args deepCopy() {
+      return new listStatus_args(this);
+    }
+
     @Override
-    public create_args clone() {
-      return new create_args(this);
+    public void clear() {
+      this.path = null;
     }
 
     public Pathname getPath() {
       return this.path;
     }
 
-    public void setPath(Pathname path) {
+    public listStatus_args setPath(Pathname path) {
       this.path = path;
+      return this;
     }
 
     public void unsetPath() {
       this.path = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
     public boolean isSetPath() {
       return this.path != null;
     }
@@ -2019,8 +12953,8 @@ public void setPathIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case PATH:
         if (value == null) {
           unsetPath();
@@ -2029,41 +12963,41 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case PATH:
         return getPath();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case PATH:
         return isSetPath();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof create_args)
-        return this.equals((create_args)that);
+      if (that instanceof listStatus_args)
+        return this.equals((listStatus_args)that);
       return false;
     }
 
-    public boolean equals(create_args that) {
+    public boolean equals(listStatus_args that) {
       if (that == null)
         return false;
 
@@ -2084,39 +13018,61 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(listStatus_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      listStatus_args typedOther = (listStatus_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.path = new Pathname();
               this.path.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -2131,7 +13087,7 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("create_args(");
+      StringBuilder sb = new StringBuilder("listStatus_args(");
       boolean first = true;
 
       sb.append("path:");
@@ -2145,43 +13101,117 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class create_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("create_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class listStatus_result implements org.apache.thrift.TBase<listStatus_result, listStatus_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("listStatus_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public List<FileStatus> success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public ThriftHandle success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ThriftHandle.class)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(create_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FileStatus.class))));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(listStatus_result.class, metaDataMap);
     }
 
-    public create_result() {
+    public listStatus_result() {
     }
 
-    public create_result(
-      ThriftHandle success,
+    public listStatus_result(
+      List<FileStatus> success,
       ThriftIOException ouch)
     {
       this();
@@ -2192,33 +13222,58 @@ public create_result(
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public create_result(create_result other) {
+    public listStatus_result(listStatus_result other) {
       if (other.isSetSuccess()) {
-        this.success = new ThriftHandle(other.success);
+        List<FileStatus> __this__success = new ArrayList<FileStatus>();
+        for (FileStatus other_element : other.success) {
+          __this__success.add(new FileStatus(other_element));
+        }
+        this.success = __this__success;
       }
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
+    public listStatus_result deepCopy() {
+      return new listStatus_result(this);
+    }
+
     @Override
-    public create_result clone() {
-      return new create_result(this);
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
     }
 
-    public ThriftHandle getSuccess() {
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public java.util.Iterator<FileStatus> getSuccessIterator() {
+      return (this.success == null) ? null : this.success.iterator();
+    }
+
+    public void addToSuccess(FileStatus elem) {
+      if (this.success == null) {
+        this.success = new ArrayList<FileStatus>();
+      }
+      this.success.add(elem);
+    }
+
+    public List<FileStatus> getSuccess() {
       return this.success;
     }
 
-    public void setSuccess(ThriftHandle success) {
+    public listStatus_result setSuccess(List<FileStatus> success) {
       this.success = success;
+      return this;
     }
 
     public void unsetSuccess() {
       this.success = null;
     }
 
-    // Returns true if field success is set (has been asigned a value) and false otherwise
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
       return this.success != null;
     }
@@ -2233,15 +13288,16 @@ public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public listStatus_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -2252,13 +13308,13 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((ThriftHandle)value);
+          setSuccess((List<FileStatus>)value);
         }
         break;
 
@@ -2270,46 +13326,46 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case SUCCESS:
         return getSuccess();
 
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case SUCCESS:
         return isSetSuccess();
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof create_result)
-        return this.equals((create_result)that);
+      if (that instanceof listStatus_result)
+        return this.equals((listStatus_result)that);
       return false;
     }
 
-    public boolean equals(create_result that) {
+    public boolean equals(listStatus_result that) {
       if (that == null)
         return false;
 
@@ -2339,52 +13395,101 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(listStatus_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      listStatus_result typedOther = (listStatus_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.STRUCT) {
-              this.success = new ThriftHandle();
-              this.success.read(iprot);
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
+                this.success = new ArrayList<FileStatus>(_list12.size);
+                for (int _i13 = 0; _i13 < _list12.size; ++_i13)
+                {
+                  FileStatus _elem14; // required
+                  _elem14 = new FileStatus();
+                  _elem14.read(iprot);
+                  this.success.add(_elem14);
+                }
+                iprot.readListEnd();
+              }
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        this.success.write(oprot);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
+          for (FileStatus _iter15 : this.success)
+          {
+            _iter15.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       } else if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
@@ -2397,7 +13502,7 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("create_result(");
+      StringBuilder sb = new StringBuilder("listStatus_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -2419,125 +13524,163 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class createFile_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("createFile_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
-    private static final TField MODE_FIELD_DESC = new TField("mode", TType.I16, (short)2);
-    private static final TField OVERWRITE_FIELD_DESC = new TField("overwrite", TType.BOOL, (short)3);
-    private static final TField BUFFER_SIZE_FIELD_DESC = new TField("bufferSize", TType.I32, (short)4);
-    private static final TField BLOCK_REPLICATION_FIELD_DESC = new TField("block_replication", TType.I16, (short)5);
-    private static final TField BLOCKSIZE_FIELD_DESC = new TField("blocksize", TType.I64, (short)6);
-
-    public Pathname path;
-    public static final int PATH = 1;
-    public short mode;
-    public static final int MODE = 2;
-    public boolean overwrite;
-    public static final int OVERWRITE = 3;
-    public int bufferSize;
-    public static final int BUFFERSIZE = 4;
-    public short block_replication;
-    public static final int BLOCK_REPLICATION = 5;
-    public long blocksize;
-    public static final int BLOCKSIZE = 6;
-
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean mode = false;
-      public boolean overwrite = false;
-      public boolean bufferSize = false;
-      public boolean block_replication = false;
-      public boolean blocksize = false;
-    }
-
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-      put(MODE, new FieldMetaData("mode", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I16)));
-      put(OVERWRITE, new FieldMetaData("overwrite", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.BOOL)));
-      put(BUFFERSIZE, new FieldMetaData("bufferSize", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I32)));
-      put(BLOCK_REPLICATION, new FieldMetaData("block_replication", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I16)));
-      put(BLOCKSIZE, new FieldMetaData("blocksize", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I64)));
-    }});
+  public static class chmod_args implements org.apache.thrift.TBase<chmod_args, chmod_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("chmod_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("mode", org.apache.thrift.protocol.TType.I16, (short)2);
+
+    public Pathname path; // required
+    public short mode; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      MODE((short)2, "mode");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // MODE
+            return MODE;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __MODE_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(createFile_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.MODE, new org.apache.thrift.meta_data.FieldMetaData("mode", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(chmod_args.class, metaDataMap);
     }
 
-    public createFile_args() {
+    public chmod_args() {
     }
 
-    public createFile_args(
+    public chmod_args(
       Pathname path,
-      short mode,
-      boolean overwrite,
-      int bufferSize,
-      short block_replication,
-      long blocksize)
+      short mode)
     {
       this();
       this.path = path;
       this.mode = mode;
-      this.__isset.mode = true;
-      this.overwrite = overwrite;
-      this.__isset.overwrite = true;
-      this.bufferSize = bufferSize;
-      this.__isset.bufferSize = true;
-      this.block_replication = block_replication;
-      this.__isset.block_replication = true;
-      this.blocksize = blocksize;
-      this.__isset.blocksize = true;
+      setModeIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public createFile_args(createFile_args other) {
+    public chmod_args(chmod_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
       if (other.isSetPath()) {
         this.path = new Pathname(other.path);
       }
-      __isset.mode = other.__isset.mode;
       this.mode = other.mode;
-      __isset.overwrite = other.__isset.overwrite;
-      this.overwrite = other.overwrite;
-      __isset.bufferSize = other.__isset.bufferSize;
-      this.bufferSize = other.bufferSize;
-      __isset.block_replication = other.__isset.block_replication;
-      this.block_replication = other.block_replication;
-      __isset.blocksize = other.__isset.blocksize;
-      this.blocksize = other.blocksize;
+    }
+
+    public chmod_args deepCopy() {
+      return new chmod_args(this);
     }
 
     @Override
-    public createFile_args clone() {
-      return new createFile_args(this);
+    public void clear() {
+      this.path = null;
+      setModeIsSet(false);
+      this.mode = 0;
     }
 
     public Pathname getPath() {
       return this.path;
     }
 
-    public void setPath(Pathname path) {
+    public chmod_args setPath(Pathname path) {
       this.path = path;
+      return this;
     }
 
     public void unsetPath() {
       this.path = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
     public boolean isSetPath() {
       return this.path != null;
     }
@@ -2552,114 +13695,27 @@ public short getMode() {
       return this.mode;
     }
 
-    public void setMode(short mode) {
+    public chmod_args setMode(short mode) {
       this.mode = mode;
-      this.__isset.mode = true;
+      setModeIsSet(true);
+      return this;
     }
 
     public void unsetMode() {
-      this.__isset.mode = false;
+      __isset_bit_vector.clear(__MODE_ISSET_ID);
     }
 
-    // Returns true if field mode is set (has been asigned a value) and false otherwise
+    /** Returns true if field mode is set (has been assigned a value) and false otherwise */
     public boolean isSetMode() {
-      return this.__isset.mode;
-    }
-
-    public void setModeIsSet(boolean value) {
-      this.__isset.mode = value;
-    }
-
-    public boolean isOverwrite() {
-      return this.overwrite;
-    }
-
-    public void setOverwrite(boolean overwrite) {
-      this.overwrite = overwrite;
-      this.__isset.overwrite = true;
-    }
-
-    public void unsetOverwrite() {
-      this.__isset.overwrite = false;
-    }
-
-    // Returns true if field overwrite is set (has been asigned a value) and false otherwise
-    public boolean isSetOverwrite() {
-      return this.__isset.overwrite;
-    }
-
-    public void setOverwriteIsSet(boolean value) {
-      this.__isset.overwrite = value;
-    }
-
-    public int getBufferSize() {
-      return this.bufferSize;
-    }
-
-    public void setBufferSize(int bufferSize) {
-      this.bufferSize = bufferSize;
-      this.__isset.bufferSize = true;
-    }
-
-    public void unsetBufferSize() {
-      this.__isset.bufferSize = false;
-    }
-
-    // Returns true if field bufferSize is set (has been asigned a value) and false otherwise
-    public boolean isSetBufferSize() {
-      return this.__isset.bufferSize;
-    }
-
-    public void setBufferSizeIsSet(boolean value) {
-      this.__isset.bufferSize = value;
-    }
-
-    public short getBlock_replication() {
-      return this.block_replication;
-    }
-
-    public void setBlock_replication(short block_replication) {
-      this.block_replication = block_replication;
-      this.__isset.block_replication = true;
-    }
-
-    public void unsetBlock_replication() {
-      this.__isset.block_replication = false;
-    }
-
-    // Returns true if field block_replication is set (has been asigned a value) and false otherwise
-    public boolean isSetBlock_replication() {
-      return this.__isset.block_replication;
-    }
-
-    public void setBlock_replicationIsSet(boolean value) {
-      this.__isset.block_replication = value;
-    }
-
-    public long getBlocksize() {
-      return this.blocksize;
-    }
-
-    public void setBlocksize(long blocksize) {
-      this.blocksize = blocksize;
-      this.__isset.blocksize = true;
-    }
-
-    public void unsetBlocksize() {
-      this.__isset.blocksize = false;
+      return __isset_bit_vector.get(__MODE_ISSET_ID);
     }
 
-    // Returns true if field blocksize is set (has been asigned a value) and false otherwise
-    public boolean isSetBlocksize() {
-      return this.__isset.blocksize;
-    }
-
-    public void setBlocksizeIsSet(boolean value) {
-      this.__isset.blocksize = value;
+    public void setModeIsSet(boolean value) {
+      __isset_bit_vector.set(__MODE_ISSET_ID, value);
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case PATH:
         if (value == null) {
           unsetPath();
@@ -2676,98 +13732,46 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      case OVERWRITE:
-        if (value == null) {
-          unsetOverwrite();
-        } else {
-          setOverwrite((Boolean)value);
-        }
-        break;
-
-      case BUFFERSIZE:
-        if (value == null) {
-          unsetBufferSize();
-        } else {
-          setBufferSize((Integer)value);
-        }
-        break;
-
-      case BLOCK_REPLICATION:
-        if (value == null) {
-          unsetBlock_replication();
-        } else {
-          setBlock_replication((Short)value);
-        }
-        break;
-
-      case BLOCKSIZE:
-        if (value == null) {
-          unsetBlocksize();
-        } else {
-          setBlocksize((Long)value);
-        }
-        break;
-
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case PATH:
         return getPath();
 
       case MODE:
-        return new Short(getMode());
+        return Short.valueOf(getMode());
 
-      case OVERWRITE:
-        return new Boolean(isOverwrite());
-
-      case BUFFERSIZE:
-        return new Integer(getBufferSize());
-
-      case BLOCK_REPLICATION:
-        return new Short(getBlock_replication());
-
-      case BLOCKSIZE:
-        return new Long(getBlocksize());
-
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case PATH:
         return isSetPath();
       case MODE:
         return isSetMode();
-      case OVERWRITE:
-        return isSetOverwrite();
-      case BUFFERSIZE:
-        return isSetBufferSize();
-      case BLOCK_REPLICATION:
-        return isSetBlock_replication();
-      case BLOCKSIZE:
-        return isSetBlocksize();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof createFile_args)
-        return this.equals((createFile_args)that);
+      if (that instanceof chmod_args)
+        return this.equals((chmod_args)that);
       return false;
     }
 
-    public boolean equals(createFile_args that) {
+    public boolean equals(chmod_args that) {
       if (that == null)
         return false;
 
@@ -2789,123 +13793,87 @@ public boolean equals(createFile_args that) {
           return false;
       }
 
-      boolean this_present_overwrite = true;
-      boolean that_present_overwrite = true;
-      if (this_present_overwrite || that_present_overwrite) {
-        if (!(this_present_overwrite && that_present_overwrite))
-          return false;
-        if (this.overwrite != that.overwrite)
-          return false;
-      }
+      return true;
+    }
 
-      boolean this_present_bufferSize = true;
-      boolean that_present_bufferSize = true;
-      if (this_present_bufferSize || that_present_bufferSize) {
-        if (!(this_present_bufferSize && that_present_bufferSize))
-          return false;
-        if (this.bufferSize != that.bufferSize)
-          return false;
-      }
+    @Override
+    public int hashCode() {
+      return 0;
+    }
 
-      boolean this_present_block_replication = true;
-      boolean that_present_block_replication = true;
-      if (this_present_block_replication || that_present_block_replication) {
-        if (!(this_present_block_replication && that_present_block_replication))
-          return false;
-        if (this.block_replication != that.block_replication)
-          return false;
+    public int compareTo(chmod_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
       }
 
-      boolean this_present_blocksize = true;
-      boolean that_present_blocksize = true;
-      if (this_present_blocksize || that_present_blocksize) {
-        if (!(this_present_blocksize && that_present_blocksize))
-          return false;
-        if (this.blocksize != that.blocksize)
-          return false;
-      }
+      int lastComparison = 0;
+      chmod_args typedOther = (chmod_args)other;
 
-      return true;
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetMode()).compareTo(typedOther.isSetMode());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetMode()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mode, typedOther.mode);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
     }
 
-    @Override
-    public int hashCode() {
-      return 0;
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.path = new Pathname();
               this.path.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case MODE:
-            if (field.type == TType.I16) {
+          case 2: // MODE
+            if (field.type == org.apache.thrift.protocol.TType.I16) {
               this.mode = iprot.readI16();
-              this.__isset.mode = true;
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OVERWRITE:
-            if (field.type == TType.BOOL) {
-              this.overwrite = iprot.readBool();
-              this.__isset.overwrite = true;
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case BUFFERSIZE:
-            if (field.type == TType.I32) {
-              this.bufferSize = iprot.readI32();
-              this.__isset.bufferSize = true;
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case BLOCK_REPLICATION:
-            if (field.type == TType.I16) {
-              this.block_replication = iprot.readI16();
-              this.__isset.block_replication = true;
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case BLOCKSIZE:
-            if (field.type == TType.I64) {
-              this.blocksize = iprot.readI64();
-              this.__isset.blocksize = true;
+              setModeIsSet(true);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -2917,25 +13885,13 @@ public void write(TProtocol oprot) throws TException {
       oprot.writeFieldBegin(MODE_FIELD_DESC);
       oprot.writeI16(this.mode);
       oprot.writeFieldEnd();
-      oprot.writeFieldBegin(OVERWRITE_FIELD_DESC);
-      oprot.writeBool(this.overwrite);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(BUFFER_SIZE_FIELD_DESC);
-      oprot.writeI32(this.bufferSize);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(BLOCK_REPLICATION_FIELD_DESC);
-      oprot.writeI16(this.block_replication);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(BLOCKSIZE_FIELD_DESC);
-      oprot.writeI64(this.blocksize);
-      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("createFile_args(");
+      StringBuilder sb = new StringBuilder("chmod_args(");
       boolean first = true;
 
       sb.append("path:");
@@ -2949,123 +13905,152 @@ public String toString() {
       sb.append("mode:");
       sb.append(this.mode);
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("overwrite:");
-      sb.append(this.overwrite);
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("bufferSize:");
-      sb.append(this.bufferSize);
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("block_replication:");
-      sb.append(this.block_replication);
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("blocksize:");
-      sb.append(this.blocksize);
-      first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class createFile_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("createFile_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class chmod_result implements org.apache.thrift.TBase<chmod_result, chmod_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("chmod_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
 
-    public ThriftHandle success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ThriftHandle.class)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(createFile_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(chmod_result.class, metaDataMap);
     }
 
-    public createFile_result() {
+    public chmod_result() {
     }
 
-    public createFile_result(
-      ThriftHandle success,
+    public chmod_result(
       ThriftIOException ouch)
     {
       this();
-      this.success = success;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public createFile_result(createFile_result other) {
-      if (other.isSetSuccess()) {
-        this.success = new ThriftHandle(other.success);
-      }
+    public chmod_result(chmod_result other) {
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
-    @Override
-    public createFile_result clone() {
-      return new createFile_result(this);
-    }
-
-    public ThriftHandle getSuccess() {
-      return this.success;
-    }
-
-    public void setSuccess(ThriftHandle success) {
-      this.success = success;
-    }
-
-    public void unsetSuccess() {
-      this.success = null;
-    }
-
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.success != null;
+    public chmod_result deepCopy() {
+      return new chmod_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public chmod_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -3076,16 +14061,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((ThriftHandle)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -3094,58 +14071,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return getSuccess();
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof createFile_result)
-        return this.equals((createFile_result)that);
+      if (that instanceof chmod_result)
+        return this.equals((chmod_result)that);
       return false;
     }
 
-    public boolean equals(createFile_result that) {
+    public boolean equals(chmod_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (!this.success.equals(that.success))
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -3154,63 +14117,73 @@ public boolean equals(createFile_result that) {
         if (!this.ouch.equals(that.ouch))
           return false;
       }
-
-      return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(chmod_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      chmod_result typedOther = (chmod_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
     }
 
-    @Override
-    public int hashCode() {
-      return 0;
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.STRUCT) {
-              this.success = new ThriftHandle();
-              this.success.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        this.success.write(oprot);
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -3221,17 +14194,9 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("createFile_result(");
+      StringBuilder sb = new StringBuilder("chmod_result(");
       boolean first = true;
 
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -3243,70 +14208,172 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class open_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("open_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
+  public static class chown_args implements org.apache.thrift.TBase<chown_args, chown_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("chown_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("group", org.apache.thrift.protocol.TType.STRING, (short)3);
+
+    public Pathname path; // required
+    public String owner; // required
+    public String group; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      OWNER((short)2, "owner"),
+      GROUP((short)3, "group");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // OWNER
+            return OWNER;
+          case 3: // GROUP
+            return GROUP;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public Pathname path;
-    public static final int PATH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(open_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.GROUP, new org.apache.thrift.meta_data.FieldMetaData("group", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(chown_args.class, metaDataMap);
     }
 
-    public open_args() {
+    public chown_args() {
     }
 
-    public open_args(
-      Pathname path)
+    public chown_args(
+      Pathname path,
+      String owner,
+      String group)
     {
       this();
       this.path = path;
+      this.owner = owner;
+      this.group = group;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public open_args(open_args other) {
+    public chown_args(chown_args other) {
       if (other.isSetPath()) {
         this.path = new Pathname(other.path);
       }
+      if (other.isSetOwner()) {
+        this.owner = other.owner;
+      }
+      if (other.isSetGroup()) {
+        this.group = other.group;
+      }
+    }
+
+    public chown_args deepCopy() {
+      return new chown_args(this);
     }
 
     @Override
-    public open_args clone() {
-      return new open_args(this);
+    public void clear() {
+      this.path = null;
+      this.owner = null;
+      this.group = null;
     }
 
     public Pathname getPath() {
       return this.path;
     }
 
-    public void setPath(Pathname path) {
+    public chown_args setPath(Pathname path) {
       this.path = path;
+      return this;
     }
 
     public void unsetPath() {
       this.path = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
     public boolean isSetPath() {
       return this.path != null;
     }
@@ -3317,8 +14384,56 @@ public void setPathIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public String getOwner() {
+      return this.owner;
+    }
+
+    public chown_args setOwner(String owner) {
+      this.owner = owner;
+      return this;
+    }
+
+    public void unsetOwner() {
+      this.owner = null;
+    }
+
+    /** Returns true if field owner is set (has been assigned a value) and false otherwise */
+    public boolean isSetOwner() {
+      return this.owner != null;
+    }
+
+    public void setOwnerIsSet(boolean value) {
+      if (!value) {
+        this.owner = null;
+      }
+    }
+
+    public String getGroup() {
+      return this.group;
+    }
+
+    public chown_args setGroup(String group) {
+      this.group = group;
+      return this;
+    }
+
+    public void unsetGroup() {
+      this.group = null;
+    }
+
+    /** Returns true if field group is set (has been assigned a value) and false otherwise */
+    public boolean isSetGroup() {
+      return this.group != null;
+    }
+
+    public void setGroupIsSet(boolean value) {
+      if (!value) {
+        this.group = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case PATH:
         if (value == null) {
           unsetPath();
@@ -3327,41 +14442,67 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case OWNER:
+        if (value == null) {
+          unsetOwner();
+        } else {
+          setOwner((String)value);
+        }
+        break;
+
+      case GROUP:
+        if (value == null) {
+          unsetGroup();
+        } else {
+          setGroup((String)value);
+        }
+        break;
+
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case PATH:
         return getPath();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case OWNER:
+        return getOwner();
+
+      case GROUP:
+        return getGroup();
+
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case PATH:
         return isSetPath();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case OWNER:
+        return isSetOwner();
+      case GROUP:
+        return isSetGroup();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof open_args)
-        return this.equals((open_args)that);
+      if (that instanceof chown_args)
+        return this.equals((chown_args)that);
       return false;
     }
 
-    public boolean equals(open_args that) {
+    public boolean equals(chown_args that) {
       if (that == null)
         return false;
 
@@ -3374,6 +14515,24 @@ public boolean equals(open_args that) {
           return false;
       }
 
+      boolean this_present_owner = true && this.isSetOwner();
+      boolean that_present_owner = true && that.isSetOwner();
+      if (this_present_owner || that_present_owner) {
+        if (!(this_present_owner && that_present_owner))
+          return false;
+        if (!this.owner.equals(that.owner))
+          return false;
+      }
+
+      boolean this_present_group = true && this.isSetGroup();
+      boolean that_present_group = true && that.isSetGroup();
+      if (this_present_group || that_present_group) {
+        if (!(this_present_group && that_present_group))
+          return false;
+        if (!this.group.equals(that.group))
+          return false;
+      }
+
       return true;
     }
 
@@ -3382,39 +14541,95 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(chown_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      chown_args typedOther = (chown_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOwner()).compareTo(typedOther.isSetOwner());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOwner()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, typedOther.owner);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetGroup()).compareTo(typedOther.isSetGroup());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetGroup()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.group, typedOther.group);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.path = new Pathname();
               this.path.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 2: // OWNER
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.owner = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // GROUP
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.group = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -3423,13 +14638,23 @@ public void write(TProtocol oprot) throws TException {
         this.path.write(oprot);
         oprot.writeFieldEnd();
       }
+      if (this.owner != null) {
+        oprot.writeFieldBegin(OWNER_FIELD_DESC);
+        oprot.writeString(this.owner);
+        oprot.writeFieldEnd();
+      }
+      if (this.group != null) {
+        oprot.writeFieldBegin(GROUP_FIELD_DESC);
+        oprot.writeString(this.group);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("open_args(");
+      StringBuilder sb = new StringBuilder("chown_args(");
       boolean first = true;
 
       sb.append("path:");
@@ -3439,107 +14664,166 @@ public String toString() {
         sb.append(this.path);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("owner:");
+      if (this.owner == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.owner);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("group:");
+      if (this.group == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.group);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
-      // check for required fields
-      // check that fields of type enum have valid values
-    }
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class chown_result implements org.apache.thrift.TBase<chown_result, chown_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("chown_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
 
-  }
+      private final short _thriftId;
+      private final String _fieldName;
 
-  public static class open_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("open_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public ThriftHandle success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ThriftHandle.class)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(open_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(chown_result.class, metaDataMap);
     }
 
-    public open_result() {
+    public chown_result() {
     }
 
-    public open_result(
-      ThriftHandle success,
+    public chown_result(
       ThriftIOException ouch)
     {
       this();
-      this.success = success;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public open_result(open_result other) {
-      if (other.isSetSuccess()) {
-        this.success = new ThriftHandle(other.success);
-      }
+    public chown_result(chown_result other) {
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
-    @Override
-    public open_result clone() {
-      return new open_result(this);
-    }
-
-    public ThriftHandle getSuccess() {
-      return this.success;
-    }
-
-    public void setSuccess(ThriftHandle success) {
-      this.success = success;
-    }
-
-    public void unsetSuccess() {
-      this.success = null;
-    }
-
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.success != null;
+    public chown_result deepCopy() {
+      return new chown_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public chown_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -3550,16 +14834,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((ThriftHandle)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -3568,58 +14844,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return getSuccess();
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof open_result)
-        return this.equals((open_result)that);
+      if (that instanceof chown_result)
+        return this.equals((chown_result)that);
       return false;
     }
 
-    public boolean equals(open_result that) {
+    public boolean equals(chown_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (!this.success.equals(that.success))
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -3637,54 +14899,64 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(chown_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      chown_result typedOther = (chown_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.STRUCT) {
-              this.success = new ThriftHandle();
-              this.success.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        this.success.write(oprot);
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -3695,17 +14967,9 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("open_result(");
+      StringBuilder sb = new StringBuilder("chown_result(");
       boolean first = true;
 
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -3717,70 +14981,163 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class append_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("append_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
+  public static class setReplication_args implements org.apache.thrift.TBase<setReplication_args, setReplication_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setReplication_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField REPLICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("replication", org.apache.thrift.protocol.TType.I16, (short)2);
+
+    public Pathname path; // required
+    public short replication; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      REPLICATION((short)2, "replication");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // REPLICATION
+            return REPLICATION;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public Pathname path;
-    public static final int PATH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-    }});
+    // isset id assignments
+    private static final int __REPLICATION_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(append_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.REPLICATION, new org.apache.thrift.meta_data.FieldMetaData("replication", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setReplication_args.class, metaDataMap);
     }
 
-    public append_args() {
+    public setReplication_args() {
     }
 
-    public append_args(
-      Pathname path)
+    public setReplication_args(
+      Pathname path,
+      short replication)
     {
       this();
       this.path = path;
+      this.replication = replication;
+      setReplicationIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public append_args(append_args other) {
+    public setReplication_args(setReplication_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
       if (other.isSetPath()) {
         this.path = new Pathname(other.path);
       }
+      this.replication = other.replication;
+    }
+
+    public setReplication_args deepCopy() {
+      return new setReplication_args(this);
     }
 
     @Override
-    public append_args clone() {
-      return new append_args(this);
+    public void clear() {
+      this.path = null;
+      setReplicationIsSet(false);
+      this.replication = 0;
     }
 
     public Pathname getPath() {
       return this.path;
     }
 
-    public void setPath(Pathname path) {
+    public setReplication_args setPath(Pathname path) {
       this.path = path;
+      return this;
     }
 
     public void unsetPath() {
       this.path = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
     public boolean isSetPath() {
       return this.path != null;
     }
@@ -3791,8 +15148,31 @@ public void setPathIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public short getReplication() {
+      return this.replication;
+    }
+
+    public setReplication_args setReplication(short replication) {
+      this.replication = replication;
+      setReplicationIsSet(true);
+      return this;
+    }
+
+    public void unsetReplication() {
+      __isset_bit_vector.clear(__REPLICATION_ISSET_ID);
+    }
+
+    /** Returns true if field replication is set (has been assigned a value) and false otherwise */
+    public boolean isSetReplication() {
+      return __isset_bit_vector.get(__REPLICATION_ISSET_ID);
+    }
+
+    public void setReplicationIsSet(boolean value) {
+      __isset_bit_vector.set(__REPLICATION_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case PATH:
         if (value == null) {
           unsetPath();
@@ -3801,41 +15181,54 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case REPLICATION:
+        if (value == null) {
+          unsetReplication();
+        } else {
+          setReplication((Short)value);
+        }
+        break;
+
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case PATH:
         return getPath();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case REPLICATION:
+        return Short.valueOf(getReplication());
+
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case PATH:
         return isSetPath();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case REPLICATION:
+        return isSetReplication();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof append_args)
-        return this.equals((append_args)that);
+      if (that instanceof setReplication_args)
+        return this.equals((setReplication_args)that);
       return false;
     }
 
-    public boolean equals(append_args that) {
+    public boolean equals(setReplication_args that) {
       if (that == null)
         return false;
 
@@ -3848,6 +15241,15 @@ public boolean equals(append_args that) {
           return false;
       }
 
+      boolean this_present_replication = true;
+      boolean that_present_replication = true;
+      if (this_present_replication || that_present_replication) {
+        if (!(this_present_replication && that_present_replication))
+          return false;
+        if (this.replication != that.replication)
+          return false;
+      }
+
       return true;
     }
 
@@ -3856,39 +15258,79 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(setReplication_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      setReplication_args typedOther = (setReplication_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetReplication()).compareTo(typedOther.isSetReplication());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetReplication()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication, typedOther.replication);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.path = new Pathname();
               this.path.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 2: // REPLICATION
+            if (field.type == org.apache.thrift.protocol.TType.I16) {
+              this.replication = iprot.readI16();
+              setReplicationIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -3897,13 +15339,16 @@ public void write(TProtocol oprot) throws TException {
         this.path.write(oprot);
         oprot.writeFieldEnd();
       }
+      oprot.writeFieldBegin(REPLICATION_FIELD_DESC);
+      oprot.writeI16(this.replication);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("append_args(");
+      StringBuilder sb = new StringBuilder("setReplication_args(");
       boolean first = true;
 
       sb.append("path:");
@@ -3913,107 +15358,156 @@ public String toString() {
         sb.append(this.path);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("replication:");
+      sb.append(this.replication);
+      first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class append_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("append_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class setReplication_result implements org.apache.thrift.TBase<setReplication_result, setReplication_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setReplication_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public ThriftHandle success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ThriftHandle.class)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(append_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setReplication_result.class, metaDataMap);
     }
 
-    public append_result() {
+    public setReplication_result() {
     }
 
-    public append_result(
-      ThriftHandle success,
+    public setReplication_result(
       ThriftIOException ouch)
     {
       this();
-      this.success = success;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public append_result(append_result other) {
-      if (other.isSetSuccess()) {
-        this.success = new ThriftHandle(other.success);
-      }
+    public setReplication_result(setReplication_result other) {
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
-    @Override
-    public append_result clone() {
-      return new append_result(this);
-    }
-
-    public ThriftHandle getSuccess() {
-      return this.success;
-    }
-
-    public void setSuccess(ThriftHandle success) {
-      this.success = success;
-    }
-
-    public void unsetSuccess() {
-      this.success = null;
-    }
-
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.success != null;
+    public setReplication_result deepCopy() {
+      return new setReplication_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public setReplication_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -4024,16 +15518,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((ThriftHandle)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -4042,58 +15528,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return getSuccess();
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof append_result)
-        return this.equals((append_result)that);
+      if (that instanceof setReplication_result)
+        return this.equals((setReplication_result)that);
       return false;
     }
 
-    public boolean equals(append_result that) {
+    public boolean equals(setReplication_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (!this.success.equals(that.success))
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -4111,54 +15583,64 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(setReplication_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      setReplication_result typedOther = (setReplication_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.STRUCT) {
-              this.success = new ThriftHandle();
-              this.success.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        this.success.write(oprot);
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -4169,17 +15651,9 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("append_result(");
+      StringBuilder sb = new StringBuilder("setReplication_result(");
       boolean first = true;
 
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -4191,189 +15665,331 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class write_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("write_args");
-    private static final TField HANDLE_FIELD_DESC = new TField("handle", TType.STRUCT, (short)1);
-    private static final TField DATA_FIELD_DESC = new TField("data", TType.STRING, (short)2);
+  public static class getFileBlockLocations_args implements org.apache.thrift.TBase<getFileBlockLocations_args, getFileBlockLocations_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getFileBlockLocations_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.I64, (short)2);
+    private static final org.apache.thrift.protocol.TField LENGTH_FIELD_DESC = new org.apache.thrift.protocol.TField("length", org.apache.thrift.protocol.TType.I64, (short)3);
+
+    public Pathname path; // required
+    public long start; // required
+    public long length; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      START((short)2, "start"),
+      LENGTH((short)3, "length");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // START
+            return START;
+          case 3: // LENGTH
+            return LENGTH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public ThriftHandle handle;
-    public static final int HANDLE = 1;
-    public String data;
-    public static final int DATA = 2;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(HANDLE, new FieldMetaData("handle", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ThriftHandle.class)));
-      put(DATA, new FieldMetaData("data", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRING)));
-    }});
+    // isset id assignments
+    private static final int __START_ISSET_ID = 0;
+    private static final int __LENGTH_ISSET_ID = 1;
+    private BitSet __isset_bit_vector = new BitSet(2);
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(write_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.START, new org.apache.thrift.meta_data.FieldMetaData("start", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.LENGTH, new org.apache.thrift.meta_data.FieldMetaData("length", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getFileBlockLocations_args.class, metaDataMap);
     }
 
-    public write_args() {
+    public getFileBlockLocations_args() {
     }
 
-    public write_args(
-      ThriftHandle handle,
-      String data)
+    public getFileBlockLocations_args(
+      Pathname path,
+      long start,
+      long length)
     {
       this();
-      this.handle = handle;
-      this.data = data;
+      this.path = path;
+      this.start = start;
+      setStartIsSet(true);
+      this.length = length;
+      setLengthIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public write_args(write_args other) {
-      if (other.isSetHandle()) {
-        this.handle = new ThriftHandle(other.handle);
-      }
-      if (other.isSetData()) {
-        this.data = other.data;
+    public getFileBlockLocations_args(getFileBlockLocations_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetPath()) {
+        this.path = new Pathname(other.path);
       }
+      this.start = other.start;
+      this.length = other.length;
+    }
+
+    public getFileBlockLocations_args deepCopy() {
+      return new getFileBlockLocations_args(this);
     }
 
     @Override
-    public write_args clone() {
-      return new write_args(this);
+    public void clear() {
+      this.path = null;
+      setStartIsSet(false);
+      this.start = 0;
+      setLengthIsSet(false);
+      this.length = 0;
     }
 
-    public ThriftHandle getHandle() {
-      return this.handle;
+    public Pathname getPath() {
+      return this.path;
     }
 
-    public void setHandle(ThriftHandle handle) {
-      this.handle = handle;
+    public getFileBlockLocations_args setPath(Pathname path) {
+      this.path = path;
+      return this;
     }
 
-    public void unsetHandle() {
-      this.handle = null;
+    public void unsetPath() {
+      this.path = null;
     }
 
-    // Returns true if field handle is set (has been asigned a value) and false otherwise
-    public boolean isSetHandle() {
-      return this.handle != null;
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
     }
 
-    public void setHandleIsSet(boolean value) {
+    public void setPathIsSet(boolean value) {
       if (!value) {
-        this.handle = null;
+        this.path = null;
       }
     }
 
-    public String getData() {
-      return this.data;
+    public long getStart() {
+      return this.start;
     }
 
-    public void setData(String data) {
-      this.data = data;
+    public getFileBlockLocations_args setStart(long start) {
+      this.start = start;
+      setStartIsSet(true);
+      return this;
     }
 
-    public void unsetData() {
-      this.data = null;
+    public void unsetStart() {
+      __isset_bit_vector.clear(__START_ISSET_ID);
     }
 
-    // Returns true if field data is set (has been asigned a value) and false otherwise
-    public boolean isSetData() {
-      return this.data != null;
+    /** Returns true if field start is set (has been assigned a value) and false otherwise */
+    public boolean isSetStart() {
+      return __isset_bit_vector.get(__START_ISSET_ID);
     }
 
-    public void setDataIsSet(boolean value) {
-      if (!value) {
-        this.data = null;
-      }
+    public void setStartIsSet(boolean value) {
+      __isset_bit_vector.set(__START_ISSET_ID, value);
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case HANDLE:
+    public long getLength() {
+      return this.length;
+    }
+
+    public getFileBlockLocations_args setLength(long length) {
+      this.length = length;
+      setLengthIsSet(true);
+      return this;
+    }
+
+    public void unsetLength() {
+      __isset_bit_vector.clear(__LENGTH_ISSET_ID);
+    }
+
+    /** Returns true if field length is set (has been assigned a value) and false otherwise */
+    public boolean isSetLength() {
+      return __isset_bit_vector.get(__LENGTH_ISSET_ID);
+    }
+
+    public void setLengthIsSet(boolean value) {
+      __isset_bit_vector.set(__LENGTH_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATH:
         if (value == null) {
-          unsetHandle();
+          unsetPath();
         } else {
-          setHandle((ThriftHandle)value);
+          setPath((Pathname)value);
         }
         break;
 
-      case DATA:
+      case START:
         if (value == null) {
-          unsetData();
+          unsetStart();
         } else {
-          setData((String)value);
+          setStart((Long)value);
+        }
+        break;
+
+      case LENGTH:
+        if (value == null) {
+          unsetLength();
+        } else {
+          setLength((Long)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case HANDLE:
-        return getHandle();
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATH:
+        return getPath();
 
-      case DATA:
-        return getData();
+      case START:
+        return Long.valueOf(getStart());
+
+      case LENGTH:
+        return Long.valueOf(getLength());
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case HANDLE:
-        return isSetHandle();
-      case DATA:
-        return isSetData();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATH:
+        return isSetPath();
+      case START:
+        return isSetStart();
+      case LENGTH:
+        return isSetLength();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof write_args)
-        return this.equals((write_args)that);
+      if (that instanceof getFileBlockLocations_args)
+        return this.equals((getFileBlockLocations_args)that);
       return false;
     }
 
-    public boolean equals(write_args that) {
+    public boolean equals(getFileBlockLocations_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_handle = true && this.isSetHandle();
-      boolean that_present_handle = true && that.isSetHandle();
-      if (this_present_handle || that_present_handle) {
-        if (!(this_present_handle && that_present_handle))
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
+          return false;
+      }
+
+      boolean this_present_start = true;
+      boolean that_present_start = true;
+      if (this_present_start || that_present_start) {
+        if (!(this_present_start && that_present_start))
           return false;
-        if (!this.handle.equals(that.handle))
+        if (this.start != that.start)
           return false;
       }
 
-      boolean this_present_data = true && this.isSetData();
-      boolean that_present_data = true && that.isSetData();
-      if (this_present_data || that_present_data) {
-        if (!(this_present_data && that_present_data))
+      boolean this_present_length = true;
+      boolean that_present_length = true;
+      if (this_present_length || that_present_length) {
+        if (!(this_present_length && that_present_length))
           return false;
-        if (!this.data.equals(that.data))
+        if (this.length != that.length)
           return false;
       }
 
@@ -4385,184 +16001,338 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(getFileBlockLocations_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getFileBlockLocations_args typedOther = (getFileBlockLocations_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetStart()).compareTo(typedOther.isSetStart());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetStart()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, typedOther.start);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetLength()).compareTo(typedOther.isSetLength());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetLength()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.length, typedOther.length);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case HANDLE:
-            if (field.type == TType.STRUCT) {
-              this.handle = new ThriftHandle();
-              this.handle.read(iprot);
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.path = new Pathname();
+              this.path.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case DATA:
-            if (field.type == TType.STRING) {
-              this.data = iprot.readString();
+          case 2: // START
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.start = iprot.readI64();
+              setStartIsSet(true);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 3: // LENGTH
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.length = iprot.readI64();
+              setLengthIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.handle != null) {
-        oprot.writeFieldBegin(HANDLE_FIELD_DESC);
-        this.handle.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (this.data != null) {
-        oprot.writeFieldBegin(DATA_FIELD_DESC);
-        oprot.writeString(this.data);
+      if (this.path != null) {
+        oprot.writeFieldBegin(PATH_FIELD_DESC);
+        this.path.write(oprot);
         oprot.writeFieldEnd();
       }
+      oprot.writeFieldBegin(START_FIELD_DESC);
+      oprot.writeI64(this.start);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(LENGTH_FIELD_DESC);
+      oprot.writeI64(this.length);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("write_args(");
+      StringBuilder sb = new StringBuilder("getFileBlockLocations_args(");
       boolean first = true;
 
-      sb.append("handle:");
-      if (this.handle == null) {
+      sb.append("path:");
+      if (this.path == null) {
         sb.append("null");
       } else {
-        sb.append(this.handle);
+        sb.append(this.path);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("data:");
-      if (this.data == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.data);
-      }
+      sb.append("start:");
+      sb.append(this.start);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("length:");
+      sb.append(this.length);
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class write_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("write_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.BOOL, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class getFileBlockLocations_result implements org.apache.thrift.TBase<getFileBlockLocations_result, getFileBlockLocations_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getFileBlockLocations_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    public boolean success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+    public List<BlockLocation> success; // required
+    public ThriftIOException ouch; // required
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean success = false;
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.BOOL)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(write_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BlockLocation.class))));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getFileBlockLocations_result.class, metaDataMap);
     }
 
-    public write_result() {
+    public getFileBlockLocations_result() {
     }
 
-    public write_result(
-      boolean success,
+    public getFileBlockLocations_result(
+      List<BlockLocation> success,
       ThriftIOException ouch)
     {
       this();
       this.success = success;
-      this.__isset.success = true;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public write_result(write_result other) {
-      __isset.success = other.__isset.success;
-      this.success = other.success;
+    public getFileBlockLocations_result(getFileBlockLocations_result other) {
+      if (other.isSetSuccess()) {
+        List<BlockLocation> __this__success = new ArrayList<BlockLocation>();
+        for (BlockLocation other_element : other.success) {
+          __this__success.add(new BlockLocation(other_element));
+        }
+        this.success = __this__success;
+      }
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
+    public getFileBlockLocations_result deepCopy() {
+      return new getFileBlockLocations_result(this);
+    }
+
     @Override
-    public write_result clone() {
-      return new write_result(this);
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
     }
 
-    public boolean isSuccess() {
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public java.util.Iterator<BlockLocation> getSuccessIterator() {
+      return (this.success == null) ? null : this.success.iterator();
+    }
+
+    public void addToSuccess(BlockLocation elem) {
+      if (this.success == null) {
+        this.success = new ArrayList<BlockLocation>();
+      }
+      this.success.add(elem);
+    }
+
+    public List<BlockLocation> getSuccess() {
       return this.success;
     }
 
-    public void setSuccess(boolean success) {
+    public getFileBlockLocations_result setSuccess(List<BlockLocation> success) {
       this.success = success;
-      this.__isset.success = true;
+      return this;
     }
 
     public void unsetSuccess() {
-      this.__isset.success = false;
+      this.success = null;
     }
 
-    // Returns true if field success is set (has been asigned a value) and false otherwise
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return this.__isset.success;
+      return this.success != null;
     }
 
     public void setSuccessIsSet(boolean value) {
-      this.__isset.success = value;
+      if (!value) {
+        this.success = null;
+      }
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public getFileBlockLocations_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -4573,13 +16343,13 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Boolean)value);
+          setSuccess((List<BlockLocation>)value);
         }
         break;
 
@@ -4591,55 +16361,55 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case SUCCESS:
-        return new Boolean(isSuccess());
+        return getSuccess();
 
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case SUCCESS:
         return isSetSuccess();
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof write_result)
-        return this.equals((write_result)that);
+      if (that instanceof getFileBlockLocations_result)
+        return this.equals((getFileBlockLocations_result)that);
       return false;
     }
 
-    public boolean equals(write_result that) {
+    public boolean equals(getFileBlockLocations_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true;
-      boolean that_present_success = true;
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
       if (this_present_success || that_present_success) {
         if (!(this_present_success && that_present_success))
           return false;
-        if (this.success != that.success)
+        if (!this.success.equals(that.success))
           return false;
       }
 
@@ -4660,320 +16430,398 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(getFileBlockLocations_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getFileBlockLocations_result typedOther = (getFileBlockLocations_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.BOOL) {
-              this.success = iprot.readBool();
-              this.__isset.success = true;
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
+                this.success = new ArrayList<BlockLocation>(_list16.size);
+                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
+                {
+                  BlockLocation _elem18; // required
+                  _elem18 = new BlockLocation();
+                  _elem18.read(iprot);
+                  this.success.add(_elem18);
+                }
+                iprot.readListEnd();
+              }
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeBool(this.success);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
+          for (BlockLocation _iter19 : this.success)
+          {
+            _iter19.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       } else if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("getFileBlockLocations_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("ouch:");
+      if (this.ouch == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ouch);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class hardLink_args implements org.apache.thrift.TBase<hardLink_args, hardLink_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("hardLink_args");
+
+    private static final org.apache.thrift.protocol.TField SRC_FIELD_DESC = new org.apache.thrift.protocol.TField("src", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField DEST_FIELD_DESC = new org.apache.thrift.protocol.TField("dest", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    public Pathname src; // required
+    public Pathname dest; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SRC((short)1, "src"),
+      DEST((short)2, "dest");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // SRC
+            return SRC;
+          case 2: // DEST
+            return DEST;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
 
-    @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("write_result(");
-      boolean first = true;
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
 
-      sb.append("success:");
-      sb.append(this.success);
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("ouch:");
-      if (this.ouch == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.ouch);
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
       }
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
 
-    public void validate() throws TException {
-      // check for required fields
-      // check that fields of type enum have valid values
-    }
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-  }
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
 
-  public static class read_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("read_args");
-    private static final TField HANDLE_FIELD_DESC = new TField("handle", TType.STRUCT, (short)1);
-    private static final TField OFFSET_FIELD_DESC = new TField("offset", TType.I64, (short)2);
-    private static final TField SIZE_FIELD_DESC = new TField("size", TType.I32, (short)3);
-
-    public ThriftHandle handle;
-    public static final int HANDLE = 1;
-    public long offset;
-    public static final int OFFSET = 2;
-    public int size;
-    public static final int SIZE = 3;
-
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean offset = false;
-      public boolean size = false;
-    }
-
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(HANDLE, new FieldMetaData("handle", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ThriftHandle.class)));
-      put(OFFSET, new FieldMetaData("offset", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I64)));
-      put(SIZE, new FieldMetaData("size", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I32)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(read_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SRC, new org.apache.thrift.meta_data.FieldMetaData("src", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.DEST, new org.apache.thrift.meta_data.FieldMetaData("dest", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(hardLink_args.class, metaDataMap);
     }
 
-    public read_args() {
+    public hardLink_args() {
     }
 
-    public read_args(
-      ThriftHandle handle,
-      long offset,
-      int size)
+    public hardLink_args(
+      Pathname src,
+      Pathname dest)
     {
       this();
-      this.handle = handle;
-      this.offset = offset;
-      this.__isset.offset = true;
-      this.size = size;
-      this.__isset.size = true;
+      this.src = src;
+      this.dest = dest;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public read_args(read_args other) {
-      if (other.isSetHandle()) {
-        this.handle = new ThriftHandle(other.handle);
+    public hardLink_args(hardLink_args other) {
+      if (other.isSetSrc()) {
+        this.src = new Pathname(other.src);
       }
-      __isset.offset = other.__isset.offset;
-      this.offset = other.offset;
-      __isset.size = other.__isset.size;
-      this.size = other.size;
+      if (other.isSetDest()) {
+        this.dest = new Pathname(other.dest);
+      }
+    }
+
+    public hardLink_args deepCopy() {
+      return new hardLink_args(this);
     }
 
     @Override
-    public read_args clone() {
-      return new read_args(this);
+    public void clear() {
+      this.src = null;
+      this.dest = null;
     }
 
-    public ThriftHandle getHandle() {
-      return this.handle;
+    public Pathname getSrc() {
+      return this.src;
     }
 
-    public void setHandle(ThriftHandle handle) {
-      this.handle = handle;
+    public hardLink_args setSrc(Pathname src) {
+      this.src = src;
+      return this;
     }
 
-    public void unsetHandle() {
-      this.handle = null;
+    public void unsetSrc() {
+      this.src = null;
     }
 
-    // Returns true if field handle is set (has been asigned a value) and false otherwise
-    public boolean isSetHandle() {
-      return this.handle != null;
+    /** Returns true if field src is set (has been assigned a value) and false otherwise */
+    public boolean isSetSrc() {
+      return this.src != null;
     }
 
-    public void setHandleIsSet(boolean value) {
+    public void setSrcIsSet(boolean value) {
       if (!value) {
-        this.handle = null;
+        this.src = null;
       }
     }
 
-    public long getOffset() {
-      return this.offset;
-    }
-
-    public void setOffset(long offset) {
-      this.offset = offset;
-      this.__isset.offset = true;
-    }
-
-    public void unsetOffset() {
-      this.__isset.offset = false;
-    }
-
-    // Returns true if field offset is set (has been asigned a value) and false otherwise
-    public boolean isSetOffset() {
-      return this.__isset.offset;
-    }
-
-    public void setOffsetIsSet(boolean value) {
-      this.__isset.offset = value;
-    }
-
-    public int getSize() {
-      return this.size;
+    public Pathname getDest() {
+      return this.dest;
     }
 
-    public void setSize(int size) {
-      this.size = size;
-      this.__isset.size = true;
+    public hardLink_args setDest(Pathname dest) {
+      this.dest = dest;
+      return this;
     }
 
-    public void unsetSize() {
-      this.__isset.size = false;
+    public void unsetDest() {
+      this.dest = null;
     }
 
-    // Returns true if field size is set (has been asigned a value) and false otherwise
-    public boolean isSetSize() {
-      return this.__isset.size;
+    /** Returns true if field dest is set (has been assigned a value) and false otherwise */
+    public boolean isSetDest() {
+      return this.dest != null;
     }
 
-    public void setSizeIsSet(boolean value) {
-      this.__isset.size = value;
+    public void setDestIsSet(boolean value) {
+      if (!value) {
+        this.dest = null;
+      }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case HANDLE:
-        if (value == null) {
-          unsetHandle();
-        } else {
-          setHandle((ThriftHandle)value);
-        }
-        break;
-
-      case OFFSET:
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SRC:
         if (value == null) {
-          unsetOffset();
+          unsetSrc();
         } else {
-          setOffset((Long)value);
+          setSrc((Pathname)value);
         }
         break;
 
-      case SIZE:
+      case DEST:
         if (value == null) {
-          unsetSize();
+          unsetDest();
         } else {
-          setSize((Integer)value);
+          setDest((Pathname)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case HANDLE:
-        return getHandle();
-
-      case OFFSET:
-        return new Long(getOffset());
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SRC:
+        return getSrc();
 
-      case SIZE:
-        return new Integer(getSize());
+      case DEST:
+        return getDest();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case HANDLE:
-        return isSetHandle();
-      case OFFSET:
-        return isSetOffset();
-      case SIZE:
-        return isSetSize();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SRC:
+        return isSetSrc();
+      case DEST:
+        return isSetDest();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof read_args)
-        return this.equals((read_args)that);
+      if (that instanceof hardLink_args)
+        return this.equals((hardLink_args)that);
       return false;
     }
 
-    public boolean equals(read_args that) {
+    public boolean equals(hardLink_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_handle = true && this.isSetHandle();
-      boolean that_present_handle = true && that.isSetHandle();
-      if (this_present_handle || that_present_handle) {
-        if (!(this_present_handle && that_present_handle))
-          return false;
-        if (!this.handle.equals(that.handle))
-          return false;
-      }
-
-      boolean this_present_offset = true;
-      boolean that_present_offset = true;
-      if (this_present_offset || that_present_offset) {
-        if (!(this_present_offset && that_present_offset))
+      boolean this_present_src = true && this.isSetSrc();
+      boolean that_present_src = true && that.isSetSrc();
+      if (this_present_src || that_present_src) {
+        if (!(this_present_src && that_present_src))
           return false;
-        if (this.offset != that.offset)
+        if (!this.src.equals(that.src))
           return false;
       }
 
-      boolean this_present_size = true;
-      boolean that_present_size = true;
-      if (this_present_size || that_present_size) {
-        if (!(this_present_size && that_present_size))
+      boolean this_present_dest = true && this.isSetDest();
+      boolean that_present_dest = true && that.isSetDest();
+      if (this_present_dest || that_present_dest) {
+        if (!(this_present_dest && that_present_dest))
           return false;
-        if (this.size != that.size)
+        if (!this.dest.equals(that.dest))
           return false;
       }
 
@@ -4985,194 +16833,300 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(hardLink_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      hardLink_args typedOther = (hardLink_args)other;
+
+      lastComparison = Boolean.valueOf(isSetSrc()).compareTo(typedOther.isSetSrc());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSrc()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.src, typedOther.src);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDest()).compareTo(typedOther.isSetDest());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDest()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dest, typedOther.dest);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case HANDLE:
-            if (field.type == TType.STRUCT) {
-              this.handle = new ThriftHandle();
-              this.handle.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OFFSET:
-            if (field.type == TType.I64) {
-              this.offset = iprot.readI64();
-              this.__isset.offset = true;
+        switch (field.id) {
+          case 1: // SRC
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.src = new Pathname();
+              this.src.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case SIZE:
-            if (field.type == TType.I32) {
-              this.size = iprot.readI32();
-              this.__isset.size = true;
+          case 2: // DEST
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.dest = new Pathname();
+              this.dest.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.handle != null) {
-        oprot.writeFieldBegin(HANDLE_FIELD_DESC);
-        this.handle.write(oprot);
+      if (this.src != null) {
+        oprot.writeFieldBegin(SRC_FIELD_DESC);
+        this.src.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.dest != null) {
+        oprot.writeFieldBegin(DEST_FIELD_DESC);
+        this.dest.write(oprot);
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(OFFSET_FIELD_DESC);
-      oprot.writeI64(this.offset);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(SIZE_FIELD_DESC);
-      oprot.writeI32(this.size);
-      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("read_args(");
+      StringBuilder sb = new StringBuilder("hardLink_args(");
       boolean first = true;
 
-      sb.append("handle:");
-      if (this.handle == null) {
+      sb.append("src:");
+      if (this.src == null) {
         sb.append("null");
       } else {
-        sb.append(this.handle);
+        sb.append(this.src);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("offset:");
-      sb.append(this.offset);
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("size:");
-      sb.append(this.size);
+      sb.append("dest:");
+      if (this.dest == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.dest);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class read_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("read_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class hardLink_result implements org.apache.thrift.TBase<hardLink_result, hardLink_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("hardLink_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public String success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRING)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(read_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(hardLink_result.class, metaDataMap);
     }
 
-    public read_result() {
+    public hardLink_result() {
     }
 
-    public read_result(
-      String success,
+    public hardLink_result(
+      boolean success,
       ThriftIOException ouch)
     {
       this();
       this.success = success;
+      setSuccessIsSet(true);
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public read_result(read_result other) {
-      if (other.isSetSuccess()) {
-        this.success = other.success;
-      }
+    public hardLink_result(hardLink_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
+    public hardLink_result deepCopy() {
+      return new hardLink_result(this);
+    }
+
     @Override
-    public read_result clone() {
-      return new read_result(this);
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.ouch = null;
     }
 
-    public String getSuccess() {
+    public boolean isSuccess() {
       return this.success;
     }
 
-    public void setSuccess(String success) {
+    public hardLink_result setSuccess(boolean success) {
       this.success = success;
+      setSuccessIsSet(true);
+      return this;
     }
 
     public void unsetSuccess() {
-      this.success = null;
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
     }
 
-    // Returns true if field success is set (has been asigned a value) and false otherwise
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return this.success != null;
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public hardLink_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -5183,13 +17137,13 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((String)value);
+          setSuccess((Boolean)value);
         }
         break;
 
@@ -5201,55 +17155,55 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case SUCCESS:
-        return getSuccess();
+        return Boolean.valueOf(isSuccess());
 
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case SUCCESS:
         return isSetSuccess();
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof read_result)
-        return this.equals((read_result)that);
+      if (that instanceof hardLink_result)
+        return this.equals((hardLink_result)that);
       return false;
     }
 
-    public boolean equals(read_result that) {
+    public boolean equals(hardLink_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
+      boolean this_present_success = true;
+      boolean that_present_success = true;
       if (this_present_success || that_present_success) {
         if (!(this_present_success && that_present_success))
           return false;
-        if (!this.success.equals(that.success))
+        if (this.success != that.success)
           return false;
       }
 
@@ -5270,51 +17224,84 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(hardLink_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      hardLink_result typedOther = (hardLink_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.STRING) {
-              this.success = iprot.readString();
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeString(this.success);
+        oprot.writeBool(this.success);
         oprot.writeFieldEnd();
       } else if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
@@ -5327,15 +17314,11 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("read_result(");
+      StringBuilder sb = new StringBuilder("hardLink_result(");
       boolean first = true;
 
       sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
+      sb.append(this.success);
       first = false;
       if (!first) sb.append(", ");
       sb.append("ouch:");
@@ -5349,134 +17332,351 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class close_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("close_args");
-    private static final TField OUT_FIELD_DESC = new TField("out", TType.STRUCT, (short)1);
+  public static class concat_args implements org.apache.thrift.TBase<concat_args, concat_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("concat_args");
+
+    private static final org.apache.thrift.protocol.TField TARGET_FIELD_DESC = new org.apache.thrift.protocol.TField("target", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField SRCS_FIELD_DESC = new org.apache.thrift.protocol.TField("srcs", org.apache.thrift.protocol.TType.LIST, (short)2);
+    private static final org.apache.thrift.protocol.TField RESTRICTED_FIELD_DESC = new org.apache.thrift.protocol.TField("restricted", org.apache.thrift.protocol.TType.BOOL, (short)3);
+
+    public Pathname target; // required
+    public List<Pathname> srcs; // required
+    public boolean restricted; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      TARGET((short)1, "target"),
+      SRCS((short)2, "srcs"),
+      RESTRICTED((short)3, "restricted");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // TARGET
+            return TARGET;
+          case 2: // SRCS
+            return SRCS;
+          case 3: // RESTRICTED
+            return RESTRICTED;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public ThriftHandle out;
-    public static final int OUT = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(OUT, new FieldMetaData("out", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ThriftHandle.class)));
-    }});
+    // isset id assignments
+    private static final int __RESTRICTED_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(close_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.TARGET, new org.apache.thrift.meta_data.FieldMetaData("target", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.SRCS, new org.apache.thrift.meta_data.FieldMetaData("srcs", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class))));
+      tmpMap.put(_Fields.RESTRICTED, new org.apache.thrift.meta_data.FieldMetaData("restricted", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(concat_args.class, metaDataMap);
     }
 
-    public close_args() {
+    public concat_args() {
     }
 
-    public close_args(
-      ThriftHandle out)
+    public concat_args(
+      Pathname target,
+      List<Pathname> srcs,
+      boolean restricted)
     {
       this();
-      this.out = out;
+      this.target = target;
+      this.srcs = srcs;
+      this.restricted = restricted;
+      setRestrictedIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public close_args(close_args other) {
-      if (other.isSetOut()) {
-        this.out = new ThriftHandle(other.out);
+    public concat_args(concat_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetTarget()) {
+        this.target = new Pathname(other.target);
+      }
+      if (other.isSetSrcs()) {
+        List<Pathname> __this__srcs = new ArrayList<Pathname>();
+        for (Pathname other_element : other.srcs) {
+          __this__srcs.add(new Pathname(other_element));
+        }
+        this.srcs = __this__srcs;
       }
+      this.restricted = other.restricted;
+    }
+
+    public concat_args deepCopy() {
+      return new concat_args(this);
     }
 
     @Override
-    public close_args clone() {
-      return new close_args(this);
+    public void clear() {
+      this.target = null;
+      this.srcs = null;
+      setRestrictedIsSet(false);
+      this.restricted = false;
     }
 
-    public ThriftHandle getOut() {
-      return this.out;
+    public Pathname getTarget() {
+      return this.target;
     }
 
-    public void setOut(ThriftHandle out) {
-      this.out = out;
+    public concat_args setTarget(Pathname target) {
+      this.target = target;
+      return this;
     }
 
-    public void unsetOut() {
-      this.out = null;
+    public void unsetTarget() {
+      this.target = null;
     }
 
-    // Returns true if field out is set (has been asigned a value) and false otherwise
-    public boolean isSetOut() {
-      return this.out != null;
+    /** Returns true if field target is set (has been assigned a value) and false otherwise */
+    public boolean isSetTarget() {
+      return this.target != null;
     }
 
-    public void setOutIsSet(boolean value) {
+    public void setTargetIsSet(boolean value) {
       if (!value) {
-        this.out = null;
+        this.target = null;
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case OUT:
+    public int getSrcsSize() {
+      return (this.srcs == null) ? 0 : this.srcs.size();
+    }
+
+    public java.util.Iterator<Pathname> getSrcsIterator() {
+      return (this.srcs == null) ? null : this.srcs.iterator();
+    }
+
+    public void addToSrcs(Pathname elem) {
+      if (this.srcs == null) {
+        this.srcs = new ArrayList<Pathname>();
+      }
+      this.srcs.add(elem);
+    }
+
+    public List<Pathname> getSrcs() {
+      return this.srcs;
+    }
+
+    public concat_args setSrcs(List<Pathname> srcs) {
+      this.srcs = srcs;
+      return this;
+    }
+
+    public void unsetSrcs() {
+      this.srcs = null;
+    }
+
+    /** Returns true if field srcs is set (has been assigned a value) and false otherwise */
+    public boolean isSetSrcs() {
+      return this.srcs != null;
+    }
+
+    public void setSrcsIsSet(boolean value) {
+      if (!value) {
+        this.srcs = null;
+      }
+    }
+
+    public boolean isRestricted() {
+      return this.restricted;
+    }
+
+    public concat_args setRestricted(boolean restricted) {
+      this.restricted = restricted;
+      setRestrictedIsSet(true);
+      return this;
+    }
+
+    public void unsetRestricted() {
+      __isset_bit_vector.clear(__RESTRICTED_ISSET_ID);
+    }
+
+    /** Returns true if field restricted is set (has been assigned a value) and false otherwise */
+    public boolean isSetRestricted() {
+      return __isset_bit_vector.get(__RESTRICTED_ISSET_ID);
+    }
+
+    public void setRestrictedIsSet(boolean value) {
+      __isset_bit_vector.set(__RESTRICTED_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case TARGET:
         if (value == null) {
-          unsetOut();
+          unsetTarget();
         } else {
-          setOut((ThriftHandle)value);
+          setTarget((Pathname)value);
+        }
+        break;
+
+      case SRCS:
+        if (value == null) {
+          unsetSrcs();
+        } else {
+          setSrcs((List<Pathname>)value);
+        }
+        break;
+
+      case RESTRICTED:
+        if (value == null) {
+          unsetRestricted();
+        } else {
+          setRestricted((Boolean)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case OUT:
-        return getOut();
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case TARGET:
+        return getTarget();
+
+      case SRCS:
+        return getSrcs();
+
+      case RESTRICTED:
+        return Boolean.valueOf(isRestricted());
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case OUT:
-        return isSetOut();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case TARGET:
+        return isSetTarget();
+      case SRCS:
+        return isSetSrcs();
+      case RESTRICTED:
+        return isSetRestricted();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof close_args)
-        return this.equals((close_args)that);
+      if (that instanceof concat_args)
+        return this.equals((concat_args)that);
       return false;
     }
 
-    public boolean equals(close_args that) {
+    public boolean equals(concat_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_out = true && this.isSetOut();
-      boolean that_present_out = true && that.isSetOut();
-      if (this_present_out || that_present_out) {
-        if (!(this_present_out && that_present_out))
+      boolean this_present_target = true && this.isSetTarget();
+      boolean that_present_target = true && that.isSetTarget();
+      if (this_present_target || that_present_target) {
+        if (!(this_present_target && that_present_target))
           return false;
-        if (!this.out.equals(that.out))
+        if (!this.target.equals(that.target))
+          return false;
+      }
+
+      boolean this_present_srcs = true && this.isSetSrcs();
+      boolean that_present_srcs = true && that.isSetSrcs();
+      if (this_present_srcs || that_present_srcs) {
+        if (!(this_present_srcs && that_present_srcs))
+          return false;
+        if (!this.srcs.equals(that.srcs))
+          return false;
+      }
+
+      boolean this_present_restricted = true;
+      boolean that_present_restricted = true;
+      if (this_present_restricted || that_present_restricted) {
+        if (!(this_present_restricted && that_present_restricted))
+          return false;
+        if (this.restricted != that.restricted)
           return false;
       }
 
@@ -5488,164 +17688,304 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(concat_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      concat_args typedOther = (concat_args)other;
+
+      lastComparison = Boolean.valueOf(isSetTarget()).compareTo(typedOther.isSetTarget());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTarget()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.target, typedOther.target);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetSrcs()).compareTo(typedOther.isSetSrcs());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSrcs()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.srcs, typedOther.srcs);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetRestricted()).compareTo(typedOther.isSetRestricted());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetRestricted()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.restricted, typedOther.restricted);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case OUT:
-            if (field.type == TType.STRUCT) {
-              this.out = new ThriftHandle();
-              this.out.read(iprot);
+        switch (field.id) {
+          case 1: // TARGET
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.target = new Pathname();
+              this.target.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 2: // SRCS
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list20 = iprot.readListBegin();
+                this.srcs = new ArrayList<Pathname>(_list20.size);
+                for (int _i21 = 0; _i21 < _list20.size; ++_i21)
+                {
+                  Pathname _elem22; // required
+                  _elem22 = new Pathname();
+                  _elem22.read(iprot);
+                  this.srcs.add(_elem22);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // RESTRICTED
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.restricted = iprot.readBool();
+              setRestrictedIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.out != null) {
-        oprot.writeFieldBegin(OUT_FIELD_DESC);
-        this.out.write(oprot);
+      if (this.target != null) {
+        oprot.writeFieldBegin(TARGET_FIELD_DESC);
+        this.target.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.srcs != null) {
+        oprot.writeFieldBegin(SRCS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.srcs.size()));
+          for (Pathname _iter23 : this.srcs)
+          {
+            _iter23.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
+      oprot.writeFieldBegin(RESTRICTED_FIELD_DESC);
+      oprot.writeBool(this.restricted);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("close_args(");
+      StringBuilder sb = new StringBuilder("concat_args(");
       boolean first = true;
 
-      sb.append("out:");
-      if (this.out == null) {
+      sb.append("target:");
+      if (this.target == null) {
         sb.append("null");
       } else {
-        sb.append(this.out);
+        sb.append(this.target);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("srcs:");
+      if (this.srcs == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.srcs);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("restricted:");
+      sb.append(this.restricted);
+      first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class close_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("close_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.BOOL, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class concat_result implements org.apache.thrift.TBase<concat_result, concat_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("concat_result");
 
-    public boolean success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean success = false;
-    }
+    public ThriftIOException ouch; // required
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.BOOL)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
 
-    static {
-      FieldMetaData.addStructMetaDataMap(close_result.class, metaDataMap);
-    }
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
-    public close_result() {
-    }
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
 
-    public close_result(
-      boolean success,
-      ThriftIOException ouch)
-    {
-      this();
-      this.success = success;
-      this.__isset.success = true;
-      this.ouch = ouch;
-    }
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
 
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public close_result(close_result other) {
-      __isset.success = other.__isset.success;
-      this.success = other.success;
-      if (other.isSetOuch()) {
-        this.ouch = new ThriftIOException(other.ouch);
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
       }
     }
 
-    @Override
-    public close_result clone() {
-      return new close_result(this);
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(concat_result.class, metaDataMap);
     }
 
-    public boolean isSuccess() {
-      return this.success;
+    public concat_result() {
     }
 
-    public void setSuccess(boolean success) {
-      this.success = success;
-      this.__isset.success = true;
+    public concat_result(
+      ThriftIOException ouch)
+    {
+      this();
+      this.ouch = ouch;
     }
 
-    public void unsetSuccess() {
-      this.__isset.success = false;
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public concat_result(concat_result other) {
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
     }
 
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.__isset.success;
+    public concat_result deepCopy() {
+      return new concat_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      this.__isset.success = value;
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public concat_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -5656,16 +17996,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Boolean)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -5674,58 +18006,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return new Boolean(isSuccess());
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof close_result)
-        return this.equals((close_result)that);
+      if (that instanceof concat_result)
+        return this.equals((concat_result)that);
       return false;
     }
 
-    public boolean equals(close_result that) {
+    public boolean equals(concat_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true;
-      boolean that_present_success = true;
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (this.success != that.success)
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -5743,54 +18061,64 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(concat_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      concat_result typedOther = (concat_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.BOOL) {
-              this.success = iprot.readBool();
-              this.__isset.success = true;
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeBool(this.success);
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -5801,13 +18129,9 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("close_result(");
+      StringBuilder sb = new StringBuilder("concat_result(");
       boolean first = true;
 
-      sb.append("success:");
-      sb.append(this.success);
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -5819,189 +18143,230 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class rm_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("rm_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
-    private static final TField RECURSIVE_FIELD_DESC = new TField("recursive", TType.BOOL, (short)2);
+  public static class reportBadBlocks_args implements org.apache.thrift.TBase<reportBadBlocks_args, reportBadBlocks_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("reportBadBlocks_args");
+
+    private static final org.apache.thrift.protocol.TField BLOCKS_FIELD_DESC = new org.apache.thrift.protocol.TField("blocks", org.apache.thrift.protocol.TType.LIST, (short)1);
+
+    public List<TLocatedBlock> blocks; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      BLOCKS((short)1, "blocks");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // BLOCKS
+            return BLOCKS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public Pathname path;
-    public static final int PATH = 1;
-    public boolean recursive;
-    public static final int RECURSIVE = 2;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean recursive = false;
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-      put(RECURSIVE, new FieldMetaData("recursive", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.BOOL)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(rm_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.BLOCKS, new org.apache.thrift.meta_data.FieldMetaData("blocks", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TLocatedBlock.class))));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(reportBadBlocks_args.class, metaDataMap);
     }
 
-    public rm_args() {
+    public reportBadBlocks_args() {
     }
 
-    public rm_args(
-      Pathname path,
-      boolean recursive)
+    public reportBadBlocks_args(
+      List<TLocatedBlock> blocks)
     {
       this();
-      this.path = path;
-      this.recursive = recursive;
-      this.__isset.recursive = true;
+      this.blocks = blocks;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public rm_args(rm_args other) {
-      if (other.isSetPath()) {
-        this.path = new Pathname(other.path);
+    public reportBadBlocks_args(reportBadBlocks_args other) {
+      if (other.isSetBlocks()) {
+        List<TLocatedBlock> __this__blocks = new ArrayList<TLocatedBlock>();
+        for (TLocatedBlock other_element : other.blocks) {
+          __this__blocks.add(new TLocatedBlock(other_element));
+        }
+        this.blocks = __this__blocks;
       }
-      __isset.recursive = other.__isset.recursive;
-      this.recursive = other.recursive;
-    }
-
-    @Override
-    public rm_args clone() {
-      return new rm_args(this);
     }
 
-    public Pathname getPath() {
-      return this.path;
+    public reportBadBlocks_args deepCopy() {
+      return new reportBadBlocks_args(this);
     }
 
-    public void setPath(Pathname path) {
-      this.path = path;
+    @Override
+    public void clear() {
+      this.blocks = null;
     }
 
-    public void unsetPath() {
-      this.path = null;
+    public int getBlocksSize() {
+      return (this.blocks == null) ? 0 : this.blocks.size();
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
+    public java.util.Iterator<TLocatedBlock> getBlocksIterator() {
+      return (this.blocks == null) ? null : this.blocks.iterator();
     }
 
-    public void setPathIsSet(boolean value) {
-      if (!value) {
-        this.path = null;
+    public void addToBlocks(TLocatedBlock elem) {
+      if (this.blocks == null) {
+        this.blocks = new ArrayList<TLocatedBlock>();
       }
+      this.blocks.add(elem);
     }
 
-    public boolean isRecursive() {
-      return this.recursive;
+    public List<TLocatedBlock> getBlocks() {
+      return this.blocks;
     }
 
-    public void setRecursive(boolean recursive) {
-      this.recursive = recursive;
-      this.__isset.recursive = true;
+    public reportBadBlocks_args setBlocks(List<TLocatedBlock> blocks) {
+      this.blocks = blocks;
+      return this;
     }
 
-    public void unsetRecursive() {
-      this.__isset.recursive = false;
+    public void unsetBlocks() {
+      this.blocks = null;
     }
 
-    // Returns true if field recursive is set (has been asigned a value) and false otherwise
-    public boolean isSetRecursive() {
-      return this.__isset.recursive;
+    /** Returns true if field blocks is set (has been assigned a value) and false otherwise */
+    public boolean isSetBlocks() {
+      return this.blocks != null;
     }
 
-    public void setRecursiveIsSet(boolean value) {
-      this.__isset.recursive = value;
+    public void setBlocksIsSet(boolean value) {
+      if (!value) {
+        this.blocks = null;
+      }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PATH:
-        if (value == null) {
-          unsetPath();
-        } else {
-          setPath((Pathname)value);
-        }
-        break;
-
-      case RECURSIVE:
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case BLOCKS:
         if (value == null) {
-          unsetRecursive();
+          unsetBlocks();
         } else {
-          setRecursive((Boolean)value);
+          setBlocks((List<TLocatedBlock>)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return getPath();
-
-      case RECURSIVE:
-        return new Boolean(isRecursive());
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case BLOCKS:
+        return getBlocks();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return isSetPath();
-      case RECURSIVE:
-        return isSetRecursive();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case BLOCKS:
+        return isSetBlocks();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof rm_args)
-        return this.equals((rm_args)that);
+      if (that instanceof reportBadBlocks_args)
+        return this.equals((reportBadBlocks_args)that);
       return false;
     }
 
-    public boolean equals(rm_args that) {
+    public boolean equals(reportBadBlocks_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
-          return false;
-        if (!this.path.equals(that.path))
-          return false;
-      }
-
-      boolean this_present_recursive = true;
-      boolean that_present_recursive = true;
-      if (this_present_recursive || that_present_recursive) {
-        if (!(this_present_recursive && that_present_recursive))
+      boolean this_present_blocks = true && this.isSetBlocks();
+      boolean that_present_blocks = true && that.isSetBlocks();
+      if (this_present_blocks || that_present_blocks) {
+        if (!(this_present_blocks && that_present_blocks))
           return false;
-        if (this.recursive != that.recursive)
+        if (!this.blocks.equals(that.blocks))
           return false;
       }
 
@@ -6013,179 +18378,246 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(reportBadBlocks_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      reportBadBlocks_args typedOther = (reportBadBlocks_args)other;
+
+      lastComparison = Boolean.valueOf(isSetBlocks()).compareTo(typedOther.isSetBlocks());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBlocks()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blocks, typedOther.blocks);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
-              this.path = new Pathname();
-              this.path.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case RECURSIVE:
-            if (field.type == TType.BOOL) {
-              this.recursive = iprot.readBool();
-              this.__isset.recursive = true;
+        switch (field.id) {
+          case 1: // BLOCKS
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
+                this.blocks = new ArrayList<TLocatedBlock>(_list24.size);
+                for (int _i25 = 0; _i25 < _list24.size; ++_i25)
+                {
+                  TLocatedBlock _elem26; // required
+                  _elem26 = new TLocatedBlock();
+                  _elem26.read(iprot);
+                  this.blocks.add(_elem26);
+                }
+                iprot.readListEnd();
+              }
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        this.path.write(oprot);
+      if (this.blocks != null) {
+        oprot.writeFieldBegin(BLOCKS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.blocks.size()));
+          for (TLocatedBlock _iter27 : this.blocks)
+          {
+            _iter27.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(RECURSIVE_FIELD_DESC);
-      oprot.writeBool(this.recursive);
-      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("rm_args(");
+      StringBuilder sb = new StringBuilder("reportBadBlocks_args(");
       boolean first = true;
 
-      sb.append("path:");
-      if (this.path == null) {
+      sb.append("blocks:");
+      if (this.blocks == null) {
         sb.append("null");
       } else {
-        sb.append(this.path);
+        sb.append(this.blocks);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("recursive:");
-      sb.append(this.recursive);
-      first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class rm_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("rm_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.BOOL, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class reportBadBlocks_result implements org.apache.thrift.TBase<reportBadBlocks_result, reportBadBlocks_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("reportBadBlocks_result");
 
-    public boolean success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean success = false;
-    }
+    public ThriftIOException ouch; // required
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.BOOL)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
 
-    static {
-      FieldMetaData.addStructMetaDataMap(rm_result.class, metaDataMap);
-    }
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
-    public rm_result() {
-    }
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
 
-    public rm_result(
-      boolean success,
-      ThriftIOException ouch)
-    {
-      this();
-      this.success = success;
-      this.__isset.success = true;
-      this.ouch = ouch;
-    }
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
 
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public rm_result(rm_result other) {
-      __isset.success = other.__isset.success;
-      this.success = other.success;
-      if (other.isSetOuch()) {
-        this.ouch = new ThriftIOException(other.ouch);
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
       }
     }
 
-    @Override
-    public rm_result clone() {
-      return new rm_result(this);
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(reportBadBlocks_result.class, metaDataMap);
     }
 
-    public boolean isSuccess() {
-      return this.success;
+    public reportBadBlocks_result() {
     }
 
-    public void setSuccess(boolean success) {
-      this.success = success;
-      this.__isset.success = true;
+    public reportBadBlocks_result(
+      ThriftIOException ouch)
+    {
+      this();
+      this.ouch = ouch;
     }
 
-    public void unsetSuccess() {
-      this.__isset.success = false;
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public reportBadBlocks_result(reportBadBlocks_result other) {
+      if (other.isSetOuch()) {
+        this.ouch = new ThriftIOException(other.ouch);
+      }
     }
 
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.__isset.success;
+    public reportBadBlocks_result deepCopy() {
+      return new reportBadBlocks_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      this.__isset.success = value;
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public reportBadBlocks_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -6196,16 +18628,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Boolean)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -6214,58 +18638,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return new Boolean(isSuccess());
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof rm_result)
-        return this.equals((rm_result)that);
+      if (that instanceof reportBadBlocks_result)
+        return this.equals((reportBadBlocks_result)that);
       return false;
     }
 
-    public boolean equals(rm_result that) {
+    public boolean equals(reportBadBlocks_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true;
-      boolean that_present_success = true;
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (this.success != that.success)
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -6283,54 +18693,64 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(reportBadBlocks_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      reportBadBlocks_result typedOther = (reportBadBlocks_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.BOOL) {
-              this.success = iprot.readBool();
-              this.__isset.success = true;
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeBool(this.success);
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -6341,13 +18761,9 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("rm_result(");
+      StringBuilder sb = new StringBuilder("reportBadBlocks_result(");
       boolean first = true;
 
-      sb.append("success:");
-      sb.append(this.success);
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -6359,192 +18775,147 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
     }
 
-  }
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
 
-  public static class rename_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("rename_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
-    private static final TField DEST_FIELD_DESC = new TField("dest", TType.STRUCT, (short)2);
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
 
-    public Pathname path;
-    public static final int PATH = 1;
-    public Pathname dest;
-    public static final int DEST = 2;
+  }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-    }
+  public static class getDataTransferProtocolVersion_args implements org.apache.thrift.TBase<getDataTransferProtocolVersion_args, getDataTransferProtocolVersion_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getDataTransferProtocolVersion_args");
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-      put(DEST, new FieldMetaData("dest", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-    }});
 
-    static {
-      FieldMetaData.addStructMetaDataMap(rename_args.class, metaDataMap);
-    }
 
-    public rename_args() {
-    }
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
 
-    public rename_args(
-      Pathname path,
-      Pathname dest)
-    {
-      this();
-      this.path = path;
-      this.dest = dest;
-    }
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public rename_args(rename_args other) {
-      if (other.isSetPath()) {
-        this.path = new Pathname(other.path);
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
       }
-      if (other.isSetDest()) {
-        this.dest = new Pathname(other.dest);
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          default:
+            return null;
+        }
       }
-    }
 
-    @Override
-    public rename_args clone() {
-      return new rename_args(this);
-    }
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
 
-    public Pathname getPath() {
-      return this.path;
-    }
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
 
-    public void setPath(Pathname path) {
-      this.path = path;
-    }
+      private final short _thriftId;
+      private final String _fieldName;
 
-    public void unsetPath() {
-      this.path = null;
-    }
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
-    }
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    public void setPathIsSet(boolean value) {
-      if (!value) {
-        this.path = null;
+      public String getFieldName() {
+        return _fieldName;
       }
     }
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getDataTransferProtocolVersion_args.class, metaDataMap);
+    }
 
-    public Pathname getDest() {
-      return this.dest;
+    public getDataTransferProtocolVersion_args() {
     }
 
-    public void setDest(Pathname dest) {
-      this.dest = dest;
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getDataTransferProtocolVersion_args(getDataTransferProtocolVersion_args other) {
     }
 
-    public void unsetDest() {
-      this.dest = null;
+    public getDataTransferProtocolVersion_args deepCopy() {
+      return new getDataTransferProtocolVersion_args(this);
     }
 
-    // Returns true if field dest is set (has been asigned a value) and false otherwise
-    public boolean isSetDest() {
-      return this.dest != null;
+    @Override
+    public void clear() {
     }
 
-    public void setDestIsSet(boolean value) {
-      if (!value) {
-        this.dest = null;
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PATH:
-        if (value == null) {
-          unsetPath();
-        } else {
-          setPath((Pathname)value);
-        }
-        break;
-
-      case DEST:
-        if (value == null) {
-          unsetDest();
-        } else {
-          setDest((Pathname)value);
-        }
-        break;
-
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       }
+      throw new IllegalStateException();
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return getPath();
-
-      case DEST:
-        return getDest();
-
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
       }
-    }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return isSetPath();
-      case DEST:
-        return isSetDest();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      switch (field) {
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof rename_args)
-        return this.equals((rename_args)that);
+      if (that instanceof getDataTransferProtocolVersion_args)
+        return this.equals((getDataTransferProtocolVersion_args)that);
       return false;
     }
 
-    public boolean equals(rename_args that) {
+    public boolean equals(getDataTransferProtocolVersion_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
-          return false;
-        if (!this.path.equals(that.path))
-          return false;
-      }
-
-      boolean this_present_dest = true && this.isSetDest();
-      boolean that_present_dest = true && that.isSetDest();
-      if (this_present_dest || that_present_dest) {
-        if (!(this_present_dest && that_present_dest))
-          return false;
-        if (!this.dest.equals(that.dest))
-          return false;
-      }
-
       return true;
     }
 
@@ -6553,185 +18924,239 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(getDataTransferProtocolVersion_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getDataTransferProtocolVersion_args typedOther = (getDataTransferProtocolVersion_args)other;
+
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
-              this.path = new Pathname();
-              this.path.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case DEST:
-            if (field.type == TType.STRUCT) {
-              this.dest = new Pathname();
-              this.dest.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
+        switch (field.id) {
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        this.path.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (this.dest != null) {
-        oprot.writeFieldBegin(DEST_FIELD_DESC);
-        this.dest.write(oprot);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("rename_args(");
+      StringBuilder sb = new StringBuilder("getDataTransferProtocolVersion_args(");
       boolean first = true;
 
-      sb.append("path:");
-      if (this.path == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.path);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("dest:");
-      if (this.dest == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.dest);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
-      // check for required fields
-      // check that fields of type enum have valid values
-    }
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class getDataTransferProtocolVersion_result implements org.apache.thrift.TBase<getDataTransferProtocolVersion_result, getDataTransferProtocolVersion_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getDataTransferProtocolVersion_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public int success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
 
-  }
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
 
-  public static class rename_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("rename_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.BOOL, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public boolean success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean success = false;
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.BOOL)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(rename_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getDataTransferProtocolVersion_result.class, metaDataMap);
     }
 
-    public rename_result() {
+    public getDataTransferProtocolVersion_result() {
     }
 
-    public rename_result(
-      boolean success,
+    public getDataTransferProtocolVersion_result(
+      int success,
       ThriftIOException ouch)
     {
       this();
       this.success = success;
-      this.__isset.success = true;
+      setSuccessIsSet(true);
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public rename_result(rename_result other) {
-      __isset.success = other.__isset.success;
+    public getDataTransferProtocolVersion_result(getDataTransferProtocolVersion_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
       this.success = other.success;
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
+    public getDataTransferProtocolVersion_result deepCopy() {
+      return new getDataTransferProtocolVersion_result(this);
+    }
+
     @Override
-    public rename_result clone() {
-      return new rename_result(this);
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = 0;
+      this.ouch = null;
     }
 
-    public boolean isSuccess() {
+    public int getSuccess() {
       return this.success;
     }
 
-    public void setSuccess(boolean success) {
+    public getDataTransferProtocolVersion_result setSuccess(int success) {
       this.success = success;
-      this.__isset.success = true;
+      setSuccessIsSet(true);
+      return this;
     }
 
     public void unsetSuccess() {
-      this.__isset.success = false;
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
     }
 
-    // Returns true if field success is set (has been asigned a value) and false otherwise
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return this.__isset.success;
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      this.__isset.success = value;
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public getDataTransferProtocolVersion_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -6742,13 +19167,13 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Boolean)value);
+          setSuccess((Integer)value);
         }
         break;
 
@@ -6760,46 +19185,46 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case SUCCESS:
-        return new Boolean(isSuccess());
+        return Integer.valueOf(getSuccess());
 
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case SUCCESS:
         return isSetSuccess();
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof rename_result)
-        return this.equals((rename_result)that);
+      if (that instanceof getDataTransferProtocolVersion_result)
+        return this.equals((getDataTransferProtocolVersion_result)that);
       return false;
     }
 
-    public boolean equals(rename_result that) {
+    public boolean equals(getDataTransferProtocolVersion_result that) {
       if (that == null)
         return false;
 
@@ -6829,52 +19254,84 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(getDataTransferProtocolVersion_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      getDataTransferProtocolVersion_result typedOther = (getDataTransferProtocolVersion_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.BOOL) {
-              this.success = iprot.readBool();
-              this.__isset.success = true;
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.I32) {
+              this.success = iprot.readI32();
+              setSuccessIsSet(true);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeBool(this.success);
+        oprot.writeI32(this.success);
         oprot.writeFieldEnd();
       } else if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
@@ -6887,7 +19344,7 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("rename_result(");
+      StringBuilder sb = new StringBuilder("getDataTransferProtocolVersion_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -6905,134 +19362,210 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class mkdirs_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("mkdirs_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
+  public static class renewLease_args implements org.apache.thrift.TBase<renewLease_args, renewLease_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("renewLease_args");
+
+    private static final org.apache.thrift.protocol.TField CLIENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("clientName", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+    public String clientName; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      CLIENT_NAME((short)1, "clientName");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // CLIENT_NAME
+            return CLIENT_NAME;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public Pathname path;
-    public static final int PATH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(mkdirs_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.CLIENT_NAME, new org.apache.thrift.meta_data.FieldMetaData("clientName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(renewLease_args.class, metaDataMap);
     }
 
-    public mkdirs_args() {
+    public renewLease_args() {
     }
 
-    public mkdirs_args(
-      Pathname path)
+    public renewLease_args(
+      String clientName)
     {
       this();
-      this.path = path;
+      this.clientName = clientName;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public mkdirs_args(mkdirs_args other) {
-      if (other.isSetPath()) {
-        this.path = new Pathname(other.path);
+    public renewLease_args(renewLease_args other) {
+      if (other.isSetClientName()) {
+        this.clientName = other.clientName;
       }
     }
 
+    public renewLease_args deepCopy() {
+      return new renewLease_args(this);
+    }
+
     @Override
-    public mkdirs_args clone() {
-      return new mkdirs_args(this);
+    public void clear() {
+      this.clientName = null;
     }
 
-    public Pathname getPath() {
-      return this.path;
+    public String getClientName() {
+      return this.clientName;
     }
 
-    public void setPath(Pathname path) {
-      this.path = path;
+    public renewLease_args setClientName(String clientName) {
+      this.clientName = clientName;
+      return this;
     }
 
-    public void unsetPath() {
-      this.path = null;
+    public void unsetClientName() {
+      this.clientName = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
+    /** Returns true if field clientName is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientName() {
+      return this.clientName != null;
     }
 
-    public void setPathIsSet(boolean value) {
+    public void setClientNameIsSet(boolean value) {
       if (!value) {
-        this.path = null;
+        this.clientName = null;
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PATH:
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case CLIENT_NAME:
         if (value == null) {
-          unsetPath();
+          unsetClientName();
         } else {
-          setPath((Pathname)value);
+          setClientName((String)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return getPath();
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case CLIENT_NAME:
+        return getClientName();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return isSetPath();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case CLIENT_NAME:
+        return isSetClientName();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof mkdirs_args)
-        return this.equals((mkdirs_args)that);
+      if (that instanceof renewLease_args)
+        return this.equals((renewLease_args)that);
       return false;
     }
 
-    public boolean equals(mkdirs_args that) {
+    public boolean equals(renewLease_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
+      boolean this_present_clientName = true && this.isSetClientName();
+      boolean that_present_clientName = true && that.isSetClientName();
+      if (this_present_clientName || that_present_clientName) {
+        if (!(this_present_clientName && that_present_clientName))
           return false;
-        if (!this.path.equals(that.path))
+        if (!this.clientName.equals(that.clientName))
           return false;
       }
 
@@ -7044,45 +19577,66 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(renewLease_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      renewLease_args typedOther = (renewLease_args)other;
+
+      lastComparison = Boolean.valueOf(isSetClientName()).compareTo(typedOther.isSetClientName());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientName, typedOther.clientName);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
-              this.path = new Pathname();
-              this.path.read(iprot);
+        switch (field.id) {
+          case 1: // CLIENT_NAME
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.clientName = iprot.readString();
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        this.path.write(oprot);
+      if (this.clientName != null) {
+        oprot.writeFieldBegin(CLIENT_NAME_FIELD_DESC);
+        oprot.writeString(this.clientName);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -7091,117 +19645,160 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("mkdirs_args(");
+      StringBuilder sb = new StringBuilder("renewLease_args(");
       boolean first = true;
 
-      sb.append("path:");
-      if (this.path == null) {
+      sb.append("clientName:");
+      if (this.clientName == null) {
         sb.append("null");
       } else {
-        sb.append(this.path);
+        sb.append(this.clientName);
       }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class mkdirs_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("mkdirs_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.BOOL, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class renewLease_result implements org.apache.thrift.TBase<renewLease_result, renewLease_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("renewLease_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
 
-    public boolean success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean success = false;
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.BOOL)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(mkdirs_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(renewLease_result.class, metaDataMap);
     }
 
-    public mkdirs_result() {
+    public renewLease_result() {
     }
 
-    public mkdirs_result(
-      boolean success,
+    public renewLease_result(
       ThriftIOException ouch)
     {
       this();
-      this.success = success;
-      this.__isset.success = true;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public mkdirs_result(mkdirs_result other) {
-      __isset.success = other.__isset.success;
-      this.success = other.success;
+    public renewLease_result(renewLease_result other) {
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
-    @Override
-    public mkdirs_result clone() {
-      return new mkdirs_result(this);
-    }
-
-    public boolean isSuccess() {
-      return this.success;
-    }
-
-    public void setSuccess(boolean success) {
-      this.success = success;
-      this.__isset.success = true;
-    }
-
-    public void unsetSuccess() {
-      this.__isset.success = false;
-    }
-
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.__isset.success;
+    public renewLease_result deepCopy() {
+      return new renewLease_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      this.__isset.success = value;
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public renewLease_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -7212,16 +19809,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Boolean)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -7230,58 +19819,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return new Boolean(isSuccess());
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof mkdirs_result)
-        return this.equals((mkdirs_result)that);
+      if (that instanceof renewLease_result)
+        return this.equals((renewLease_result)that);
       return false;
     }
 
-    public boolean equals(mkdirs_result that) {
+    public boolean equals(renewLease_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true;
-      boolean that_present_success = true;
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (this.success != that.success)
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -7299,54 +19874,64 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(renewLease_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      renewLease_result typedOther = (renewLease_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.BOOL) {
-              this.success = iprot.readBool();
-              this.__isset.success = true;
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeBool(this.success);
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -7357,88 +19942,173 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("mkdirs_result(");
+      StringBuilder sb = new StringBuilder("renewLease_result(");
       boolean first = true;
 
-      sb.append("success:");
-      sb.append(this.success);
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
       } else {
         sb.append(this.ouch);
       }
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class recoverLease_args implements org.apache.thrift.TBase<recoverLease_args, recoverLease_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("recoverLease_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CLIENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("clientName", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+    public Pathname path; // required
+    public String clientName; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      CLIENT_NAME((short)2, "clientName");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
 
-    public void validate() throws TException {
-      // check for required fields
-      // check that fields of type enum have valid values
-    }
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // CLIENT_NAME
+            return CLIENT_NAME;
+          default:
+            return null;
+        }
+      }
 
-  }
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
 
-  public static class exists_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("exists_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public Pathname path;
-    public static final int PATH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(exists_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.CLIENT_NAME, new org.apache.thrift.meta_data.FieldMetaData("clientName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(recoverLease_args.class, metaDataMap);
     }
 
-    public exists_args() {
+    public recoverLease_args() {
     }
 
-    public exists_args(
-      Pathname path)
+    public recoverLease_args(
+      Pathname path,
+      String clientName)
     {
       this();
       this.path = path;
+      this.clientName = clientName;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public exists_args(exists_args other) {
+    public recoverLease_args(recoverLease_args other) {
       if (other.isSetPath()) {
         this.path = new Pathname(other.path);
       }
+      if (other.isSetClientName()) {
+        this.clientName = other.clientName;
+      }
+    }
+
+    public recoverLease_args deepCopy() {
+      return new recoverLease_args(this);
     }
 
     @Override
-    public exists_args clone() {
-      return new exists_args(this);
+    public void clear() {
+      this.path = null;
+      this.clientName = null;
     }
 
     public Pathname getPath() {
       return this.path;
     }
 
-    public void setPath(Pathname path) {
+    public recoverLease_args setPath(Pathname path) {
       this.path = path;
+      return this;
     }
 
     public void unsetPath() {
       this.path = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
     public boolean isSetPath() {
       return this.path != null;
     }
@@ -7449,8 +20119,32 @@ public void setPathIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public String getClientName() {
+      return this.clientName;
+    }
+
+    public recoverLease_args setClientName(String clientName) {
+      this.clientName = clientName;
+      return this;
+    }
+
+    public void unsetClientName() {
+      this.clientName = null;
+    }
+
+    /** Returns true if field clientName is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientName() {
+      return this.clientName != null;
+    }
+
+    public void setClientNameIsSet(boolean value) {
+      if (!value) {
+        this.clientName = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case PATH:
         if (value == null) {
           unsetPath();
@@ -7459,41 +20153,54 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case CLIENT_NAME:
+        if (value == null) {
+          unsetClientName();
+        } else {
+          setClientName((String)value);
+        }
+        break;
+
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case PATH:
         return getPath();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case CLIENT_NAME:
+        return getClientName();
+
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case PATH:
         return isSetPath();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case CLIENT_NAME:
+        return isSetClientName();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof exists_args)
-        return this.equals((exists_args)that);
+      if (that instanceof recoverLease_args)
+        return this.equals((recoverLease_args)that);
       return false;
     }
 
-    public boolean equals(exists_args that) {
+    public boolean equals(recoverLease_args that) {
       if (that == null)
         return false;
 
@@ -7506,6 +20213,15 @@ public boolean equals(exists_args that) {
           return false;
       }
 
+      boolean this_present_clientName = true && this.isSetClientName();
+      boolean that_present_clientName = true && that.isSetClientName();
+      if (this_present_clientName || that_present_clientName) {
+        if (!(this_present_clientName && that_present_clientName))
+          return false;
+        if (!this.clientName.equals(that.clientName))
+          return false;
+      }
+
       return true;
     }
 
@@ -7514,39 +20230,78 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(recoverLease_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      recoverLease_args typedOther = (recoverLease_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientName()).compareTo(typedOther.isSetClientName());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientName, typedOther.clientName);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.path = new Pathname();
               this.path.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 2: // CLIENT_NAME
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.clientName = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -7555,13 +20310,18 @@ public void write(TProtocol oprot) throws TException {
         this.path.write(oprot);
         oprot.writeFieldEnd();
       }
+      if (this.clientName != null) {
+        oprot.writeFieldBegin(CLIENT_NAME_FIELD_DESC);
+        oprot.writeString(this.clientName);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("exists_args(");
+      StringBuilder sb = new StringBuilder("recoverLease_args(");
       boolean first = true;
 
       sb.append("path:");
@@ -7571,107 +20331,158 @@ public String toString() {
         sb.append(this.path);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("clientName:");
+      if (this.clientName == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.clientName);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class exists_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("exists_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.BOOL, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class recoverLease_result implements org.apache.thrift.TBase<recoverLease_result, recoverLease_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("recoverLease_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public boolean success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean success = false;
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.BOOL)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(exists_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(recoverLease_result.class, metaDataMap);
     }
 
-    public exists_result() {
+    public recoverLease_result() {
     }
 
-    public exists_result(
-      boolean success,
+    public recoverLease_result(
       ThriftIOException ouch)
     {
       this();
-      this.success = success;
-      this.__isset.success = true;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public exists_result(exists_result other) {
-      __isset.success = other.__isset.success;
-      this.success = other.success;
+    public recoverLease_result(recoverLease_result other) {
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
-    @Override
-    public exists_result clone() {
-      return new exists_result(this);
-    }
-
-    public boolean isSuccess() {
-      return this.success;
-    }
-
-    public void setSuccess(boolean success) {
-      this.success = success;
-      this.__isset.success = true;
-    }
-
-    public void unsetSuccess() {
-      this.__isset.success = false;
-    }
-
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.__isset.success;
+    public recoverLease_result deepCopy() {
+      return new recoverLease_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      this.__isset.success = value;
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public recoverLease_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -7682,16 +20493,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Boolean)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -7700,58 +20503,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return new Boolean(isSuccess());
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof exists_result)
-        return this.equals((exists_result)that);
+      if (that instanceof recoverLease_result)
+        return this.equals((recoverLease_result)that);
       return false;
     }
 
-    public boolean equals(exists_result that) {
+    public boolean equals(recoverLease_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true;
-      boolean that_present_success = true;
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (this.success != that.success)
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -7769,54 +20558,64 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(recoverLease_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      recoverLease_result typedOther = (recoverLease_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.BOOL) {
-              this.success = iprot.readBool();
-              this.__isset.success = true;
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeBool(this.success);
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -7827,13 +20626,9 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("exists_result(");
+      StringBuilder sb = new StringBuilder("recoverLease_result(");
       boolean first = true;
 
-      sb.append("success:");
-      sb.append(this.success);
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -7845,82 +20640,235 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class stat_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("stat_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
+  public static class closeRecoverLease_args implements org.apache.thrift.TBase<closeRecoverLease_args, closeRecoverLease_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("closeRecoverLease_args");
+
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CLIENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("clientName", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField DISCARD_LAST_BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("discardLastBlock", org.apache.thrift.protocol.TType.BOOL, (short)3);
+
+    public Pathname path; // required
+    public String clientName; // required
+    public boolean discardLastBlock; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATH((short)1, "path"),
+      CLIENT_NAME((short)2, "clientName"),
+      DISCARD_LAST_BLOCK((short)3, "discardLastBlock");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATH
+            return PATH;
+          case 2: // CLIENT_NAME
+            return CLIENT_NAME;
+          case 3: // DISCARD_LAST_BLOCK
+            return DISCARD_LAST_BLOCK;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public Pathname path;
-    public static final int PATH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-    }});
+    // isset id assignments
+    private static final int __DISCARDLASTBLOCK_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(stat_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.CLIENT_NAME, new org.apache.thrift.meta_data.FieldMetaData("clientName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.DISCARD_LAST_BLOCK, new org.apache.thrift.meta_data.FieldMetaData("discardLastBlock", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(closeRecoverLease_args.class, metaDataMap);
     }
 
-    public stat_args() {
+    public closeRecoverLease_args() {
     }
 
-    public stat_args(
-      Pathname path)
+    public closeRecoverLease_args(
+      Pathname path,
+      String clientName,
+      boolean discardLastBlock)
     {
       this();
       this.path = path;
+      this.clientName = clientName;
+      this.discardLastBlock = discardLastBlock;
+      setDiscardLastBlockIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public stat_args(stat_args other) {
+    public closeRecoverLease_args(closeRecoverLease_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
       if (other.isSetPath()) {
         this.path = new Pathname(other.path);
       }
+      if (other.isSetClientName()) {
+        this.clientName = other.clientName;
+      }
+      this.discardLastBlock = other.discardLastBlock;
+    }
+
+    public closeRecoverLease_args deepCopy() {
+      return new closeRecoverLease_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.path = null;
+      this.clientName = null;
+      setDiscardLastBlockIsSet(false);
+      this.discardLastBlock = false;
+    }
+
+    public Pathname getPath() {
+      return this.path;
+    }
+
+    public closeRecoverLease_args setPath(Pathname path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
+      }
+    }
+
+    public String getClientName() {
+      return this.clientName;
+    }
+
+    public closeRecoverLease_args setClientName(String clientName) {
+      this.clientName = clientName;
+      return this;
+    }
+
+    public void unsetClientName() {
+      this.clientName = null;
+    }
+
+    /** Returns true if field clientName is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientName() {
+      return this.clientName != null;
     }
 
-    @Override
-    public stat_args clone() {
-      return new stat_args(this);
+    public void setClientNameIsSet(boolean value) {
+      if (!value) {
+        this.clientName = null;
+      }
     }
 
-    public Pathname getPath() {
-      return this.path;
+    public boolean isDiscardLastBlock() {
+      return this.discardLastBlock;
     }
 
-    public void setPath(Pathname path) {
-      this.path = path;
+    public closeRecoverLease_args setDiscardLastBlock(boolean discardLastBlock) {
+      this.discardLastBlock = discardLastBlock;
+      setDiscardLastBlockIsSet(true);
+      return this;
     }
 
-    public void unsetPath() {
-      this.path = null;
+    public void unsetDiscardLastBlock() {
+      __isset_bit_vector.clear(__DISCARDLASTBLOCK_ISSET_ID);
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
+    /** Returns true if field discardLastBlock is set (has been assigned a value) and false otherwise */
+    public boolean isSetDiscardLastBlock() {
+      return __isset_bit_vector.get(__DISCARDLASTBLOCK_ISSET_ID);
     }
 
-    public void setPathIsSet(boolean value) {
-      if (!value) {
-        this.path = null;
-      }
+    public void setDiscardLastBlockIsSet(boolean value) {
+      __isset_bit_vector.set(__DISCARDLASTBLOCK_ISSET_ID, value);
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case PATH:
         if (value == null) {
           unsetPath();
@@ -7929,41 +20877,67 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case CLIENT_NAME:
+        if (value == null) {
+          unsetClientName();
+        } else {
+          setClientName((String)value);
+        }
+        break;
+
+      case DISCARD_LAST_BLOCK:
+        if (value == null) {
+          unsetDiscardLastBlock();
+        } else {
+          setDiscardLastBlock((Boolean)value);
+        }
+        break;
+
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case PATH:
         return getPath();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case CLIENT_NAME:
+        return getClientName();
+
+      case DISCARD_LAST_BLOCK:
+        return Boolean.valueOf(isDiscardLastBlock());
+
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case PATH:
         return isSetPath();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+      case CLIENT_NAME:
+        return isSetClientName();
+      case DISCARD_LAST_BLOCK:
+        return isSetDiscardLastBlock();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof stat_args)
-        return this.equals((stat_args)that);
+      if (that instanceof closeRecoverLease_args)
+        return this.equals((closeRecoverLease_args)that);
       return false;
     }
 
-    public boolean equals(stat_args that) {
+    public boolean equals(closeRecoverLease_args that) {
       if (that == null)
         return false;
 
@@ -7976,6 +20950,24 @@ public boolean equals(stat_args that) {
           return false;
       }
 
+      boolean this_present_clientName = true && this.isSetClientName();
+      boolean that_present_clientName = true && that.isSetClientName();
+      if (this_present_clientName || that_present_clientName) {
+        if (!(this_present_clientName && that_present_clientName))
+          return false;
+        if (!this.clientName.equals(that.clientName))
+          return false;
+      }
+
+      boolean this_present_discardLastBlock = true;
+      boolean that_present_discardLastBlock = true;
+      if (this_present_discardLastBlock || that_present_discardLastBlock) {
+        if (!(this_present_discardLastBlock && that_present_discardLastBlock))
+          return false;
+        if (this.discardLastBlock != that.discardLastBlock)
+          return false;
+      }
+
       return true;
     }
 
@@ -7984,39 +20976,96 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(closeRecoverLease_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      closeRecoverLease_args typedOther = (closeRecoverLease_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(typedOther.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, typedOther.path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientName()).compareTo(typedOther.isSetClientName());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientName, typedOther.clientName);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetDiscardLastBlock()).compareTo(typedOther.isSetDiscardLastBlock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetDiscardLastBlock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.discardLastBlock, typedOther.discardLastBlock);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // PATH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.path = new Pathname();
               this.path.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 2: // CLIENT_NAME
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.clientName = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 3: // DISCARD_LAST_BLOCK
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.discardLastBlock = iprot.readBool();
+              setDiscardLastBlockIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -8025,13 +21074,21 @@ public void write(TProtocol oprot) throws TException {
         this.path.write(oprot);
         oprot.writeFieldEnd();
       }
+      if (this.clientName != null) {
+        oprot.writeFieldBegin(CLIENT_NAME_FIELD_DESC);
+        oprot.writeString(this.clientName);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(DISCARD_LAST_BLOCK_FIELD_DESC);
+      oprot.writeBool(this.discardLastBlock);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("stat_args(");
+      StringBuilder sb = new StringBuilder("closeRecoverLease_args(");
       boolean first = true;
 
       sb.append("path:");
@@ -8041,107 +21098,164 @@ public String toString() {
         sb.append(this.path);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("clientName:");
+      if (this.clientName == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.clientName);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("discardLastBlock:");
+      sb.append(this.discardLastBlock);
+      first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class stat_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("stat_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class closeRecoverLease_result implements org.apache.thrift.TBase<closeRecoverLease_result, closeRecoverLease_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("closeRecoverLease_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public FileStatus success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, FileStatus.class)));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(stat_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(closeRecoverLease_result.class, metaDataMap);
     }
 
-    public stat_result() {
+    public closeRecoverLease_result() {
     }
 
-    public stat_result(
-      FileStatus success,
+    public closeRecoverLease_result(
       ThriftIOException ouch)
     {
       this();
-      this.success = success;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public stat_result(stat_result other) {
-      if (other.isSetSuccess()) {
-        this.success = new FileStatus(other.success);
-      }
+    public closeRecoverLease_result(closeRecoverLease_result other) {
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
-    @Override
-    public stat_result clone() {
-      return new stat_result(this);
-    }
-
-    public FileStatus getSuccess() {
-      return this.success;
-    }
-
-    public void setSuccess(FileStatus success) {
-      this.success = success;
-    }
-
-    public void unsetSuccess() {
-      this.success = null;
-    }
-
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.success != null;
+    public closeRecoverLease_result deepCopy() {
+      return new closeRecoverLease_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public closeRecoverLease_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -8152,16 +21266,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((FileStatus)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -8170,58 +21276,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return getSuccess();
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof stat_result)
-        return this.equals((stat_result)that);
+      if (that instanceof closeRecoverLease_result)
+        return this.equals((closeRecoverLease_result)that);
       return false;
     }
 
-    public boolean equals(stat_result that) {
+    public boolean equals(closeRecoverLease_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (!this.success.equals(that.success))
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -8239,54 +21331,64 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(closeRecoverLease_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      closeRecoverLease_result typedOther = (closeRecoverLease_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.STRUCT) {
-              this.success = new FileStatus();
-              this.success.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        this.success.write(oprot);
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -8297,17 +21399,9 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("stat_result(");
+      StringBuilder sb = new StringBuilder("closeRecoverLease_result(");
       boolean first = true;
 
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -8319,134 +21413,328 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class listStatus_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("listStatus_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
+  public static class abandonBlock_args implements org.apache.thrift.TBase<abandonBlock_args, abandonBlock_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abandonBlock_args");
+
+    private static final org.apache.thrift.protocol.TField BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("block", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField PATHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("pathname", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField CLIENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("clientName", org.apache.thrift.protocol.TType.STRING, (short)3);
+
+    public TBlock block; // required
+    public Pathname pathname; // required
+    public String clientName; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      BLOCK((short)1, "block"),
+      PATHNAME((short)2, "pathname"),
+      CLIENT_NAME((short)3, "clientName");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // BLOCK
+            return BLOCK;
+          case 2: // PATHNAME
+            return PATHNAME;
+          case 3: // CLIENT_NAME
+            return CLIENT_NAME;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public Pathname path;
-    public static final int PATH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(listStatus_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.BLOCK, new org.apache.thrift.meta_data.FieldMetaData("block", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TBlock.class)));
+      tmpMap.put(_Fields.PATHNAME, new org.apache.thrift.meta_data.FieldMetaData("pathname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.CLIENT_NAME, new org.apache.thrift.meta_data.FieldMetaData("clientName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abandonBlock_args.class, metaDataMap);
     }
 
-    public listStatus_args() {
+    public abandonBlock_args() {
     }
 
-    public listStatus_args(
-      Pathname path)
+    public abandonBlock_args(
+      TBlock block,
+      Pathname pathname,
+      String clientName)
     {
       this();
-      this.path = path;
+      this.block = block;
+      this.pathname = pathname;
+      this.clientName = clientName;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public abandonBlock_args(abandonBlock_args other) {
+      if (other.isSetBlock()) {
+        this.block = new TBlock(other.block);
+      }
+      if (other.isSetPathname()) {
+        this.pathname = new Pathname(other.pathname);
+      }
+      if (other.isSetClientName()) {
+        this.clientName = other.clientName;
+      }
+    }
+
+    public abandonBlock_args deepCopy() {
+      return new abandonBlock_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.block = null;
+      this.pathname = null;
+      this.clientName = null;
+    }
+
+    public TBlock getBlock() {
+      return this.block;
+    }
+
+    public abandonBlock_args setBlock(TBlock block) {
+      this.block = block;
+      return this;
+    }
+
+    public void unsetBlock() {
+      this.block = null;
+    }
+
+    /** Returns true if field block is set (has been assigned a value) and false otherwise */
+    public boolean isSetBlock() {
+      return this.block != null;
+    }
+
+    public void setBlockIsSet(boolean value) {
+      if (!value) {
+        this.block = null;
+      }
+    }
+
+    public Pathname getPathname() {
+      return this.pathname;
+    }
+
+    public abandonBlock_args setPathname(Pathname pathname) {
+      this.pathname = pathname;
+      return this;
+    }
+
+    public void unsetPathname() {
+      this.pathname = null;
     }
 
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public listStatus_args(listStatus_args other) {
-      if (other.isSetPath()) {
-        this.path = new Pathname(other.path);
-      }
+    /** Returns true if field pathname is set (has been assigned a value) and false otherwise */
+    public boolean isSetPathname() {
+      return this.pathname != null;
     }
 
-    @Override
-    public listStatus_args clone() {
-      return new listStatus_args(this);
+    public void setPathnameIsSet(boolean value) {
+      if (!value) {
+        this.pathname = null;
+      }
     }
 
-    public Pathname getPath() {
-      return this.path;
+    public String getClientName() {
+      return this.clientName;
     }
 
-    public void setPath(Pathname path) {
-      this.path = path;
+    public abandonBlock_args setClientName(String clientName) {
+      this.clientName = clientName;
+      return this;
     }
 
-    public void unsetPath() {
-      this.path = null;
+    public void unsetClientName() {
+      this.clientName = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
+    /** Returns true if field clientName is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientName() {
+      return this.clientName != null;
     }
 
-    public void setPathIsSet(boolean value) {
+    public void setClientNameIsSet(boolean value) {
       if (!value) {
-        this.path = null;
+        this.clientName = null;
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PATH:
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case BLOCK:
         if (value == null) {
-          unsetPath();
+          unsetBlock();
         } else {
-          setPath((Pathname)value);
+          setBlock((TBlock)value);
+        }
+        break;
+
+      case PATHNAME:
+        if (value == null) {
+          unsetPathname();
+        } else {
+          setPathname((Pathname)value);
+        }
+        break;
+
+      case CLIENT_NAME:
+        if (value == null) {
+          unsetClientName();
+        } else {
+          setClientName((String)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return getPath();
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case BLOCK:
+        return getBlock();
+
+      case PATHNAME:
+        return getPathname();
+
+      case CLIENT_NAME:
+        return getClientName();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return isSetPath();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case BLOCK:
+        return isSetBlock();
+      case PATHNAME:
+        return isSetPathname();
+      case CLIENT_NAME:
+        return isSetClientName();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof listStatus_args)
-        return this.equals((listStatus_args)that);
+      if (that instanceof abandonBlock_args)
+        return this.equals((abandonBlock_args)that);
       return false;
     }
 
-    public boolean equals(listStatus_args that) {
+    public boolean equals(abandonBlock_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
+      boolean this_present_block = true && this.isSetBlock();
+      boolean that_present_block = true && that.isSetBlock();
+      if (this_present_block || that_present_block) {
+        if (!(this_present_block && that_present_block))
           return false;
-        if (!this.path.equals(that.path))
+        if (!this.block.equals(that.block))
+          return false;
+      }
+
+      boolean this_present_pathname = true && this.isSetPathname();
+      boolean that_present_pathname = true && that.isSetPathname();
+      if (this_present_pathname || that_present_pathname) {
+        if (!(this_present_pathname && that_present_pathname))
+          return false;
+        if (!this.pathname.equals(that.pathname))
+          return false;
+      }
+
+      boolean this_present_clientName = true && this.isSetClientName();
+      boolean that_present_clientName = true && that.isSetClientName();
+      if (this_present_clientName || that_present_clientName) {
+        if (!(this_present_clientName && that_present_clientName))
+          return false;
+        if (!this.clientName.equals(that.clientName))
           return false;
       }
 
@@ -8458,45 +21746,112 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(abandonBlock_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      abandonBlock_args typedOther = (abandonBlock_args)other;
+
+      lastComparison = Boolean.valueOf(isSetBlock()).compareTo(typedOther.isSetBlock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBlock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.block, typedOther.block);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetPathname()).compareTo(typedOther.isSetPathname());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPathname()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.pathname, typedOther.pathname);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientName()).compareTo(typedOther.isSetClientName());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientName, typedOther.clientName);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
-              this.path = new Pathname();
-              this.path.read(iprot);
+        switch (field.id) {
+          case 1: // BLOCK
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.block = new TBlock();
+              this.block.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 2: // PATHNAME
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.pathname = new Pathname();
+              this.pathname.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          case 3: // CLIENT_NAME
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.clientName = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        this.path.write(oprot);
+      if (this.block != null) {
+        oprot.writeFieldBegin(BLOCK_FIELD_DESC);
+        this.block.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.pathname != null) {
+        oprot.writeFieldBegin(PATHNAME_FIELD_DESC);
+        this.pathname.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.clientName != null) {
+        oprot.writeFieldBegin(CLIENT_NAME_FIELD_DESC);
+        oprot.writeString(this.clientName);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -8505,137 +21860,176 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("listStatus_args(");
+      StringBuilder sb = new StringBuilder("abandonBlock_args(");
       boolean first = true;
 
-      sb.append("path:");
-      if (this.path == null) {
+      sb.append("block:");
+      if (this.block == null) {
         sb.append("null");
       } else {
-        sb.append(this.path);
+        sb.append(this.block);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("pathname:");
+      if (this.pathname == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.pathname);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("clientName:");
+      if (this.clientName == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.clientName);
       }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class listStatus_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("listStatus_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class abandonBlock_result implements org.apache.thrift.TBase<abandonBlock_result, abandonBlock_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abandonBlock_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
 
-    public List<FileStatus> success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new ListMetaData(TType.LIST, 
-              new StructMetaData(TType.STRUCT, FileStatus.class))));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(listStatus_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abandonBlock_result.class, metaDataMap);
     }
 
-    public listStatus_result() {
+    public abandonBlock_result() {
     }
 
-    public listStatus_result(
-      List<FileStatus> success,
+    public abandonBlock_result(
       ThriftIOException ouch)
     {
       this();
-      this.success = success;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public listStatus_result(listStatus_result other) {
-      if (other.isSetSuccess()) {
-        List<FileStatus> __this__success = new ArrayList<FileStatus>();
-        for (FileStatus other_element : other.success) {
-          __this__success.add(new FileStatus(other_element));
-        }
-        this.success = __this__success;
-      }
+    public abandonBlock_result(abandonBlock_result other) {
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
-    @Override
-    public listStatus_result clone() {
-      return new listStatus_result(this);
-    }
-
-    public int getSuccessSize() {
-      return (this.success == null) ? 0 : this.success.size();
-    }
-
-    public java.util.Iterator<FileStatus> getSuccessIterator() {
-      return (this.success == null) ? null : this.success.iterator();
-    }
-
-    public void addToSuccess(FileStatus elem) {
-      if (this.success == null) {
-        this.success = new ArrayList<FileStatus>();
-      }
-      this.success.add(elem);
-    }
-
-    public List<FileStatus> getSuccess() {
-      return this.success;
-    }
-
-    public void setSuccess(List<FileStatus> success) {
-      this.success = success;
-    }
-
-    public void unsetSuccess() {
-      this.success = null;
-    }
-
-    // Returns true if field success is set (has been asigned a value) and false otherwise
-    public boolean isSetSuccess() {
-      return this.success != null;
+    public abandonBlock_result deepCopy() {
+      return new abandonBlock_result(this);
     }
 
-    public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+    @Override
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public abandonBlock_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -8646,16 +22040,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((List<FileStatus>)value);
-        }
-        break;
-
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -8664,58 +22050,44 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return getSuccess();
-
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case SUCCESS:
-        return isSetSuccess();
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof listStatus_result)
-        return this.equals((listStatus_result)that);
+      if (that instanceof abandonBlock_result)
+        return this.equals((abandonBlock_result)that);
       return false;
     }
 
-    public boolean equals(listStatus_result that) {
+    public boolean equals(abandonBlock_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (!this.success.equals(that.success))
-          return false;
-      }
-
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -8733,91 +22105,77 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(abandonBlock_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      abandonBlock_result typedOther = (abandonBlock_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.LIST) {
-              {
-                TList _list8 = iprot.readListBegin();
-                this.success = new ArrayList<FileStatus>(_list8.size);
-                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
-                {
-                  FileStatus _elem10;
-                  _elem10 = new FileStatus();
-                  _elem10.read(iprot);
-                  this.success.add(_elem10);
-                }
-                iprot.readListEnd();
-              }
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
-          for (FileStatus _iter11 : this.success)          {
-            _iter11.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      } else if (this.isSetOuch()) {
+      if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("listStatus_result(");
-      boolean first = true;
-
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
-      first = false;
-      if (!first) sb.append(", ");
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("abandonBlock_result(");
+      boolean first = true;
+
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -8829,189 +22187,269 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class chmod_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("chmod_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
-    private static final TField MODE_FIELD_DESC = new TField("mode", TType.I16, (short)2);
+  public static class abandonFile_args implements org.apache.thrift.TBase<abandonFile_args, abandonFile_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abandonFile_args");
+
+    private static final org.apache.thrift.protocol.TField PATHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("pathname", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CLIENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("clientName", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+    public Pathname pathname; // required
+    public String clientName; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATHNAME((short)1, "pathname"),
+      CLIENT_NAME((short)2, "clientName");
 
-    public Pathname path;
-    public static final int PATH = 1;
-    public short mode;
-    public static final int MODE = 2;
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATHNAME
+            return PATHNAME;
+          case 2: // CLIENT_NAME
+            return CLIENT_NAME;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean mode = false;
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-      put(MODE, new FieldMetaData("mode", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I16)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(chmod_args.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATHNAME, new org.apache.thrift.meta_data.FieldMetaData("pathname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.CLIENT_NAME, new org.apache.thrift.meta_data.FieldMetaData("clientName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abandonFile_args.class, metaDataMap);
     }
 
-    public chmod_args() {
+    public abandonFile_args() {
     }
 
-    public chmod_args(
-      Pathname path,
-      short mode)
+    public abandonFile_args(
+      Pathname pathname,
+      String clientName)
     {
       this();
-      this.path = path;
-      this.mode = mode;
-      this.__isset.mode = true;
+      this.pathname = pathname;
+      this.clientName = clientName;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public chmod_args(chmod_args other) {
-      if (other.isSetPath()) {
-        this.path = new Pathname(other.path);
+    public abandonFile_args(abandonFile_args other) {
+      if (other.isSetPathname()) {
+        this.pathname = new Pathname(other.pathname);
+      }
+      if (other.isSetClientName()) {
+        this.clientName = other.clientName;
       }
-      __isset.mode = other.__isset.mode;
-      this.mode = other.mode;
+    }
+
+    public abandonFile_args deepCopy() {
+      return new abandonFile_args(this);
     }
 
     @Override
-    public chmod_args clone() {
-      return new chmod_args(this);
+    public void clear() {
+      this.pathname = null;
+      this.clientName = null;
     }
 
-    public Pathname getPath() {
-      return this.path;
+    public Pathname getPathname() {
+      return this.pathname;
     }
 
-    public void setPath(Pathname path) {
-      this.path = path;
+    public abandonFile_args setPathname(Pathname pathname) {
+      this.pathname = pathname;
+      return this;
     }
 
-    public void unsetPath() {
-      this.path = null;
+    public void unsetPathname() {
+      this.pathname = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
+    /** Returns true if field pathname is set (has been assigned a value) and false otherwise */
+    public boolean isSetPathname() {
+      return this.pathname != null;
     }
 
-    public void setPathIsSet(boolean value) {
+    public void setPathnameIsSet(boolean value) {
       if (!value) {
-        this.path = null;
+        this.pathname = null;
       }
     }
 
-    public short getMode() {
-      return this.mode;
+    public String getClientName() {
+      return this.clientName;
     }
 
-    public void setMode(short mode) {
-      this.mode = mode;
-      this.__isset.mode = true;
+    public abandonFile_args setClientName(String clientName) {
+      this.clientName = clientName;
+      return this;
     }
 
-    public void unsetMode() {
-      this.__isset.mode = false;
+    public void unsetClientName() {
+      this.clientName = null;
     }
 
-    // Returns true if field mode is set (has been asigned a value) and false otherwise
-    public boolean isSetMode() {
-      return this.__isset.mode;
+    /** Returns true if field clientName is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientName() {
+      return this.clientName != null;
     }
 
-    public void setModeIsSet(boolean value) {
-      this.__isset.mode = value;
+    public void setClientNameIsSet(boolean value) {
+      if (!value) {
+        this.clientName = null;
+      }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PATH:
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATHNAME:
         if (value == null) {
-          unsetPath();
+          unsetPathname();
         } else {
-          setPath((Pathname)value);
+          setPathname((Pathname)value);
         }
         break;
 
-      case MODE:
+      case CLIENT_NAME:
         if (value == null) {
-          unsetMode();
+          unsetClientName();
         } else {
-          setMode((Short)value);
+          setClientName((String)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return getPath();
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATHNAME:
+        return getPathname();
 
-      case MODE:
-        return new Short(getMode());
+      case CLIENT_NAME:
+        return getClientName();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return isSetPath();
-      case MODE:
-        return isSetMode();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATHNAME:
+        return isSetPathname();
+      case CLIENT_NAME:
+        return isSetClientName();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof chmod_args)
-        return this.equals((chmod_args)that);
+      if (that instanceof abandonFile_args)
+        return this.equals((abandonFile_args)that);
       return false;
     }
 
-    public boolean equals(chmod_args that) {
+    public boolean equals(abandonFile_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
+      boolean this_present_pathname = true && this.isSetPathname();
+      boolean that_present_pathname = true && that.isSetPathname();
+      if (this_present_pathname || that_present_pathname) {
+        if (!(this_present_pathname && that_present_pathname))
           return false;
-        if (!this.path.equals(that.path))
+        if (!this.pathname.equals(that.pathname))
           return false;
       }
 
-      boolean this_present_mode = true;
-      boolean that_present_mode = true;
-      if (this_present_mode || that_present_mode) {
-        if (!(this_present_mode && that_present_mode))
+      boolean this_present_clientName = true && this.isSetClientName();
+      boolean that_present_clientName = true && that.isSetClientName();
+      if (this_present_clientName || that_present_clientName) {
+        if (!(this_present_clientName && that_present_clientName))
           return false;
-        if (this.mode != that.mode)
+        if (!this.clientName.equals(that.clientName))
           return false;
       }
 
@@ -9023,113 +22461,221 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(abandonFile_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      abandonFile_args typedOther = (abandonFile_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPathname()).compareTo(typedOther.isSetPathname());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPathname()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.pathname, typedOther.pathname);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientName()).compareTo(typedOther.isSetClientName());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientName, typedOther.clientName);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
-              this.path = new Pathname();
-              this.path.read(iprot);
+        switch (field.id) {
+          case 1: // PATHNAME
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.pathname = new Pathname();
+              this.pathname.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case MODE:
-            if (field.type == TType.I16) {
-              this.mode = iprot.readI16();
-              this.__isset.mode = true;
+          case 2: // CLIENT_NAME
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.clientName = iprot.readString();
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        this.path.write(oprot);
+      if (this.pathname != null) {
+        oprot.writeFieldBegin(PATHNAME_FIELD_DESC);
+        this.pathname.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.clientName != null) {
+        oprot.writeFieldBegin(CLIENT_NAME_FIELD_DESC);
+        oprot.writeString(this.clientName);
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(MODE_FIELD_DESC);
-      oprot.writeI16(this.mode);
-      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("chmod_args(");
+      StringBuilder sb = new StringBuilder("abandonFile_args(");
       boolean first = true;
 
-      sb.append("path:");
-      if (this.path == null) {
+      sb.append("pathname:");
+      if (this.pathname == null) {
         sb.append("null");
       } else {
-        sb.append(this.path);
+        sb.append(this.pathname);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("mode:");
-      sb.append(this.mode);
+      sb.append("clientName:");
+      if (this.clientName == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.clientName);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class chmod_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("chmod_result");
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class abandonFile_result implements org.apache.thrift.TBase<abandonFile_result, abandonFile_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abandonFile_result");
+
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(chmod_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abandonFile_result.class, metaDataMap);
     }
 
-    public chmod_result() {
+    public abandonFile_result() {
     }
 
-    public chmod_result(
+    public abandonFile_result(
       ThriftIOException ouch)
     {
       this();
@@ -9139,30 +22685,35 @@ public chmod_result(
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public chmod_result(chmod_result other) {
+    public abandonFile_result(abandonFile_result other) {
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
+    public abandonFile_result deepCopy() {
+      return new abandonFile_result(this);
+    }
+
     @Override
-    public chmod_result clone() {
-      return new chmod_result(this);
+    public void clear() {
+      this.ouch = null;
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public abandonFile_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -9173,8 +22724,8 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -9183,41 +22734,41 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof chmod_result)
-        return this.equals((chmod_result)that);
+      if (that instanceof abandonFile_result)
+        return this.equals((abandonFile_result)that);
       return false;
     }
 
-    public boolean equals(chmod_result that) {
+    public boolean equals(abandonFile_result that) {
       if (that == null)
         return false;
 
@@ -9238,39 +22789,61 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(abandonFile_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      abandonFile_result typedOther = (abandonFile_result)other;
+
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
       if (this.isSetOuch()) {
@@ -9284,7 +22857,7 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("chmod_result(");
+      StringBuilder sb = new StringBuilder("abandonFile_result(");
       boolean first = true;
 
       sb.append("ouch:");
@@ -9298,244 +22871,548 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
-      // check for required fields
-      // check that fields of type enum have valid values
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class addBlock_args implements org.apache.thrift.TBase<addBlock_args, addBlock_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addBlock_args");
+
+    private static final org.apache.thrift.protocol.TField PATHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("pathname", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CLIENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("clientName", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField START_OFFSET_FIELD_DESC = new org.apache.thrift.protocol.TField("startOffset", org.apache.thrift.protocol.TType.I64, (short)3);
+    private static final org.apache.thrift.protocol.TField LAST_BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("lastBlock", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+    private static final org.apache.thrift.protocol.TField EXCLUDED_NODES_FIELD_DESC = new org.apache.thrift.protocol.TField("excludedNodes", org.apache.thrift.protocol.TType.LIST, (short)5);
+    private static final org.apache.thrift.protocol.TField FAVOURED_NODES_FIELD_DESC = new org.apache.thrift.protocol.TField("favouredNodes", org.apache.thrift.protocol.TType.LIST, (short)6);
+
+    public Pathname pathname; // required
+    public String clientName; // required
+    public long startOffset; // required
+    public TBlock lastBlock; // required
+    public List<TDatanodeID> excludedNodes; // required
+    public List<TDatanodeID> favouredNodes; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATHNAME((short)1, "pathname"),
+      CLIENT_NAME((short)2, "clientName"),
+      START_OFFSET((short)3, "startOffset"),
+      LAST_BLOCK((short)4, "lastBlock"),
+      EXCLUDED_NODES((short)5, "excludedNodes"),
+      FAVOURED_NODES((short)6, "favouredNodes");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATHNAME
+            return PATHNAME;
+          case 2: // CLIENT_NAME
+            return CLIENT_NAME;
+          case 3: // START_OFFSET
+            return START_OFFSET;
+          case 4: // LAST_BLOCK
+            return LAST_BLOCK;
+          case 5: // EXCLUDED_NODES
+            return EXCLUDED_NODES;
+          case 6: // FAVOURED_NODES
+            return FAVOURED_NODES;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __STARTOFFSET_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATHNAME, new org.apache.thrift.meta_data.FieldMetaData("pathname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.CLIENT_NAME, new org.apache.thrift.meta_data.FieldMetaData("clientName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.START_OFFSET, new org.apache.thrift.meta_data.FieldMetaData("startOffset", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.LAST_BLOCK, new org.apache.thrift.meta_data.FieldMetaData("lastBlock", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TBlock.class)));
+      tmpMap.put(_Fields.EXCLUDED_NODES, new org.apache.thrift.meta_data.FieldMetaData("excludedNodes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class))));
+      tmpMap.put(_Fields.FAVOURED_NODES, new org.apache.thrift.meta_data.FieldMetaData("favouredNodes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class))));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addBlock_args.class, metaDataMap);
+    }
+
+    public addBlock_args() {
+    }
+
+    public addBlock_args(
+      Pathname pathname,
+      String clientName,
+      long startOffset,
+      TBlock lastBlock,
+      List<TDatanodeID> excludedNodes,
+      List<TDatanodeID> favouredNodes)
+    {
+      this();
+      this.pathname = pathname;
+      this.clientName = clientName;
+      this.startOffset = startOffset;
+      setStartOffsetIsSet(true);
+      this.lastBlock = lastBlock;
+      this.excludedNodes = excludedNodes;
+      this.favouredNodes = favouredNodes;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public addBlock_args(addBlock_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetPathname()) {
+        this.pathname = new Pathname(other.pathname);
+      }
+      if (other.isSetClientName()) {
+        this.clientName = other.clientName;
+      }
+      this.startOffset = other.startOffset;
+      if (other.isSetLastBlock()) {
+        this.lastBlock = new TBlock(other.lastBlock);
+      }
+      if (other.isSetExcludedNodes()) {
+        List<TDatanodeID> __this__excludedNodes = new ArrayList<TDatanodeID>();
+        for (TDatanodeID other_element : other.excludedNodes) {
+          __this__excludedNodes.add(new TDatanodeID(other_element));
+        }
+        this.excludedNodes = __this__excludedNodes;
+      }
+      if (other.isSetFavouredNodes()) {
+        List<TDatanodeID> __this__favouredNodes = new ArrayList<TDatanodeID>();
+        for (TDatanodeID other_element : other.favouredNodes) {
+          __this__favouredNodes.add(new TDatanodeID(other_element));
+        }
+        this.favouredNodes = __this__favouredNodes;
+      }
+    }
+
+    public addBlock_args deepCopy() {
+      return new addBlock_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.pathname = null;
+      this.clientName = null;
+      setStartOffsetIsSet(false);
+      this.startOffset = 0;
+      this.lastBlock = null;
+      this.excludedNodes = null;
+      this.favouredNodes = null;
+    }
+
+    public Pathname getPathname() {
+      return this.pathname;
+    }
+
+    public addBlock_args setPathname(Pathname pathname) {
+      this.pathname = pathname;
+      return this;
+    }
+
+    public void unsetPathname() {
+      this.pathname = null;
+    }
+
+    /** Returns true if field pathname is set (has been assigned a value) and false otherwise */
+    public boolean isSetPathname() {
+      return this.pathname != null;
+    }
+
+    public void setPathnameIsSet(boolean value) {
+      if (!value) {
+        this.pathname = null;
+      }
+    }
+
+    public String getClientName() {
+      return this.clientName;
+    }
+
+    public addBlock_args setClientName(String clientName) {
+      this.clientName = clientName;
+      return this;
+    }
+
+    public void unsetClientName() {
+      this.clientName = null;
+    }
+
+    /** Returns true if field clientName is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientName() {
+      return this.clientName != null;
+    }
+
+    public void setClientNameIsSet(boolean value) {
+      if (!value) {
+        this.clientName = null;
+      }
+    }
+
+    public long getStartOffset() {
+      return this.startOffset;
     }
 
-  }
+    public addBlock_args setStartOffset(long startOffset) {
+      this.startOffset = startOffset;
+      setStartOffsetIsSet(true);
+      return this;
+    }
 
-  public static class chown_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("chown_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
-    private static final TField OWNER_FIELD_DESC = new TField("owner", TType.STRING, (short)2);
-    private static final TField GROUP_FIELD_DESC = new TField("group", TType.STRING, (short)3);
+    public void unsetStartOffset() {
+      __isset_bit_vector.clear(__STARTOFFSET_ISSET_ID);
+    }
 
-    public Pathname path;
-    public static final int PATH = 1;
-    public String owner;
-    public static final int OWNER = 2;
-    public String group;
-    public static final int GROUP = 3;
+    /** Returns true if field startOffset is set (has been assigned a value) and false otherwise */
+    public boolean isSetStartOffset() {
+      return __isset_bit_vector.get(__STARTOFFSET_ISSET_ID);
+    }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+    public void setStartOffsetIsSet(boolean value) {
+      __isset_bit_vector.set(__STARTOFFSET_ISSET_ID, value);
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-      put(OWNER, new FieldMetaData("owner", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRING)));
-      put(GROUP, new FieldMetaData("group", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRING)));
-    }});
+    public TBlock getLastBlock() {
+      return this.lastBlock;
+    }
 
-    static {
-      FieldMetaData.addStructMetaDataMap(chown_args.class, metaDataMap);
+    public addBlock_args setLastBlock(TBlock lastBlock) {
+      this.lastBlock = lastBlock;
+      return this;
     }
 
-    public chown_args() {
+    public void unsetLastBlock() {
+      this.lastBlock = null;
     }
 
-    public chown_args(
-      Pathname path,
-      String owner,
-      String group)
-    {
-      this();
-      this.path = path;
-      this.owner = owner;
-      this.group = group;
+    /** Returns true if field lastBlock is set (has been assigned a value) and false otherwise */
+    public boolean isSetLastBlock() {
+      return this.lastBlock != null;
     }
 
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public chown_args(chown_args other) {
-      if (other.isSetPath()) {
-        this.path = new Pathname(other.path);
-      }
-      if (other.isSetOwner()) {
-        this.owner = other.owner;
-      }
-      if (other.isSetGroup()) {
-        this.group = other.group;
+    public void setLastBlockIsSet(boolean value) {
+      if (!value) {
+        this.lastBlock = null;
       }
     }
 
-    @Override
-    public chown_args clone() {
-      return new chown_args(this);
+    public int getExcludedNodesSize() {
+      return (this.excludedNodes == null) ? 0 : this.excludedNodes.size();
     }
 
-    public Pathname getPath() {
-      return this.path;
+    public java.util.Iterator<TDatanodeID> getExcludedNodesIterator() {
+      return (this.excludedNodes == null) ? null : this.excludedNodes.iterator();
     }
 
-    public void setPath(Pathname path) {
-      this.path = path;
+    public void addToExcludedNodes(TDatanodeID elem) {
+      if (this.excludedNodes == null) {
+        this.excludedNodes = new ArrayList<TDatanodeID>();
+      }
+      this.excludedNodes.add(elem);
     }
 
-    public void unsetPath() {
-      this.path = null;
+    public List<TDatanodeID> getExcludedNodes() {
+      return this.excludedNodes;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
+    public addBlock_args setExcludedNodes(List<TDatanodeID> excludedNodes) {
+      this.excludedNodes = excludedNodes;
+      return this;
     }
 
-    public void setPathIsSet(boolean value) {
-      if (!value) {
-        this.path = null;
-      }
+    public void unsetExcludedNodes() {
+      this.excludedNodes = null;
     }
 
-    public String getOwner() {
-      return this.owner;
+    /** Returns true if field excludedNodes is set (has been assigned a value) and false otherwise */
+    public boolean isSetExcludedNodes() {
+      return this.excludedNodes != null;
     }
 
-    public void setOwner(String owner) {
-      this.owner = owner;
+    public void setExcludedNodesIsSet(boolean value) {
+      if (!value) {
+        this.excludedNodes = null;
+      }
     }
 
-    public void unsetOwner() {
-      this.owner = null;
+    public int getFavouredNodesSize() {
+      return (this.favouredNodes == null) ? 0 : this.favouredNodes.size();
     }
 
-    // Returns true if field owner is set (has been asigned a value) and false otherwise
-    public boolean isSetOwner() {
-      return this.owner != null;
+    public java.util.Iterator<TDatanodeID> getFavouredNodesIterator() {
+      return (this.favouredNodes == null) ? null : this.favouredNodes.iterator();
     }
 
-    public void setOwnerIsSet(boolean value) {
-      if (!value) {
-        this.owner = null;
+    public void addToFavouredNodes(TDatanodeID elem) {
+      if (this.favouredNodes == null) {
+        this.favouredNodes = new ArrayList<TDatanodeID>();
       }
+      this.favouredNodes.add(elem);
     }
 
-    public String getGroup() {
-      return this.group;
+    public List<TDatanodeID> getFavouredNodes() {
+      return this.favouredNodes;
     }
 
-    public void setGroup(String group) {
-      this.group = group;
+    public addBlock_args setFavouredNodes(List<TDatanodeID> favouredNodes) {
+      this.favouredNodes = favouredNodes;
+      return this;
     }
 
-    public void unsetGroup() {
-      this.group = null;
+    public void unsetFavouredNodes() {
+      this.favouredNodes = null;
     }
 
-    // Returns true if field group is set (has been asigned a value) and false otherwise
-    public boolean isSetGroup() {
-      return this.group != null;
+    /** Returns true if field favouredNodes is set (has been assigned a value) and false otherwise */
+    public boolean isSetFavouredNodes() {
+      return this.favouredNodes != null;
     }
 
-    public void setGroupIsSet(boolean value) {
+    public void setFavouredNodesIsSet(boolean value) {
       if (!value) {
-        this.group = null;
+        this.favouredNodes = null;
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PATH:
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATHNAME:
         if (value == null) {
-          unsetPath();
+          unsetPathname();
         } else {
-          setPath((Pathname)value);
+          setPathname((Pathname)value);
         }
         break;
 
-      case OWNER:
+      case CLIENT_NAME:
         if (value == null) {
-          unsetOwner();
+          unsetClientName();
         } else {
-          setOwner((String)value);
+          setClientName((String)value);
         }
         break;
 
-      case GROUP:
+      case START_OFFSET:
         if (value == null) {
-          unsetGroup();
+          unsetStartOffset();
         } else {
-          setGroup((String)value);
+          setStartOffset((Long)value);
+        }
+        break;
+
+      case LAST_BLOCK:
+        if (value == null) {
+          unsetLastBlock();
+        } else {
+          setLastBlock((TBlock)value);
+        }
+        break;
+
+      case EXCLUDED_NODES:
+        if (value == null) {
+          unsetExcludedNodes();
+        } else {
+          setExcludedNodes((List<TDatanodeID>)value);
+        }
+        break;
+
+      case FAVOURED_NODES:
+        if (value == null) {
+          unsetFavouredNodes();
+        } else {
+          setFavouredNodes((List<TDatanodeID>)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return getPath();
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATHNAME:
+        return getPathname();
 
-      case OWNER:
-        return getOwner();
+      case CLIENT_NAME:
+        return getClientName();
 
-      case GROUP:
-        return getGroup();
+      case START_OFFSET:
+        return Long.valueOf(getStartOffset());
+
+      case LAST_BLOCK:
+        return getLastBlock();
+
+      case EXCLUDED_NODES:
+        return getExcludedNodes();
+
+      case FAVOURED_NODES:
+        return getFavouredNodes();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return isSetPath();
-      case OWNER:
-        return isSetOwner();
-      case GROUP:
-        return isSetGroup();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
       }
+
+      switch (field) {
+      case PATHNAME:
+        return isSetPathname();
+      case CLIENT_NAME:
+        return isSetClientName();
+      case START_OFFSET:
+        return isSetStartOffset();
+      case LAST_BLOCK:
+        return isSetLastBlock();
+      case EXCLUDED_NODES:
+        return isSetExcludedNodes();
+      case FAVOURED_NODES:
+        return isSetFavouredNodes();
+      }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof chown_args)
-        return this.equals((chown_args)that);
+      if (that instanceof addBlock_args)
+        return this.equals((addBlock_args)that);
       return false;
     }
 
-    public boolean equals(chown_args that) {
+    public boolean equals(addBlock_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
+      boolean this_present_pathname = true && this.isSetPathname();
+      boolean that_present_pathname = true && that.isSetPathname();
+      if (this_present_pathname || that_present_pathname) {
+        if (!(this_present_pathname && that_present_pathname))
           return false;
-        if (!this.path.equals(that.path))
+        if (!this.pathname.equals(that.pathname))
           return false;
       }
 
-      boolean this_present_owner = true && this.isSetOwner();
-      boolean that_present_owner = true && that.isSetOwner();
-      if (this_present_owner || that_present_owner) {
-        if (!(this_present_owner && that_present_owner))
+      boolean this_present_clientName = true && this.isSetClientName();
+      boolean that_present_clientName = true && that.isSetClientName();
+      if (this_present_clientName || that_present_clientName) {
+        if (!(this_present_clientName && that_present_clientName))
           return false;
-        if (!this.owner.equals(that.owner))
+        if (!this.clientName.equals(that.clientName))
           return false;
       }
 
-      boolean this_present_group = true && this.isSetGroup();
-      boolean that_present_group = true && that.isSetGroup();
-      if (this_present_group || that_present_group) {
-        if (!(this_present_group && that_present_group))
+      boolean this_present_startOffset = true;
+      boolean that_present_startOffset = true;
+      if (this_present_startOffset || that_present_startOffset) {
+        if (!(this_present_startOffset && that_present_startOffset))
           return false;
-        if (!this.group.equals(that.group))
+        if (this.startOffset != that.startOffset)
+          return false;
+      }
+
+      boolean this_present_lastBlock = true && this.isSetLastBlock();
+      boolean that_present_lastBlock = true && that.isSetLastBlock();
+      if (this_present_lastBlock || that_present_lastBlock) {
+        if (!(this_present_lastBlock && that_present_lastBlock))
+          return false;
+        if (!this.lastBlock.equals(that.lastBlock))
+          return false;
+      }
+
+      boolean this_present_excludedNodes = true && this.isSetExcludedNodes();
+      boolean that_present_excludedNodes = true && that.isSetExcludedNodes();
+      if (this_present_excludedNodes || that_present_excludedNodes) {
+        if (!(this_present_excludedNodes && that_present_excludedNodes))
+          return false;
+        if (!this.excludedNodes.equals(that.excludedNodes))
+          return false;
+      }
+
+      boolean this_present_favouredNodes = true && this.isSetFavouredNodes();
+      boolean that_present_favouredNodes = true && that.isSetFavouredNodes();
+      if (this_present_favouredNodes || that_present_favouredNodes) {
+        if (!(this_present_favouredNodes && that_present_favouredNodes))
+          return false;
+        if (!this.favouredNodes.equals(that.favouredNodes))
           return false;
       }
 
@@ -9547,69 +23424,213 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(addBlock_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      addBlock_args typedOther = (addBlock_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPathname()).compareTo(typedOther.isSetPathname());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPathname()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.pathname, typedOther.pathname);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientName()).compareTo(typedOther.isSetClientName());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientName, typedOther.clientName);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetStartOffset()).compareTo(typedOther.isSetStartOffset());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetStartOffset()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startOffset, typedOther.startOffset);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetLastBlock()).compareTo(typedOther.isSetLastBlock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetLastBlock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastBlock, typedOther.lastBlock);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetExcludedNodes()).compareTo(typedOther.isSetExcludedNodes());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetExcludedNodes()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.excludedNodes, typedOther.excludedNodes);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetFavouredNodes()).compareTo(typedOther.isSetFavouredNodes());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetFavouredNodes()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.favouredNodes, typedOther.favouredNodes);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
-              this.path = new Pathname();
-              this.path.read(iprot);
+        switch (field.id) {
+          case 1: // PATHNAME
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.pathname = new Pathname();
+              this.pathname.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case OWNER:
-            if (field.type == TType.STRING) {
-              this.owner = iprot.readString();
+          case 2: // CLIENT_NAME
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.clientName = iprot.readString();
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case GROUP:
-            if (field.type == TType.STRING) {
-              this.group = iprot.readString();
+          case 3: // START_OFFSET
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.startOffset = iprot.readI64();
+              setStartOffsetIsSet(true);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 4: // LAST_BLOCK
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.lastBlock = new TBlock();
+              this.lastBlock.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 5: // EXCLUDED_NODES
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list28 = iprot.readListBegin();
+                this.excludedNodes = new ArrayList<TDatanodeID>(_list28.size);
+                for (int _i29 = 0; _i29 < _list28.size; ++_i29)
+                {
+                  TDatanodeID _elem30; // required
+                  _elem30 = new TDatanodeID();
+                  _elem30.read(iprot);
+                  this.excludedNodes.add(_elem30);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 6: // FAVOURED_NODES
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list31 = iprot.readListBegin();
+                this.favouredNodes = new ArrayList<TDatanodeID>(_list31.size);
+                for (int _i32 = 0; _i32 < _list31.size; ++_i32)
+                {
+                  TDatanodeID _elem33; // required
+                  _elem33 = new TDatanodeID();
+                  _elem33.read(iprot);
+                  this.favouredNodes.add(_elem33);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        this.path.write(oprot);
+      if (this.pathname != null) {
+        oprot.writeFieldBegin(PATHNAME_FIELD_DESC);
+        this.pathname.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (this.owner != null) {
-        oprot.writeFieldBegin(OWNER_FIELD_DESC);
-        oprot.writeString(this.owner);
+      if (this.clientName != null) {
+        oprot.writeFieldBegin(CLIENT_NAME_FIELD_DESC);
+        oprot.writeString(this.clientName);
         oprot.writeFieldEnd();
       }
-      if (this.group != null) {
-        oprot.writeFieldBegin(GROUP_FIELD_DESC);
-        oprot.writeString(this.group);
+      oprot.writeFieldBegin(START_OFFSET_FIELD_DESC);
+      oprot.writeI64(this.startOffset);
+      oprot.writeFieldEnd();
+      if (this.lastBlock != null) {
+        oprot.writeFieldBegin(LAST_BLOCK_FIELD_DESC);
+        this.lastBlock.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.excludedNodes != null) {
+        oprot.writeFieldBegin(EXCLUDED_NODES_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.excludedNodes.size()));
+          for (TDatanodeID _iter34 : this.excludedNodes)
+          {
+            _iter34.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (this.favouredNodes != null) {
+        oprot.writeFieldBegin(FAVOURED_NODES_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.favouredNodes.size()));
+          for (TDatanodeID _iter35 : this.favouredNodes)
+          {
+            _iter35.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -9618,100 +23639,235 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("chown_args(");
+      StringBuilder sb = new StringBuilder("addBlock_args(");
       boolean first = true;
 
-      sb.append("path:");
-      if (this.path == null) {
+      sb.append("pathname:");
+      if (this.pathname == null) {
         sb.append("null");
       } else {
-        sb.append(this.path);
+        sb.append(this.pathname);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("owner:");
-      if (this.owner == null) {
+      sb.append("clientName:");
+      if (this.clientName == null) {
         sb.append("null");
       } else {
-        sb.append(this.owner);
+        sb.append(this.clientName);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("group:");
-      if (this.group == null) {
+      sb.append("startOffset:");
+      sb.append(this.startOffset);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("lastBlock:");
+      if (this.lastBlock == null) {
         sb.append("null");
       } else {
-        sb.append(this.group);
+        sb.append(this.lastBlock);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("excludedNodes:");
+      if (this.excludedNodes == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.excludedNodes);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("favouredNodes:");
+      if (this.favouredNodes == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.favouredNodes);
       }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
     }
 
-  }
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class addBlock_result implements org.apache.thrift.TBase<addBlock_result, addBlock_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addBlock_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public TLocatedBlock success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
 
-  public static class chown_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("chown_result");
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(chown_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TLocatedBlock.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addBlock_result.class, metaDataMap);
     }
 
-    public chown_result() {
+    public addBlock_result() {
     }
 
-    public chown_result(
+    public addBlock_result(
+      TLocatedBlock success,
       ThriftIOException ouch)
     {
       this();
+      this.success = success;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public chown_result(chown_result other) {
+    public addBlock_result(addBlock_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new TLocatedBlock(other.success);
+      }
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
+    public addBlock_result deepCopy() {
+      return new addBlock_result(this);
+    }
+
     @Override
-    public chown_result clone() {
-      return new chown_result(this);
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public TLocatedBlock getSuccess() {
+      return this.success;
+    }
+
+    public addBlock_result setSuccess(TLocatedBlock success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public addBlock_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -9722,8 +23878,16 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((TLocatedBlock)value);
+        }
+        break;
+
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -9732,44 +23896,58 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof chown_result)
-        return this.equals((chown_result)that);
+      if (that instanceof addBlock_result)
+        return this.equals((addBlock_result)that);
       return false;
     }
 
-    public boolean equals(chown_result that) {
+    public boolean equals(addBlock_result that) {
       if (that == null)
         return false;
 
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -9787,42 +23965,86 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(addBlock_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      addBlock_result typedOther = (addBlock_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new TLocatedBlock();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetOuch()) {
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -9833,9 +24055,17 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("chown_result(");
+      StringBuilder sb = new StringBuilder("addBlock_result(");
       boolean first = true;
 
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -9847,340 +24077,824 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class setReplication_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("setReplication_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
-    private static final TField REPLICATION_FIELD_DESC = new TField("replication", TType.I16, (short)2);
+  public static class addFirstBlock_args implements org.apache.thrift.TBase<addFirstBlock_args, addFirstBlock_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addFirstBlock_args");
 
-    public Pathname path;
-    public static final int PATH = 1;
-    public short replication;
-    public static final int REPLICATION = 2;
+    private static final org.apache.thrift.protocol.TField PATHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("pathname", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CLIENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("clientName", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField EXCLUDED_NODES_FIELD_DESC = new org.apache.thrift.protocol.TField("excludedNodes", org.apache.thrift.protocol.TType.LIST, (short)3);
+    private static final org.apache.thrift.protocol.TField FAVOURED_NODES_FIELD_DESC = new org.apache.thrift.protocol.TField("favouredNodes", org.apache.thrift.protocol.TType.LIST, (short)4);
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean replication = false;
-    }
+    public Pathname pathname; // required
+    public String clientName; // required
+    public List<TDatanodeID> excludedNodes; // required
+    public List<TDatanodeID> favouredNodes; // required
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-      put(REPLICATION, new FieldMetaData("replication", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I16)));
-    }});
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATHNAME((short)1, "pathname"),
+      CLIENT_NAME((short)2, "clientName"),
+      EXCLUDED_NODES((short)3, "excludedNodes"),
+      FAVOURED_NODES((short)4, "favouredNodes");
 
-    static {
-      FieldMetaData.addStructMetaDataMap(setReplication_args.class, metaDataMap);
-    }
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
-    public setReplication_args() {
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATHNAME
+            return PATHNAME;
+          case 2: // CLIENT_NAME
+            return CLIENT_NAME;
+          case 3: // EXCLUDED_NODES
+            return EXCLUDED_NODES;
+          case 4: // FAVOURED_NODES
+            return FAVOURED_NODES;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public setReplication_args(
-      Pathname path,
-      short replication)
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATHNAME, new org.apache.thrift.meta_data.FieldMetaData("pathname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.CLIENT_NAME, new org.apache.thrift.meta_data.FieldMetaData("clientName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.EXCLUDED_NODES, new org.apache.thrift.meta_data.FieldMetaData("excludedNodes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class))));
+      tmpMap.put(_Fields.FAVOURED_NODES, new org.apache.thrift.meta_data.FieldMetaData("favouredNodes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDatanodeID.class))));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addFirstBlock_args.class, metaDataMap);
+    }
+
+    public addFirstBlock_args() {
+    }
+
+    public addFirstBlock_args(
+      Pathname pathname,
+      String clientName,
+      List<TDatanodeID> excludedNodes,
+      List<TDatanodeID> favouredNodes)
     {
       this();
-      this.path = path;
-      this.replication = replication;
-      this.__isset.replication = true;
+      this.pathname = pathname;
+      this.clientName = clientName;
+      this.excludedNodes = excludedNodes;
+      this.favouredNodes = favouredNodes;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public setReplication_args(setReplication_args other) {
-      if (other.isSetPath()) {
-        this.path = new Pathname(other.path);
+    public addFirstBlock_args(addFirstBlock_args other) {
+      if (other.isSetPathname()) {
+        this.pathname = new Pathname(other.pathname);
+      }
+      if (other.isSetClientName()) {
+        this.clientName = other.clientName;
+      }
+      if (other.isSetExcludedNodes()) {
+        List<TDatanodeID> __this__excludedNodes = new ArrayList<TDatanodeID>();
+        for (TDatanodeID other_element : other.excludedNodes) {
+          __this__excludedNodes.add(new TDatanodeID(other_element));
+        }
+        this.excludedNodes = __this__excludedNodes;
+      }
+      if (other.isSetFavouredNodes()) {
+        List<TDatanodeID> __this__favouredNodes = new ArrayList<TDatanodeID>();
+        for (TDatanodeID other_element : other.favouredNodes) {
+          __this__favouredNodes.add(new TDatanodeID(other_element));
+        }
+        this.favouredNodes = __this__favouredNodes;
       }
-      __isset.replication = other.__isset.replication;
-      this.replication = other.replication;
+    }
+
+    public addFirstBlock_args deepCopy() {
+      return new addFirstBlock_args(this);
     }
 
     @Override
-    public setReplication_args clone() {
-      return new setReplication_args(this);
+    public void clear() {
+      this.pathname = null;
+      this.clientName = null;
+      this.excludedNodes = null;
+      this.favouredNodes = null;
     }
 
-    public Pathname getPath() {
-      return this.path;
+    public Pathname getPathname() {
+      return this.pathname;
     }
 
-    public void setPath(Pathname path) {
-      this.path = path;
+    public addFirstBlock_args setPathname(Pathname pathname) {
+      this.pathname = pathname;
+      return this;
     }
 
-    public void unsetPath() {
-      this.path = null;
+    public void unsetPathname() {
+      this.pathname = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
+    /** Returns true if field pathname is set (has been assigned a value) and false otherwise */
+    public boolean isSetPathname() {
+      return this.pathname != null;
     }
 
-    public void setPathIsSet(boolean value) {
+    public void setPathnameIsSet(boolean value) {
       if (!value) {
-        this.path = null;
+        this.pathname = null;
       }
     }
 
-    public short getReplication() {
-      return this.replication;
+    public String getClientName() {
+      return this.clientName;
     }
 
-    public void setReplication(short replication) {
-      this.replication = replication;
-      this.__isset.replication = true;
+    public addFirstBlock_args setClientName(String clientName) {
+      this.clientName = clientName;
+      return this;
     }
 
-    public void unsetReplication() {
-      this.__isset.replication = false;
+    public void unsetClientName() {
+      this.clientName = null;
     }
 
-    // Returns true if field replication is set (has been asigned a value) and false otherwise
-    public boolean isSetReplication() {
-      return this.__isset.replication;
+    /** Returns true if field clientName is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientName() {
+      return this.clientName != null;
     }
 
-    public void setReplicationIsSet(boolean value) {
-      this.__isset.replication = value;
+    public void setClientNameIsSet(boolean value) {
+      if (!value) {
+        this.clientName = null;
+      }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PATH:
+    public int getExcludedNodesSize() {
+      return (this.excludedNodes == null) ? 0 : this.excludedNodes.size();
+    }
+
+    public java.util.Iterator<TDatanodeID> getExcludedNodesIterator() {
+      return (this.excludedNodes == null) ? null : this.excludedNodes.iterator();
+    }
+
+    public void addToExcludedNodes(TDatanodeID elem) {
+      if (this.excludedNodes == null) {
+        this.excludedNodes = new ArrayList<TDatanodeID>();
+      }
+      this.excludedNodes.add(elem);
+    }
+
+    public List<TDatanodeID> getExcludedNodes() {
+      return this.excludedNodes;
+    }
+
+    public addFirstBlock_args setExcludedNodes(List<TDatanodeID> excludedNodes) {
+      this.excludedNodes = excludedNodes;
+      return this;
+    }
+
+    public void unsetExcludedNodes() {
+      this.excludedNodes = null;
+    }
+
+    /** Returns true if field excludedNodes is set (has been assigned a value) and false otherwise */
+    public boolean isSetExcludedNodes() {
+      return this.excludedNodes != null;
+    }
+
+    public void setExcludedNodesIsSet(boolean value) {
+      if (!value) {
+        this.excludedNodes = null;
+      }
+    }
+
+    public int getFavouredNodesSize() {
+      return (this.favouredNodes == null) ? 0 : this.favouredNodes.size();
+    }
+
+    public java.util.Iterator<TDatanodeID> getFavouredNodesIterator() {
+      return (this.favouredNodes == null) ? null : this.favouredNodes.iterator();
+    }
+
+    public void addToFavouredNodes(TDatanodeID elem) {
+      if (this.favouredNodes == null) {
+        this.favouredNodes = new ArrayList<TDatanodeID>();
+      }
+      this.favouredNodes.add(elem);
+    }
+
+    public List<TDatanodeID> getFavouredNodes() {
+      return this.favouredNodes;
+    }
+
+    public addFirstBlock_args setFavouredNodes(List<TDatanodeID> favouredNodes) {
+      this.favouredNodes = favouredNodes;
+      return this;
+    }
+
+    public void unsetFavouredNodes() {
+      this.favouredNodes = null;
+    }
+
+    /** Returns true if field favouredNodes is set (has been assigned a value) and false otherwise */
+    public boolean isSetFavouredNodes() {
+      return this.favouredNodes != null;
+    }
+
+    public void setFavouredNodesIsSet(boolean value) {
+      if (!value) {
+        this.favouredNodes = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATHNAME:
         if (value == null) {
-          unsetPath();
+          unsetPathname();
         } else {
-          setPath((Pathname)value);
+          setPathname((Pathname)value);
         }
         break;
 
-      case REPLICATION:
+      case CLIENT_NAME:
         if (value == null) {
-          unsetReplication();
+          unsetClientName();
         } else {
-          setReplication((Short)value);
+          setClientName((String)value);
+        }
+        break;
+
+      case EXCLUDED_NODES:
+        if (value == null) {
+          unsetExcludedNodes();
+        } else {
+          setExcludedNodes((List<TDatanodeID>)value);
+        }
+        break;
+
+      case FAVOURED_NODES:
+        if (value == null) {
+          unsetFavouredNodes();
+        } else {
+          setFavouredNodes((List<TDatanodeID>)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return getPath();
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATHNAME:
+        return getPathname();
 
-      case REPLICATION:
-        return new Short(getReplication());
+      case CLIENT_NAME:
+        return getClientName();
+
+      case EXCLUDED_NODES:
+        return getExcludedNodes();
+
+      case FAVOURED_NODES:
+        return getFavouredNodes();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return isSetPath();
-      case REPLICATION:
-        return isSetReplication();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PATHNAME:
+        return isSetPathname();
+      case CLIENT_NAME:
+        return isSetClientName();
+      case EXCLUDED_NODES:
+        return isSetExcludedNodes();
+      case FAVOURED_NODES:
+        return isSetFavouredNodes();
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof setReplication_args)
-        return this.equals((setReplication_args)that);
+      if (that instanceof addFirstBlock_args)
+        return this.equals((addFirstBlock_args)that);
       return false;
     }
 
-    public boolean equals(setReplication_args that) {
+    public boolean equals(addFirstBlock_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
+      boolean this_present_pathname = true && this.isSetPathname();
+      boolean that_present_pathname = true && that.isSetPathname();
+      if (this_present_pathname || that_present_pathname) {
+        if (!(this_present_pathname && that_present_pathname))
           return false;
-        if (!this.path.equals(that.path))
+        if (!this.pathname.equals(that.pathname))
           return false;
       }
 
-      boolean this_present_replication = true;
-      boolean that_present_replication = true;
-      if (this_present_replication || that_present_replication) {
-        if (!(this_present_replication && that_present_replication))
+      boolean this_present_clientName = true && this.isSetClientName();
+      boolean that_present_clientName = true && that.isSetClientName();
+      if (this_present_clientName || that_present_clientName) {
+        if (!(this_present_clientName && that_present_clientName))
           return false;
-        if (this.replication != that.replication)
+        if (!this.clientName.equals(that.clientName))
+          return false;
+      }
+
+      boolean this_present_excludedNodes = true && this.isSetExcludedNodes();
+      boolean that_present_excludedNodes = true && that.isSetExcludedNodes();
+      if (this_present_excludedNodes || that_present_excludedNodes) {
+        if (!(this_present_excludedNodes && that_present_excludedNodes))
+          return false;
+        if (!this.excludedNodes.equals(that.excludedNodes))
+          return false;
+      }
+
+      boolean this_present_favouredNodes = true && this.isSetFavouredNodes();
+      boolean that_present_favouredNodes = true && that.isSetFavouredNodes();
+      if (this_present_favouredNodes || that_present_favouredNodes) {
+        if (!(this_present_favouredNodes && that_present_favouredNodes))
+          return false;
+        if (!this.favouredNodes.equals(that.favouredNodes))
           return false;
       }
 
-      return true;
-    }
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(addFirstBlock_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      addFirstBlock_args typedOther = (addFirstBlock_args)other;
 
-    @Override
-    public int hashCode() {
+      lastComparison = Boolean.valueOf(isSetPathname()).compareTo(typedOther.isSetPathname());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPathname()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.pathname, typedOther.pathname);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientName()).compareTo(typedOther.isSetClientName());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientName, typedOther.clientName);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetExcludedNodes()).compareTo(typedOther.isSetExcludedNodes());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetExcludedNodes()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.excludedNodes, typedOther.excludedNodes);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetFavouredNodes()).compareTo(typedOther.isSetFavouredNodes());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetFavouredNodes()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.favouredNodes, typedOther.favouredNodes);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
-              this.path = new Pathname();
-              this.path.read(iprot);
+        switch (field.id) {
+          case 1: // PATHNAME
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.pathname = new Pathname();
+              this.pathname.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case REPLICATION:
-            if (field.type == TType.I16) {
-              this.replication = iprot.readI16();
-              this.__isset.replication = true;
+          case 2: // CLIENT_NAME
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.clientName = iprot.readString();
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 3: // EXCLUDED_NODES
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list36 = iprot.readListBegin();
+                this.excludedNodes = new ArrayList<TDatanodeID>(_list36.size);
+                for (int _i37 = 0; _i37 < _list36.size; ++_i37)
+                {
+                  TDatanodeID _elem38; // required
+                  _elem38 = new TDatanodeID();
+                  _elem38.read(iprot);
+                  this.excludedNodes.add(_elem38);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 4: // FAVOURED_NODES
+            if (field.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list39 = iprot.readListBegin();
+                this.favouredNodes = new ArrayList<TDatanodeID>(_list39.size);
+                for (int _i40 = 0; _i40 < _list39.size; ++_i40)
+                {
+                  TDatanodeID _elem41; // required
+                  _elem41 = new TDatanodeID();
+                  _elem41.read(iprot);
+                  this.favouredNodes.add(_elem41);
+                }
+                iprot.readListEnd();
+              }
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        this.path.write(oprot);
+      if (this.pathname != null) {
+        oprot.writeFieldBegin(PATHNAME_FIELD_DESC);
+        this.pathname.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (this.clientName != null) {
+        oprot.writeFieldBegin(CLIENT_NAME_FIELD_DESC);
+        oprot.writeString(this.clientName);
+        oprot.writeFieldEnd();
+      }
+      if (this.excludedNodes != null) {
+        oprot.writeFieldBegin(EXCLUDED_NODES_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.excludedNodes.size()));
+          for (TDatanodeID _iter42 : this.excludedNodes)
+          {
+            _iter42.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (this.favouredNodes != null) {
+        oprot.writeFieldBegin(FAVOURED_NODES_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.favouredNodes.size()));
+          for (TDatanodeID _iter43 : this.favouredNodes)
+          {
+            _iter43.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(REPLICATION_FIELD_DESC);
-      oprot.writeI16(this.replication);
-      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("setReplication_args(");
+      StringBuilder sb = new StringBuilder("addFirstBlock_args(");
       boolean first = true;
 
-      sb.append("path:");
-      if (this.path == null) {
+      sb.append("pathname:");
+      if (this.pathname == null) {
         sb.append("null");
       } else {
-        sb.append(this.path);
+        sb.append(this.pathname);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("replication:");
-      sb.append(this.replication);
+      sb.append("clientName:");
+      if (this.clientName == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.clientName);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("excludedNodes:");
+      if (this.excludedNodes == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.excludedNodes);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("favouredNodes:");
+      if (this.favouredNodes == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.favouredNodes);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class setReplication_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("setReplication_result");
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class addFirstBlock_result implements org.apache.thrift.TBase<addFirstBlock_result, addFirstBlock_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addFirstBlock_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public TLocatedBlock success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
 
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(setReplication_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TLocatedBlock.class)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addFirstBlock_result.class, metaDataMap);
     }
 
-    public setReplication_result() {
+    public addFirstBlock_result() {
     }
 
-    public setReplication_result(
+    public addFirstBlock_result(
+      TLocatedBlock success,
       ThriftIOException ouch)
     {
       this();
+      this.success = success;
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public setReplication_result(setReplication_result other) {
+    public addFirstBlock_result(addFirstBlock_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new TLocatedBlock(other.success);
+      }
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
+    public addFirstBlock_result deepCopy() {
+      return new addFirstBlock_result(this);
+    }
+
     @Override
-    public setReplication_result clone() {
-      return new setReplication_result(this);
+    public void clear() {
+      this.success = null;
+      this.ouch = null;
+    }
+
+    public TLocatedBlock getSuccess() {
+      return this.success;
+    }
+
+    public addFirstBlock_result setSuccess(TLocatedBlock success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public addFirstBlock_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -10191,8 +24905,16 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((TLocatedBlock)value);
+        }
+        break;
+
       case OUCH:
         if (value == null) {
           unsetOuch();
@@ -10201,44 +24923,58 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof setReplication_result)
-        return this.equals((setReplication_result)that);
+      if (that instanceof addFirstBlock_result)
+        return this.equals((addFirstBlock_result)that);
       return false;
     }
 
-    public boolean equals(setReplication_result that) {
+    public boolean equals(addFirstBlock_result that) {
       if (that == null)
         return false;
 
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
       boolean this_present_ouch = true && this.isSetOuch();
       boolean that_present_ouch = true && that.isSetOuch();
       if (this_present_ouch || that_present_ouch) {
@@ -10256,42 +24992,86 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(addFirstBlock_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      addFirstBlock_result typedOther = (addFirstBlock_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.success = new TLocatedBlock();
+              this.success.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetOuch()) {
+      if (this.isSetSuccess()) {
+        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+        this.success.write(oprot);
+        oprot.writeFieldEnd();
+      } else if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
         this.ouch.write(oprot);
         oprot.writeFieldEnd();
@@ -10302,9 +25082,17 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("setReplication_result(");
+      StringBuilder sb = new StringBuilder("addFirstBlock_result(");
       boolean first = true;
 
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("ouch:");
       if (this.ouch == null) {
         sb.append("null");
@@ -10316,244 +25104,390 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class getFileBlockLocations_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("getFileBlockLocations_args");
-    private static final TField PATH_FIELD_DESC = new TField("path", TType.STRUCT, (short)1);
-    private static final TField START_FIELD_DESC = new TField("start", TType.I64, (short)2);
-    private static final TField LENGTH_FIELD_DESC = new TField("length", TType.I64, (short)3);
-
-    public Pathname path;
-    public static final int PATH = 1;
-    public long start;
-    public static final int START = 2;
-    public long length;
-    public static final int LENGTH = 3;
-
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
-      public boolean start = false;
-      public boolean length = false;
-    }
-
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(PATH, new FieldMetaData("path", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, Pathname.class)));
-      put(START, new FieldMetaData("start", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I64)));
-      put(LENGTH, new FieldMetaData("length", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.I64)));
-    }});
+  public static class complete_args implements org.apache.thrift.TBase<complete_args, complete_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("complete_args");
 
-    static {
-      FieldMetaData.addStructMetaDataMap(getFileBlockLocations_args.class, metaDataMap);
-    }
+    private static final org.apache.thrift.protocol.TField PATHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("pathname", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CLIENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("clientName", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField FILE_LEN_FIELD_DESC = new org.apache.thrift.protocol.TField("fileLen", org.apache.thrift.protocol.TType.I64, (short)3);
+    private static final org.apache.thrift.protocol.TField LAST_BLOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("lastBlock", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    public getFileBlockLocations_args() {
+    public Pathname pathname; // required
+    public String clientName; // required
+    public long fileLen; // required
+    public TBlock lastBlock; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      PATHNAME((short)1, "pathname"),
+      CLIENT_NAME((short)2, "clientName"),
+      FILE_LEN((short)3, "fileLen"),
+      LAST_BLOCK((short)4, "lastBlock");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // PATHNAME
+            return PATHNAME;
+          case 2: // CLIENT_NAME
+            return CLIENT_NAME;
+          case 3: // FILE_LEN
+            return FILE_LEN;
+          case 4: // LAST_BLOCK
+            return LAST_BLOCK;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public getFileBlockLocations_args(
-      Pathname path,
-      long start,
-      long length)
+    // isset id assignments
+    private static final int __FILELEN_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.PATHNAME, new org.apache.thrift.meta_data.FieldMetaData("pathname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Pathname.class)));
+      tmpMap.put(_Fields.CLIENT_NAME, new org.apache.thrift.meta_data.FieldMetaData("clientName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.FILE_LEN, new org.apache.thrift.meta_data.FieldMetaData("fileLen", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.LAST_BLOCK, new org.apache.thrift.meta_data.FieldMetaData("lastBlock", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TBlock.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(complete_args.class, metaDataMap);
+    }
+
+    public complete_args() {
+    }
+
+    public complete_args(
+      Pathname pathname,
+      String clientName,
+      long fileLen,
+      TBlock lastBlock)
     {
       this();
-      this.path = path;
-      this.start = start;
-      this.__isset.start = true;
-      this.length = length;
-      this.__isset.length = true;
+      this.pathname = pathname;
+      this.clientName = clientName;
+      this.fileLen = fileLen;
+      setFileLenIsSet(true);
+      this.lastBlock = lastBlock;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getFileBlockLocations_args(getFileBlockLocations_args other) {
-      if (other.isSetPath()) {
-        this.path = new Pathname(other.path);
+    public complete_args(complete_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      if (other.isSetPathname()) {
+        this.pathname = new Pathname(other.pathname);
       }
-      __isset.start = other.__isset.start;
-      this.start = other.start;
-      __isset.length = other.__isset.length;
-      this.length = other.length;
+      if (other.isSetClientName()) {
+        this.clientName = other.clientName;
+      }
+      this.fileLen = other.fileLen;
+      if (other.isSetLastBlock()) {
+        this.lastBlock = new TBlock(other.lastBlock);
+      }
+    }
+
+    public complete_args deepCopy() {
+      return new complete_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.pathname = null;
+      this.clientName = null;
+      setFileLenIsSet(false);
+      this.fileLen = 0;
+      this.lastBlock = null;
+    }
+
+    public Pathname getPathname() {
+      return this.pathname;
+    }
+
+    public complete_args setPathname(Pathname pathname) {
+      this.pathname = pathname;
+      return this;
+    }
+
+    public void unsetPathname() {
+      this.pathname = null;
+    }
+
+    /** Returns true if field pathname is set (has been assigned a value) and false otherwise */
+    public boolean isSetPathname() {
+      return this.pathname != null;
     }
 
-    @Override
-    public getFileBlockLocations_args clone() {
-      return new getFileBlockLocations_args(this);
+    public void setPathnameIsSet(boolean value) {
+      if (!value) {
+        this.pathname = null;
+      }
     }
 
-    public Pathname getPath() {
-      return this.path;
+    public String getClientName() {
+      return this.clientName;
     }
 
-    public void setPath(Pathname path) {
-      this.path = path;
+    public complete_args setClientName(String clientName) {
+      this.clientName = clientName;
+      return this;
     }
 
-    public void unsetPath() {
-      this.path = null;
+    public void unsetClientName() {
+      this.clientName = null;
     }
 
-    // Returns true if field path is set (has been asigned a value) and false otherwise
-    public boolean isSetPath() {
-      return this.path != null;
+    /** Returns true if field clientName is set (has been assigned a value) and false otherwise */
+    public boolean isSetClientName() {
+      return this.clientName != null;
     }
 
-    public void setPathIsSet(boolean value) {
+    public void setClientNameIsSet(boolean value) {
       if (!value) {
-        this.path = null;
+        this.clientName = null;
       }
     }
 
-    public long getStart() {
-      return this.start;
+    public long getFileLen() {
+      return this.fileLen;
     }
 
-    public void setStart(long start) {
-      this.start = start;
-      this.__isset.start = true;
+    public complete_args setFileLen(long fileLen) {
+      this.fileLen = fileLen;
+      setFileLenIsSet(true);
+      return this;
     }
 
-    public void unsetStart() {
-      this.__isset.start = false;
+    public void unsetFileLen() {
+      __isset_bit_vector.clear(__FILELEN_ISSET_ID);
     }
 
-    // Returns true if field start is set (has been asigned a value) and false otherwise
-    public boolean isSetStart() {
-      return this.__isset.start;
+    /** Returns true if field fileLen is set (has been assigned a value) and false otherwise */
+    public boolean isSetFileLen() {
+      return __isset_bit_vector.get(__FILELEN_ISSET_ID);
     }
 
-    public void setStartIsSet(boolean value) {
-      this.__isset.start = value;
+    public void setFileLenIsSet(boolean value) {
+      __isset_bit_vector.set(__FILELEN_ISSET_ID, value);
     }
 
-    public long getLength() {
-      return this.length;
+    public TBlock getLastBlock() {
+      return this.lastBlock;
     }
 
-    public void setLength(long length) {
-      this.length = length;
-      this.__isset.length = true;
+    public complete_args setLastBlock(TBlock lastBlock) {
+      this.lastBlock = lastBlock;
+      return this;
     }
 
-    public void unsetLength() {
-      this.__isset.length = false;
+    public void unsetLastBlock() {
+      this.lastBlock = null;
     }
 
-    // Returns true if field length is set (has been asigned a value) and false otherwise
-    public boolean isSetLength() {
-      return this.__isset.length;
+    /** Returns true if field lastBlock is set (has been assigned a value) and false otherwise */
+    public boolean isSetLastBlock() {
+      return this.lastBlock != null;
     }
 
-    public void setLengthIsSet(boolean value) {
-      this.__isset.length = value;
+    public void setLastBlockIsSet(boolean value) {
+      if (!value) {
+        this.lastBlock = null;
+      }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
-      case PATH:
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case PATHNAME:
         if (value == null) {
-          unsetPath();
+          unsetPathname();
         } else {
-          setPath((Pathname)value);
+          setPathname((Pathname)value);
         }
         break;
 
-      case START:
+      case CLIENT_NAME:
         if (value == null) {
-          unsetStart();
+          unsetClientName();
         } else {
-          setStart((Long)value);
+          setClientName((String)value);
         }
         break;
 
-      case LENGTH:
+      case FILE_LEN:
         if (value == null) {
-          unsetLength();
+          unsetFileLen();
         } else {
-          setLength((Long)value);
+          setFileLen((Long)value);
+        }
+        break;
+
+      case LAST_BLOCK:
+        if (value == null) {
+          unsetLastBlock();
+        } else {
+          setLastBlock((TBlock)value);
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return getPath();
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PATHNAME:
+        return getPathname();
 
-      case START:
-        return new Long(getStart());
+      case CLIENT_NAME:
+        return getClientName();
 
-      case LENGTH:
-        return new Long(getLength());
+      case FILE_LEN:
+        return Long.valueOf(getFileLen());
+
+      case LAST_BLOCK:
+        return getLastBlock();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
-      case PATH:
-        return isSetPath();
-      case START:
-        return isSetStart();
-      case LENGTH:
-        return isSetLength();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
       }
+
+      switch (field) {
+      case PATHNAME:
+        return isSetPathname();
+      case CLIENT_NAME:
+        return isSetClientName();
+      case FILE_LEN:
+        return isSetFileLen();
+      case LAST_BLOCK:
+        return isSetLastBlock();
+      }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getFileBlockLocations_args)
-        return this.equals((getFileBlockLocations_args)that);
+      if (that instanceof complete_args)
+        return this.equals((complete_args)that);
       return false;
     }
 
-    public boolean equals(getFileBlockLocations_args that) {
+    public boolean equals(complete_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
+      boolean this_present_pathname = true && this.isSetPathname();
+      boolean that_present_pathname = true && that.isSetPathname();
+      if (this_present_pathname || that_present_pathname) {
+        if (!(this_present_pathname && that_present_pathname))
           return false;
-        if (!this.path.equals(that.path))
+        if (!this.pathname.equals(that.pathname))
           return false;
       }
 
-      boolean this_present_start = true;
-      boolean that_present_start = true;
-      if (this_present_start || that_present_start) {
-        if (!(this_present_start && that_present_start))
+      boolean this_present_clientName = true && this.isSetClientName();
+      boolean that_present_clientName = true && that.isSetClientName();
+      if (this_present_clientName || that_present_clientName) {
+        if (!(this_present_clientName && that_present_clientName))
           return false;
-        if (this.start != that.start)
+        if (!this.clientName.equals(that.clientName))
           return false;
       }
 
-      boolean this_present_length = true;
-      boolean that_present_length = true;
-      if (this_present_length || that_present_length) {
-        if (!(this_present_length && that_present_length))
+      boolean this_present_fileLen = true;
+      boolean that_present_fileLen = true;
+      if (this_present_fileLen || that_present_fileLen) {
+        if (!(this_present_fileLen && that_present_fileLen))
           return false;
-        if (this.length != that.length)
+        if (this.fileLen != that.fileLen)
+          return false;
+      }
+
+      boolean this_present_lastBlock = true && this.isSetLastBlock();
+      boolean that_present_lastBlock = true && that.isSetLastBlock();
+      if (this_present_lastBlock || that_present_lastBlock) {
+        if (!(this_present_lastBlock && that_present_lastBlock))
+          return false;
+        if (!this.lastBlock.equals(that.lastBlock))
           return false;
       }
 
@@ -10565,214 +25499,357 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(complete_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      complete_args typedOther = (complete_args)other;
+
+      lastComparison = Boolean.valueOf(isSetPathname()).compareTo(typedOther.isSetPathname());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPathname()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.pathname, typedOther.pathname);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetClientName()).compareTo(typedOther.isSetClientName());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetClientName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.clientName, typedOther.clientName);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetFileLen()).compareTo(typedOther.isSetFileLen());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetFileLen()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileLen, typedOther.fileLen);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetLastBlock()).compareTo(typedOther.isSetLastBlock());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetLastBlock()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastBlock, typedOther.lastBlock);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case PATH:
-            if (field.type == TType.STRUCT) {
-              this.path = new Pathname();
-              this.path.read(iprot);
+        switch (field.id) {
+          case 1: // PATHNAME
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.pathname = new Pathname();
+              this.pathname.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case START:
-            if (field.type == TType.I64) {
-              this.start = iprot.readI64();
-              this.__isset.start = true;
+          case 2: // CLIENT_NAME
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.clientName = iprot.readString();
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case LENGTH:
-            if (field.type == TType.I64) {
-              this.length = iprot.readI64();
-              this.__isset.length = true;
+          case 3: // FILE_LEN
+            if (field.type == org.apache.thrift.protocol.TType.I64) {
+              this.fileLen = iprot.readI64();
+              setFileLenIsSet(true);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
+          case 4: // LAST_BLOCK
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.lastBlock = new TBlock();
+              this.lastBlock.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        this.path.write(oprot);
+      if (this.pathname != null) {
+        oprot.writeFieldBegin(PATHNAME_FIELD_DESC);
+        this.pathname.write(oprot);
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(START_FIELD_DESC);
-      oprot.writeI64(this.start);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(LENGTH_FIELD_DESC);
-      oprot.writeI64(this.length);
+      if (this.clientName != null) {
+        oprot.writeFieldBegin(CLIENT_NAME_FIELD_DESC);
+        oprot.writeString(this.clientName);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(FILE_LEN_FIELD_DESC);
+      oprot.writeI64(this.fileLen);
       oprot.writeFieldEnd();
+      if (this.lastBlock != null) {
+        oprot.writeFieldBegin(LAST_BLOCK_FIELD_DESC);
+        this.lastBlock.write(oprot);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getFileBlockLocations_args(");
+      StringBuilder sb = new StringBuilder("complete_args(");
       boolean first = true;
 
-      sb.append("path:");
-      if (this.path == null) {
+      sb.append("pathname:");
+      if (this.pathname == null) {
         sb.append("null");
       } else {
-        sb.append(this.path);
+        sb.append(this.pathname);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("start:");
-      sb.append(this.start);
+      sb.append("clientName:");
+      if (this.clientName == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.clientName);
+      }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("length:");
-      sb.append(this.length);
+      sb.append("fileLen:");
+      sb.append(this.fileLen);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("lastBlock:");
+      if (this.lastBlock == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.lastBlock);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
 
-  public static class getFileBlockLocations_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("getFileBlockLocations_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0);
-    private static final TField OUCH_FIELD_DESC = new TField("ouch", TType.STRUCT, (short)1);
+  public static class complete_result implements org.apache.thrift.TBase<complete_result, complete_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("complete_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public boolean success; // required
+    public ThriftIOException ouch; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      OUCH((short)1, "ouch");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
-    public List<BlockLocation> success;
-    public static final int SUCCESS = 0;
-    public ThriftIOException ouch;
-    public static final int OUCH = 1;
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // OUCH
+            return OUCH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
 
-    private final Isset __isset = new Isset();
-    private static final class Isset implements java.io.Serializable {
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
     }
 
-    public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new ListMetaData(TType.LIST, 
-              new StructMetaData(TType.STRUCT, BlockLocation.class))));
-      put(OUCH, new FieldMetaData("ouch", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-    }});
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      FieldMetaData.addStructMetaDataMap(getFileBlockLocations_result.class, metaDataMap);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(complete_result.class, metaDataMap);
     }
 
-    public getFileBlockLocations_result() {
+    public complete_result() {
     }
 
-    public getFileBlockLocations_result(
-      List<BlockLocation> success,
+    public complete_result(
+      boolean success,
       ThriftIOException ouch)
     {
       this();
       this.success = success;
+      setSuccessIsSet(true);
       this.ouch = ouch;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getFileBlockLocations_result(getFileBlockLocations_result other) {
-      if (other.isSetSuccess()) {
-        List<BlockLocation> __this__success = new ArrayList<BlockLocation>();
-        for (BlockLocation other_element : other.success) {
-          __this__success.add(new BlockLocation(other_element));
-        }
-        this.success = __this__success;
-      }
+    public complete_result(complete_result other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
+      this.success = other.success;
       if (other.isSetOuch()) {
         this.ouch = new ThriftIOException(other.ouch);
       }
     }
 
-    @Override
-    public getFileBlockLocations_result clone() {
-      return new getFileBlockLocations_result(this);
-    }
-
-    public int getSuccessSize() {
-      return (this.success == null) ? 0 : this.success.size();
-    }
-
-    public java.util.Iterator<BlockLocation> getSuccessIterator() {
-      return (this.success == null) ? null : this.success.iterator();
+    public complete_result deepCopy() {
+      return new complete_result(this);
     }
 
-    public void addToSuccess(BlockLocation elem) {
-      if (this.success == null) {
-        this.success = new ArrayList<BlockLocation>();
-      }
-      this.success.add(elem);
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+      this.ouch = null;
     }
 
-    public List<BlockLocation> getSuccess() {
+    public boolean isSuccess() {
       return this.success;
     }
 
-    public void setSuccess(List<BlockLocation> success) {
+    public complete_result setSuccess(boolean success) {
       this.success = success;
+      setSuccessIsSet(true);
+      return this;
     }
 
     public void unsetSuccess() {
-      this.success = null;
+      __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
     }
 
-    // Returns true if field success is set (has been asigned a value) and false otherwise
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return this.success != null;
+      return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+      __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
     }
 
     public ThriftIOException getOuch() {
       return this.ouch;
     }
 
-    public void setOuch(ThriftIOException ouch) {
+    public complete_result setOuch(ThriftIOException ouch) {
       this.ouch = ouch;
+      return this;
     }
 
     public void unsetOuch() {
       this.ouch = null;
     }
 
-    // Returns true if field ouch is set (has been asigned a value) and false otherwise
+    /** Returns true if field ouch is set (has been assigned a value) and false otherwise */
     public boolean isSetOuch() {
       return this.ouch != null;
     }
@@ -10783,13 +25860,13 @@ public void setOuchIsSet(boolean value) {
       }
     }
 
-    public void setFieldValue(int fieldID, Object value) {
-      switch (fieldID) {
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<BlockLocation>)value);
+          setSuccess((Boolean)value);
         }
         break;
 
@@ -10801,55 +25878,55 @@ public void setFieldValue(int fieldID, Object value) {
         }
         break;
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
     }
 
-    public Object getFieldValue(int fieldID) {
-      switch (fieldID) {
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
       case SUCCESS:
-        return getSuccess();
+        return Boolean.valueOf(isSuccess());
 
       case OUCH:
         return getOuch();
 
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
-    // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-    public boolean isSet(int fieldID) {
-      switch (fieldID) {
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
       case SUCCESS:
         return isSetSuccess();
       case OUCH:
         return isSetOuch();
-      default:
-        throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
+      throw new IllegalStateException();
     }
 
     @Override
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getFileBlockLocations_result)
-        return this.equals((getFileBlockLocations_result)that);
+      if (that instanceof complete_result)
+        return this.equals((complete_result)that);
       return false;
     }
 
-    public boolean equals(getFileBlockLocations_result that) {
+    public boolean equals(complete_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
+      boolean this_present_success = true;
+      boolean that_present_success = true;
       if (this_present_success || that_present_success) {
         if (!(this_present_success && that_present_success))
           return false;
-        if (!this.success.equals(that.success))
+        if (this.success != that.success)
           return false;
       }
 
@@ -10870,68 +25947,84 @@ public int hashCode() {
       return 0;
     }
 
-    public void read(TProtocol iprot) throws TException {
-      TField field;
+    public int compareTo(complete_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      complete_result typedOther = (complete_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetOuch()).compareTo(typedOther.isSetOuch());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetOuch()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, typedOther.ouch);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
       iprot.readStructBegin();
       while (true)
       {
         field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
           break;
         }
-        switch (field.id)
-        {
-          case SUCCESS:
-            if (field.type == TType.LIST) {
-              {
-                TList _list12 = iprot.readListBegin();
-                this.success = new ArrayList<BlockLocation>(_list12.size);
-                for (int _i13 = 0; _i13 < _list12.size; ++_i13)
-                {
-                  BlockLocation _elem14;
-                  _elem14 = new BlockLocation();
-                  _elem14.read(iprot);
-                  this.success.add(_elem14);
-                }
-                iprot.readListEnd();
-              }
+        switch (field.id) {
+          case 0: // SUCCESS
+            if (field.type == org.apache.thrift.protocol.TType.BOOL) {
+              this.success = iprot.readBool();
+              setSuccessIsSet(true);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case OUCH:
-            if (field.type == TType.STRUCT) {
+          case 1: // OUCH
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
               this.ouch = new ThriftIOException();
               this.ouch.read(iprot);
             } else { 
-              TProtocolUtil.skip(iprot, field.type);
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             }
             break;
           default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
         }
         iprot.readFieldEnd();
       }
       iprot.readStructEnd();
 
-
       // check for required fields of primitive type, which can't be checked in the validate method
       validate();
     }
 
-    public void write(TProtocol oprot) throws TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
-          for (BlockLocation _iter15 : this.success)          {
-            _iter15.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
+        oprot.writeBool(this.success);
         oprot.writeFieldEnd();
       } else if (this.isSetOuch()) {
         oprot.writeFieldBegin(OUCH_FIELD_DESC);
@@ -10944,15 +26037,11 @@ public void write(TProtocol oprot) throws TException {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getFileBlockLocations_result(");
+      StringBuilder sb = new StringBuilder("complete_result(");
       boolean first = true;
 
       sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
+      sb.append(this.success);
       first = false;
       if (!first) sb.append(", ");
       sb.append("ouch:");
@@ -10966,9 +26055,24 @@ public String toString() {
       return sb.toString();
     }
 
-    public void validate() throws TException {
+    public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      // check that fields of type enum have valid values
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
     }
 
   }
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHandle.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHandle.java
index 6b1bfb53..8650fba4 100644
--- a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHandle.java
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHandle.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -9,34 +9,93 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Collections;
-import org.apache.log4j.Logger;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.protocol.*;
+public class ThriftHandle implements org.apache.thrift.TBase<ThriftHandle, ThriftHandle._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftHandle");
 
-public class ThriftHandle implements TBase, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("ThriftHandle");
-  private static final TField ID_FIELD_DESC = new TField("id", TType.I64, (short)1);
+  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I64, (short)1);
 
-  public long id;
-  public static final int ID = 1;
+  public long id; // required
 
-  private final Isset __isset = new Isset();
-  private static final class Isset implements java.io.Serializable {
-    public boolean id = false;
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    ID((short)1, "id");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // ID
+          return ID;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
   }
 
-  public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-    put(ID, new FieldMetaData("id", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-  }});
+  // isset id assignments
+  private static final int __ID_ISSET_ID = 0;
+  private BitSet __isset_bit_vector = new BitSet(1);
 
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    FieldMetaData.addStructMetaDataMap(ThriftHandle.class, metaDataMap);
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThriftHandle.class, metaDataMap);
   }
 
   public ThriftHandle() {
@@ -47,46 +106,53 @@ public ThriftHandle(
   {
     this();
     this.id = id;
-    this.__isset.id = true;
+    setIdIsSet(true);
   }
 
   /**
    * Performs a deep copy on <i>other</i>.
    */
   public ThriftHandle(ThriftHandle other) {
-    __isset.id = other.__isset.id;
+    __isset_bit_vector.clear();
+    __isset_bit_vector.or(other.__isset_bit_vector);
     this.id = other.id;
   }
 
-  @Override
-  public ThriftHandle clone() {
+  public ThriftHandle deepCopy() {
     return new ThriftHandle(this);
   }
 
+  @Override
+  public void clear() {
+    setIdIsSet(false);
+    this.id = 0;
+  }
+
   public long getId() {
     return this.id;
   }
 
-  public void setId(long id) {
+  public ThriftHandle setId(long id) {
     this.id = id;
-    this.__isset.id = true;
+    setIdIsSet(true);
+    return this;
   }
 
   public void unsetId() {
-    this.__isset.id = false;
+    __isset_bit_vector.clear(__ID_ISSET_ID);
   }
 
-  // Returns true if field id is set (has been asigned a value) and false otherwise
+  /** Returns true if field id is set (has been assigned a value) and false otherwise */
   public boolean isSetId() {
-    return this.__isset.id;
+    return __isset_bit_vector.get(__ID_ISSET_ID);
   }
 
   public void setIdIsSet(boolean value) {
-    this.__isset.id = value;
+    __isset_bit_vector.set(__ID_ISSET_ID, value);
   }
 
-  public void setFieldValue(int fieldID, Object value) {
-    switch (fieldID) {
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
     case ID:
       if (value == null) {
         unsetId();
@@ -95,29 +161,29 @@ public void setFieldValue(int fieldID, Object value) {
       }
       break;
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
   }
 
-  public Object getFieldValue(int fieldID) {
-    switch (fieldID) {
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
     case ID:
-      return new Long(getId());
+      return Long.valueOf(getId());
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
-  // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-  public boolean isSet(int fieldID) {
-    switch (fieldID) {
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
     case ID:
       return isSetId();
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
   @Override
@@ -150,39 +216,61 @@ public int hashCode() {
     return 0;
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public int compareTo(ThriftHandle other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    ThriftHandle typedOther = (ThriftHandle)other;
+
+    lastComparison = Boolean.valueOf(isSetId()).compareTo(typedOther.isSetId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
-      switch (field.id)
-      {
-        case ID:
-          if (field.type == TType.I64) {
+      switch (field.id) {
+        case 1: // ID
+          if (field.type == org.apache.thrift.protocol.TType.I64) {
             this.id = iprot.readI64();
-            this.__isset.id = true;
+            setIdIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
 
-
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -205,9 +293,26 @@ public String toString() {
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
-    // check that fields of type enum have valid values
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
   }
 
 }
diff --git a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftIOException.java b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftIOException.java
index f4e09a83..c4c3918c 100644
--- a/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftIOException.java
+++ b/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftIOException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -9,33 +9,91 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Collections;
-import org.apache.log4j.Logger;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.protocol.*;
+public class ThriftIOException extends Exception implements org.apache.thrift.TBase<ThriftIOException, ThriftIOException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftIOException");
 
-public class ThriftIOException extends Exception implements TBase, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("ThriftIOException");
-  private static final TField MESSAGE_FIELD_DESC = new TField("message", TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-  public String message;
-  public static final int MESSAGE = 1;
+  public String message; // required
 
-  private final Isset __isset = new Isset();
-  private static final class Isset implements java.io.Serializable {
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
   }
 
-  public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-    put(MESSAGE, new FieldMetaData("message", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-  }});
+  // isset id assignments
 
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    FieldMetaData.addStructMetaDataMap(ThriftIOException.class, metaDataMap);
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThriftIOException.class, metaDataMap);
   }
 
   public ThriftIOException() {
@@ -57,24 +115,29 @@ public ThriftIOException(ThriftIOException other) {
     }
   }
 
-  @Override
-  public ThriftIOException clone() {
+  public ThriftIOException deepCopy() {
     return new ThriftIOException(this);
   }
 
+  @Override
+  public void clear() {
+    this.message = null;
+  }
+
   public String getMessage() {
     return this.message;
   }
 
-  public void setMessage(String message) {
+  public ThriftIOException setMessage(String message) {
     this.message = message;
+    return this;
   }
 
   public void unsetMessage() {
     this.message = null;
   }
 
-  // Returns true if field message is set (has been asigned a value) and false otherwise
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
   public boolean isSetMessage() {
     return this.message != null;
   }
@@ -85,8 +148,8 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
-  public void setFieldValue(int fieldID, Object value) {
-    switch (fieldID) {
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
     case MESSAGE:
       if (value == null) {
         unsetMessage();
@@ -95,29 +158,29 @@ public void setFieldValue(int fieldID, Object value) {
       }
       break;
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
   }
 
-  public Object getFieldValue(int fieldID) {
-    switch (fieldID) {
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
     case MESSAGE:
       return getMessage();
 
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
-  // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
-  public boolean isSet(int fieldID) {
-    switch (fieldID) {
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
     case MESSAGE:
       return isSetMessage();
-    default:
-      throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
     }
+    throw new IllegalStateException();
   }
 
   @Override
@@ -150,38 +213,60 @@ public int hashCode() {
     return 0;
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public int compareTo(ThriftIOException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    ThriftIOException typedOther = (ThriftIOException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
-      switch (field.id)
-      {
-        case MESSAGE:
-          if (field.type == TType.STRING) {
+      switch (field.id) {
+        case 1: // MESSAGE
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.message = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
 
-
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -210,9 +295,24 @@ public String toString() {
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
-    // check that fields of type enum have valid values
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
   }
 
 }
diff --git a/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem-remote b/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem-remote
index 6f5f8437..3093c3a3 100755
--- a/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem-remote
+++ b/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem-remote
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -40,6 +40,18 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print '  void chown(Pathname path, string owner, string group)'
   print '  void setReplication(Pathname path, i16 replication)'
   print '   getFileBlockLocations(Pathname path, i64 start, i64 length)'
+  print '  bool hardLink(Pathname src, Pathname dest)'
+  print '  void concat(Pathname target,  srcs, bool restricted)'
+  print '  void reportBadBlocks( blocks)'
+  print '  i32 getDataTransferProtocolVersion()'
+  print '  void renewLease(string clientName)'
+  print '  void recoverLease(Pathname path, string clientName)'
+  print '  void closeRecoverLease(Pathname path, string clientName, bool discardLastBlock)'
+  print '  void abandonBlock(TBlock block, Pathname pathname, string clientName)'
+  print '  void abandonFile(Pathname pathname, string clientName)'
+  print '  TLocatedBlock addBlock(Pathname pathname, string clientName, i64 startOffset, TBlock lastBlock,  excludedNodes,  favouredNodes)'
+  print '  TLocatedBlock addFirstBlock(Pathname pathname, string clientName,  excludedNodes,  favouredNodes)'
+  print '  bool complete(Pathname pathname, string clientName, i64 fileLen, TBlock lastBlock)'
   print ''
   sys.exit(0)
 
@@ -52,20 +64,22 @@ http = False
 argi = 1
 
 if sys.argv[argi] == '-h':
-  parts = sys.argv[argi+1].split(':') 
+  parts = sys.argv[argi+1].split(':')
   host = parts[0]
   port = int(parts[1])
   argi += 2
 
 if sys.argv[argi] == '-u':
   url = urlparse(sys.argv[argi+1])
-  parts = url[1].split(':') 
+  parts = url[1].split(':')
   host = parts[0]
   if len(parts) > 1:
     port = int(parts[1])
   else:
     port = 80
   uri = url[2]
+  if url[4]:
+    uri += '?%s' % url[4]
   http = True
   argi += 2
 
@@ -202,4 +216,80 @@ elif cmd == 'getFileBlockLocations':
     sys.exit(1)
   pp.pprint(client.getFileBlockLocations(eval(args[0]),eval(args[1]),eval(args[2]),))
 
+elif cmd == 'hardLink':
+  if len(args) != 2:
+    print 'hardLink requires 2 args'
+    sys.exit(1)
+  pp.pprint(client.hardLink(eval(args[0]),eval(args[1]),))
+
+elif cmd == 'concat':
+  if len(args) != 3:
+    print 'concat requires 3 args'
+    sys.exit(1)
+  pp.pprint(client.concat(eval(args[0]),eval(args[1]),eval(args[2]),))
+
+elif cmd == 'reportBadBlocks':
+  if len(args) != 1:
+    print 'reportBadBlocks requires 1 args'
+    sys.exit(1)
+  pp.pprint(client.reportBadBlocks(eval(args[0]),))
+
+elif cmd == 'getDataTransferProtocolVersion':
+  if len(args) != 0:
+    print 'getDataTransferProtocolVersion requires 0 args'
+    sys.exit(1)
+  pp.pprint(client.getDataTransferProtocolVersion())
+
+elif cmd == 'renewLease':
+  if len(args) != 1:
+    print 'renewLease requires 1 args'
+    sys.exit(1)
+  pp.pprint(client.renewLease(args[0],))
+
+elif cmd == 'recoverLease':
+  if len(args) != 2:
+    print 'recoverLease requires 2 args'
+    sys.exit(1)
+  pp.pprint(client.recoverLease(eval(args[0]),args[1],))
+
+elif cmd == 'closeRecoverLease':
+  if len(args) != 3:
+    print 'closeRecoverLease requires 3 args'
+    sys.exit(1)
+  pp.pprint(client.closeRecoverLease(eval(args[0]),args[1],eval(args[2]),))
+
+elif cmd == 'abandonBlock':
+  if len(args) != 3:
+    print 'abandonBlock requires 3 args'
+    sys.exit(1)
+  pp.pprint(client.abandonBlock(eval(args[0]),eval(args[1]),args[2],))
+
+elif cmd == 'abandonFile':
+  if len(args) != 2:
+    print 'abandonFile requires 2 args'
+    sys.exit(1)
+  pp.pprint(client.abandonFile(eval(args[0]),args[1],))
+
+elif cmd == 'addBlock':
+  if len(args) != 6:
+    print 'addBlock requires 6 args'
+    sys.exit(1)
+  pp.pprint(client.addBlock(eval(args[0]),args[1],eval(args[2]),eval(args[3]),eval(args[4]),eval(args[5]),))
+
+elif cmd == 'addFirstBlock':
+  if len(args) != 4:
+    print 'addFirstBlock requires 4 args'
+    sys.exit(1)
+  pp.pprint(client.addFirstBlock(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+
+elif cmd == 'complete':
+  if len(args) != 4:
+    print 'complete requires 4 args'
+    sys.exit(1)
+  pp.pprint(client.complete(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+
+else:
+  print 'Unrecognized method %s' % cmd
+  sys.exit(1)
+
 transport.close()
diff --git a/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem.py b/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem.py
index f7464e99..d3e056c0 100644
--- a/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem.py
+++ b/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -8,7 +8,7 @@
 from ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
+from thrift.protocol import TBinaryProtocol, TProtocol
 try:
   from thrift.protocol import fastbinary
 except:
@@ -165,11 +165,115 @@ def getFileBlockLocations(self, path, start, length):
     """
     pass
 
+  def hardLink(self, src, dest):
+    """
+    Parameters:
+     - src
+     - dest
+    """
+    pass
+
+  def concat(self, target, srcs, restricted):
+    """
+    Parameters:
+     - target
+     - srcs
+     - restricted
+    """
+    pass
+
+  def reportBadBlocks(self, blocks):
+    """
+    Parameters:
+     - blocks
+    """
+    pass
+
+  def getDataTransferProtocolVersion(self, ):
+    """
+    The following methods are typically used by native C++ hdfs client and
+    are not used by hdfs applications themselves
+    """
+    pass
+
+  def renewLease(self, clientName):
+    """
+    Parameters:
+     - clientName
+    """
+    pass
+
+  def recoverLease(self, path, clientName):
+    """
+    Parameters:
+     - path
+     - clientName
+    """
+    pass
+
+  def closeRecoverLease(self, path, clientName, discardLastBlock):
+    """
+    Parameters:
+     - path
+     - clientName
+     - discardLastBlock
+    """
+    pass
+
+  def abandonBlock(self, block, pathname, clientName):
+    """
+    Parameters:
+     - block
+     - pathname
+     - clientName
+    """
+    pass
+
+  def abandonFile(self, pathname, clientName):
+    """
+    Parameters:
+     - pathname
+     - clientName
+    """
+    pass
+
+  def addBlock(self, pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes):
+    """
+    Parameters:
+     - pathname
+     - clientName
+     - startOffset
+     - lastBlock
+     - excludedNodes
+     - favouredNodes
+    """
+    pass
+
+  def addFirstBlock(self, pathname, clientName, excludedNodes, favouredNodes):
+    """
+    Parameters:
+     - pathname
+     - clientName
+     - excludedNodes
+     - favouredNodes
+    """
+    pass
+
+  def complete(self, pathname, clientName, fileLen, lastBlock):
+    """
+    Parameters:
+     - pathname
+     - clientName
+     - fileLen
+     - lastBlock
+    """
+    pass
+
 
 class Client(Iface):
   def __init__(self, iprot, oprot=None):
     self._iprot = self._oprot = iprot
-    if oprot != None:
+    if oprot is not None:
       self._oprot = oprot
     self._seqid = 0
 
@@ -255,9 +359,9 @@ def recv_create(self, ):
     result = create_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "create failed: unknown result");
 
@@ -297,9 +401,9 @@ def recv_createFile(self, ):
     result = createFile_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "createFile failed: unknown result");
 
@@ -329,9 +433,9 @@ def recv_open(self, ):
     result = open_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "open failed: unknown result");
 
@@ -361,9 +465,9 @@ def recv_append(self, ):
     result = append_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "append failed: unknown result");
 
@@ -395,9 +499,9 @@ def recv_write(self, ):
     result = write_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "write failed: unknown result");
 
@@ -431,9 +535,9 @@ def recv_read(self, ):
     result = read_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "read failed: unknown result");
 
@@ -463,9 +567,9 @@ def recv_close(self, ):
     result = close_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "close failed: unknown result");
 
@@ -497,9 +601,9 @@ def recv_rm(self, ):
     result = rm_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "rm failed: unknown result");
 
@@ -531,9 +635,9 @@ def recv_rename(self, ):
     result = rename_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "rename failed: unknown result");
 
@@ -563,9 +667,9 @@ def recv_mkdirs(self, ):
     result = mkdirs_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "mkdirs failed: unknown result");
 
@@ -595,9 +699,9 @@ def recv_exists(self, ):
     result = exists_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "exists failed: unknown result");
 
@@ -627,9 +731,9 @@ def recv_stat(self, ):
     result = stat_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "stat failed: unknown result");
 
@@ -659,9 +763,9 @@ def recv_listStatus(self, ):
     result = listStatus_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "listStatus failed: unknown result");
 
@@ -693,7 +797,7 @@ def recv_chmod(self, ):
     result = chmod_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     return
 
@@ -727,7 +831,7 @@ def recv_chown(self, ):
     result = chown_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     return
 
@@ -759,7 +863,7 @@ def recv_setReplication(self, ):
     result = setReplication_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     return
 
@@ -793,224 +897,645 @@ def recv_getFileBlockLocations(self, ):
     result = getFileBlockLocations_result()
     result.read(self._iprot)
     self._iprot.readMessageEnd()
-    if result.success != None:
+    if result.success is not None:
       return result.success
-    if result.ouch != None:
+    if result.ouch is not None:
       raise result.ouch
     raise TApplicationException(TApplicationException.MISSING_RESULT, "getFileBlockLocations failed: unknown result");
 
+  def hardLink(self, src, dest):
+    """
+    Parameters:
+     - src
+     - dest
+    """
+    self.send_hardLink(src, dest)
+    return self.recv_hardLink()
 
-class Processor(Iface, TProcessor):
-  def __init__(self, handler):
-    self._handler = handler
-    self._processMap = {}
-    self._processMap["setInactivityTimeoutPeriod"] = Processor.process_setInactivityTimeoutPeriod
-    self._processMap["shutdown"] = Processor.process_shutdown
-    self._processMap["create"] = Processor.process_create
-    self._processMap["createFile"] = Processor.process_createFile
-    self._processMap["open"] = Processor.process_open
-    self._processMap["append"] = Processor.process_append
-    self._processMap["write"] = Processor.process_write
-    self._processMap["read"] = Processor.process_read
-    self._processMap["close"] = Processor.process_close
-    self._processMap["rm"] = Processor.process_rm
-    self._processMap["rename"] = Processor.process_rename
-    self._processMap["mkdirs"] = Processor.process_mkdirs
-    self._processMap["exists"] = Processor.process_exists
-    self._processMap["stat"] = Processor.process_stat
-    self._processMap["listStatus"] = Processor.process_listStatus
-    self._processMap["chmod"] = Processor.process_chmod
-    self._processMap["chown"] = Processor.process_chown
-    self._processMap["setReplication"] = Processor.process_setReplication
-    self._processMap["getFileBlockLocations"] = Processor.process_getFileBlockLocations
-
-  def process(self, iprot, oprot):
-    (name, type, seqid) = iprot.readMessageBegin()
-    if name not in self._processMap:
-      iprot.skip(TType.STRUCT)
-      iprot.readMessageEnd()
-      x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name))
-      oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)
-      x.write(oprot)
-      oprot.writeMessageEnd()
-      oprot.trans.flush()
-      return
-    else:
-      self._processMap[name](self, seqid, iprot, oprot)
-    return True
+  def send_hardLink(self, src, dest):
+    self._oprot.writeMessageBegin('hardLink', TMessageType.CALL, self._seqid)
+    args = hardLink_args()
+    args.src = src
+    args.dest = dest
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
 
-  def process_setInactivityTimeoutPeriod(self, seqid, iprot, oprot):
-    args = setInactivityTimeoutPeriod_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = setInactivityTimeoutPeriod_result()
-    self._handler.setInactivityTimeoutPeriod(args.periodInSeconds)
-    oprot.writeMessageBegin("setInactivityTimeoutPeriod", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def recv_hardLink(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = hardLink_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ouch is not None:
+      raise result.ouch
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "hardLink failed: unknown result");
 
-  def process_shutdown(self, seqid, iprot, oprot):
-    args = shutdown_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = shutdown_result()
-    self._handler.shutdown(args.status)
-    oprot.writeMessageBegin("shutdown", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def concat(self, target, srcs, restricted):
+    """
+    Parameters:
+     - target
+     - srcs
+     - restricted
+    """
+    self.send_concat(target, srcs, restricted)
+    self.recv_concat()
+
+  def send_concat(self, target, srcs, restricted):
+    self._oprot.writeMessageBegin('concat', TMessageType.CALL, self._seqid)
+    args = concat_args()
+    args.target = target
+    args.srcs = srcs
+    args.restricted = restricted
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
 
-  def process_create(self, seqid, iprot, oprot):
-    args = create_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = create_result()
-    try:
-      result.success = self._handler.create(args.path)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("create", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def recv_concat(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = concat_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.ouch is not None:
+      raise result.ouch
+    return
 
-  def process_createFile(self, seqid, iprot, oprot):
-    args = createFile_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = createFile_result()
-    try:
-      result.success = self._handler.createFile(args.path, args.mode, args.overwrite, args.bufferSize, args.block_replication, args.blocksize)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("createFile", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def reportBadBlocks(self, blocks):
+    """
+    Parameters:
+     - blocks
+    """
+    self.send_reportBadBlocks(blocks)
+    self.recv_reportBadBlocks()
 
-  def process_open(self, seqid, iprot, oprot):
-    args = open_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = open_result()
-    try:
-      result.success = self._handler.open(args.path)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("open", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def send_reportBadBlocks(self, blocks):
+    self._oprot.writeMessageBegin('reportBadBlocks', TMessageType.CALL, self._seqid)
+    args = reportBadBlocks_args()
+    args.blocks = blocks
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
 
-  def process_append(self, seqid, iprot, oprot):
-    args = append_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = append_result()
-    try:
-      result.success = self._handler.append(args.path)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("append", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def recv_reportBadBlocks(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = reportBadBlocks_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.ouch is not None:
+      raise result.ouch
+    return
 
-  def process_write(self, seqid, iprot, oprot):
-    args = write_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = write_result()
-    try:
-      result.success = self._handler.write(args.handle, args.data)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("write", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def getDataTransferProtocolVersion(self, ):
+    """
+    The following methods are typically used by native C++ hdfs client and
+    are not used by hdfs applications themselves
+    """
+    self.send_getDataTransferProtocolVersion()
+    return self.recv_getDataTransferProtocolVersion()
 
-  def process_read(self, seqid, iprot, oprot):
-    args = read_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = read_result()
-    try:
-      result.success = self._handler.read(args.handle, args.offset, args.size)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("read", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def send_getDataTransferProtocolVersion(self, ):
+    self._oprot.writeMessageBegin('getDataTransferProtocolVersion', TMessageType.CALL, self._seqid)
+    args = getDataTransferProtocolVersion_args()
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
 
-  def process_close(self, seqid, iprot, oprot):
-    args = close_args()
-    args.read(iprot)
+  def recv_getDataTransferProtocolVersion(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = getDataTransferProtocolVersion_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ouch is not None:
+      raise result.ouch
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getDataTransferProtocolVersion failed: unknown result");
+
+  def renewLease(self, clientName):
+    """
+    Parameters:
+     - clientName
+    """
+    self.send_renewLease(clientName)
+    self.recv_renewLease()
+
+  def send_renewLease(self, clientName):
+    self._oprot.writeMessageBegin('renewLease', TMessageType.CALL, self._seqid)
+    args = renewLease_args()
+    args.clientName = clientName
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_renewLease(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = renewLease_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.ouch is not None:
+      raise result.ouch
+    return
+
+  def recoverLease(self, path, clientName):
+    """
+    Parameters:
+     - path
+     - clientName
+    """
+    self.send_recoverLease(path, clientName)
+    self.recv_recoverLease()
+
+  def send_recoverLease(self, path, clientName):
+    self._oprot.writeMessageBegin('recoverLease', TMessageType.CALL, self._seqid)
+    args = recoverLease_args()
+    args.path = path
+    args.clientName = clientName
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_recoverLease(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = recoverLease_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.ouch is not None:
+      raise result.ouch
+    return
+
+  def closeRecoverLease(self, path, clientName, discardLastBlock):
+    """
+    Parameters:
+     - path
+     - clientName
+     - discardLastBlock
+    """
+    self.send_closeRecoverLease(path, clientName, discardLastBlock)
+    self.recv_closeRecoverLease()
+
+  def send_closeRecoverLease(self, path, clientName, discardLastBlock):
+    self._oprot.writeMessageBegin('closeRecoverLease', TMessageType.CALL, self._seqid)
+    args = closeRecoverLease_args()
+    args.path = path
+    args.clientName = clientName
+    args.discardLastBlock = discardLastBlock
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_closeRecoverLease(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = closeRecoverLease_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.ouch is not None:
+      raise result.ouch
+    return
+
+  def abandonBlock(self, block, pathname, clientName):
+    """
+    Parameters:
+     - block
+     - pathname
+     - clientName
+    """
+    self.send_abandonBlock(block, pathname, clientName)
+    self.recv_abandonBlock()
+
+  def send_abandonBlock(self, block, pathname, clientName):
+    self._oprot.writeMessageBegin('abandonBlock', TMessageType.CALL, self._seqid)
+    args = abandonBlock_args()
+    args.block = block
+    args.pathname = pathname
+    args.clientName = clientName
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_abandonBlock(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = abandonBlock_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.ouch is not None:
+      raise result.ouch
+    return
+
+  def abandonFile(self, pathname, clientName):
+    """
+    Parameters:
+     - pathname
+     - clientName
+    """
+    self.send_abandonFile(pathname, clientName)
+    self.recv_abandonFile()
+
+  def send_abandonFile(self, pathname, clientName):
+    self._oprot.writeMessageBegin('abandonFile', TMessageType.CALL, self._seqid)
+    args = abandonFile_args()
+    args.pathname = pathname
+    args.clientName = clientName
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_abandonFile(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = abandonFile_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.ouch is not None:
+      raise result.ouch
+    return
+
+  def addBlock(self, pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes):
+    """
+    Parameters:
+     - pathname
+     - clientName
+     - startOffset
+     - lastBlock
+     - excludedNodes
+     - favouredNodes
+    """
+    self.send_addBlock(pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes)
+    return self.recv_addBlock()
+
+  def send_addBlock(self, pathname, clientName, startOffset, lastBlock, excludedNodes, favouredNodes):
+    self._oprot.writeMessageBegin('addBlock', TMessageType.CALL, self._seqid)
+    args = addBlock_args()
+    args.pathname = pathname
+    args.clientName = clientName
+    args.startOffset = startOffset
+    args.lastBlock = lastBlock
+    args.excludedNodes = excludedNodes
+    args.favouredNodes = favouredNodes
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_addBlock(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = addBlock_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ouch is not None:
+      raise result.ouch
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "addBlock failed: unknown result");
+
+  def addFirstBlock(self, pathname, clientName, excludedNodes, favouredNodes):
+    """
+    Parameters:
+     - pathname
+     - clientName
+     - excludedNodes
+     - favouredNodes
+    """
+    self.send_addFirstBlock(pathname, clientName, excludedNodes, favouredNodes)
+    return self.recv_addFirstBlock()
+
+  def send_addFirstBlock(self, pathname, clientName, excludedNodes, favouredNodes):
+    self._oprot.writeMessageBegin('addFirstBlock', TMessageType.CALL, self._seqid)
+    args = addFirstBlock_args()
+    args.pathname = pathname
+    args.clientName = clientName
+    args.excludedNodes = excludedNodes
+    args.favouredNodes = favouredNodes
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_addFirstBlock(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = addFirstBlock_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ouch is not None:
+      raise result.ouch
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "addFirstBlock failed: unknown result");
+
+  def complete(self, pathname, clientName, fileLen, lastBlock):
+    """
+    Parameters:
+     - pathname
+     - clientName
+     - fileLen
+     - lastBlock
+    """
+    self.send_complete(pathname, clientName, fileLen, lastBlock)
+    return self.recv_complete()
+
+  def send_complete(self, pathname, clientName, fileLen, lastBlock):
+    self._oprot.writeMessageBegin('complete', TMessageType.CALL, self._seqid)
+    args = complete_args()
+    args.pathname = pathname
+    args.clientName = clientName
+    args.fileLen = fileLen
+    args.lastBlock = lastBlock
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_complete(self, ):
+    (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(self._iprot)
+      self._iprot.readMessageEnd()
+      raise x
+    result = complete_result()
+    result.read(self._iprot)
+    self._iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ouch is not None:
+      raise result.ouch
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "complete failed: unknown result");
+
+
+class Processor(Iface, TProcessor):
+  def __init__(self, handler):
+    self._handler = handler
+    self._processMap = {}
+    self._processMap["setInactivityTimeoutPeriod"] = Processor.process_setInactivityTimeoutPeriod
+    self._processMap["shutdown"] = Processor.process_shutdown
+    self._processMap["create"] = Processor.process_create
+    self._processMap["createFile"] = Processor.process_createFile
+    self._processMap["open"] = Processor.process_open
+    self._processMap["append"] = Processor.process_append
+    self._processMap["write"] = Processor.process_write
+    self._processMap["read"] = Processor.process_read
+    self._processMap["close"] = Processor.process_close
+    self._processMap["rm"] = Processor.process_rm
+    self._processMap["rename"] = Processor.process_rename
+    self._processMap["mkdirs"] = Processor.process_mkdirs
+    self._processMap["exists"] = Processor.process_exists
+    self._processMap["stat"] = Processor.process_stat
+    self._processMap["listStatus"] = Processor.process_listStatus
+    self._processMap["chmod"] = Processor.process_chmod
+    self._processMap["chown"] = Processor.process_chown
+    self._processMap["setReplication"] = Processor.process_setReplication
+    self._processMap["getFileBlockLocations"] = Processor.process_getFileBlockLocations
+    self._processMap["hardLink"] = Processor.process_hardLink
+    self._processMap["concat"] = Processor.process_concat
+    self._processMap["reportBadBlocks"] = Processor.process_reportBadBlocks
+    self._processMap["getDataTransferProtocolVersion"] = Processor.process_getDataTransferProtocolVersion
+    self._processMap["renewLease"] = Processor.process_renewLease
+    self._processMap["recoverLease"] = Processor.process_recoverLease
+    self._processMap["closeRecoverLease"] = Processor.process_closeRecoverLease
+    self._processMap["abandonBlock"] = Processor.process_abandonBlock
+    self._processMap["abandonFile"] = Processor.process_abandonFile
+    self._processMap["addBlock"] = Processor.process_addBlock
+    self._processMap["addFirstBlock"] = Processor.process_addFirstBlock
+    self._processMap["complete"] = Processor.process_complete
+
+  def process(self, iprot, oprot):
+    (name, type, seqid) = iprot.readMessageBegin()
+    if name not in self._processMap:
+      iprot.skip(TType.STRUCT)
+      iprot.readMessageEnd()
+      x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name))
+      oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)
+      x.write(oprot)
+      oprot.writeMessageEnd()
+      oprot.trans.flush()
+      return
+    else:
+      self._processMap[name](self, seqid, iprot, oprot)
+    return True
+
+  def process_setInactivityTimeoutPeriod(self, seqid, iprot, oprot):
+    args = setInactivityTimeoutPeriod_args()
+    args.read(iprot)
     iprot.readMessageEnd()
-    result = close_result()
-    try:
-      result.success = self._handler.close(args.out)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("close", TMessageType.REPLY, seqid)
+    result = setInactivityTimeoutPeriod_result()
+    self._handler.setInactivityTimeoutPeriod(args.periodInSeconds)
+    oprot.writeMessageBegin("setInactivityTimeoutPeriod", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_rm(self, seqid, iprot, oprot):
-    args = rm_args()
+  def process_shutdown(self, seqid, iprot, oprot):
+    args = shutdown_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = rm_result()
-    try:
-      result.success = self._handler.rm(args.path, args.recursive)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("rm", TMessageType.REPLY, seqid)
+    result = shutdown_result()
+    self._handler.shutdown(args.status)
+    oprot.writeMessageBegin("shutdown", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_rename(self, seqid, iprot, oprot):
-    args = rename_args()
+  def process_create(self, seqid, iprot, oprot):
+    args = create_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = rename_result()
+    result = create_result()
     try:
-      result.success = self._handler.rename(args.path, args.dest)
+      result.success = self._handler.create(args.path)
     except ThriftIOException, ouch:
       result.ouch = ouch
-    oprot.writeMessageBegin("rename", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("create", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_mkdirs(self, seqid, iprot, oprot):
-    args = mkdirs_args()
+  def process_createFile(self, seqid, iprot, oprot):
+    args = createFile_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = mkdirs_result()
+    result = createFile_result()
     try:
-      result.success = self._handler.mkdirs(args.path)
+      result.success = self._handler.createFile(args.path, args.mode, args.overwrite, args.bufferSize, args.block_replication, args.blocksize)
     except ThriftIOException, ouch:
       result.ouch = ouch
-    oprot.writeMessageBegin("mkdirs", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("createFile", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_exists(self, seqid, iprot, oprot):
-    args = exists_args()
+  def process_open(self, seqid, iprot, oprot):
+    args = open_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = exists_result()
+    result = open_result()
     try:
-      result.success = self._handler.exists(args.path)
+      result.success = self._handler.open(args.path)
     except ThriftIOException, ouch:
       result.ouch = ouch
-    oprot.writeMessageBegin("exists", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("open", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_append(self, seqid, iprot, oprot):
+    args = append_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = append_result()
+    try:
+      result.success = self._handler.append(args.path)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("append", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_write(self, seqid, iprot, oprot):
+    args = write_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = write_result()
+    try:
+      result.success = self._handler.write(args.handle, args.data)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("write", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_read(self, seqid, iprot, oprot):
+    args = read_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = read_result()
+    try:
+      result.success = self._handler.read(args.handle, args.offset, args.size)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("read", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_close(self, seqid, iprot, oprot):
+    args = close_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = close_result()
+    try:
+      result.success = self._handler.close(args.out)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("close", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_rm(self, seqid, iprot, oprot):
+    args = rm_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = rm_result()
+    try:
+      result.success = self._handler.rm(args.path, args.recursive)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("rm", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_rename(self, seqid, iprot, oprot):
+    args = rename_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = rename_result()
+    try:
+      result.success = self._handler.rename(args.path, args.dest)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("rename", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_mkdirs(self, seqid, iprot, oprot):
+    args = mkdirs_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = mkdirs_result()
+    try:
+      result.success = self._handler.mkdirs(args.path)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("mkdirs", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_exists(self, seqid, iprot, oprot):
+    args = exists_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = exists_result()
+    try:
+      result.success = self._handler.exists(args.path)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("exists", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -1057,64 +1582,1891 @@ def process_chmod(self, seqid, iprot, oprot):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_chown(self, seqid, iprot, oprot):
-    args = chown_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = chown_result()
-    try:
-      self._handler.chown(args.path, args.owner, args.group)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("chown", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def process_chown(self, seqid, iprot, oprot):
+    args = chown_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = chown_result()
+    try:
+      self._handler.chown(args.path, args.owner, args.group)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("chown", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_setReplication(self, seqid, iprot, oprot):
+    args = setReplication_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = setReplication_result()
+    try:
+      self._handler.setReplication(args.path, args.replication)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("setReplication", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_getFileBlockLocations(self, seqid, iprot, oprot):
+    args = getFileBlockLocations_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = getFileBlockLocations_result()
+    try:
+      result.success = self._handler.getFileBlockLocations(args.path, args.start, args.length)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("getFileBlockLocations", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_hardLink(self, seqid, iprot, oprot):
+    args = hardLink_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = hardLink_result()
+    try:
+      result.success = self._handler.hardLink(args.src, args.dest)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("hardLink", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_concat(self, seqid, iprot, oprot):
+    args = concat_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = concat_result()
+    try:
+      self._handler.concat(args.target, args.srcs, args.restricted)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("concat", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_reportBadBlocks(self, seqid, iprot, oprot):
+    args = reportBadBlocks_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = reportBadBlocks_result()
+    try:
+      self._handler.reportBadBlocks(args.blocks)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("reportBadBlocks", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_getDataTransferProtocolVersion(self, seqid, iprot, oprot):
+    args = getDataTransferProtocolVersion_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = getDataTransferProtocolVersion_result()
+    try:
+      result.success = self._handler.getDataTransferProtocolVersion()
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("getDataTransferProtocolVersion", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_renewLease(self, seqid, iprot, oprot):
+    args = renewLease_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = renewLease_result()
+    try:
+      self._handler.renewLease(args.clientName)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("renewLease", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_recoverLease(self, seqid, iprot, oprot):
+    args = recoverLease_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = recoverLease_result()
+    try:
+      self._handler.recoverLease(args.path, args.clientName)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("recoverLease", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_closeRecoverLease(self, seqid, iprot, oprot):
+    args = closeRecoverLease_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = closeRecoverLease_result()
+    try:
+      self._handler.closeRecoverLease(args.path, args.clientName, args.discardLastBlock)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("closeRecoverLease", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_abandonBlock(self, seqid, iprot, oprot):
+    args = abandonBlock_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = abandonBlock_result()
+    try:
+      self._handler.abandonBlock(args.block, args.pathname, args.clientName)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("abandonBlock", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_abandonFile(self, seqid, iprot, oprot):
+    args = abandonFile_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = abandonFile_result()
+    try:
+      self._handler.abandonFile(args.pathname, args.clientName)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("abandonFile", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_addBlock(self, seqid, iprot, oprot):
+    args = addBlock_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = addBlock_result()
+    try:
+      result.success = self._handler.addBlock(args.pathname, args.clientName, args.startOffset, args.lastBlock, args.excludedNodes, args.favouredNodes)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("addBlock", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_addFirstBlock(self, seqid, iprot, oprot):
+    args = addFirstBlock_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = addFirstBlock_result()
+    try:
+      result.success = self._handler.addFirstBlock(args.pathname, args.clientName, args.excludedNodes, args.favouredNodes)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("addFirstBlock", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_complete(self, seqid, iprot, oprot):
+    args = complete_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = complete_result()
+    try:
+      result.success = self._handler.complete(args.pathname, args.clientName, args.fileLen, args.lastBlock)
+    except ThriftIOException, ouch:
+      result.ouch = ouch
+    oprot.writeMessageBegin("complete", TMessageType.REPLY, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+
+# HELPER FUNCTIONS AND STRUCTURES
+
+class setInactivityTimeoutPeriod_args:
+  """
+  Attributes:
+   - periodInSeconds
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.I64, 'periodInSeconds', None, None, ), # 1
+  )
+
+  def __init__(self, periodInSeconds=None,):
+    self.periodInSeconds = periodInSeconds
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.I64:
+          self.periodInSeconds = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('setInactivityTimeoutPeriod_args')
+    if self.periodInSeconds is not None:
+      oprot.writeFieldBegin('periodInSeconds', TType.I64, 1)
+      oprot.writeI64(self.periodInSeconds)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class setInactivityTimeoutPeriod_result:
+
+  thrift_spec = (
+  )
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('setInactivityTimeoutPeriod_result')
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class shutdown_args:
+  """
+  Attributes:
+   - status
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.I32, 'status', None, None, ), # 1
+  )
+
+  def __init__(self, status=None,):
+    self.status = status
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.I32:
+          self.status = iprot.readI32();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('shutdown_args')
+    if self.status is not None:
+      oprot.writeFieldBegin('status', TType.I32, 1)
+      oprot.writeI32(self.status)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class shutdown_result:
+
+  thrift_spec = (
+  )
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('shutdown_result')
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class create_args:
+  """
+  Attributes:
+   - path
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, path=None,):
+    self.path = path
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('create_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class create_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.STRUCT, 'success', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = ThriftHandle()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('create_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class createFile_args:
+  """
+  Attributes:
+   - path
+   - mode
+   - overwrite
+   - bufferSize
+   - block_replication
+   - blocksize
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.I16, 'mode', None, None, ), # 2
+    (3, TType.BOOL, 'overwrite', None, None, ), # 3
+    (4, TType.I32, 'bufferSize', None, None, ), # 4
+    (5, TType.I16, 'block_replication', None, None, ), # 5
+    (6, TType.I64, 'blocksize', None, None, ), # 6
+  )
+
+  def __init__(self, path=None, mode=None, overwrite=None, bufferSize=None, block_replication=None, blocksize=None,):
+    self.path = path
+    self.mode = mode
+    self.overwrite = overwrite
+    self.bufferSize = bufferSize
+    self.block_replication = block_replication
+    self.blocksize = blocksize
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I16:
+          self.mode = iprot.readI16();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.BOOL:
+          self.overwrite = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.I32:
+          self.bufferSize = iprot.readI32();
+        else:
+          iprot.skip(ftype)
+      elif fid == 5:
+        if ftype == TType.I16:
+          self.block_replication = iprot.readI16();
+        else:
+          iprot.skip(ftype)
+      elif fid == 6:
+        if ftype == TType.I64:
+          self.blocksize = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('createFile_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
+      oprot.writeFieldEnd()
+    if self.mode is not None:
+      oprot.writeFieldBegin('mode', TType.I16, 2)
+      oprot.writeI16(self.mode)
+      oprot.writeFieldEnd()
+    if self.overwrite is not None:
+      oprot.writeFieldBegin('overwrite', TType.BOOL, 3)
+      oprot.writeBool(self.overwrite)
+      oprot.writeFieldEnd()
+    if self.bufferSize is not None:
+      oprot.writeFieldBegin('bufferSize', TType.I32, 4)
+      oprot.writeI32(self.bufferSize)
+      oprot.writeFieldEnd()
+    if self.block_replication is not None:
+      oprot.writeFieldBegin('block_replication', TType.I16, 5)
+      oprot.writeI16(self.block_replication)
+      oprot.writeFieldEnd()
+    if self.blocksize is not None:
+      oprot.writeFieldBegin('blocksize', TType.I64, 6)
+      oprot.writeI64(self.blocksize)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class createFile_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.STRUCT, 'success', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = ThriftHandle()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('createFile_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class open_args:
+  """
+  Attributes:
+   - path
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, path=None,):
+    self.path = path
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('open_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class open_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.STRUCT, 'success', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = ThriftHandle()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('open_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class append_args:
+  """
+  Attributes:
+   - path
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, path=None,):
+    self.path = path
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('append_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class append_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.STRUCT, 'success', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = ThriftHandle()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('append_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class write_args:
+  """
+  Attributes:
+   - handle
+   - data
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'handle', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 1
+    (2, TType.STRING, 'data', None, None, ), # 2
+  )
+
+  def __init__(self, handle=None, data=None,):
+    self.handle = handle
+    self.data = data
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.handle = ThriftHandle()
+          self.handle.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.data = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('write_args')
+    if self.handle is not None:
+      oprot.writeFieldBegin('handle', TType.STRUCT, 1)
+      self.handle.write(oprot)
+      oprot.writeFieldEnd()
+    if self.data is not None:
+      oprot.writeFieldBegin('data', TType.STRING, 2)
+      oprot.writeString(self.data)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class write_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.BOOL:
+          self.success = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('write_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.BOOL, 0)
+      oprot.writeBool(self.success)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class read_args:
+  """
+  Attributes:
+   - handle
+   - offset
+   - size
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'handle', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 1
+    (2, TType.I64, 'offset', None, None, ), # 2
+    (3, TType.I32, 'size', None, None, ), # 3
+  )
+
+  def __init__(self, handle=None, offset=None, size=None,):
+    self.handle = handle
+    self.offset = offset
+    self.size = size
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.handle = ThriftHandle()
+          self.handle.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I64:
+          self.offset = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.I32:
+          self.size = iprot.readI32();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('read_args')
+    if self.handle is not None:
+      oprot.writeFieldBegin('handle', TType.STRUCT, 1)
+      self.handle.write(oprot)
+      oprot.writeFieldEnd()
+    if self.offset is not None:
+      oprot.writeFieldBegin('offset', TType.I64, 2)
+      oprot.writeI64(self.offset)
+      oprot.writeFieldEnd()
+    if self.size is not None:
+      oprot.writeFieldBegin('size', TType.I32, 3)
+      oprot.writeI32(self.size)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class read_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.STRING, 'success', None, None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.STRING:
+          self.success = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('read_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRING, 0)
+      oprot.writeString(self.success)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class close_args:
+  """
+  Attributes:
+   - out
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'out', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, out=None,):
+    self.out = out
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.out = ThriftHandle()
+          self.out.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('close_args')
+    if self.out is not None:
+      oprot.writeFieldBegin('out', TType.STRUCT, 1)
+      self.out.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class close_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.BOOL:
+          self.success = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('close_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.BOOL, 0)
+      oprot.writeBool(self.success)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class rm_args:
+  """
+  Attributes:
+   - path
+   - recursive
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.BOOL, 'recursive', None, None, ), # 2
+  )
+
+  def __init__(self, path=None, recursive=None,):
+    self.path = path
+    self.recursive = recursive
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.BOOL:
+          self.recursive = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('rm_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
+      oprot.writeFieldEnd()
+    if self.recursive is not None:
+      oprot.writeFieldBegin('recursive', TType.BOOL, 2)
+      oprot.writeBool(self.recursive)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class rm_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.BOOL:
+          self.success = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('rm_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.BOOL, 0)
+      oprot.writeBool(self.success)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class rename_args:
+  """
+  Attributes:
+   - path
+   - dest
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRUCT, 'dest', (Pathname, Pathname.thrift_spec), None, ), # 2
+  )
+
+  def __init__(self, path=None, dest=None,):
+    self.path = path
+    self.dest = dest
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRUCT:
+          self.dest = Pathname()
+          self.dest.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('rename_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
+      oprot.writeFieldEnd()
+    if self.dest is not None:
+      oprot.writeFieldBegin('dest', TType.STRUCT, 2)
+      self.dest.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class rename_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.BOOL:
+          self.success = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('rename_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.BOOL, 0)
+      oprot.writeBool(self.success)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class mkdirs_args:
+  """
+  Attributes:
+   - path
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, path=None,):
+    self.path = path
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('mkdirs_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class mkdirs_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
+
+  thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
+  )
+
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 0:
+        if ftype == TType.BOOL:
+          self.success = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('mkdirs_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.BOOL, 0)
+      oprot.writeBool(self.success)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
 
-  def process_setReplication(self, seqid, iprot, oprot):
-    args = setReplication_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = setReplication_result()
-    try:
-      self._handler.setReplication(args.path, args.replication)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("setReplication", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+  def validate(self):
+    return
 
-  def process_getFileBlockLocations(self, seqid, iprot, oprot):
-    args = getFileBlockLocations_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = getFileBlockLocations_result()
-    try:
-      result.success = self._handler.getFileBlockLocations(args.path, args.start, args.length)
-    except ThriftIOException, ouch:
-      result.ouch = ouch
-    oprot.writeMessageBegin("getFileBlockLocations", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
 
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
-# HELPER FUNCTIONS AND STRUCTURES
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
 
-class setInactivityTimeoutPeriod_args:
+  def __ne__(self, other):
+    return not (self == other)
+
+class exists_args:
   """
   Attributes:
-   - periodInSeconds
+   - path
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.I64, 'periodInSeconds', None, None, ), # 1
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, periodInSeconds=None,):
-    self.periodInSeconds = periodInSeconds
+  def __init__(self, path=None,):
+    self.path = path
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -1126,8 +3478,9 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 1:
-        if ftype == TType.I64:
-          self.periodInSeconds = iprot.readI64();
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
         else:
           iprot.skip(ftype)
       else:
@@ -1139,14 +3492,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('setInactivityTimeoutPeriod_args')
-    if self.periodInSeconds != None:
-      oprot.writeFieldBegin('periodInSeconds', TType.I64, 1)
-      oprot.writeI64(self.periodInSeconds)
+    oprot.writeStructBegin('exists_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1158,11 +3515,22 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class setInactivityTimeoutPeriod_result:
+class exists_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
 
   thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
       fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
@@ -1172,6 +3540,17 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
+      if fid == 0:
+        if ftype == TType.BOOL:
+          self.success = iprot.readBool();
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -1181,10 +3560,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('setInactivityTimeoutPeriod_result')
+    oprot.writeStructBegin('exists_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.BOOL, 0)
+      oprot.writeBool(self.success)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1196,19 +3587,19 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class shutdown_args:
+class stat_args:
   """
   Attributes:
-   - status
+   - path
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.I32, 'status', None, None, ), # 1
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, status=None,):
-    self.status = status
+  def __init__(self, path=None,):
+    self.path = path
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -1220,8 +3611,9 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 1:
-        if ftype == TType.I32:
-          self.status = iprot.readI32();
+        if ftype == TType.STRUCT:
+          self.path = Pathname()
+          self.path.read(iprot)
         else:
           iprot.skip(ftype)
       else:
@@ -1233,14 +3625,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('shutdown_args')
-    if self.status != None:
-      oprot.writeFieldBegin('status', TType.I32, 1)
-      oprot.writeI32(self.status)
+    oprot.writeStructBegin('stat_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1252,11 +3648,22 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class shutdown_result:
+class stat_result:
+  """
+  Attributes:
+   - success
+   - ouch
+  """
 
   thrift_spec = (
+    (0, TType.STRUCT, 'success', (FileStatus, FileStatus.thrift_spec), None, ), # 0
+    (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
+    self.ouch = ouch
+
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
       fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
@@ -1266,6 +3673,18 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = FileStatus()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
+        if ftype == TType.STRUCT:
+          self.ouch = ThriftIOException()
+          self.ouch.read(iprot)
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -1275,10 +3694,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('shutdown_result')
+    oprot.writeStructBegin('stat_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
+      oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
+      self.ouch.write(oprot)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1290,7 +3721,7 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class create_args:
+class listStatus_args:
   """
   Attributes:
    - path
@@ -1328,14 +3759,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('create_args')
-    if self.path != None:
+    oprot.writeStructBegin('listStatus_args')
+    if self.path is not None:
       oprot.writeFieldBegin('path', TType.STRUCT, 1)
       self.path.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1347,7 +3782,7 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class create_result:
+class listStatus_result:
   """
   Attributes:
    - success
@@ -1355,7 +3790,7 @@ class create_result:
   """
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT,(FileStatus, FileStatus.thrift_spec)), None, ), # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
@@ -1373,9 +3808,14 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 0:
-        if ftype == TType.STRUCT:
-          self.success = ThriftHandle()
-          self.success.read(iprot)
+        if ftype == TType.LIST:
+          self.success = []
+          (_etype24, _size21) = iprot.readListBegin()
+          for _i25 in xrange(_size21):
+            _elem26 = FileStatus()
+            _elem26.read(iprot)
+            self.success.append(_elem26)
+          iprot.readListEnd()
         else:
           iprot.skip(ftype)
       elif fid == 1:
@@ -1393,18 +3833,25 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('create_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.STRUCT, 0)
-      self.success.write(oprot)
+    oprot.writeStructBegin('listStatus_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.LIST, 0)
+      oprot.writeListBegin(TType.STRUCT, len(self.success))
+      for iter27 in self.success:
+        iter27.write(oprot)
+      oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.ouch != None:
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1416,34 +3863,22 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class createFile_args:
+class chmod_args:
   """
   Attributes:
    - path
    - mode
-   - overwrite
-   - bufferSize
-   - block_replication
-   - blocksize
   """
 
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
     (2, TType.I16, 'mode', None, None, ), # 2
-    (3, TType.BOOL, 'overwrite', None, None, ), # 3
-    (4, TType.I32, 'bufferSize', None, None, ), # 4
-    (5, TType.I16, 'block_replication', None, None, ), # 5
-    (6, TType.I64, 'blocksize', None, None, ), # 6
   )
 
-  def __init__(self, path=None, mode=None, overwrite=None, bufferSize=None, block_replication=None, blocksize=None,):
+  def __init__(self, path=None, mode=None,):
     self.path = path
     self.mode = mode
-    self.overwrite = overwrite
-    self.bufferSize = bufferSize
-    self.block_replication = block_replication
-    self.blocksize = blocksize
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -1459,30 +3894,10 @@ def read(self, iprot):
           self.path = Pathname()
           self.path.read(iprot)
         else:
-          iprot.skip(ftype)
-      elif fid == 2:
-        if ftype == TType.I16:
-          self.mode = iprot.readI16();
-        else:
-          iprot.skip(ftype)
-      elif fid == 3:
-        if ftype == TType.BOOL:
-          self.overwrite = iprot.readBool();
-        else:
-          iprot.skip(ftype)
-      elif fid == 4:
-        if ftype == TType.I32:
-          self.bufferSize = iprot.readI32();
-        else:
-          iprot.skip(ftype)
-      elif fid == 5:
-        if ftype == TType.I16:
-          self.block_replication = iprot.readI16();
-        else:
-          iprot.skip(ftype)
-      elif fid == 6:
-        if ftype == TType.I64:
-          self.blocksize = iprot.readI64();
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I16:
+          self.mode = iprot.readI16();
         else:
           iprot.skip(ftype)
       else:
@@ -1494,34 +3909,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('createFile_args')
-    if self.path != None:
+    oprot.writeStructBegin('chmod_args')
+    if self.path is not None:
       oprot.writeFieldBegin('path', TType.STRUCT, 1)
       self.path.write(oprot)
       oprot.writeFieldEnd()
-    if self.mode != None:
+    if self.mode is not None:
       oprot.writeFieldBegin('mode', TType.I16, 2)
       oprot.writeI16(self.mode)
       oprot.writeFieldEnd()
-    if self.overwrite != None:
-      oprot.writeFieldBegin('overwrite', TType.BOOL, 3)
-      oprot.writeBool(self.overwrite)
-      oprot.writeFieldEnd()
-    if self.bufferSize != None:
-      oprot.writeFieldBegin('bufferSize', TType.I32, 4)
-      oprot.writeI32(self.bufferSize)
-      oprot.writeFieldEnd()
-    if self.block_replication != None:
-      oprot.writeFieldBegin('block_replication', TType.I16, 5)
-      oprot.writeI16(self.block_replication)
-      oprot.writeFieldEnd()
-    if self.blocksize != None:
-      oprot.writeFieldBegin('blocksize', TType.I64, 6)
-      oprot.writeI64(self.blocksize)
-      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1533,20 +3936,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class createFile_result:
+class chmod_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -1558,13 +3959,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.STRUCT:
-          self.success = ThriftHandle()
-          self.success.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -1579,18 +3974,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('createFile_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.STRUCT, 0)
-      self.success.write(oprot)
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    oprot.writeStructBegin('chmod_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1602,19 +3997,25 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class open_args:
+class chown_args:
   """
   Attributes:
    - path
+   - owner
+   - group
   """
 
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRING, 'owner', None, None, ), # 2
+    (3, TType.STRING, 'group', None, None, ), # 3
   )
 
-  def __init__(self, path=None,):
+  def __init__(self, path=None, owner=None, group=None,):
     self.path = path
+    self.owner = owner
+    self.group = group
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -1631,6 +4032,16 @@ def read(self, iprot):
           self.path.read(iprot)
         else:
           iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.owner = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRING:
+          self.group = iprot.readString();
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -1640,14 +4051,26 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('open_args')
-    if self.path != None:
+    oprot.writeStructBegin('chown_args')
+    if self.path is not None:
       oprot.writeFieldBegin('path', TType.STRUCT, 1)
       self.path.write(oprot)
       oprot.writeFieldEnd()
+    if self.owner is not None:
+      oprot.writeFieldBegin('owner', TType.STRING, 2)
+      oprot.writeString(self.owner)
+      oprot.writeFieldEnd()
+    if self.group is not None:
+      oprot.writeFieldBegin('group', TType.STRING, 3)
+      oprot.writeString(self.group)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1659,20 +4082,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class open_result:
+class chown_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -1684,13 +4105,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.STRUCT:
-          self.success = ThriftHandle()
-          self.success.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -1705,18 +4120,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('open_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.STRUCT, 0)
-      self.success.write(oprot)
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    oprot.writeStructBegin('chown_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1728,19 +4143,22 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class append_args:
+class setReplication_args:
   """
   Attributes:
    - path
+   - replication
   """
 
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.I16, 'replication', None, None, ), # 2
   )
 
-  def __init__(self, path=None,):
+  def __init__(self, path=None, replication=None,):
     self.path = path
+    self.replication = replication
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -1757,6 +4175,11 @@ def read(self, iprot):
           self.path.read(iprot)
         else:
           iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I16:
+          self.replication = iprot.readI16();
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -1766,14 +4189,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('append_args')
-    if self.path != None:
+    oprot.writeStructBegin('setReplication_args')
+    if self.path is not None:
       oprot.writeFieldBegin('path', TType.STRUCT, 1)
       self.path.write(oprot)
       oprot.writeFieldEnd()
+    if self.replication is not None:
+      oprot.writeFieldBegin('replication', TType.I16, 2)
+      oprot.writeI16(self.replication)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1785,20 +4216,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class append_result:
+class setReplication_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -1810,13 +4239,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.STRUCT:
-          self.success = ThriftHandle()
-          self.success.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -1831,18 +4254,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('append_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.STRUCT, 0)
-      self.success.write(oprot)
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    oprot.writeStructBegin('setReplication_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1854,22 +4277,25 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class write_args:
+class getFileBlockLocations_args:
   """
   Attributes:
-   - handle
-   - data
+   - path
+   - start
+   - length
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'handle', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 1
-    (2, TType.STRING, 'data', None, None, ), # 2
+    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.I64, 'start', None, None, ), # 2
+    (3, TType.I64, 'length', None, None, ), # 3
   )
 
-  def __init__(self, handle=None, data=None,):
-    self.handle = handle
-    self.data = data
+  def __init__(self, path=None, start=None, length=None,):
+    self.path = path
+    self.start = start
+    self.length = length
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -1882,13 +4308,18 @@ def read(self, iprot):
         break
       if fid == 1:
         if ftype == TType.STRUCT:
-          self.handle = ThriftHandle()
-          self.handle.read(iprot)
+          self.path = Pathname()
+          self.path.read(iprot)
         else:
           iprot.skip(ftype)
       elif fid == 2:
-        if ftype == TType.STRING:
-          self.data = iprot.readString();
+        if ftype == TType.I64:
+          self.start = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.I64:
+          self.length = iprot.readI64();
         else:
           iprot.skip(ftype)
       else:
@@ -1900,18 +4331,26 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('write_args')
-    if self.handle != None:
-      oprot.writeFieldBegin('handle', TType.STRUCT, 1)
-      self.handle.write(oprot)
+    oprot.writeStructBegin('getFileBlockLocations_args')
+    if self.path is not None:
+      oprot.writeFieldBegin('path', TType.STRUCT, 1)
+      self.path.write(oprot)
       oprot.writeFieldEnd()
-    if self.data != None:
-      oprot.writeFieldBegin('data', TType.STRING, 2)
-      oprot.writeString(self.data)
+    if self.start is not None:
+      oprot.writeFieldBegin('start', TType.I64, 2)
+      oprot.writeI64(self.start)
+      oprot.writeFieldEnd()
+    if self.length is not None:
+      oprot.writeFieldBegin('length', TType.I64, 3)
+      oprot.writeI64(self.length)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1923,7 +4362,7 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class write_result:
+class getFileBlockLocations_result:
   """
   Attributes:
    - success
@@ -1931,7 +4370,7 @@ class write_result:
   """
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None, ), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT,(BlockLocation, BlockLocation.thrift_spec)), None, ), # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
@@ -1949,8 +4388,14 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 0:
-        if ftype == TType.BOOL:
-          self.success = iprot.readBool();
+        if ftype == TType.LIST:
+          self.success = []
+          (_etype31, _size28) = iprot.readListBegin()
+          for _i32 in xrange(_size28):
+            _elem33 = BlockLocation()
+            _elem33.read(iprot)
+            self.success.append(_elem33)
+          iprot.readListEnd()
         else:
           iprot.skip(ftype)
       elif fid == 1:
@@ -1968,18 +4413,25 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('write_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.BOOL, 0)
-      oprot.writeBool(self.success)
+    oprot.writeStructBegin('getFileBlockLocations_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.LIST, 0)
+      oprot.writeListBegin(TType.STRUCT, len(self.success))
+      for iter34 in self.success:
+        iter34.write(oprot)
+      oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.ouch != None:
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1991,25 +4443,22 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class read_args:
+class hardLink_args:
   """
   Attributes:
-   - handle
-   - offset
-   - size
+   - src
+   - dest
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'handle', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 1
-    (2, TType.I64, 'offset', None, None, ), # 2
-    (3, TType.I32, 'size', None, None, ), # 3
+    (1, TType.STRUCT, 'src', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRUCT, 'dest', (Pathname, Pathname.thrift_spec), None, ), # 2
   )
 
-  def __init__(self, handle=None, offset=None, size=None,):
-    self.handle = handle
-    self.offset = offset
-    self.size = size
+  def __init__(self, src=None, dest=None,):
+    self.src = src
+    self.dest = dest
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -2022,18 +4471,14 @@ def read(self, iprot):
         break
       if fid == 1:
         if ftype == TType.STRUCT:
-          self.handle = ThriftHandle()
-          self.handle.read(iprot)
+          self.src = Pathname()
+          self.src.read(iprot)
         else:
           iprot.skip(ftype)
       elif fid == 2:
-        if ftype == TType.I64:
-          self.offset = iprot.readI64();
-        else:
-          iprot.skip(ftype)
-      elif fid == 3:
-        if ftype == TType.I32:
-          self.size = iprot.readI32();
+        if ftype == TType.STRUCT:
+          self.dest = Pathname()
+          self.dest.read(iprot)
         else:
           iprot.skip(ftype)
       else:
@@ -2045,22 +4490,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('read_args')
-    if self.handle != None:
-      oprot.writeFieldBegin('handle', TType.STRUCT, 1)
-      self.handle.write(oprot)
+    oprot.writeStructBegin('hardLink_args')
+    if self.src is not None:
+      oprot.writeFieldBegin('src', TType.STRUCT, 1)
+      self.src.write(oprot)
       oprot.writeFieldEnd()
-    if self.offset != None:
-      oprot.writeFieldBegin('offset', TType.I64, 2)
-      oprot.writeI64(self.offset)
-      oprot.writeFieldEnd()
-    if self.size != None:
-      oprot.writeFieldBegin('size', TType.I32, 3)
-      oprot.writeI32(self.size)
+    if self.dest is not None:
+      oprot.writeFieldBegin('dest', TType.STRUCT, 2)
+      self.dest.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2072,7 +4517,7 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class read_result:
+class hardLink_result:
   """
   Attributes:
    - success
@@ -2080,7 +4525,7 @@ class read_result:
   """
 
   thrift_spec = (
-    (0, TType.STRING, 'success', None, None, ), # 0
+    (0, TType.BOOL, 'success', None, None, ), # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
@@ -2098,8 +4543,8 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 0:
-        if ftype == TType.STRING:
-          self.success = iprot.readString();
+        if ftype == TType.BOOL:
+          self.success = iprot.readBool();
         else:
           iprot.skip(ftype)
       elif fid == 1:
@@ -2117,18 +4562,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('read_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.STRING, 0)
-      oprot.writeString(self.success)
+    oprot.writeStructBegin('hardLink_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.BOOL, 0)
+      oprot.writeBool(self.success)
       oprot.writeFieldEnd()
-    if self.ouch != None:
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2140,19 +4589,25 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class close_args:
+class concat_args:
   """
   Attributes:
-   - out
+   - target
+   - srcs
+   - restricted
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'out', (ThriftHandle, ThriftHandle.thrift_spec), None, ), # 1
+    (1, TType.STRUCT, 'target', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.LIST, 'srcs', (TType.STRUCT,(Pathname, Pathname.thrift_spec)), None, ), # 2
+    (3, TType.BOOL, 'restricted', None, None, ), # 3
   )
 
-  def __init__(self, out=None,):
-    self.out = out
+  def __init__(self, target=None, srcs=None, restricted=None,):
+    self.target = target
+    self.srcs = srcs
+    self.restricted = restricted
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -2165,8 +4620,24 @@ def read(self, iprot):
         break
       if fid == 1:
         if ftype == TType.STRUCT:
-          self.out = ThriftHandle()
-          self.out.read(iprot)
+          self.target = Pathname()
+          self.target.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.LIST:
+          self.srcs = []
+          (_etype38, _size35) = iprot.readListBegin()
+          for _i39 in xrange(_size35):
+            _elem40 = Pathname()
+            _elem40.read(iprot)
+            self.srcs.append(_elem40)
+          iprot.readListEnd()
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.BOOL:
+          self.restricted = iprot.readBool();
         else:
           iprot.skip(ftype)
       else:
@@ -2178,14 +4649,29 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('close_args')
-    if self.out != None:
-      oprot.writeFieldBegin('out', TType.STRUCT, 1)
-      self.out.write(oprot)
+    oprot.writeStructBegin('concat_args')
+    if self.target is not None:
+      oprot.writeFieldBegin('target', TType.STRUCT, 1)
+      self.target.write(oprot)
+      oprot.writeFieldEnd()
+    if self.srcs is not None:
+      oprot.writeFieldBegin('srcs', TType.LIST, 2)
+      oprot.writeListBegin(TType.STRUCT, len(self.srcs))
+      for iter41 in self.srcs:
+        iter41.write(oprot)
+      oprot.writeListEnd()
+      oprot.writeFieldEnd()
+    if self.restricted is not None:
+      oprot.writeFieldBegin('restricted', TType.BOOL, 3)
+      oprot.writeBool(self.restricted)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2197,20 +4683,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class close_result:
+class concat_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -2222,12 +4706,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.BOOL:
-          self.success = iprot.readBool();
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -2242,18 +4721,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('close_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.BOOL, 0)
-      oprot.writeBool(self.success)
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    oprot.writeStructBegin('concat_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2265,22 +4744,19 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class rm_args:
+class reportBadBlocks_args:
   """
   Attributes:
-   - path
-   - recursive
+   - blocks
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
-    (2, TType.BOOL, 'recursive', None, None, ), # 2
+    (1, TType.LIST, 'blocks', (TType.STRUCT,(TLocatedBlock, TLocatedBlock.thrift_spec)), None, ), # 1
   )
 
-  def __init__(self, path=None, recursive=None,):
-    self.path = path
-    self.recursive = recursive
+  def __init__(self, blocks=None,):
+    self.blocks = blocks
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -2292,14 +4768,14 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 1:
-        if ftype == TType.STRUCT:
-          self.path = Pathname()
-          self.path.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 2:
-        if ftype == TType.BOOL:
-          self.recursive = iprot.readBool();
+        if ftype == TType.LIST:
+          self.blocks = []
+          (_etype45, _size42) = iprot.readListBegin()
+          for _i46 in xrange(_size42):
+            _elem47 = TLocatedBlock()
+            _elem47.read(iprot)
+            self.blocks.append(_elem47)
+          iprot.readListEnd()
         else:
           iprot.skip(ftype)
       else:
@@ -2311,18 +4787,21 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('rm_args')
-    if self.path != None:
-      oprot.writeFieldBegin('path', TType.STRUCT, 1)
-      self.path.write(oprot)
-      oprot.writeFieldEnd()
-    if self.recursive != None:
-      oprot.writeFieldBegin('recursive', TType.BOOL, 2)
-      oprot.writeBool(self.recursive)
+    oprot.writeStructBegin('reportBadBlocks_args')
+    if self.blocks is not None:
+      oprot.writeFieldBegin('blocks', TType.LIST, 1)
+      oprot.writeListBegin(TType.STRUCT, len(self.blocks))
+      for iter48 in self.blocks:
+        iter48.write(oprot)
+      oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2334,20 +4813,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class rm_result:
+class reportBadBlocks_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -2359,12 +4836,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.BOOL:
-          self.success = iprot.readBool();
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -2379,18 +4851,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('rm_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.BOOL, 0)
-      oprot.writeBool(self.success)
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    oprot.writeStructBegin('reportBadBlocks_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2402,23 +4874,11 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class rename_args:
-  """
-  Attributes:
-   - path
-   - dest
-  """
+class getDataTransferProtocolVersion_args:
 
   thrift_spec = (
-    None, # 0
-    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
-    (2, TType.STRUCT, 'dest', (Pathname, Pathname.thrift_spec), None, ), # 2
   )
 
-  def __init__(self, path=None, dest=None,):
-    self.path = path
-    self.dest = dest
-
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
       fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
@@ -2428,18 +4888,6 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 1:
-        if ftype == TType.STRUCT:
-          self.path = Pathname()
-          self.path.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 2:
-        if ftype == TType.STRUCT:
-          self.dest = Pathname()
-          self.dest.read(iprot)
-        else:
-          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -2449,18 +4897,14 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('rename_args')
-    if self.path != None:
-      oprot.writeFieldBegin('path', TType.STRUCT, 1)
-      self.path.write(oprot)
-      oprot.writeFieldEnd()
-    if self.dest != None:
-      oprot.writeFieldBegin('dest', TType.STRUCT, 2)
-      self.dest.write(oprot)
-      oprot.writeFieldEnd()
+    oprot.writeStructBegin('getDataTransferProtocolVersion_args')
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2472,7 +4916,7 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class rename_result:
+class getDataTransferProtocolVersion_result:
   """
   Attributes:
    - success
@@ -2480,7 +4924,7 @@ class rename_result:
   """
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None, ), # 0
+    (0, TType.I32, 'success', None, None, ), # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
@@ -2498,8 +4942,8 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 0:
-        if ftype == TType.BOOL:
-          self.success = iprot.readBool();
+        if ftype == TType.I32:
+          self.success = iprot.readI32();
         else:
           iprot.skip(ftype)
       elif fid == 1:
@@ -2517,18 +4961,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('rename_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.BOOL, 0)
-      oprot.writeBool(self.success)
+    oprot.writeStructBegin('getDataTransferProtocolVersion_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.I32, 0)
+      oprot.writeI32(self.success)
       oprot.writeFieldEnd()
-    if self.ouch != None:
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2540,19 +4988,19 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class mkdirs_args:
+class renewLease_args:
   """
   Attributes:
-   - path
+   - clientName
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (1, TType.STRING, 'clientName', None, None, ), # 1
   )
 
-  def __init__(self, path=None,):
-    self.path = path
+  def __init__(self, clientName=None,):
+    self.clientName = clientName
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -2564,9 +5012,8 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 1:
-        if ftype == TType.STRUCT:
-          self.path = Pathname()
-          self.path.read(iprot)
+        if ftype == TType.STRING:
+          self.clientName = iprot.readString();
         else:
           iprot.skip(ftype)
       else:
@@ -2578,14 +5025,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('mkdirs_args')
-    if self.path != None:
-      oprot.writeFieldBegin('path', TType.STRUCT, 1)
-      self.path.write(oprot)
+    oprot.writeStructBegin('renewLease_args')
+    if self.clientName is not None:
+      oprot.writeFieldBegin('clientName', TType.STRING, 1)
+      oprot.writeString(self.clientName)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2597,20 +5048,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class mkdirs_result:
+class renewLease_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -2622,12 +5071,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.BOOL:
-          self.success = iprot.readBool();
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -2642,18 +5086,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('mkdirs_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.BOOL, 0)
-      oprot.writeBool(self.success)
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    oprot.writeStructBegin('renewLease_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2665,19 +5109,22 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class exists_args:
+class recoverLease_args:
   """
   Attributes:
    - path
+   - clientName
   """
 
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRING, 'clientName', None, None, ), # 2
   )
 
-  def __init__(self, path=None,):
+  def __init__(self, path=None, clientName=None,):
     self.path = path
+    self.clientName = clientName
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -2694,6 +5141,11 @@ def read(self, iprot):
           self.path.read(iprot)
         else:
           iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.clientName = iprot.readString();
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -2703,14 +5155,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('exists_args')
-    if self.path != None:
+    oprot.writeStructBegin('recoverLease_args')
+    if self.path is not None:
       oprot.writeFieldBegin('path', TType.STRUCT, 1)
       self.path.write(oprot)
       oprot.writeFieldEnd()
+    if self.clientName is not None:
+      oprot.writeFieldBegin('clientName', TType.STRING, 2)
+      oprot.writeString(self.clientName)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2722,20 +5182,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class exists_result:
+class recoverLease_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.BOOL, 'success', None, None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -2747,12 +5205,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.BOOL:
-          self.success = iprot.readBool();
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -2767,18 +5220,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('exists_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.BOOL, 0)
-      oprot.writeBool(self.success)
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    oprot.writeStructBegin('recoverLease_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2790,19 +5243,25 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class stat_args:
+class closeRecoverLease_args:
   """
   Attributes:
    - path
+   - clientName
+   - discardLastBlock
   """
 
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRING, 'clientName', None, None, ), # 2
+    (3, TType.BOOL, 'discardLastBlock', None, None, ), # 3
   )
 
-  def __init__(self, path=None,):
+  def __init__(self, path=None, clientName=None, discardLastBlock=None,):
     self.path = path
+    self.clientName = clientName
+    self.discardLastBlock = discardLastBlock
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -2819,6 +5278,16 @@ def read(self, iprot):
           self.path.read(iprot)
         else:
           iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.clientName = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.BOOL:
+          self.discardLastBlock = iprot.readBool();
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -2828,14 +5297,26 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('stat_args')
-    if self.path != None:
+    oprot.writeStructBegin('closeRecoverLease_args')
+    if self.path is not None:
       oprot.writeFieldBegin('path', TType.STRUCT, 1)
       self.path.write(oprot)
       oprot.writeFieldEnd()
+    if self.clientName is not None:
+      oprot.writeFieldBegin('clientName', TType.STRING, 2)
+      oprot.writeString(self.clientName)
+      oprot.writeFieldEnd()
+    if self.discardLastBlock is not None:
+      oprot.writeFieldBegin('discardLastBlock', TType.BOOL, 3)
+      oprot.writeBool(self.discardLastBlock)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2847,20 +5328,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class stat_result:
+class closeRecoverLease_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (FileStatus, FileStatus.thrift_spec), None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -2872,13 +5351,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.STRUCT:
-          self.success = FileStatus()
-          self.success.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -2890,21 +5363,21 @@ def read(self, iprot):
     iprot.readStructEnd()
 
   def write(self, oprot):
-    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
-      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
-      return
-    oprot.writeStructBegin('stat_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.STRUCT, 0)
-      self.success.write(oprot)
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('closeRecoverLease_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2916,19 +5389,25 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class listStatus_args:
+class abandonBlock_args:
   """
   Attributes:
-   - path
+   - block
+   - pathname
+   - clientName
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (1, TType.STRUCT, 'block', (TBlock, TBlock.thrift_spec), None, ), # 1
+    (2, TType.STRUCT, 'pathname', (Pathname, Pathname.thrift_spec), None, ), # 2
+    (3, TType.STRING, 'clientName', None, None, ), # 3
   )
 
-  def __init__(self, path=None,):
-    self.path = path
+  def __init__(self, block=None, pathname=None, clientName=None,):
+    self.block = block
+    self.pathname = pathname
+    self.clientName = clientName
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -2941,8 +5420,19 @@ def read(self, iprot):
         break
       if fid == 1:
         if ftype == TType.STRUCT:
-          self.path = Pathname()
-          self.path.read(iprot)
+          self.block = TBlock()
+          self.block.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRUCT:
+          self.pathname = Pathname()
+          self.pathname.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRING:
+          self.clientName = iprot.readString();
         else:
           iprot.skip(ftype)
       else:
@@ -2954,14 +5444,26 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('listStatus_args')
-    if self.path != None:
-      oprot.writeFieldBegin('path', TType.STRUCT, 1)
-      self.path.write(oprot)
+    oprot.writeStructBegin('abandonBlock_args')
+    if self.block is not None:
+      oprot.writeFieldBegin('block', TType.STRUCT, 1)
+      self.block.write(oprot)
+      oprot.writeFieldEnd()
+    if self.pathname is not None:
+      oprot.writeFieldBegin('pathname', TType.STRUCT, 2)
+      self.pathname.write(oprot)
+      oprot.writeFieldEnd()
+    if self.clientName is not None:
+      oprot.writeFieldBegin('clientName', TType.STRING, 3)
+      oprot.writeString(self.clientName)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -2973,20 +5475,18 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class listStatus_result:
+class abandonBlock_result:
   """
   Attributes:
-   - success
    - ouch
   """
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT,(FileStatus, FileStatus.thrift_spec)), None, ), # 0
+    None, # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, success=None, ouch=None,):
-    self.success = success
+  def __init__(self, ouch=None,):
     self.ouch = ouch
 
   def read(self, iprot):
@@ -2998,18 +5498,7 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 0:
-        if ftype == TType.LIST:
-          self.success = []
-          (_etype17, _size14) = iprot.readListBegin()
-          for _i18 in xrange(_size14):
-            _elem19 = FileStatus()
-            _elem19.read(iprot)
-            self.success.append(_elem19)
-          iprot.readListEnd()
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
+      if fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -3024,21 +5513,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('listStatus_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.LIST, 0)
-      oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter20 in self.success:
-        iter20.write(oprot)
-      oprot.writeListEnd()
-      oprot.writeFieldEnd()
-    if self.ouch != None:
+    oprot.writeStructBegin('abandonBlock_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3050,22 +5536,22 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class chmod_args:
+class abandonFile_args:
   """
   Attributes:
-   - path
-   - mode
+   - pathname
+   - clientName
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
-    (2, TType.I16, 'mode', None, None, ), # 2
+    (1, TType.STRUCT, 'pathname', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRING, 'clientName', None, None, ), # 2
   )
 
-  def __init__(self, path=None, mode=None,):
-    self.path = path
-    self.mode = mode
+  def __init__(self, pathname=None, clientName=None,):
+    self.pathname = pathname
+    self.clientName = clientName
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -3078,13 +5564,13 @@ def read(self, iprot):
         break
       if fid == 1:
         if ftype == TType.STRUCT:
-          self.path = Pathname()
-          self.path.read(iprot)
+          self.pathname = Pathname()
+          self.pathname.read(iprot)
         else:
           iprot.skip(ftype)
       elif fid == 2:
-        if ftype == TType.I16:
-          self.mode = iprot.readI16();
+        if ftype == TType.STRING:
+          self.clientName = iprot.readString();
         else:
           iprot.skip(ftype)
       else:
@@ -3096,18 +5582,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('chmod_args')
-    if self.path != None:
-      oprot.writeFieldBegin('path', TType.STRUCT, 1)
-      self.path.write(oprot)
+    oprot.writeStructBegin('abandonFile_args')
+    if self.pathname is not None:
+      oprot.writeFieldBegin('pathname', TType.STRUCT, 1)
+      self.pathname.write(oprot)
       oprot.writeFieldEnd()
-    if self.mode != None:
-      oprot.writeFieldBegin('mode', TType.I16, 2)
-      oprot.writeI16(self.mode)
+    if self.clientName is not None:
+      oprot.writeFieldBegin('clientName', TType.STRING, 2)
+      oprot.writeString(self.clientName)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3119,7 +5609,7 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class chmod_result:
+class abandonFile_result:
   """
   Attributes:
    - ouch
@@ -3157,14 +5647,18 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('chmod_result')
-    if self.ouch != None:
+    oprot.writeStructBegin('abandonFile_result')
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3176,25 +5670,34 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class chown_args:
+class addBlock_args:
   """
   Attributes:
-   - path
-   - owner
-   - group
+   - pathname
+   - clientName
+   - startOffset
+   - lastBlock
+   - excludedNodes
+   - favouredNodes
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
-    (2, TType.STRING, 'owner', None, None, ), # 2
-    (3, TType.STRING, 'group', None, None, ), # 3
+    (1, TType.STRUCT, 'pathname', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRING, 'clientName', None, None, ), # 2
+    (3, TType.I64, 'startOffset', None, None, ), # 3
+    (4, TType.STRUCT, 'lastBlock', (TBlock, TBlock.thrift_spec), None, ), # 4
+    (5, TType.LIST, 'excludedNodes', (TType.STRUCT,(TDatanodeID, TDatanodeID.thrift_spec)), None, ), # 5
+    (6, TType.LIST, 'favouredNodes', (TType.STRUCT,(TDatanodeID, TDatanodeID.thrift_spec)), None, ), # 6
   )
 
-  def __init__(self, path=None, owner=None, group=None,):
-    self.path = path
-    self.owner = owner
-    self.group = group
+  def __init__(self, pathname=None, clientName=None, startOffset=None, lastBlock=None, excludedNodes=None, favouredNodes=None,):
+    self.pathname = pathname
+    self.clientName = clientName
+    self.startOffset = startOffset
+    self.lastBlock = lastBlock
+    self.excludedNodes = excludedNodes
+    self.favouredNodes = favouredNodes
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -3207,18 +5710,46 @@ def read(self, iprot):
         break
       if fid == 1:
         if ftype == TType.STRUCT:
-          self.path = Pathname()
-          self.path.read(iprot)
+          self.pathname = Pathname()
+          self.pathname.read(iprot)
         else:
           iprot.skip(ftype)
       elif fid == 2:
         if ftype == TType.STRING:
-          self.owner = iprot.readString();
+          self.clientName = iprot.readString();
         else:
           iprot.skip(ftype)
       elif fid == 3:
-        if ftype == TType.STRING:
-          self.group = iprot.readString();
+        if ftype == TType.I64:
+          self.startOffset = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.STRUCT:
+          self.lastBlock = TBlock()
+          self.lastBlock.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 5:
+        if ftype == TType.LIST:
+          self.excludedNodes = []
+          (_etype52, _size49) = iprot.readListBegin()
+          for _i53 in xrange(_size49):
+            _elem54 = TDatanodeID()
+            _elem54.read(iprot)
+            self.excludedNodes.append(_elem54)
+          iprot.readListEnd()
+        else:
+          iprot.skip(ftype)
+      elif fid == 6:
+        if ftype == TType.LIST:
+          self.favouredNodes = []
+          (_etype58, _size55) = iprot.readListBegin()
+          for _i59 in xrange(_size55):
+            _elem60 = TDatanodeID()
+            _elem60.read(iprot)
+            self.favouredNodes.append(_elem60)
+          iprot.readListEnd()
         else:
           iprot.skip(ftype)
       else:
@@ -3230,22 +5761,44 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('chown_args')
-    if self.path != None:
-      oprot.writeFieldBegin('path', TType.STRUCT, 1)
-      self.path.write(oprot)
+    oprot.writeStructBegin('addBlock_args')
+    if self.pathname is not None:
+      oprot.writeFieldBegin('pathname', TType.STRUCT, 1)
+      self.pathname.write(oprot)
       oprot.writeFieldEnd()
-    if self.owner != None:
-      oprot.writeFieldBegin('owner', TType.STRING, 2)
-      oprot.writeString(self.owner)
+    if self.clientName is not None:
+      oprot.writeFieldBegin('clientName', TType.STRING, 2)
+      oprot.writeString(self.clientName)
       oprot.writeFieldEnd()
-    if self.group != None:
-      oprot.writeFieldBegin('group', TType.STRING, 3)
-      oprot.writeString(self.group)
+    if self.startOffset is not None:
+      oprot.writeFieldBegin('startOffset', TType.I64, 3)
+      oprot.writeI64(self.startOffset)
+      oprot.writeFieldEnd()
+    if self.lastBlock is not None:
+      oprot.writeFieldBegin('lastBlock', TType.STRUCT, 4)
+      self.lastBlock.write(oprot)
+      oprot.writeFieldEnd()
+    if self.excludedNodes is not None:
+      oprot.writeFieldBegin('excludedNodes', TType.LIST, 5)
+      oprot.writeListBegin(TType.STRUCT, len(self.excludedNodes))
+      for iter61 in self.excludedNodes:
+        iter61.write(oprot)
+      oprot.writeListEnd()
+      oprot.writeFieldEnd()
+    if self.favouredNodes is not None:
+      oprot.writeFieldBegin('favouredNodes', TType.LIST, 6)
+      oprot.writeListBegin(TType.STRUCT, len(self.favouredNodes))
+      for iter62 in self.favouredNodes:
+        iter62.write(oprot)
+      oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3257,18 +5810,20 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class chown_result:
+class addBlock_result:
   """
   Attributes:
+   - success
    - ouch
   """
 
   thrift_spec = (
-    None, # 0
+    (0, TType.STRUCT, 'success', (TLocatedBlock, TLocatedBlock.thrift_spec), None, ), # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, ouch=None,):
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
     self.ouch = ouch
 
   def read(self, iprot):
@@ -3280,7 +5835,13 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 1:
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = TLocatedBlock()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -3295,14 +5856,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('chown_result')
-    if self.ouch != None:
+    oprot.writeStructBegin('addBlock_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3314,22 +5883,28 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class setReplication_args:
+class addFirstBlock_args:
   """
   Attributes:
-   - path
-   - replication
+   - pathname
+   - clientName
+   - excludedNodes
+   - favouredNodes
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
-    (2, TType.I16, 'replication', None, None, ), # 2
+    (1, TType.STRUCT, 'pathname', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRING, 'clientName', None, None, ), # 2
+    (3, TType.LIST, 'excludedNodes', (TType.STRUCT,(TDatanodeID, TDatanodeID.thrift_spec)), None, ), # 3
+    (4, TType.LIST, 'favouredNodes', (TType.STRUCT,(TDatanodeID, TDatanodeID.thrift_spec)), None, ), # 4
   )
 
-  def __init__(self, path=None, replication=None,):
-    self.path = path
-    self.replication = replication
+  def __init__(self, pathname=None, clientName=None, excludedNodes=None, favouredNodes=None,):
+    self.pathname = pathname
+    self.clientName = clientName
+    self.excludedNodes = excludedNodes
+    self.favouredNodes = favouredNodes
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -3342,13 +5917,35 @@ def read(self, iprot):
         break
       if fid == 1:
         if ftype == TType.STRUCT:
-          self.path = Pathname()
-          self.path.read(iprot)
+          self.pathname = Pathname()
+          self.pathname.read(iprot)
         else:
           iprot.skip(ftype)
       elif fid == 2:
-        if ftype == TType.I16:
-          self.replication = iprot.readI16();
+        if ftype == TType.STRING:
+          self.clientName = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.LIST:
+          self.excludedNodes = []
+          (_etype66, _size63) = iprot.readListBegin()
+          for _i67 in xrange(_size63):
+            _elem68 = TDatanodeID()
+            _elem68.read(iprot)
+            self.excludedNodes.append(_elem68)
+          iprot.readListEnd()
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.LIST:
+          self.favouredNodes = []
+          (_etype72, _size69) = iprot.readListBegin()
+          for _i73 in xrange(_size69):
+            _elem74 = TDatanodeID()
+            _elem74.read(iprot)
+            self.favouredNodes.append(_elem74)
+          iprot.readListEnd()
         else:
           iprot.skip(ftype)
       else:
@@ -3360,18 +5957,36 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('setReplication_args')
-    if self.path != None:
-      oprot.writeFieldBegin('path', TType.STRUCT, 1)
-      self.path.write(oprot)
+    oprot.writeStructBegin('addFirstBlock_args')
+    if self.pathname is not None:
+      oprot.writeFieldBegin('pathname', TType.STRUCT, 1)
+      self.pathname.write(oprot)
       oprot.writeFieldEnd()
-    if self.replication != None:
-      oprot.writeFieldBegin('replication', TType.I16, 2)
-      oprot.writeI16(self.replication)
+    if self.clientName is not None:
+      oprot.writeFieldBegin('clientName', TType.STRING, 2)
+      oprot.writeString(self.clientName)
+      oprot.writeFieldEnd()
+    if self.excludedNodes is not None:
+      oprot.writeFieldBegin('excludedNodes', TType.LIST, 3)
+      oprot.writeListBegin(TType.STRUCT, len(self.excludedNodes))
+      for iter75 in self.excludedNodes:
+        iter75.write(oprot)
+      oprot.writeListEnd()
+      oprot.writeFieldEnd()
+    if self.favouredNodes is not None:
+      oprot.writeFieldBegin('favouredNodes', TType.LIST, 4)
+      oprot.writeListBegin(TType.STRUCT, len(self.favouredNodes))
+      for iter76 in self.favouredNodes:
+        iter76.write(oprot)
+      oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3383,18 +5998,20 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class setReplication_result:
+class addFirstBlock_result:
   """
   Attributes:
+   - success
    - ouch
   """
 
   thrift_spec = (
-    None, # 0
+    (0, TType.STRUCT, 'success', (TLocatedBlock, TLocatedBlock.thrift_spec), None, ), # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
-  def __init__(self, ouch=None,):
+  def __init__(self, success=None, ouch=None,):
+    self.success = success
     self.ouch = ouch
 
   def read(self, iprot):
@@ -3406,7 +6023,13 @@ def read(self, iprot):
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
-      if fid == 1:
+      if fid == 0:
+        if ftype == TType.STRUCT:
+          self.success = TLocatedBlock()
+          self.success.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 1:
         if ftype == TType.STRUCT:
           self.ouch = ThriftIOException()
           self.ouch.read(iprot)
@@ -3421,14 +6044,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('setReplication_result')
-    if self.ouch != None:
+    oprot.writeStructBegin('addFirstBlock_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.STRUCT, 0)
+      self.success.write(oprot)
+      oprot.writeFieldEnd()
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3440,25 +6071,28 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class getFileBlockLocations_args:
+class complete_args:
   """
   Attributes:
-   - path
-   - start
-   - length
+   - pathname
+   - clientName
+   - fileLen
+   - lastBlock
   """
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRUCT, 'path', (Pathname, Pathname.thrift_spec), None, ), # 1
-    (2, TType.I64, 'start', None, None, ), # 2
-    (3, TType.I64, 'length', None, None, ), # 3
+    (1, TType.STRUCT, 'pathname', (Pathname, Pathname.thrift_spec), None, ), # 1
+    (2, TType.STRING, 'clientName', None, None, ), # 2
+    (3, TType.I64, 'fileLen', None, None, ), # 3
+    (4, TType.STRUCT, 'lastBlock', (TBlock, TBlock.thrift_spec), None, ), # 4
   )
 
-  def __init__(self, path=None, start=None, length=None,):
-    self.path = path
-    self.start = start
-    self.length = length
+  def __init__(self, pathname=None, clientName=None, fileLen=None, lastBlock=None,):
+    self.pathname = pathname
+    self.clientName = clientName
+    self.fileLen = fileLen
+    self.lastBlock = lastBlock
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -3471,18 +6105,24 @@ def read(self, iprot):
         break
       if fid == 1:
         if ftype == TType.STRUCT:
-          self.path = Pathname()
-          self.path.read(iprot)
+          self.pathname = Pathname()
+          self.pathname.read(iprot)
         else:
           iprot.skip(ftype)
       elif fid == 2:
-        if ftype == TType.I64:
-          self.start = iprot.readI64();
+        if ftype == TType.STRING:
+          self.clientName = iprot.readString();
         else:
           iprot.skip(ftype)
       elif fid == 3:
         if ftype == TType.I64:
-          self.length = iprot.readI64();
+          self.fileLen = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.STRUCT:
+          self.lastBlock = TBlock()
+          self.lastBlock.read(iprot)
         else:
           iprot.skip(ftype)
       else:
@@ -3494,22 +6134,30 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('getFileBlockLocations_args')
-    if self.path != None:
-      oprot.writeFieldBegin('path', TType.STRUCT, 1)
-      self.path.write(oprot)
+    oprot.writeStructBegin('complete_args')
+    if self.pathname is not None:
+      oprot.writeFieldBegin('pathname', TType.STRUCT, 1)
+      self.pathname.write(oprot)
       oprot.writeFieldEnd()
-    if self.start != None:
-      oprot.writeFieldBegin('start', TType.I64, 2)
-      oprot.writeI64(self.start)
+    if self.clientName is not None:
+      oprot.writeFieldBegin('clientName', TType.STRING, 2)
+      oprot.writeString(self.clientName)
       oprot.writeFieldEnd()
-    if self.length != None:
-      oprot.writeFieldBegin('length', TType.I64, 3)
-      oprot.writeI64(self.length)
+    if self.fileLen is not None:
+      oprot.writeFieldBegin('fileLen', TType.I64, 3)
+      oprot.writeI64(self.fileLen)
+      oprot.writeFieldEnd()
+    if self.lastBlock is not None:
+      oprot.writeFieldBegin('lastBlock', TType.STRUCT, 4)
+      self.lastBlock.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3521,7 +6169,7 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not (self == other)
 
-class getFileBlockLocations_result:
+class complete_result:
   """
   Attributes:
    - success
@@ -3529,7 +6177,7 @@ class getFileBlockLocations_result:
   """
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT,(BlockLocation, BlockLocation.thrift_spec)), None, ), # 0
+    (0, TType.BOOL, 'success', None, None, ), # 0
     (1, TType.STRUCT, 'ouch', (ThriftIOException, ThriftIOException.thrift_spec), None, ), # 1
   )
 
@@ -3547,14 +6195,8 @@ def read(self, iprot):
       if ftype == TType.STOP:
         break
       if fid == 0:
-        if ftype == TType.LIST:
-          self.success = []
-          (_etype24, _size21) = iprot.readListBegin()
-          for _i25 in xrange(_size21):
-            _elem26 = BlockLocation()
-            _elem26.read(iprot)
-            self.success.append(_elem26)
-          iprot.readListEnd()
+        if ftype == TType.BOOL:
+          self.success = iprot.readBool();
         else:
           iprot.skip(ftype)
       elif fid == 1:
@@ -3572,21 +6214,22 @@ def write(self, oprot):
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('getFileBlockLocations_result')
-    if self.success != None:
-      oprot.writeFieldBegin('success', TType.LIST, 0)
-      oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter27 in self.success:
-        iter27.write(oprot)
-      oprot.writeListEnd()
+    oprot.writeStructBegin('complete_result')
+    if self.success is not None:
+      oprot.writeFieldBegin('success', TType.BOOL, 0)
+      oprot.writeBool(self.success)
       oprot.writeFieldEnd()
-    if self.ouch != None:
+    if self.ouch is not None:
       oprot.writeFieldBegin('ouch', TType.STRUCT, 1)
       self.ouch.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -3597,5 +6240,3 @@ def __eq__(self, other):
 
   def __ne__(self, other):
     return not (self == other)
-
-
diff --git a/src/contrib/thriftfs/gen-py/hadoopfs/constants.py b/src/contrib/thriftfs/gen-py/hadoopfs/constants.py
index 2f17ec34..732b3680 100644
--- a/src/contrib/thriftfs/gen-py/hadoopfs/constants.py
+++ b/src/contrib/thriftfs/gen-py/hadoopfs/constants.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/src/contrib/thriftfs/gen-py/hadoopfs/ttypes.py b/src/contrib/thriftfs/gen-py/hadoopfs/ttypes.py
index 1790d017..1c601601 100644
--- a/src/contrib/thriftfs/gen-py/hadoopfs/ttypes.py
+++ b/src/contrib/thriftfs/gen-py/hadoopfs/ttypes.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -7,13 +7,14 @@
 from thrift.Thrift import *
 
 from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
+from thrift.protocol import TBinaryProtocol, TProtocol
 try:
   from thrift.protocol import fastbinary
 except:
   fastbinary = None
 
 
+
 class ThriftHandle:
   """
   Attributes:
@@ -52,13 +53,17 @@ def write(self, oprot):
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('ThriftHandle')
-    if self.id != None:
+    if self.id is not None:
       oprot.writeFieldBegin('id', TType.I64, 1)
       oprot.writeI64(self.id)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -108,13 +113,17 @@ def write(self, oprot):
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('Pathname')
-    if self.pathname != None:
+    if self.pathname is not None:
       oprot.writeFieldBegin('pathname', TType.STRING, 1)
       oprot.writeString(self.pathname)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -228,45 +237,49 @@ def write(self, oprot):
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('FileStatus')
-    if self.path != None:
+    if self.path is not None:
       oprot.writeFieldBegin('path', TType.STRING, 1)
       oprot.writeString(self.path)
       oprot.writeFieldEnd()
-    if self.length != None:
+    if self.length is not None:
       oprot.writeFieldBegin('length', TType.I64, 2)
       oprot.writeI64(self.length)
       oprot.writeFieldEnd()
-    if self.isdir != None:
+    if self.isdir is not None:
       oprot.writeFieldBegin('isdir', TType.BOOL, 3)
       oprot.writeBool(self.isdir)
       oprot.writeFieldEnd()
-    if self.block_replication != None:
+    if self.block_replication is not None:
       oprot.writeFieldBegin('block_replication', TType.I16, 4)
       oprot.writeI16(self.block_replication)
       oprot.writeFieldEnd()
-    if self.blocksize != None:
+    if self.blocksize is not None:
       oprot.writeFieldBegin('blocksize', TType.I64, 5)
       oprot.writeI64(self.blocksize)
       oprot.writeFieldEnd()
-    if self.modification_time != None:
+    if self.modification_time is not None:
       oprot.writeFieldBegin('modification_time', TType.I64, 6)
       oprot.writeI64(self.modification_time)
       oprot.writeFieldEnd()
-    if self.permission != None:
+    if self.permission is not None:
       oprot.writeFieldBegin('permission', TType.STRING, 7)
       oprot.writeString(self.permission)
       oprot.writeFieldEnd()
-    if self.owner != None:
+    if self.owner is not None:
       oprot.writeFieldBegin('owner', TType.STRING, 8)
       oprot.writeString(self.owner)
       oprot.writeFieldEnd()
-    if self.group != None:
+    if self.group is not None:
       oprot.writeFieldBegin('group', TType.STRING, 9)
       oprot.writeString(self.group)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -350,31 +363,285 @@ def write(self, oprot):
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('BlockLocation')
-    if self.hosts != None:
+    if self.hosts is not None:
       oprot.writeFieldBegin('hosts', TType.LIST, 1)
       oprot.writeListBegin(TType.STRING, len(self.hosts))
       for iter12 in self.hosts:
         oprot.writeString(iter12)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.names != None:
+    if self.names is not None:
       oprot.writeFieldBegin('names', TType.LIST, 2)
       oprot.writeListBegin(TType.STRING, len(self.names))
       for iter13 in self.names:
         oprot.writeString(iter13)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.offset != None:
+    if self.offset is not None:
       oprot.writeFieldBegin('offset', TType.I64, 3)
       oprot.writeI64(self.offset)
       oprot.writeFieldEnd()
-    if self.length != None:
+    if self.length is not None:
       oprot.writeFieldBegin('length', TType.I64, 4)
       oprot.writeI64(self.length)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class TBlock:
+  """
+  Attributes:
+   - blockId
+   - numBytes
+   - generationStamp
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.I64, 'blockId', None, None, ), # 1
+    (2, TType.I64, 'numBytes', None, None, ), # 2
+    (3, TType.I64, 'generationStamp', None, None, ), # 3
+  )
+
+  def __init__(self, blockId=None, numBytes=None, generationStamp=None,):
+    self.blockId = blockId
+    self.numBytes = numBytes
+    self.generationStamp = generationStamp
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.I64:
+          self.blockId = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I64:
+          self.numBytes = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.I64:
+          self.generationStamp = iprot.readI64();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('TBlock')
+    if self.blockId is not None:
+      oprot.writeFieldBegin('blockId', TType.I64, 1)
+      oprot.writeI64(self.blockId)
+      oprot.writeFieldEnd()
+    if self.numBytes is not None:
+      oprot.writeFieldBegin('numBytes', TType.I64, 2)
+      oprot.writeI64(self.numBytes)
+      oprot.writeFieldEnd()
+    if self.generationStamp is not None:
+      oprot.writeFieldBegin('generationStamp', TType.I64, 3)
+      oprot.writeI64(self.generationStamp)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class TDatanodeID:
+  """
+  Attributes:
+   - name
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'name', None, None, ), # 1
+  )
+
+  def __init__(self, name=None,):
+    self.name = name
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.name = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('TDatanodeID')
+    if self.name is not None:
+      oprot.writeFieldBegin('name', TType.STRING, 1)
+      oprot.writeString(self.name)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class TLocatedBlock:
+  """
+  Attributes:
+   - block
+   - namespaceId
+   - dataTransferVersion
+   - location
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRUCT, 'block', (TBlock, TBlock.thrift_spec), None, ), # 1
+    (2, TType.I32, 'namespaceId', None, None, ), # 2
+    (3, TType.I32, 'dataTransferVersion', None, None, ), # 3
+    (4, TType.LIST, 'location', (TType.STRUCT,(TDatanodeID, TDatanodeID.thrift_spec)), None, ), # 4
+  )
+
+  def __init__(self, block=None, namespaceId=None, dataTransferVersion=None, location=None,):
+    self.block = block
+    self.namespaceId = namespaceId
+    self.dataTransferVersion = dataTransferVersion
+    self.location = location
+
+  def read(self, iprot):
+    if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRUCT:
+          self.block = TBlock()
+          self.block.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I32:
+          self.namespaceId = iprot.readI32();
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.I32:
+          self.dataTransferVersion = iprot.readI32();
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.LIST:
+          self.location = []
+          (_etype17, _size14) = iprot.readListBegin()
+          for _i18 in xrange(_size14):
+            _elem19 = TDatanodeID()
+            _elem19.read(iprot)
+            self.location.append(_elem19)
+          iprot.readListEnd()
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('TLocatedBlock')
+    if self.block is not None:
+      oprot.writeFieldBegin('block', TType.STRUCT, 1)
+      self.block.write(oprot)
+      oprot.writeFieldEnd()
+    if self.namespaceId is not None:
+      oprot.writeFieldBegin('namespaceId', TType.I32, 2)
+      oprot.writeI32(self.namespaceId)
+      oprot.writeFieldEnd()
+    if self.dataTransferVersion is not None:
+      oprot.writeFieldBegin('dataTransferVersion', TType.I32, 3)
+      oprot.writeI32(self.dataTransferVersion)
+      oprot.writeFieldEnd()
+    if self.location is not None:
+      oprot.writeFieldBegin('location', TType.LIST, 4)
+      oprot.writeListBegin(TType.STRUCT, len(self.location))
+      for iter20 in self.location:
+        iter20.write(oprot)
+      oprot.writeListEnd()
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    return
+
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -424,13 +691,17 @@ def write(self, oprot):
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('MalformedInputException')
-    if self.message != None:
+    if self.message is not None:
       oprot.writeFieldBegin('message', TType.STRING, 1)
       oprot.writeString(self.message)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __str__(self):
     return repr(self)
 
@@ -483,13 +754,17 @@ def write(self, oprot):
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('ThriftIOException')
-    if self.message != None:
+    if self.message is not None:
       oprot.writeFieldBegin('message', TType.STRING, 1)
       oprot.writeString(self.message)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
+  def validate(self):
+    return
+
+
   def __str__(self):
     return repr(self)
 
@@ -503,4 +778,3 @@ def __eq__(self, other):
 
   def __ne__(self, other):
     return not (self == other)
-
diff --git a/src/contrib/thriftfs/if/hadoopfs.thrift b/src/contrib/thriftfs/if/hadoopfs.thrift
index aea37c8a..dc099207 100644
--- a/src/contrib/thriftfs/if/hadoopfs.thrift
+++ b/src/contrib/thriftfs/if/hadoopfs.thrift
@@ -52,6 +52,24 @@ struct BlockLocation {
   4: i64 length                  /* length of data */
 }
 
+/* hdfs block object */
+struct TBlock {
+  1:i64 blockId,
+  2:i64 numBytes,
+  3:i64 generationStamp
+}
+
+struct TDatanodeID {
+  1:string name       // host:port for datanode
+}
+
+struct TLocatedBlock {
+  1: TBlock block,                 /* hdfs block */
+  2: i32 namespaceId,              /* namespace id */
+  3: i32 dataTransferVersion,      /* datanode protocol */
+  4: list<TDatanodeID> location    /* replica locations */
+}
+
 exception MalformedInputException {
   1: string message
 }
@@ -124,4 +142,69 @@ service ThriftHadoopFileSystem
 
   // get the locations of the blocks of this file
   list<BlockLocation> getFileBlockLocations(1:Pathname path, 2:i64 start, 3:i64 length) throws (1:ThriftIOException ouch),
+
+  // hardlink
+  bool hardLink(1:Pathname src, 2:Pathname dest)
+                throws (1:ThriftIOException ouch),
+
+  // concat, restricted is true if all blocks sizes should be same
+  void concat(1:Pathname target, 2:list<Pathname> srcs, 3:bool restricted)
+                throws (1:ThriftIOException ouch),
+
+  // Report bad block
+  void reportBadBlocks(1:list<TLocatedBlock> blocks)  // bad blocks
+                       throws (1:ThriftIOException ouch),
+
+  /**
+   * The following methods are typically used by native C++ hdfs client and
+   * are not used by hdfs applications themselves
+   */
+
+  // get data transfer version
+  i32 getDataTransferProtocolVersion() throws (1:ThriftIOException ouch),
+
+  // renew lease
+  void renewLease(1:string clientName) throws (1:ThriftIOException ouch),
+
+  // recover lease
+  void recoverLease(1:Pathname path, 2:string clientName) 
+                    throws (1:ThriftIOException ouch),
+
+  // recover lease and close file
+  void closeRecoverLease(1:Pathname path, 2:string clientName, 
+                         3:bool discardLastBlock) 
+                         throws (1:ThriftIOException ouch),
+
+  // The client can give up on a block by calling abandonBlock().
+  // Any partial writes to the block will be discarded.
+  void abandonBlock(1:TBlock block, 2:Pathname pathname, 3:string clientName) 
+                    throws (1:ThriftIOException ouch),
+
+
+  // Any partial writes may be recovered and the lease will be relinquished
+  void abandonFile(1:Pathname pathname, 2:string clientName) 
+                   throws (1:ThriftIOException ouch),
+
+  // Add new block to a file
+  TLocatedBlock addBlock(1:Pathname pathname,               // filename
+                         2:string clientName,               // client identifier
+                         3:i64 startOffset,                 // offset in file
+                         4:TBlock lastBlock,                // previously alocated
+                         5:list<TDatanodeID> excludedNodes,  // do not use these
+                         6:list<TDatanodeID> favouredNodes)  // prefer these
+                         throws (1:ThriftIOException ouch),
+
+  // Add the first block for a file
+  TLocatedBlock addFirstBlock(1:Pathname pathname,           // filename
+                         2:string clientName,                // client identifier
+                         3:list<TDatanodeID> excludedNodes,  // do not use these
+                         4:list<TDatanodeID> favouredNodes)  // prefer these
+                         throws (1:ThriftIOException ouch),
+
+  // Complete writing to a new file
+  bool complete(1:Pathname pathname,           // filename
+                2:string clientName,           // client identifier
+                3:i64 fileLen,                 // length of file
+                4:TBlock lastBlock)            // previously alocated last block
+                throws (1:ThriftIOException ouch),
 }
diff --git a/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java b/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java
index ceccebd8..715f465f 100644
--- a/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java
+++ b/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java
@@ -5,6 +5,7 @@
 import java.net.ServerSocket;
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
@@ -16,10 +17,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.thriftfs.api.Pathname;
-import org.apache.hadoop.thriftfs.api.ThriftHadoopFileSystem;
-import org.apache.hadoop.thriftfs.api.ThriftHandle;
-import org.apache.hadoop.thriftfs.api.ThriftIOException;
+import org.apache.hadoop.thriftfs.api.*;
 import org.apache.hadoop.util.Daemon;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.thrift.TProcessor;
@@ -30,6 +28,15 @@
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TServerTransport;
 import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.TException;
+
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import org.apache.hadoop.hdfs.protocol.LocatedBlockWithMetaInfo;
 
 /**
  * ThriftHadoopFileSystem
@@ -47,7 +54,8 @@ public static class HadoopThriftHandler implements ThriftHadoopFileSystem.Iface
 
     // HDFS glue
     Configuration conf;
-    FileSystem fs;
+    FileSystem fs = null;
+    ClientProtocol namenode = null;
         
     // stucture that maps each Thrift object into an hadoop object
     private long nextId = new Random().nextLong();
@@ -132,6 +140,9 @@ public HadoopThriftHandler(String name) {
       try {
         inactivityThread = new Daemon(new InactivityMonitor());
         fs = FileSystem.get(conf);
+        if (fs instanceof DistributedFileSystem) {
+          namenode = ((DistributedFileSystem)fs).getClient().getNameNodeRPC();
+        }
       } catch (IOException e) {
         LOG.warn("Unable to open hadoop file system...");
         Runtime.getRuntime().exit(-1);
@@ -561,6 +572,273 @@ public void setReplication(Pathname path, short repl) throws ThriftIOException {
         throw new ThriftIOException(e.getMessage());
       }
     }
+
+    public boolean hardLink(Pathname src, Pathname dest) 
+      throws ThriftIOException, TException {
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("hardLink: " + src +
+                                     " destination: " + dest);
+        boolean ret = fs.hardLink(new Path(src.pathname), 
+                                  new Path(dest.pathname));
+        return ret;
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public void concat(Pathname target, List<Pathname> srcs, 
+      boolean restricted) throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("concat: " + target);
+        String[] params = new String[srcs.size()];
+        for (int i = 0; i < params.length; i++) {
+          params[i] = srcs.get(i).pathname;
+        }
+        namenode.concat(target.pathname, params, restricted);
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public void reportBadBlocks(List<TLocatedBlock> blocks) 
+      throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        LocatedBlock[] blks = new LocatedBlock[blocks.size()];
+        for (int i = 0; i < blks.length; i++) {
+          blks[i] = convertLocatedBlock(blocks.get(i));
+        }
+        HadoopThriftHandler.LOG.debug("reportBadBlocks: "); 
+        namenode.reportBadBlocks(blks);
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    /**
+     * The following methods are typically used by native C++ hdfs client and
+     * are not used by hdfs applications themselves
+     */
+    public int getDataTransferProtocolVersion() 
+      throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("getDataTransferProtocolVersion: "); 
+        int ret = namenode.getDataTransferProtocolVersion();
+        return ret;
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public void renewLease(String clientName) 
+      throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("renewLease: ");
+        namenode.renewLease(clientName);
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public void recoverLease(Pathname path, String clientName) 
+      throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("recoverLease: " +
+                                      path);
+        namenode.recoverLease(path.pathname, clientName);
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public void closeRecoverLease(Pathname path, String clientName, 
+      boolean discardLastBlock) throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("closeRecoverLease: " +
+                                      path);
+        namenode.closeRecoverLease(path.pathname, 
+                                   clientName, discardLastBlock);
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public void abandonBlock(TBlock block, Pathname path, 
+      String clientName) throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("abandonBlock: " +
+                                      path);
+        namenode.abandonBlock(convertBlock(block),
+                              path.pathname, 
+                              clientName);
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public void abandonFile(Pathname path, String clientName) 
+      throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("abandonFile: " +
+                                      path);
+        namenode.abandonFile(path.pathname, clientName);
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public TLocatedBlock addFirstBlock(Pathname path, String clientName, 
+      List<TDatanodeID> excludedNodes, 
+      List<TDatanodeID> favouredNodes) throws ThriftIOException, TException {
+      return addBlock(path, clientName, 0, null,
+                      excludedNodes, favouredNodes);
+    }
+
+    public TLocatedBlock addBlock(Pathname path, String clientName, 
+      long startOffset, TBlock lastBlock, List<TDatanodeID> excludedNodes, 
+      List<TDatanodeID> favouredNodes) throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("addBlock: " + path);
+ 
+        // initialize excluded nodes
+        DatanodeInfo[] excludes = null;
+        if (excludedNodes != null) {
+          excludes = new DatanodeInfo[excludedNodes.size()];
+          for (int i = 0; i < excludes.length; i++) {
+            String name = excludedNodes.get(i).name;
+            excludes[i] = new DatanodeInfo(
+                   new DatanodeID(name, "", -1, getPort(name)));
+          }
+        }
+
+        // initialize favoured nodes
+        DatanodeInfo[] favoured = null;
+        if (favouredNodes != null) {
+          favoured = new DatanodeInfo[favouredNodes.size()];
+          for (int i = 0; i < favoured.length; i++) {
+            String name = favouredNodes.get(i).name;
+            favoured[i] = new DatanodeInfo(
+                   new DatanodeID(name, "", -1, getPort(name)));
+          }
+        }
+
+        LocatedBlockWithMetaInfo val =  namenode.addBlockAndFetchMetaInfo(
+                                 path.pathname, 
+                                 clientName,
+                                 excludes,
+                                 favoured,
+                                 startOffset,
+                                 lastBlock != null ? convertBlock(lastBlock) : null);
+
+        // convert from LocatedBlockWithMetaInfo to TLocatedBlock
+        Block bb = val.getBlock();
+	TLocatedBlock tblk = new TLocatedBlock();
+        tblk.block = new TBlock(bb.getBlockId(), bb.getNumBytes(),
+                                bb.getGenerationStamp());
+        tblk.namespaceId = val.getNamespaceID();
+        tblk.dataTransferVersion = val.getDataProtocolVersion();
+
+        // fill up replica locations
+        tblk.location = new ArrayList<TDatanodeID>();
+        DatanodeInfo[] replicas = val.getLocations();
+        for (int i = 0; i < replicas.length; i++) {
+          tblk.location.add(i, new TDatanodeID(replicas[i].getName()));
+        }
+        return tblk;
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+
+    public boolean complete(Pathname path, String clientName, 
+      long fileLen, TBlock lastBlock) throws ThriftIOException, TException {
+      if (namenode == null) {
+        throw new ThriftIOException("Not a HDFS filesystem");
+      }
+      try {
+        now = now();
+        HadoopThriftHandler.LOG.debug("complete: " +
+                                      path);
+        return namenode.complete(path.pathname, 
+                                 clientName,
+                                 fileLen,
+                                 convertBlock(lastBlock));
+      } catch (IOException e) {
+        throw new ThriftIOException(e.getMessage());
+      }
+    }
+  }
+
+  /**
+   * Converts a TLocatedBlock to a LocatedBlock
+   */
+  private static LocatedBlock convertLocatedBlock(TLocatedBlock tblk) {
+    TBlock one = tblk.block;
+    Block hblock = new Block(one.getBlockId(), 
+                             one.getNumBytes(),
+                             one.getGenerationStamp());
+    List<TDatanodeID> locs = tblk.location;
+    DatanodeInfo[] dn = new DatanodeInfo[locs.size()];
+    for (int j = 0; j < dn.length; j++) {
+      String name = locs.get(j).name;
+      dn[j] = new DatanodeInfo(new DatanodeID(name, "", -1, getPort(name)));
+    }
+    return new LocatedBlock(hblock, dn);
+  }
+  /**
+   * Converts a TBlock to a Block
+   */
+  private static Block convertBlock(TBlock tblk) {
+    return new Block(tblk.getBlockId(), 
+                     tblk.getNumBytes(),
+                     tblk.getGenerationStamp());
+  }
+
+  /**
+   * Parse a host:port pair and return the port name
+   */
+  static private int getPort(String name) {
+    int colon = name.indexOf(":");
+    if (colon < 0) {
+      return 50010; // default port.
+    }
+    return Integer.parseInt(name.substring(colon+1));
   }
 
   // Bind to port. If the specified port is 0, then bind to random port.
@@ -596,14 +874,12 @@ public HadoopThriftServer(String [] args) {
       TServerTransport serverTransport = new TServerSocket(ssock);
       Iface handler = new HadoopThriftHandler("hdfs-thrift-dhruba");
       ThriftHadoopFileSystem.Processor processor = new ThriftHadoopFileSystem.Processor(handler);
-      TThreadPoolServer.Options options = new TThreadPoolServer.Options();
-      options.minWorkerThreads = 10;
-      server = new TThreadPoolServer(processor, serverTransport,
-                                             new TTransportFactory(),
-                                             new TTransportFactory(),
-                                             new TBinaryProtocol.Factory(),
-                                             new TBinaryProtocol.Factory(), 
-                                             options);
+      TThreadPoolServer.Args serverArgs = new TThreadPoolServer.Args(serverTransport);
+      serverArgs.minWorkerThreads = 10;
+      serverArgs.processor(processor);
+      serverArgs.transportFactory(new TTransportFactory());
+      serverArgs.protocolFactory(new TBinaryProtocol.Factory());
+      server = new TThreadPoolServer(serverArgs);
       System.out.println("Starting the hadoop thrift server on port [" + serverPort + "]...");
       HadoopThriftHandler.LOG.info("Starting the hadoop thrift server on port [" +serverPort + "]...");
       System.out.flush();
diff --git a/src/contrib/thriftfs/src/test/org/apache/hadoop/thriftfs/TestThriftfs.java b/src/contrib/thriftfs/src/test/org/apache/hadoop/thriftfs/TestThriftfs.java
new file mode 100644
index 00000000..d81de7bb
--- /dev/null
+++ b/src/contrib/thriftfs/src/test/org/apache/hadoop/thriftfs/TestThriftfs.java
@@ -0,0 +1,56 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.thriftfs;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.apache.thrift.TException;
+
+
+/**
+ * This class is supposed to test ThriftHadoopFileSystem but has a long long
+ * way to go.
+ */
+public class TestThriftfs extends TestCase
+{
+  final static int numDatanodes = 1;
+
+  public TestThriftfs() throws IOException
+  {
+  }
+
+  public void testServer() throws Exception
+  {
+    final HadoopThriftServer server = new HadoopThriftServer(new String[0]);
+    Thread t = new Thread(new Runnable() {
+      public void run() {
+        try {
+          server.server.serve();
+        } catch (Exception e) {
+          e.printStackTrace();
+        }
+      }
+    });
+    t.start();
+    Thread.sleep(1000);
+    server.server.stop();
+  }
+}
diff --git a/src/contrib/thriftfs/test/org/apache/hadoop/thriftfs/TestThriftfs.java b/src/contrib/thriftfs/test/org/apache/hadoop/thriftfs/TestThriftfs.java
index 19b5e5cd..e69de29b 100644
--- a/src/contrib/thriftfs/test/org/apache/hadoop/thriftfs/TestThriftfs.java
+++ b/src/contrib/thriftfs/test/org/apache/hadoop/thriftfs/TestThriftfs.java
@@ -1,51 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.hadoop.thriftfs;
-
-import junit.framework.TestCase;
-import java.io.*;
-
-/**
- * This class is supposed to test ThriftHadoopFileSystem but has a long long
- * way to go.
- */
-public class TestThriftfs extends TestCase
-{
-  final static int numDatanodes = 1;
-
-  public TestThriftfs() throws IOException
-  {
-  }
-
-  public void testServer() throws IOException
-  {
-    Configuration conf = new Configuration();
-    MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, true, null);
-    cluster.waitActive();
-    DistributedFileSystem dfs = (DistributedFileSystem)cluster.getFileSystem();
-    HadoopThriftServer server = new HadoopThriftServer();
-    server.close();
-  }
-
-  public static void main(String[]args) throws Exception
-  {
-    new TestThriftfs().testServer();
-  }
-
-}
diff --git a/src/core/core-default.xml b/src/core/core-default.xml
index 04e886f9..9c0f64b8 100644
--- a/src/core/core-default.xml
+++ b/src/core/core-default.xml
@@ -86,7 +86,7 @@
 
 <property>
   <name>io.compression.codecs</name>
-  <value>org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.BZip2Codec</value>
+  <value>org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.BZip2Codec,org.apache.hadoop.io.compress.SnappyCodec</value>
   <description>A list of the compression codec classes that can be used 
                for compression/decompression.</description>
 </property>
@@ -222,9 +222,9 @@
 </property>
 
 <property>
-  <name>fs.checkpoint.size</name>
-  <value>67108864</value>
-  <description>The size of the current edit log (in bytes) that triggers
+  <name>fs.checkpoint.txns</name>
+  <value>700000</value>
+  <description>The size of the current edit log (in transactions) that triggers
        a periodic checkpoint even if the fs.checkpoint.period hasn't expired.
   </description>
 </property>
diff --git a/src/core/org/apache/hadoop/conf/Configuration.java b/src/core/org/apache/hadoop/conf/Configuration.java
index 59ef8de1..789e92c8 100644
--- a/src/core/org/apache/hadoop/conf/Configuration.java
+++ b/src/core/org/apache/hadoop/conf/Configuration.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.conf;
 
 import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.File;
@@ -66,6 +67,8 @@
 import org.apache.hadoop.util.StringUtils;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.w3c.dom.Comment;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -184,7 +187,12 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
    */
   private HashMap<String, String> updatingResource;
   
-  static{
+  /**
+   * Name of the file that holds all json configurations.
+   */ 
+  public static final String MATERIALIZEDJSON = "config.materialized_JSON";
+    
+  static{	  
     //print deprecation warning if hadoop-site.xml is found in classpath
     ClassLoader cL = Thread.currentThread().getContextClassLoader();
     if (cL == null) {
@@ -210,7 +218,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
       classLoader = Configuration.class.getClassLoader();
     }
   }
-  
+	
   /** A new configuration. */
   public Configuration() {
     this(true);
@@ -225,9 +233,6 @@ public Configuration() {
    */
   public Configuration(boolean loadDefaults) {
     this.loadDefaults = loadDefaults;
-    if (LOG.isDebugEnabled()) {
-      LOG.debug(StringUtils.stringifyException(new IOException("config()")));
-    }
     updatingResource = new HashMap<String, String>();
     synchronized(Configuration.class) {
       REGISTRY.put(this, null);
@@ -273,7 +278,21 @@ public Configuration(Configuration other) {
   public static synchronized void addDefaultResource(String name) {
     if(!defaultResources.contains(name)) {
       defaultResources.add(name);
-      for(Configuration conf : REGISTRY.keySet()) {
+      for(Configuration conf : REGISTRY.keySet()) { 
+        if(conf.loadDefaults) {
+          conf.reloadConfiguration();
+        }
+      }
+    }
+  }
+  
+  /**
+   * Remove default resource
+   */
+  public static synchronized void removeDefaultResource(String name) {
+    if(defaultResources.contains(name)) {
+      defaultResources.remove(name);
+      for(Configuration conf : REGISTRY.keySet()) { 
         if(conf.loadDefaults) {
           conf.reloadConfiguration();
         }
@@ -597,12 +616,20 @@ public void setFloat(String name, float value) {
    *         or <code>defaultValue</code>. 
    */
   public boolean getBoolean(String name, boolean defaultValue) {
-    String valueString = get(name);
-    if ("true".equals(valueString))
-      return true;
-    else if ("false".equals(valueString))
+    String valueString = get(name); 
+    if (valueString == null) {
+      return defaultValue;
+    }
+    valueString = valueString.toLowerCase();
+    
+    if ("true".equals(valueString)) {
+      return true;  
+    } else if ("false".equals(valueString)) {
       return false;
-    else return defaultValue;
+    }
+    
+    throw new IllegalArgumentException("Invalid value of boolean conf option " + name + ": " +
+        valueString);
   }
 
   /** 
@@ -885,7 +912,7 @@ else if (theClass != null)
    */
   public void setClass(String name, Class<?> theClass, Class<?> xface) {
     if (!xface.isAssignableFrom(theClass))
-      throw new RuntimeException(theClass+" not "+xface.getName());
+      throw new RuntimeException(theClass + " does not implement " + xface.getName());
     set(name, theClass.getName());
   }
 
@@ -1061,7 +1088,7 @@ private void loadResources(Properties properties,
                              boolean quiet) {
     if(loadDefaults) {
       for (String resource : defaultResources) {
-        loadResource(properties, resource, quiet);
+    	loadResource(properties, resource, quiet);
       }
     
       //support the hadoop-site.xml as a deprecated case
@@ -1076,7 +1103,23 @@ private void loadResources(Properties properties,
   }
 
   private void loadResource(Properties properties, Object name, boolean quiet) {
+    // Try to load the resource from the json object found in the file 
+    // config.materialized_JSON.  If that fails, load the resource from the
+    // xml file specified by the name parameter.
+    Object initialName = name;
+    try {
+      name = convertFile(name);
+      if (name instanceof JSONObject) {
+        JSONObject json = (JSONObject)name;
+        loadJsonResource(json, properties, initialName);
+        return;
+      }
+    } catch (IOException e) {
+    } catch (JSONException e) {
+    }
+    // Load resource from xml.	  
     try {
+      name = initialName;
       DocumentBuilderFactory docBuilderFactory 
         = DocumentBuilderFactory.newInstance();
       //ignore all comments inside the xml file
@@ -1209,7 +1252,144 @@ private void loadResource(Properties properties, Object name, boolean quiet) {
       throw new RuntimeException(e);
     }
   }
-
+  
+  /**
+   * Maps xml configs to their respective key names 
+   * in the file config.materialized_JSON
+   */ 
+  public String xmlToThrift(String name) {
+    name = name.replace("-custom.xml", "");
+    name = name.replace(".xml", "");
+    name = name.replace("-", "_");
+    return name;
+  }
+  
+  /**
+   * Given an input stream, read in the contents of the file
+   * and instantiate a JSON object if it exists.
+   */
+  public JSONObject instantiateJsonObject(InputStream in) throws IOException,
+                                                                JSONException {
+    BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+    StringBuffer contents = new StringBuffer();
+    String text = null;
+    while ((text = reader.readLine()) != null) {
+      contents.append(text).append(System.getProperty("line.separator"));
+    }
+    in.close();
+    JSONObject json = new JSONObject(contents.toString());
+    return json;
+  }
+  
+  /**
+   * Given a xml config file specified as a string, return the
+   * corresponding json object if it exists.
+   */
+  private JSONObject getJsonConfig(String name) throws IOException, 
+                                                       JSONException {
+    if (name.endsWith(".xml")) {
+      URL url = getResource(MATERIALIZEDJSON);
+      if (url != null) {
+        InputStream in = url.openStream();
+        if (in != null) {
+          JSONObject json = instantiateJsonObject(in);
+          if (json.has(xmlToThrift(name))) {
+            return json.getJSONObject(xmlToThrift(name));
+          } 
+        }
+      }
+    }
+    return null;
+  }
+  
+  /**
+   * Given a xml config file specified by a path, return the
+   * corresponding json object if it exists.
+   */ 
+  private JSONObject getJsonConfig(Path name) throws IOException,
+                                                     JSONException {
+    String pathString = name.toUri().getPath();
+    if (pathString.endsWith(".xml")) {
+      String xml = new Path(pathString).getName();
+      File jsonFile = new File(pathString.replace(xml, MATERIALIZEDJSON))
+                          .getAbsoluteFile();
+      if (jsonFile.exists()) {
+        InputStream in = new BufferedInputStream(new FileInputStream(jsonFile));
+        if (in != null) {
+          JSONObject json = instantiateJsonObject(in);
+          if (json.has(xmlToThrift(xml))) {
+            return json.getJSONObject(xmlToThrift(xml));
+          } 
+        }
+      }
+    }
+    return null;
+  }
+ 
+  /**
+   * Given a xml config file, return the corresponding json
+   * object if it exists.
+   */  
+  private Object convertFile(Object name) throws IOException, JSONException{
+    if (name instanceof String) {
+      String file = (String) name;
+      JSONObject json = getJsonConfig(file);
+      if (json!=null) {
+        return json;
+      }
+    } else if (name instanceof Path) {
+        Path file = (Path)name;
+        JSONObject json = getJsonConfig(file);
+        if (json != null) {
+          return json;
+        }
+    } 
+    return name;
+  }
+ 
+  /**
+   * Helper function to loadResource that adds resources to the
+   * properties parameter by parsing through a json object.
+   */  
+  private void loadJsonResource(JSONObject json, Properties properties, Object name)
+                                throws JSONException {
+    Iterator<String> keys = json.keys();
+    while (keys.hasNext()) {
+      String key = keys.next();
+      // can't have . in thrift fields so we represent . with _
+      String keyUnderscoresToDots = key.replace("_", ".");  
+      // actual _ are represented as __ in thrift schema
+      keyUnderscoresToDots = keyUnderscoresToDots.replace("..", "_");
+      if (!json.isNull(key)) {
+        Object value = json.get(key);
+        String stringVal = "";
+        if (value instanceof String) {
+          stringVal = (String)value;
+        } else if (value instanceof Integer) {
+            stringVal = new Integer((Integer)value).toString();
+        } else if (value instanceof Long) {
+            stringVal = new Long((Long)value).toString();
+        } else if (value instanceof Double) {
+            stringVal = new Double((Double)value).toString();
+        } else if (value instanceof Boolean) {
+            stringVal = new Boolean((Boolean)value).toString();
+        } else if (value instanceof JSONObject) {
+            loadJsonResource((JSONObject)value, properties, name);
+            continue;
+        } else {
+            LOG.warn("unsupported value in json object: " + value);
+        }
+        if (!finalParameters.contains(keyUnderscoresToDots)) {
+          properties.setProperty(keyUnderscoresToDots, stringVal);
+          updatingResource.put(keyUnderscoresToDots, name.toString());
+    	} else {
+    	    LOG.warn(name+":a attempt to override final parameter: "+
+                     keyUnderscoresToDots+";  Ignoring.");
+    	}
+      } 
+    }
+  }
+  
   /** 
    * Write out the non-default properties in this configuration to the given
    * {@link OutputStream}.
@@ -1379,12 +1559,12 @@ private void toString(List resources, StringBuffer sb) {
   public synchronized void setQuietMode(boolean quietmode) {
     this.quietmode = quietmode;
   }
-
+  
   /** For debugging.  List non-default properties to the terminal and exit. */
   public static void main(String[] args) throws Exception {
     new Configuration().writeXml(System.out);
   }
-
+  
   @Override
   public void readFields(DataInput in) throws IOException {
     clear();
diff --git a/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java b/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
index 1d8460da..25ff83ae 100644
--- a/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
+++ b/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
@@ -20,13 +20,13 @@
 
 import java.io.*;
 import java.util.Arrays;
-import java.util.zip.CRC32;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.util.Progressable;
+import org.apache.hadoop.util.PureJavaCrc32;
 import org.apache.hadoop.util.StringUtils;
 
 /****************************************************************
@@ -135,7 +135,7 @@ public ChecksumFSInputChecker(ChecksumFileSystem fs, Path file, int bufferSize)
         if (!Arrays.equals(version, CHECKSUM_VERSION))
           throw new IOException("Not a checksum file: "+sumFile);
         this.bytesPerSum = sums.readInt();
-        set(fs.verifyChecksum, new CRC32(), bytesPerSum, 4);
+        set(fs.verifyChecksum, new PureJavaCrc32(), bytesPerSum, 4);
       } catch (FileNotFoundException e) {         // quietly ignore
         set(fs.verifyChecksum, null, 1, 0);
       } catch (IOException e) {                   // loudly ignore
@@ -332,7 +332,7 @@ public ChecksumFSOutputSummer(ChecksumFileSystem fs,
                           int bytesPerChecksum,
                           Progressable progress)
       throws IOException {
-      super(new CRC32(), bytesPerChecksum, 4);
+      super(new PureJavaCrc32(), bytesPerChecksum, 4);
       this.datas = fs.getRawFileSystem().create(file, overwrite, bufferSize, 
                                          replication, blockSize, progress);
       int sumBufferSize = fs.getSumBufferSize(bytesPerChecksum, bufferSize);
diff --git a/src/core/org/apache/hadoop/fs/FileStatus.java b/src/core/org/apache/hadoop/fs/FileStatus.java
index 29c3e166..c65cf719 100644
--- a/src/core/org/apache/hadoop/fs/FileStatus.java
+++ b/src/core/org/apache/hadoop/fs/FileStatus.java
@@ -215,8 +215,8 @@ public void write(DataOutput out) throws IOException {
     out.writeLong(modification_time);
     out.writeLong(access_time);
     permission.write(out);
-    Text.writeString(out, owner);
-    Text.writeString(out, group);
+    Text.writeStringOpt(out, owner);
+    Text.writeStringOpt(out, group);
   }
 
   public void readFields(DataInput in) throws IOException {
@@ -229,8 +229,28 @@ public void readFields(DataInput in) throws IOException {
     modification_time = in.readLong();
     access_time = in.readLong();
     permission.readFields(in);
-    owner = Text.readString(in);
-    group = Text.readString(in);
+    owner = Text.readStringOpt(in);
+    group = Text.readStringOpt(in);
+  }
+
+  public boolean compareFull(Object o, boolean closedFile) {
+    if (this == o)
+      return true;
+    if (o == null || getClass() != o.getClass())
+      return false;
+    FileStatus other = (FileStatus) o;
+    if(closedFile && (other.getLen() != this.getLen())) {
+      return false;
+    }
+    return (other.isDir() == this.isDir()
+        && other.getReplication() == this.getReplication()
+        && other.getBlockSize() == this.getBlockSize()
+        && other.getModificationTime() == this.getModificationTime()
+        && other.getAccessTime() == this.getAccessTime()
+        && other.getPermission().equals(this.getPermission())
+        && other.getOwner().equals(this.getOwner())
+        && other.getGroup().equals(this.getGroup())
+        && other.getPath().equals(this.getPath()));
   }
 
   /**
diff --git a/src/core/org/apache/hadoop/fs/FileSystem.java b/src/core/org/apache/hadoop/fs/FileSystem.java
index 370c7481..763d839f 100644
--- a/src/core/org/apache/hadoop/fs/FileSystem.java
+++ b/src/core/org/apache/hadoop/fs/FileSystem.java
@@ -732,13 +732,19 @@ public boolean setReplication(Path src, short replication)
     throws IOException {
     return true;
   }
+
   /**
-    * hard link Path dst to Path src. Can take place on DFS. 
-    */ 
-   public boolean hardLink(Path src, Path dst) throws IOException {  
-     throw new UnsupportedOperationException(getClass().getCanonicalName() + 
-         " does not support hard link"); 
-   } 
+   * hard link Path dst to Path src. Can take place on DFS.
+   */
+  public boolean hardLink(Path src, Path dst) throws IOException {
+    throw new UnsupportedOperationException(getClass().getCanonicalName()
+        + " does not support hard link");
+  }
+
+  public String[] getHardLinkedFiles(Path src) throws IOException {
+    throw new UnsupportedOperationException(getClass().getCanonicalName()
+        + " does not support hard link");
+  }
    
   /**
    * Renames Path src to Path dst.  Can take place on local fs
diff --git a/src/core/org/apache/hadoop/fs/FileUtil.java b/src/core/org/apache/hadoop/fs/FileUtil.java
index 5771eda6..cdc9fa75 100644
--- a/src/core/org/apache/hadoop/fs/FileUtil.java
+++ b/src/core/org/apache/hadoop/fs/FileUtil.java
@@ -664,27 +664,79 @@ public static FileStatus[] listStatus(FileSystem fs, Path f, int depth)
   /**
    * Core logic for listStatus
    */
-  private static List<FileStatus> listStatusHelper(FileSystem fs, Path path,
+  public static List<FileStatus> listStatusHelper(FileSystem fs, Path path,
       int depth, List<FileStatus> acc) throws IOException {
     FileStatus[] fileStatusResults = fs.listStatus(path);
+    if (fileStatusResults == null) {
+      throw new IOException("Path does not exist: " + path);
+    }
 
-    if (null != fileStatusResults) {
-      for (FileStatus f : fileStatusResults) {
-        Path subPath = f.getPath();
-        if (!f.isDir()) {
-          acc.add(f); // Accumulate all files
+    for (FileStatus f : fileStatusResults) {
+      Path subPath = f.getPath();
+      if (!f.isDir()) {
+        acc.add(f); // Accumulate all files
+      } else {
+        if (depth > 1) {
+          listStatusHelper(fs, subPath, depth - 1, acc);
         } else {
-          if (depth > 1) {
-            listStatusHelper(fs, subPath, depth - 1, acc);
-          } else {
-            acc.add(f); // Accumulate all leaves
-          }
+          acc.add(f); // Accumulate all leaves
         }
       }
     }
+
     return acc;
   }
 
+  /**
+   * pass in a directory path, get the list of statuses of leaf directories
+   * @param fs file system
+   * @param path path to scan
+   * @param acc the collection of file status of leaf directories
+   * @throws IOException if any error occurs
+   */
+  public static void listStatusForLeafDir(FileSystem fs,
+      FileStatus pathStatus,
+      List<FileStatus> acc) throws IOException {
+    if (!pathStatus.isDir())
+      return;
+    FileStatus[] fileStatusResults = fs.listStatus(pathStatus.getPath());
+    if (fileStatusResults == null) {
+      throw new IOException("Path does not exist: " + pathStatus.getPath());
+    }
+    
+    boolean leafDir = true;
+    for (FileStatus f : fileStatusResults) {
+      if (f.isDir()) {
+        leafDir = false;
+        listStatusForLeafDir(fs, f, acc);
+      }
+    }
+    if (leafDir) {
+      acc.add(pathStatus); // Accumulate leaf dir
+    }
+  }
+  
+  /**
+   * A wrapper for {@link File#listFiles()}. This java.io API returns null when
+   * a dir is not a directory or for any I/O error. Instead of having null check
+   * everywhere File#listFiles() is used, we will add utility API to get around
+   * this problem. For the majority of cases where we prefer an IOException to
+   * be thrown.
+   * 
+   * @param dir  directory for which listing should be performed
+   * @return list of files or empty list
+   * @exception IOException
+   *              for invalid directory or for a bad disk.
+   */
+  public static File[] listFiles(File dir) throws IOException {
+    File[] files = dir.listFiles();
+    if (files == null) {
+      throw new IOException("Invalid directory or I/O error occurred for dir: "
+          + dir.toString());
+    }
+    return files;
+  }
+
   /**
    * Move the src file to the name specified by target.
    * @param src the source file
diff --git a/src/core/org/apache/hadoop/fs/FilterFileSystem.java b/src/core/org/apache/hadoop/fs/FilterFileSystem.java
index f94b7f4b..0b2d6176 100644
--- a/src/core/org/apache/hadoop/fs/FilterFileSystem.java
+++ b/src/core/org/apache/hadoop/fs/FilterFileSystem.java
@@ -169,6 +169,10 @@ public boolean setReplication(Path src, short replication) throws IOException {
   public boolean hardLink(Path src, Path dst) throws IOException {  
     return fs.hardLink(src, dst);
   } 
+
+  public String[] getHardLinkedFiles(Path src) throws IOException {
+    return fs.getHardLinkedFiles(src);
+  }
   
   /**
    * Renames Path src to Path dst.  Can take place on local fs
diff --git a/src/core/org/apache/hadoop/fs/FsShell.java b/src/core/org/apache/hadoop/fs/FsShell.java
index dfdefc3f..357528de 100644
--- a/src/core/org/apache/hadoop/fs/FsShell.java
+++ b/src/core/org/apache/hadoop/fs/FsShell.java
@@ -1048,6 +1048,25 @@ void copy(String srcf, String dstf, Configuration conf) throws IOException {
     }
   }
 
+  private int hardlink(String argv[]) throws IOException {
+    if (argv.length != 3) {
+      throw new IllegalArgumentException(
+          "Must specify exactly two files to hardlink");
+    }
+    if (argv[1] == null || argv[2] == null) {
+      throw new IllegalArgumentException("One of the arguments is null");
+    }
+    Path src = new Path(argv[1]);
+    Path dst = new Path(argv[2]);
+    FileSystem srcFs = src.getFileSystem(getConf());
+    FileSystem dstFs = dst.getFileSystem(getConf());
+    if (!srcFs.getUri().equals(dstFs.getUri())) {
+      throw new IllegalArgumentException("Source and Destination files are" +
+        " on different filesystems");
+    }
+    return (srcFs.hardLink(src, dst)) ? 0 : -1;
+  }
+
   /**
    * Copy file(s) to a destination file. Multiple source
    * files can be specified. The destination is the last element of
@@ -1067,7 +1086,7 @@ private int copy(String argv[], Configuration conf) throws IOException {
     //
     if (argv.length > 3) {
       Path dst = new Path(dest);
-      if (!getFS().isDirectory(dst)) {
+      if (!dst.getFileSystem(conf).isDirectory(dst)) {
         throw new IOException("When copying multiple files, " 
                               + "destination " + dest + " should be a directory.");
       }
@@ -1534,6 +1553,12 @@ private void printHelp(String cmd) {
       "\t\tdestination.  When copying multiple files, the destination\n" +
       "\t\tmust be a directory. \n";
 
+    String hardlink = "-hardlink <src> <dst> : Hardlink a source file to a "
+        + "destination file. The destination file must not exist";
+
+    String showlinks = "-showlinks <srcs...> : Displays the files hardlinked "
+        + "to each of the files specified on the command line";
+
     String rm = "-rm [-skipTrash] <src>: \tDelete all files that match the specified file pattern.\n" +
       "\t\tEquivalent to the Unix command \"rm <src>\"\n" +
       "\t\t-skipTrash option bypasses trash, if enabled, and immediately\n" +
@@ -1606,7 +1631,9 @@ private void printHelp(String cmd) {
       "\t\tDo not create any files\n" +
       "\t-d, --date=\"yyyy-MM-dd HH:mm:ss\"\n" +
       "\t\tUse specified date instead of current time\n" +
-      "\t-m\tChange only modification time\n";
+      "\t-m\tChange only modification time\n" + 
+      "\t-u timestamp\n" + 
+      "\t\tUse specified timestamp instead of date";
 
     String test = "-test -[ezd] <path>: If file { exists, has zero length, is a directory\n" +
       "\t\tthen return 0, else return 1.\n";
@@ -1674,6 +1701,10 @@ private void printHelp(String cmd) {
       System.out.println(dus);
     } else if ("rm".equals(cmd)) {
       System.out.println(rm);
+    } else if ("hardlink".equals(cmd)) {
+      System.out.println(hardlink);
+    } else if ("showlinks".equals(cmd)) {
+      System.out.println(showlinks);
     } else if ("rmr".equals(cmd)) {
       System.out.println(rmr);
     } else if ("rmdir".equals(cmd)) {
@@ -1730,6 +1761,8 @@ private void printHelp(String cmd) {
       System.out.println(chgrp);
     } else if ("undelete".equals(cmd)) {
       System.out.println(undelete);
+    } else if ("hardlink".equals(cmd)) {
+      System.out.println(undelete);
     } else if (Count.matches(cmd)) {
       System.out.println(Count.DESCRIPTION);
     } else if ("help".equals(cmd)) {
@@ -1777,6 +1810,17 @@ private void printHelp(String cmd) {
 
   }
 
+  private void showlinks(String src) throws IOException {
+    Path srcPath = new Path(src);
+    String[] files = srcPath.getFileSystem(getConf()).getHardLinkedFiles(
+        srcPath);
+    System.out.println("The following files (" + files.length
+        + ") are hardlinked to " + src + " : ");
+    for (String file : files) {
+      System.out.println(file);
+    }
+  }
+
   /**
    * Apply operation specified by 'cmd' on all parameters
    * starting from argv[startindex].
@@ -1813,6 +1857,8 @@ private int doall(String cmd, String argv[], int startindex) {
           mkdir(argv[i]);
         } else if ("-rm".equals(cmd)) {
           delete(argv[i], false, rmSkipTrash);
+        } else if ("-showlinks".equals(cmd)) {
+          showlinks(argv[i]);
         } else if ("-rmr".equals(cmd)) {
           delete(argv[i], true, rmSkipTrash);
         } else if ("-rmdir".equals(cmd)) {
@@ -1909,7 +1955,8 @@ private static void printUsage(String cmd) {
     } else if ("-rmdir".equals(cmd)) {
       System.err.println("Usage: java FsShell [" + cmd + 
                            " [-ignore-fail-on-non-empty] <src>]");
-    } else if ("-mv".equals(cmd) || "-cp".equals(cmd) || "-compress".equals(cmd)) {
+    } else if ("-mv".equals(cmd) || "-cp".equals(cmd)
+        || "-compress".equals(cmd) || "-hardlink".equals(cmd)) {
       System.err.println("Usage: java FsShell" +
                          " [" + cmd + " <src> <dst>]");
     } else if ("-put".equals(cmd) || "-copyFromLocal".equals(cmd) ||
@@ -1926,6 +1973,8 @@ private static void printUsage(String cmd) {
     } else if ("-cat".equals(cmd)) {
       System.err.println("Usage: java FsShell" +
                          " [" + cmd + " <src>]");
+    } else if ("-showlinks".equals(cmd)) {
+      System.err.println("Usage: java FsShell" + " [" + cmd + " <srcs...>]");
     } else if ("-setrep".equals(cmd)) {
       System.err.println("Usage: java FsShell [" + SETREP_SHORT_USAGE + "]");
     } else if ("-test".equals(cmd)) {
@@ -1950,6 +1999,9 @@ private static void printUsage(String cmd) {
       System.err.println("           [" + Count.USAGE + "]");
       System.err.println("           [-mv <src> <dst>]");
       System.err.println("           [-cp <src> <dst>]");
+      System.err.println("           [-hardlink <src> <dst>]");
+      System.err.println("           [-showlinks <srcs ..>] shows the files "
+          + "hardlinked to the given file");
       System.err.println("           [-rm [-skipTrash] <path>]");
       System.err.println("           [-rmr [-skipTrash] <path>]");
       System.err.println("           [-rmdir [-ignore-fail-on-non-empty] <path>]");
@@ -2012,7 +2064,8 @@ public int run(String argv[]) throws Exception {
         printUsage(cmd);
         return exitCode;
       }
-    } else if ("-mv".equals(cmd) || "-cp".equals(cmd) || "-compress".equals(cmd)) {
+    } else if ("-mv".equals(cmd) || "-cp".equals(cmd)
+        || "-compress".equals(cmd) || "-hardlink".equals(cmd)) {
       if (argv.length < 3) {
         printUsage(cmd);
         return exitCode;
@@ -2022,7 +2075,7 @@ public int run(String argv[]) throws Exception {
                "-mkdir".equals(cmd) || "-touchz".equals(cmd) ||
                "-stat".equals(cmd) || "-text".equals(cmd) ||
                "-decompress".equals(cmd) || "-touch".equals(cmd) ||
-               "-undelete".equals(cmd)) {
+               "-undelete".equals(cmd) || "-showlinks".equals(cmd)) {
       if (argv.length < 2) {
         printUsage(cmd);
         return exitCode;
@@ -2097,10 +2150,14 @@ public int run(String argv[]) throws Exception {
         exitCode = rename(argv, getConf());
       } else if ("-cp".equals(cmd)) {
         exitCode = copy(argv, getConf());
+      } else if ("-hardlink".equals(cmd)) {
+        exitCode = hardlink(argv);
       } else if ("-compress".equals(cmd)) {
         exitCode = compress(argv, getConf());
       } else if ("-rm".equals(cmd)) {
         exitCode = doall(cmd, argv, i);
+      } else if ("-showlinks".equals(cmd)) {
+        exitCode = doall(cmd, argv, i);
       } else if ("-rmr".equals(cmd)) {
         exitCode = doall(cmd, argv, i);
       } else if ("-rmdir".equals(cmd)) {
@@ -2139,7 +2196,7 @@ public int run(String argv[]) throws Exception {
         }
       } else if ("-help".equals(cmd)) {
         if (i < argv.length) {
-          printHelp(argv[i]);
+          printHelp(argv[i].substring(1));
         } else {
           printHelp("");
         }
diff --git a/src/core/org/apache/hadoop/fs/FsShellTouch.java b/src/core/org/apache/hadoop/fs/FsShellTouch.java
index 6bff994c..709267a0 100644
--- a/src/core/org/apache/hadoop/fs/FsShellTouch.java
+++ b/src/core/org/apache/hadoop/fs/FsShellTouch.java
@@ -25,7 +25,7 @@
 
 class FsShellTouch {
 
-  static String TOUCH_USAGE = "-touch [-acdm] PATH...";
+  static String TOUCH_USAGE = "-touch [-acdmu] PATH...";
 
   protected static final SimpleDateFormat dateFmt =
     new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -36,6 +36,7 @@ private static class TouchWorker {
     boolean setATime;
     boolean setMTime;
     Date newDate;
+    Long unixTime;
 
     TouchWorker(FileSystem fs) {
       this.fs = fs;
@@ -43,6 +44,7 @@ private static class TouchWorker {
       this.setATime = false;
       this.setMTime = false;
       this.newDate = null;
+      this.unixTime = null;
     }
 
     void touch(String src) throws IOException {
@@ -63,19 +65,25 @@ void touch(String src) throws IOException {
         return;
       }
 
-      Date d = newDate;
-      if (d == null) {
+      Long ut = null;
+      if (newDate != null) {
+        ut = newDate.getTime();
+      }
+      if (ut == null && unixTime != null) {
+        ut = unixTime;
+      }
+      if (ut == null) {
         // Date was not specified. Using current date for each file.
-        d = new Date();
+        ut = new Date().getTime();
       }
 
       long atime = -1;
       long mtime = -1;
       if (setATime) {
-        atime = d.getTime();
+        atime = ut;
       }
       if (setMTime) {
-        mtime = d.getTime();
+        mtime = ut;
       }
       fs.setTimes(f, mtime, atime);
     }
@@ -122,6 +130,13 @@ public static void touchFiles(FileSystem fs, String argv[], int startIndex)
             case 'c':
               worker.createFiles = false;
               break;
+            case 'u':
+              if (i != arg.length() - 1 || startIndex == argv.length - 1) {
+                throw new IOException("expected timestamp after 'u' option");
+              }
+              ++startIndex;
+              worker.unixTime = Long.parseLong(argv[startIndex]);
+              break;
             case 'd':
               if (i != arg.length() - 1 || startIndex == argv.length - 1) {
                 throw new IOException("expected date after 'd' option");
diff --git a/src/core/org/apache/hadoop/fs/LocalDirAllocator.java b/src/core/org/apache/hadoop/fs/LocalDirAllocator.java
index ed0eded4..4be8ecc4 100644
--- a/src/core/org/apache/hadoop/fs/LocalDirAllocator.java
+++ b/src/core/org/apache/hadoop/fs/LocalDirAllocator.java
@@ -28,6 +28,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 import org.apache.hadoop.conf.Configuration; 
+import org.apache.hadoop.util.DataDirFileReader;
 
 /** An implementation of a round-robin scheme for disk allocation for creating
  * files. The way it works is that it is kept track what disk was last
@@ -192,12 +193,13 @@ private static class AllocatorPerContext {
       LogFactory.getLog(AllocatorPerContext.class);
 
     private int dirNumLastAccessed;
+    private long lastReloadTimestamp = 0;
     private Random dirIndexRandomizer = new Random();
     private FileSystem localFS;
     private DF[] dirDF;
     private String contextCfgItemName;
     private String[] localDirs;
-    private String savedLocalDirs = "";
+    private String savedLocalDirs;
 
     public AllocatorPerContext(String contextCfgItemName) {
       this.contextCfgItemName = contextCfgItemName;
@@ -207,11 +209,45 @@ public AllocatorPerContext(String contextCfgItemName) {
      * that any change to localDirs is reflected immediately.
      */
     private void confChanged(Configuration conf) throws IOException {
-      String newLocalDirs = conf.get(contextCfgItemName);
+      String configFilePath = conf.get("mapred.localdir.confpath");
+      String newLocalDirs = null;
+      String[] localDirsList = null;
+      if ((contextCfgItemName.equals("mapred.local.dir")) && 
+        (configFilePath != null)) {
+        try {
+          DataDirFileReader reader = new DataDirFileReader(configFilePath);
+          if (lastReloadTimestamp < reader.getLastModTimeStamp()) {
+            lastReloadTimestamp = reader.getLastModTimeStamp();
+            String tempLocalDirs = reader.getNewDirectories();
+            localDirsList = reader.getArrayOfCurrentDataDirectories();
+            if(tempLocalDirs == null) {
+              LOG.warn("File is empty, using mapred.local.dir directories");
+            }
+            else {
+              newLocalDirs = tempLocalDirs;
+            }
+          } else {
+            newLocalDirs = savedLocalDirs;
+          }
+        } catch (IOException e) {
+          LOG.warn("Could not read file, using directories from mapred.local" +
+                                                         ".dir Exception: ", e);
+        }
+      } else {
+        LOG.warn("No mapred.localdir.confpath not defined, now using default " +
+                                                             "directories");
+      }
+      if (newLocalDirs == null) {
+        newLocalDirs = conf.get(contextCfgItemName);
+      }
       Configuration newConf = new Configuration(conf);
       newConf.setLong("dfs.df.interval", 30000);
       if (!newLocalDirs.equals(savedLocalDirs)) {
-        localDirs = newConf.getStrings(contextCfgItemName);
+        if (localDirsList != null) {
+          localDirs = localDirsList;
+        } else {
+          localDirs = newConf.getStrings(contextCfgItemName);
+        }
         localFS = FileSystem.getLocal(newConf);
         int numDirs = localDirs.length;
         ArrayList<String> dirs = new ArrayList<String>(numDirs);
@@ -244,6 +280,14 @@ private void confChanged(Configuration conf) throws IOException {
         // randomize the first disk picked in the round-robin selection 
         dirNumLastAccessed = dirIndexRandomizer.nextInt(dirs.size());
       }
+
+      if (localDirs == null) {
+        throw new IllegalStateException("confChanged: Cannot have null " +
+            "localDirs with configFilePath " + configFilePath +
+            ", contextCfgItemName" + conf.get(contextCfgItemName) +
+            ", newLocalDirs " + newLocalDirs + ", savedLocalDirs " +
+            savedLocalDirs);
+      }
     }
 
     private Path createPath(String path) throws IOException {
diff --git a/src/core/org/apache/hadoop/http/HttpServer.java b/src/core/org/apache/hadoop/http/HttpServer.java
index c4170bb2..446d222b 100644
--- a/src/core/org/apache/hadoop/http/HttpServer.java
+++ b/src/core/org/apache/hadoop/http/HttpServer.java
@@ -95,6 +95,7 @@ public class HttpServer implements FilterContainer {
   protected final List<String> filterNames = new ArrayList<String>();
   private static final int MAX_RETRIES = 10;
   static final String HTTP_MAX_THREADS = "hadoop.http.max.threads";
+  public static final String HTTP_THREADPOOL_MAX_STOP_TIME = "hadoop.http.threadpool.max.stoptime";
 
   /** Same as this(name, bindAddress, port, findPort, null); */
   public HttpServer(String name, String bindAddress, int port, boolean findPort
@@ -122,10 +123,14 @@ public HttpServer(String name, String bindAddress, int port,
     webServer.addConnector(listener);
 
     int maxThreads = conf.getInt(HTTP_MAX_THREADS, -1);
+    // Wait a maximum of 1 minute by default for the threadpool to exit.
+    int maxStopTime = conf.getInt(HTTP_THREADPOOL_MAX_STOP_TIME, 60000);
     // If HTTP_MAX_THREADS is not configured, QueueThreadPool() will use the 
     // default value (currently 254).
     QueuedThreadPool threadPool = maxThreads == -1 ?
         new QueuedThreadPool() : new QueuedThreadPool(maxThreads);
+    threadPool.setMaxStopTimeMs(maxStopTime);
+    threadPool.setDaemon(true);
     webServer.setThreadPool(threadPool);
 
     final String appDir = getWebAppsPath();
diff --git a/src/core/org/apache/hadoop/http/NettyMapOutputHttpServer.java b/src/core/org/apache/hadoop/http/NettyMapOutputHttpServer.java
index db506152..332e5ee0 100644
--- a/src/core/org/apache/hadoop/http/NettyMapOutputHttpServer.java
+++ b/src/core/org/apache/hadoop/http/NettyMapOutputHttpServer.java
@@ -43,6 +43,12 @@
  * used to handle all other requests.
  */
 public class NettyMapOutputHttpServer {
+  /** Netty's backlog parameter. */
+  public static final String BOOTSTRAP_BACKLOG_PARAM = "backlog";
+  /** The backlog to be used for netty. */
+  public static final String BACKLOG_CONF = "mapred.task.tracker.netty.backlog";
+  /** The default backlog. */
+  public static final int DEFAULT_BACKLOG = 1000;
   /** Maximum thread pool size key */
   public static final String MAXIMUM_THREAD_POOL_SIZE =
     "mapred.task.tracker.netty.maxThreadPoolSize";
@@ -91,14 +97,20 @@ public synchronized void init(Configuration conf) {
     } catch (ClassCastException e) {
       LOG.warn("Netty worker thread pool is not of type ThreadPoolExecutor", e);
     }
+    LOG.info("Netty starting up with a maximum of " + maximumPoolSize +
+        " worker threads");
     channelFactory = new NioServerSocketChannelFactory(
         Executors.newCachedThreadPool(bossFactory),
-        workerThreadPool);
+        workerThreadPool, maximumPoolSize);
   }
 
-  public synchronized int start(ChannelPipelineFactory pipelineFactory) {
+  public synchronized int start(
+    Configuration conf, ChannelPipelineFactory pipelineFactory) {
     ServerBootstrap bootstrap = new ServerBootstrap(channelFactory);
     bootstrap.setPipelineFactory(pipelineFactory);
+    bootstrap.setOption(
+      BOOTSTRAP_BACKLOG_PARAM,
+      conf.getInt(BACKLOG_CONF, DEFAULT_BACKLOG));
     // Try to bind to a port.  If the port is 0, netty will select a port.
     int bindAttempt = 0;
     while (bindAttempt < DEFAULT_BIND_ATTEMPT_MAX) {
diff --git a/src/core/org/apache/hadoop/io/IOUtils.java b/src/core/org/apache/hadoop/io/IOUtils.java
index 5c232f94..f3ab34b4 100644
--- a/src/core/org/apache/hadoop/io/IOUtils.java
+++ b/src/core/org/apache/hadoop/io/IOUtils.java
@@ -22,12 +22,12 @@
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
-import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
 import org.apache.commons.logging.Log;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.PureJavaCrc32;
 
 /**
  * An utility class for I/O related functionality. 
@@ -79,7 +79,7 @@ public static long copyBytesAndGenerateCRC(InputStream in, OutputStream out,
     
     PrintStream ps = out instanceof PrintStream ? (PrintStream)out : null;
     byte buf[] = new byte[buffSize];
-    Checksum sum = new CRC32();
+    Checksum sum = new PureJavaCrc32();
     sum.reset();
     try {
       int bytesRead = in.read(buf);
diff --git a/src/core/org/apache/hadoop/io/ObjectWritable.java b/src/core/org/apache/hadoop/io/ObjectWritable.java
index 89f97d4d..db04d03c 100644
--- a/src/core/org/apache/hadoop/io/ObjectWritable.java
+++ b/src/core/org/apache/hadoop/io/ObjectWritable.java
@@ -102,7 +102,7 @@ public void readFields(DataInput in) throws IOException {
       }
     }
     public void write(DataOutput out) throws IOException {
-      UTF8.writeString(out, declaredClass.getName());
+      UTF8.writeStringOpt(out, declaredClass.getName());
     }
   }
 
@@ -117,7 +117,7 @@ public static void writeObject(DataOutput out, Object instance,
       declaredClass = Writable.class;
     }
 
-    UTF8.writeString(out, declaredClass.getName()); // always write declared
+    UTF8.writeStringOpt(out, declaredClass.getName()); // always write declared
 
     if (declaredClass.isArray()) {                // array
       int length = Array.getLength(instance);
@@ -128,7 +128,7 @@ public static void writeObject(DataOutput out, Object instance,
       }
       
     } else if (declaredClass == String.class) {   // String
-      UTF8.writeString(out, (String)instance);
+      UTF8.writeStringOpt(out, (String)instance);
       
     } else if (declaredClass.isPrimitive()) {     // primitive type
 
@@ -153,9 +153,9 @@ public static void writeObject(DataOutput out, Object instance,
         throw new IllegalArgumentException("Not a primitive: "+declaredClass);
       }
     } else if (declaredClass.isEnum()) {         // enum
-      UTF8.writeString(out, ((Enum)instance).name());
+      UTF8.writeStringOpt(out, ((Enum)instance).name());
     } else if (Writable.class.isAssignableFrom(declaredClass)) { // Writable
-      UTF8.writeString(out, instance.getClass().getName());
+      UTF8.writeStringOpt(out, instance.getClass().getName());
       ((Writable)instance).write(out);
 
     } else {
diff --git a/src/core/org/apache/hadoop/io/ShortWritable.java b/src/core/org/apache/hadoop/io/ShortWritable.java
new file mode 100644
index 00000000..be09df18
--- /dev/null
+++ b/src/core/org/apache/hadoop/io/ShortWritable.java
@@ -0,0 +1,111 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.io;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
+/** A WritableComparable for shorts. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
+public class ShortWritable implements WritableComparable<ShortWritable> {
+  private short value;
+
+  public ShortWritable() {
+  }
+
+  public ShortWritable(short value) {
+    set(value);
+  }
+
+  /** Set the value of this ShortWritable. */
+  public void set(short value) {
+    this.value = value;
+  }
+
+  /** Return the value of this ShortWritable. */
+  public short get() {
+    return value;
+  }
+
+  /** read the short value */
+  @Override
+  public void readFields(DataInput in) throws IOException {
+    value = in.readShort();
+  }
+
+  /** write short value */
+  @Override
+  public void write(DataOutput out) throws IOException {
+    out.writeShort(value);
+  }
+
+  /** Returns true iff <code>o</code> is a ShortWritable with the same value. */
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof ShortWritable))
+      return false;
+    ShortWritable other = (ShortWritable) o;
+    return this.value == other.value;
+  }
+
+  /** hash code */
+  @Override
+  public int hashCode() {
+    return value;
+  }
+
+  /** Compares two ShortWritable. */
+  @Override
+  public int compareTo(ShortWritable o) {
+    short thisValue = this.value;
+    short thatValue = (o).value;
+    return (thisValue < thatValue ? -1 : (thisValue == thatValue ? 0 : 1));
+  }
+
+  /** Short values in string format */
+  @Override
+  public String toString() {
+    return Short.toString(value);
+  }
+
+  /** A Comparator optimized for ShortWritable. */
+  public static class Comparator extends WritableComparator {
+
+    public Comparator() {
+      super(ShortWritable.class);
+    }
+    
+    @Override
+    public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
+      short thisValue = (short) readUnsignedShort(b1, s1);
+      short thatValue = (short) readUnsignedShort(b2, s2);
+      return (thisValue < thatValue ? -1 : (thisValue == thatValue ? 0 : 1));
+    }
+  }
+
+  static { // register this comparator
+    WritableComparator.define(ShortWritable.class, new Comparator());
+  }
+
+}
diff --git a/src/core/org/apache/hadoop/io/Text.java b/src/core/org/apache/hadoop/io/Text.java
index 3b5cea61..ed051f78 100644
--- a/src/core/org/apache/hadoop/io/Text.java
+++ b/src/core/org/apache/hadoop/io/Text.java
@@ -443,7 +443,7 @@ public static int writeString(DataOutput out, String s) throws IOException {
   public static void writeStringOpt(DataOutput out, String str) 
       throws IOException{
     final int len = str.length();
-    byte[] rawBytes = new byte[len];
+    byte[] rawBytes = UTF8.getByteArray(len);
     char[] charArray = UTF8.getCharArray(len);
     str.getChars(0, len, charArray, 0);
     
diff --git a/src/core/org/apache/hadoop/io/UTF8.java b/src/core/org/apache/hadoop/io/UTF8.java
index 9cf7e923..9bd975c1 100644
--- a/src/core/org/apache/hadoop/io/UTF8.java
+++ b/src/core/org/apache/hadoop/io/UTF8.java
@@ -36,12 +36,19 @@ public class UTF8 implements WritableComparable {
   
   /* Used for string conversions*/
   private static final int MAX_STRING_LENGTH = 8000;
+  private static final int MAX_BYTE_LENGTH = 1000;
   private static final ThreadLocal<char[]> charArrays = new ThreadLocal<char[]>() {
     protected char[] initialValue() {
       return new char[MAX_STRING_LENGTH];
     }
   };
   
+  private static final ThreadLocal<byte[]> byteArrays = new ThreadLocal<byte[]>() {
+    protected byte[] initialValue() {
+      return new byte[MAX_BYTE_LENGTH];
+    }
+  };
+  
   public static final char[] getCharArray(int len) {
     if(len <= MAX_STRING_LENGTH) {
       // return cached array
@@ -51,6 +58,15 @@ public static final char[] getCharArray(int len) {
     return new char[len];
   }
   
+  public static final byte[] getByteArray(int len) {
+    byte[] byteArray = byteArrays.get();
+    if (byteArray.length < len) {
+      byteArray = new byte[len];
+      byteArrays.set(byteArray);
+    }
+    return byteArray;
+  }
+  
   public static final byte MIN_ASCII_CODE = 0;
   public static final byte MAX_ASCII_CODE = 0x7f;
  
@@ -61,14 +77,6 @@ protected DataInputBuffer initialValue() {
       return new DataInputBuffer();
     }
   };
-  private static final ThreadLocal<DataOutputBuffer> OBUF_FACTORY =
-    new ThreadLocal<DataOutputBuffer>(){
-    @Override
-    protected DataOutputBuffer initialValue() {
-      return new DataOutputBuffer();
-    }
-  };
-
 
   private static final byte[] EMPTY_BYTES = new byte[0];
 
@@ -136,10 +144,7 @@ public void set(String string, boolean optimized) {
       bytes = new byte[length];
 
     try {                                         // avoid sync'd allocations
-      DataOutputBuffer obuf = OBUF_FACTORY.get();
-      obuf.reset();
-      writeChars(obuf, string, 0, string.length());
-      System.arraycopy(obuf.getData(), 0, bytes, 0, length);
+      writeChars(bytes, string, 0, string.length());
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
@@ -238,10 +243,7 @@ public int compare(byte[] b1, int s1, int l1,
   public static byte[] getBytes(String string) {
     byte[] result = new byte[utf8Length(string)];
     try {                                         // avoid sync'd allocations
-      DataOutputBuffer obuf = OBUF_FACTORY.get();
-      obuf.reset();
-      writeChars(obuf, string, 0, string.length());
-      System.arraycopy(obuf.getData(), 0, result, 0, obuf.getLength());
+      writeChars(result, string, 0, string.length());
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
@@ -259,13 +261,10 @@ public static String readString(DataInput in) throws IOException {
 
   private static String readChars(DataInput in, int nBytes)
     throws IOException {
-    DataOutputBuffer obuf = OBUF_FACTORY.get();  
-    obuf.reset();
-    obuf.write(in, nBytes);
-    byte[] bytes = obuf.getData();
+    byte[] bytes = getByteArray(nBytes);
+    in.readFully(bytes, 0, nBytes);
     char[] charArray = getCharArray(nBytes);
     
-    // otherwise full conversion
     int i = 0;
     int strLen = 0;
     while (i < nBytes) {
@@ -283,6 +282,19 @@ private static String readChars(DataInput in, int nBytes)
     }
     return new String(charArray, 0, strLen);
   }
+  
+  public static int writeStringOpt(DataOutput out, String s) throws IOException {
+    int len = s.length();
+    byte[] bytes = getByteArray(len);
+    char[] charArray = getCharArray(len);
+    s.getChars(0, len, charArray, 0);
+    if (copyStringToBytes(s, charArray, bytes, len)) {
+      out.writeShort(len);
+      out.write(bytes, 0, len);
+      return len;
+    }
+    return writeString(out, s);
+  }
 
   /** Write a UTF-8 encoded string.
    *
@@ -351,5 +363,24 @@ private static void writeChars(DataOutput out,
       }
     }
   }
+  
+  private static void writeChars(byte[] out, String s, int start, int length)
+      throws IOException {
+    final int end = start + length;
+    int count = 0;
+    for (int i = start; i < end; i++) {
+      int code = s.charAt(i);
+      if (code <= 0x7F) {
+        out[count++] = (byte) code;
+      } else if (code <= 0x07FF) {
+        out[count++] = (byte) (0xC0 | ((code >> 6) & 0x1F));
+        out[count++] = (byte) (0x80 | code & 0x3F);
+      } else {
+        out[count++] = (byte) (0xE0 | ((code >> 12) & 0X0F));
+        out[count++] = (byte) (0x80 | ((code >> 6) & 0x3F));
+        out[count++] = (byte) (0x80 | (code & 0x3F));
+      }
+    }
+  }
 
 }
diff --git a/src/core/org/apache/hadoop/io/WritableUtils.java b/src/core/org/apache/hadoop/io/WritableUtils.java
index 96eb90bd..9a4ae560 100644
--- a/src/core/org/apache/hadoop/io/WritableUtils.java
+++ b/src/core/org/apache/hadoop/io/WritableUtils.java
@@ -27,7 +27,7 @@
 import java.util.zip.GZIPOutputStream;
 
 public final class WritableUtils  {
-  
+
   public static final int INT_LENGTH_BYTES = 4;
 
   public static byte[] readCompressedByteArray(DataInput in) throws IOException {
@@ -91,7 +91,7 @@ public static int  writeCompressedString(DataOutput out, String s) throws IOExce
    * Write a String as a Network Int n, followed by n Bytes
    * Alternative to 16 bit read/writeUTF.
    * Encoding standard is... ?
-   * 
+   *
    */
   public static void writeString(DataOutput out, String s) throws IOException {
     if (s != null) {
@@ -115,7 +115,7 @@ public static String readString(DataInput in) throws IOException{
     if (length == -1) return null;
     byte[] buffer = new byte[length];
     in.readFully(buffer);      // could/should use readFully(buffer,0,length)?
-    return new String(buffer,"UTF-8");  
+    return new String(buffer,"UTF-8");
   }
 
 
@@ -182,7 +182,7 @@ public static  String[] readCompressedStringArray(DataInput in) throws IOExcepti
 
   /*
    *
-   * Test Utility Method Display Byte Array. 
+   * Test Utility Method Display Byte Array.
    *
    */
   public static void displayByteArray(byte[] record){
@@ -239,12 +239,12 @@ public static void cloneInto(Writable dst, Writable src) throws IOException {
    *
    * @param stream Binary output stream
    * @param i Integer to be serialized
-   * @throws java.io.IOException 
+   * @throws java.io.IOException
    */
   public static void writeVInt(DataOutput stream, int i) throws IOException {
     writeVLong(stream, i);
   }
-  
+
   /**
    * Serializes a long to a binary stream with zero-compressed encoding.
    * For -112 <= i <= 127, only one byte is used with the actual value.
@@ -255,45 +255,45 @@ public static void writeVInt(DataOutput stream, int i) throws IOException {
    * If the first byte value v is between -121 and -128, the following long
    * is negative, with number of bytes that follow are -(v+120). Bytes are
    * stored in the high-non-zero-byte-first order.
-   * 
+   *
    * @param stream Binary output stream
    * @param i Long to be serialized
-   * @throws java.io.IOException 
+   * @throws java.io.IOException
    */
   public static void writeVLong(DataOutput stream, long i) throws IOException {
     if (i >= -112 && i <= 127) {
       stream.writeByte((byte)i);
       return;
     }
-      
+
     int len = -112;
     if (i < 0) {
       i ^= -1L; // take one's complement'
       len = -120;
     }
-      
+
     long tmp = i;
     while (tmp != 0) {
       tmp = tmp >> 8;
       len--;
     }
-      
+
     stream.writeByte((byte)len);
-      
+
     len = (len < -120) ? -(len + 120) : -(len + 112);
-      
+
     for (int idx = len; idx != 0; idx--) {
       int shiftbits = (idx - 1) * 8;
       long mask = 0xFFL << shiftbits;
       stream.writeByte((byte)((i & mask) >> shiftbits));
     }
   }
-  
+
 
   /**
    * Reads a zero-compressed encoded long from input stream and returns it.
    * @param stream Binary input stream
-   * @throws java.io.IOException 
+   * @throws java.io.IOException
    * @return deserialized long from stream.
    */
   public static long readVLong(DataInput stream) throws IOException {
@@ -314,13 +314,13 @@ public static long readVLong(DataInput stream) throws IOException {
   /**
    * Reads a zero-compressed encoded integer from input stream and returns it.
    * @param stream Binary input stream
-   * @throws java.io.IOException 
+   * @throws java.io.IOException
    * @return deserialized integer from stream.
    */
   public static int readVInt(DataInput stream) throws IOException {
     return (int) readVLong(stream);
   }
- 
+
   /**
    * Given the first byte of a vint/vlong, determine the sign
    * @param value the first byte
@@ -346,13 +346,13 @@ public static int decodeVIntSize(byte value) {
 
   /**
    * Get the encoded length if an integer is stored in a variable-length format
-   * @return the encoded length 
+   * @return the encoded length
    */
   public static int getVIntSize(long i) {
     if (i >= -112 && i <= 127) {
       return 1;
     }
-      
+
     if (i < 0) {
       i ^= -1L; // take one's complement'
     }
@@ -362,27 +362,27 @@ public static int getVIntSize(long i) {
     return (dataBits + 7) / 8 + 1;
   }
   /**
-   * Read an Enum value from DataInput, Enums are read and written 
-   * using String values. 
+   * Read an Enum value from DataInput, Enums are read and written
+   * using String values.
    * @param <T> Enum type
-   * @param in DataInput to read from 
+   * @param in DataInput to read from
    * @param enumType Class type of Enum
    * @return Enum represented by String read from DataInput
    * @throws IOException
    */
   public static <T extends Enum<T>> T readEnum(DataInput in, Class<T> enumType)
     throws IOException{
-    return T.valueOf(enumType, Text.readString(in));
+    return T.valueOf(enumType, Text.readStringOpt(in));
   }
   /**
-   * writes String value of enum to DataOutput. 
+   * writes String value of enum to DataOutput.
    * @param out Dataoutput stream
    * @param enumVal enum value
    * @throws IOException
    */
-  public static void writeEnum(DataOutput out,  Enum<?> enumVal) 
+  public static void writeEnum(DataOutput out,  Enum<?> enumVal)
     throws IOException{
-    Text.writeString(out, enumVal.name()); 
+    Text.writeStringOpt(out, enumVal.name());
   }
   /**
    * Skip <i>len</i> number of bytes in input stream<i>in</i>
@@ -417,4 +417,29 @@ public static byte[] toByteArray(Writable... writables) {
     }
     return out.getData();
   }
+
+  /**
+   * Read a string, but check it for sanity. The format consists of a vint
+   * followed by the given number of bytes.
+   * @param in the stream to read from
+   * @param maxLength the largest acceptable length of the encoded string
+   * @return the bytes as a string
+   * @throws IOException if reading from the DataInput fails
+   * @throws IllegalArgumentException if the encoded byte size for string
+   *         is negative or larger than maxSize. Only the vint is read.
+   */
+  public static String readStringSafely(
+      DataInput in, int maxLength)
+      throws IOException, IllegalArgumentException {
+    int length = readVInt(in);
+    if (length < 0 || length > maxLength) {
+      throw new IllegalArgumentException(
+          "Encoded byte size for String was " + length +
+          ", which is outside of 0.." +
+          maxLength + " range.");
+    }
+    byte [] bytes = new byte[length];
+    in.readFully(bytes, 0, length);
+    return Text.decode(bytes);
+  }
 }
diff --git a/src/core/org/apache/hadoop/io/compress/BlockDecompressorStream.java b/src/core/org/apache/hadoop/io/compress/BlockDecompressorStream.java
index 5fbddc1f..690a2640 100644
--- a/src/core/org/apache/hadoop/io/compress/BlockDecompressorStream.java
+++ b/src/core/org/apache/hadoop/io/compress/BlockDecompressorStream.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.io.compress;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -69,7 +70,7 @@ protected int decompress(byte[] b, int off, int len) throws IOException {
       do {
         try {
           originalBlockSize =  rawReadInt();
-        } catch (IOException ioe) {
+        } catch (EOFException ioe) {
           return -1;
         }
       } while (originalBlockSize == 0);
diff --git a/src/core/org/apache/hadoop/io/compress/CodecUnavailableException.java b/src/core/org/apache/hadoop/io/compress/CodecUnavailableException.java
new file mode 100644
index 00000000..33799b97
--- /dev/null
+++ b/src/core/org/apache/hadoop/io/compress/CodecUnavailableException.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.io.compress;
+
+/** 
+ * Thrown when a compression codec is unavailable, e.g. because the native library is not 
+ * provided.
+ */
+public class CodecUnavailableException extends IllegalStateException {
+
+  private static final long serialVersionUID = 1L;
+
+  public CodecUnavailableException() {
+    super();
+  }
+
+  public CodecUnavailableException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public CodecUnavailableException(String s) {
+    super(s);
+  }
+
+  public CodecUnavailableException(Throwable cause) {
+    super(cause);
+  }
+
+}
diff --git a/src/core/org/apache/hadoop/io/compress/SnappyCodec.java b/src/core/org/apache/hadoop/io/compress/SnappyCodec.java
new file mode 100644
index 00000000..c2f7a0d8
--- /dev/null
+++ b/src/core/org/apache/hadoop/io/compress/SnappyCodec.java
@@ -0,0 +1,234 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.io.compress;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.hadoop.conf.Configurable;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.compress.snappy.LoadSnappy;
+import org.apache.hadoop.io.compress.snappy.SnappyCompressor;
+import org.apache.hadoop.io.compress.snappy.SnappyDecompressor;
+
+/**
+ * This class creates snappy compressors/decompressors.
+ */
+public class SnappyCodec implements Configurable, CompressionCodec {
+
+  /** Internal buffer size for Snappy compressor/decompressors */
+  public static final String IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_KEY = "io.compression.codec.snappy.buffersize";
+
+  /** Default value for IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_KEY */
+  public static final int IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_DEFAULT = 256 * 1024;
+
+  static {
+    LoadSnappy.isLoaded();
+  }
+
+  Configuration conf;
+
+  /**
+   * Set the configuration to be used by this object.
+   *
+   * @param conf
+   *            the configuration object.
+   */
+  @Override
+  public void setConf(Configuration conf) {
+    this.conf = conf;
+  }
+
+  /**
+   * Return the configuration used by this object.
+   *
+   * @return the configuration object used by this objec.
+   */
+  @Override
+  public Configuration getConf() {
+    return conf;
+  }
+
+  /**
+   * Are the native snappy libraries loaded & initialized?
+   *
+   * @param conf
+   *            configuration
+   * @return true if loaded & initialized, otherwise false
+   */
+  public static boolean isNativeSnappyLoaded(Configuration conf) {
+    return LoadSnappy.isLoaded();
+  }
+
+  /**
+   * Create a {@link CompressionOutputStream} that will write to the given
+   * {@link OutputStream}.
+   *
+   * @param out
+   *            the location for the final output stream
+   * @return a stream the user can write uncompressed data to have it
+   *         compressed
+   * @throws IOException
+   */
+  @Override
+  public CompressionOutputStream createOutputStream(OutputStream out)
+      throws IOException {
+    return createOutputStream(out, createCompressor());
+  }
+
+  /**
+   * Create a {@link CompressionOutputStream} that will write to the given
+   * {@link OutputStream} with the given {@link Compressor}.
+   *
+   * @param out
+   *            the location for the final output stream
+   * @param compressor
+   *            compressor to use
+   * @return a stream the user can write uncompressed data to have it
+   *         compressed
+   * @throws IOException
+   */
+  @Override
+  public CompressionOutputStream createOutputStream(OutputStream out,
+      Compressor compressor) throws IOException {
+    if (!isNativeSnappyLoaded(conf)) {
+      throw new CodecUnavailableException("native snappy library not available");
+    }
+    int bufferSize = conf.getInt(
+        IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_KEY,
+        IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_DEFAULT);
+
+    int compressionOverhead = (bufferSize / 6) + 32;
+
+    return new BlockCompressorStream(out, compressor, bufferSize,
+        compressionOverhead);
+  }
+
+  /**
+   * Get the type of {@link Compressor} needed by this
+   * {@link CompressionCodec}.
+   *
+   * @return the type of compressor needed by this codec.
+   */
+  @Override
+  public Class<? extends Compressor> getCompressorType() {
+    if (!isNativeSnappyLoaded(conf)) {
+      throw new RuntimeException("native snappy library not available");
+    }
+
+    return SnappyCompressor.class;
+  }
+
+  /**
+   * Create a new {@link Compressor} for use by this {@link CompressionCodec}.
+   *
+   * @return a new compressor for use by this codec
+   */
+  @Override
+  public Compressor createCompressor() {
+    if (!isNativeSnappyLoaded(conf)) {
+      throw new CodecUnavailableException("native snappy library not available");
+    }
+    int bufferSize = conf.getInt(
+        IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_KEY,
+        IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_DEFAULT);
+    return new SnappyCompressor(bufferSize);
+  }
+
+  /**
+   * Create a {@link CompressionInputStream} that will read from the given
+   * input stream.
+   *
+   * @param in
+   *            the stream to read compressed bytes from
+   * @return a stream to read uncompressed bytes from
+   * @throws IOException
+   */
+  @Override
+  public CompressionInputStream createInputStream(InputStream in)
+      throws IOException {
+    return createInputStream(in, createDecompressor());
+  }
+
+  /**
+   * Create a {@link CompressionInputStream} that will read from the given
+   * {@link InputStream} with the given {@link Decompressor}.
+   *
+   * @param in
+   *            the stream to read compressed bytes from
+   * @param decompressor
+   *            decompressor to use
+   * @return a stream to read uncompressed bytes from
+   * @throws IOException
+   */
+  @Override
+  public CompressionInputStream createInputStream(InputStream in,
+      Decompressor decompressor) throws IOException {
+    if (!isNativeSnappyLoaded(conf)) {
+      throw new RuntimeException("native snappy library not available");
+    }
+
+    return new BlockDecompressorStream(in, decompressor, conf.getInt(
+        IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_KEY,
+        IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_DEFAULT));
+  }
+
+  /**
+   * Get the type of {@link Decompressor} needed by this
+   * {@link CompressionCodec}.
+   *
+   * @return the type of decompressor needed by this codec.
+   */
+  @Override
+  public Class<? extends Decompressor> getDecompressorType() {
+    if (!isNativeSnappyLoaded(conf)) {
+      throw new RuntimeException("native snappy library not available");
+    }
+
+    return SnappyDecompressor.class;
+  }
+
+  /**
+   * Create a new {@link Decompressor} for use by this
+   * {@link CompressionCodec}.
+   *
+   * @return a new decompressor for use by this codec
+   */
+  @Override
+  public Decompressor createDecompressor() {
+    if (!isNativeSnappyLoaded(conf)) {
+      throw new RuntimeException("native snappy library not available");
+    }
+    int bufferSize = conf.getInt(
+        IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_KEY,
+        IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_DEFAULT);
+    return new SnappyDecompressor(bufferSize);
+  }
+
+  /**
+   * Get the default filename extension for this kind of compression.
+   *
+   * @return <code>.snappy</code>.
+   */
+  @Override
+  public String getDefaultExtension() {
+    return ".snappy";
+  }
+}
diff --git a/src/core/org/apache/hadoop/io/compress/snappy/LoadSnappy.java b/src/core/org/apache/hadoop/io/compress/snappy/LoadSnappy.java
new file mode 100644
index 00000000..acb4bfd7
--- /dev/null
+++ b/src/core/org/apache/hadoop/io/compress/snappy/LoadSnappy.java
@@ -0,0 +1,70 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.io.compress.snappy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.util.NativeCodeLoader;
+
+/**
+ * Determines if Snappy native library is available and loads it if available.
+ */
+public class LoadSnappy {
+  private static final Log LOG = LogFactory.getLog(LoadSnappy.class.getName());
+
+  private static boolean AVAILABLE = false;
+  private static boolean LOADED = false;
+
+  static {
+    try {
+      System.loadLibrary("snappy");
+      System.loadLibrary("hadoopsnappy");
+      LOG.warn("Snappy native library is available");
+      AVAILABLE = true;
+    } catch (UnsatisfiedLinkError ex) {
+      LOG.debug("Snappy native library not found");
+    }
+    LOADED = AVAILABLE;
+    if (LOADED) {
+      LOG.info("Snappy native library loaded");
+    } else {
+      LOG.warn("Snappy native library not loaded");
+    }
+  }
+
+  /**
+   * Returns if Snappy native library is loaded.
+   *
+   * @return <code>true</code> if Snappy native library is loaded,
+   * <code>false</code> if not.
+   */
+  public static boolean isAvailable() {
+    return AVAILABLE;
+  }
+
+  /**
+   * Returns if Snappy native library is loaded.
+   *
+   * @return <code>true</code> if Snappy native library is loaded,
+   * <code>false</code> if not.
+   */
+  public static boolean isLoaded() {
+    return LOADED;
+  }
+
+}
diff --git a/src/core/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java b/src/core/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java
new file mode 100644
index 00000000..0eb5a367
--- /dev/null
+++ b/src/core/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java
@@ -0,0 +1,297 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.io.compress.snappy;
+
+import java.io.IOException;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.compress.Compressor;
+
+/**
+ * A {@link Compressor} based on the snappy compression algorithm.
+ * http://code.google.com/p/snappy/
+ */
+public class SnappyCompressor implements Compressor {
+  private static final Log LOG =
+      LogFactory.getLog(SnappyCompressor.class.getName());
+  private static final int DEFAULT_DIRECT_BUFFER_SIZE = 64 * 1024;
+
+  // HACK - Use this as a global lock in the JNI layer
+  @SuppressWarnings({"unchecked", "unused"})
+  private static Class clazz = SnappyCompressor.class;
+
+  private int directBufferSize;
+  private Buffer compressedDirectBuf = null;
+  private int uncompressedDirectBufLen;
+  private Buffer uncompressedDirectBuf = null;
+  private byte[] userBuf = null;
+  private int userBufOff = 0, userBufLen = 0;
+  private boolean finish, finished;
+
+  private long bytesRead = 0L;
+  private long bytesWritten = 0L;
+
+
+  static {
+    if (LoadSnappy.isLoaded()) {
+      // Initialize the native library
+      try {
+        initIDs();
+      } catch (Throwable t) {
+        // Ignore failure to load/initialize snappy
+        LOG.warn(t.toString());
+      }
+    } else {
+      LOG.error("Cannot load " + SnappyCompressor.class.getName() +
+          " without snappy library!");
+    }
+  }
+
+  /**
+   * Creates a new compressor.
+   *
+   * @param directBufferSize size of the direct buffer to be used.
+   */
+  public SnappyCompressor(int directBufferSize) {
+    this.directBufferSize = directBufferSize;
+
+    uncompressedDirectBuf = ByteBuffer.allocateDirect(directBufferSize);
+    compressedDirectBuf = ByteBuffer.allocateDirect(directBufferSize);
+    compressedDirectBuf.position(directBufferSize);
+  }
+
+  /**
+   * Creates a new compressor with the default buffer size.
+   */
+  public SnappyCompressor() {
+    this(DEFAULT_DIRECT_BUFFER_SIZE);
+  }
+
+  /**
+   * Sets input data for compression.
+   * This should be called whenever #needsInput() returns
+   * <code>true</code> indicating that more input data is required.
+   *
+   * @param b   Input data
+   * @param off Start offset
+   * @param len Length
+   */
+  @Override
+  public synchronized void setInput(byte[] b, int off, int len) {
+    if (b == null) {
+      throw new NullPointerException();
+    }
+    if (off < 0 || len < 0 || off > b.length - len) {
+      throw new ArrayIndexOutOfBoundsException();
+    }
+    finished = false;
+
+    if (len > uncompressedDirectBuf.remaining()) {
+      // save data; now !needsInput
+      this.userBuf = b;
+      this.userBufOff = off;
+      this.userBufLen = len;
+    } else {
+      ((ByteBuffer) uncompressedDirectBuf).put(b, off, len);
+      uncompressedDirectBufLen = uncompressedDirectBuf.position();
+    }
+
+    bytesRead += len;
+  }
+
+  /**
+   * If a write would exceed the capacity of the direct buffers, it is set
+   * aside to be loaded by this function while the compressed data are
+   * consumed.
+   */
+  synchronized void setInputFromSavedData() {
+    if (0 >= userBufLen) {
+      return;
+    }
+    finished = false;
+
+    uncompressedDirectBufLen = Math.min(userBufLen, directBufferSize);
+    ((ByteBuffer) uncompressedDirectBuf).put(userBuf, userBufOff,
+        uncompressedDirectBufLen);
+
+    // Note how much data is being fed to snappy
+    userBufOff += uncompressedDirectBufLen;
+    userBufLen -= uncompressedDirectBufLen;
+  }
+
+  /**
+   * Does nothing.
+   */
+  @Override
+  public synchronized void setDictionary(byte[] b, int off, int len) {
+    // do nothing
+  }
+
+  /**
+   * Returns true if the input data buffer is empty and
+   * #setInput() should be called to provide more input.
+   *
+   * @return <code>true</code> if the input data buffer is empty and
+   *         #setInput() should be called in order to provide more input.
+   */
+  @Override
+  public synchronized boolean needsInput() {
+    return !(compressedDirectBuf.remaining() > 0
+        || uncompressedDirectBuf.remaining() == 0 || userBufLen > 0);
+  }
+
+  /**
+   * When called, indicates that compression should end
+   * with the current contents of the input buffer.
+   */
+  @Override
+  public synchronized void finish() {
+    finish = true;
+  }
+
+  /**
+   * Returns true if the end of the compressed
+   * data output stream has been reached.
+   *
+   * @return <code>true</code> if the end of the compressed
+   *         data output stream has been reached.
+   */
+  @Override
+  public synchronized boolean finished() {
+    // Check if all uncompressed data has been consumed
+    return (finish && finished && compressedDirectBuf.remaining() == 0);
+  }
+
+  /**
+   * Fills specified buffer with compressed data. Returns actual number
+   * of bytes of compressed data. A return value of 0 indicates that
+   * needsInput() should be called in order to determine if more input
+   * data is required.
+   *
+   * @param b   Buffer for the compressed data
+   * @param off Start offset of the data
+   * @param len Size of the buffer
+   * @return The actual number of bytes of compressed data.
+   */
+  @Override
+  public synchronized int compress(byte[] b, int off, int len)
+      throws IOException {
+    if (b == null) {
+      throw new NullPointerException();
+    }
+    if (off < 0 || len < 0 || off > b.length - len) {
+      throw new ArrayIndexOutOfBoundsException();
+    }
+
+    // Check if there is compressed data
+    int n = compressedDirectBuf.remaining();
+    if (n > 0) {
+      n = Math.min(n, len);
+      ((ByteBuffer) compressedDirectBuf).get(b, off, n);
+      bytesWritten += n;
+      return n;
+    }
+
+    // Re-initialize the snappy's output direct-buffer
+    compressedDirectBuf.clear();
+    compressedDirectBuf.limit(0);
+    if (0 == uncompressedDirectBuf.position()) {
+      // No compressed data, so we should have !needsInput or !finished
+      setInputFromSavedData();
+      if (0 == uncompressedDirectBuf.position()) {
+        // Called without data; write nothing
+        finished = true;
+        return 0;
+      }
+    }
+
+    // Compress data
+    n = compressBytesDirect();
+    compressedDirectBuf.limit(n);
+    uncompressedDirectBuf.clear(); // snappy consumes all buffer input
+
+    // Set 'finished' if snapy has consumed all user-data
+    if (0 == userBufLen) {
+      finished = true;
+    }
+
+    // Get atmost 'len' bytes
+    n = Math.min(n, len);
+    bytesWritten += n;
+    ((ByteBuffer) compressedDirectBuf).get(b, off, n);
+
+    return n;
+  }
+
+  /**
+   * Resets compressor so that a new set of input data can be processed.
+   */
+  @Override
+  public synchronized void reset() {
+    finish = false;
+    finished = false;
+    uncompressedDirectBuf.clear();
+    uncompressedDirectBufLen = 0;
+    compressedDirectBuf.clear();
+    compressedDirectBuf.limit(0);
+    userBufOff = userBufLen = 0;
+    bytesRead = bytesWritten = 0L;
+  }
+
+  /**
+   * Prepare the compressor to be used in a new stream with settings defined in
+   * the given Configuration
+   *
+   * @param conf Configuration from which new setting are fetched
+   */
+  public synchronized void reinit(Configuration conf) {
+    reset();
+  }
+
+  /**
+   * Return number of bytes given to this compressor since last reset.
+   */
+  @Override
+  public synchronized long getBytesRead() {
+    return bytesRead;
+  }
+
+  /**
+   * Return number of bytes consumed by callers of compress since last reset.
+   */
+  @Override
+  public synchronized long getBytesWritten() {
+    return bytesWritten;
+  }
+
+  /**
+   * Closes the compressor and discards any unprocessed input.
+   */
+  @Override
+  public synchronized void end() {
+  }
+
+  private native static void initIDs();
+
+  private native int compressBytesDirect();
+}
diff --git a/src/core/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java b/src/core/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java
new file mode 100644
index 00000000..8d43a8e2
--- /dev/null
+++ b/src/core/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java
@@ -0,0 +1,273 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.io.compress.snappy;
+
+import java.io.IOException;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.io.compress.Decompressor;
+
+/**
+ * A {@link Decompressor} based on the snappy compression algorithm.
+ * http://code.google.com/p/snappy/
+ */
+public class SnappyDecompressor implements Decompressor {
+  private static final Log LOG =
+      LogFactory.getLog(SnappyCompressor.class.getName());
+  private static final int DEFAULT_DIRECT_BUFFER_SIZE = 64 * 1024;
+
+  // HACK - Use this as a global lock in the JNI layer
+  @SuppressWarnings({"unchecked", "unused"})
+  private static Class clazz = SnappyDecompressor.class;
+
+  private int directBufferSize;
+  private Buffer compressedDirectBuf = null;
+  private int compressedDirectBufLen;
+  private Buffer uncompressedDirectBuf = null;
+  private byte[] userBuf = null;
+  private int userBufOff = 0, userBufLen = 0;
+  private boolean finished;
+
+  static {
+    if (LoadSnappy.isLoaded()) {
+      // Initialize the native library
+      try {
+        initIDs();
+      } catch (Throwable t) {
+        // Ignore failure to load/initialize snappy
+        LOG.warn(t.toString());
+      }
+    } else {
+      LOG.error("Cannot load " + SnappyDecompressor.class.getName() +
+          " without snappy library!");
+    }
+  }
+
+  /**
+   * Creates a new compressor.
+   *
+   * @param directBufferSize size of the direct buffer to be used.
+   */
+  public SnappyDecompressor(int directBufferSize) {
+    this.directBufferSize = directBufferSize;
+
+    compressedDirectBuf = ByteBuffer.allocateDirect(directBufferSize);
+    uncompressedDirectBuf = ByteBuffer.allocateDirect(directBufferSize);
+    uncompressedDirectBuf.position(directBufferSize);
+
+  }
+
+  /**
+   * Creates a new decompressor with the default buffer size.
+   */
+  public SnappyDecompressor() {
+    this(DEFAULT_DIRECT_BUFFER_SIZE);
+  }
+
+  /**
+   * Sets input data for decompression.
+   * This should be called if and only if {@link #needsInput()} returns
+   * <code>true</code> indicating that more input data is required.
+   * (Both native and non-native versions of various Decompressors require
+   * that the data passed in via <code>b[]</code> remain unmodified until
+   * the caller is explicitly notified--via {@link #needsInput()}--that the
+   * buffer may be safely modified.  With this requirement, an extra
+   * buffer-copy can be avoided.)
+   *
+   * @param b   Input data
+   * @param off Start offset
+   * @param len Length
+   */
+  @Override
+  public synchronized void setInput(byte[] b, int off, int len) {
+    if (b == null) {
+      throw new NullPointerException();
+    }
+    if (off < 0 || len < 0 || off > b.length - len) {
+      throw new ArrayIndexOutOfBoundsException();
+    }
+
+    this.userBuf = b;
+    this.userBufOff = off;
+    this.userBufLen = len;
+
+    setInputFromSavedData();
+
+    // Reinitialize snappy's output direct-buffer
+    uncompressedDirectBuf.limit(directBufferSize);
+    uncompressedDirectBuf.position(directBufferSize);
+  }
+
+  /**
+   * If a write would exceed the capacity of the direct buffers, it is set
+   * aside to be loaded by this function while the compressed data are
+   * consumed.
+   */
+  synchronized void setInputFromSavedData() {
+    compressedDirectBufLen = Math.min(userBufLen, directBufferSize);
+
+    // Reinitialize snappy's input direct buffer
+    compressedDirectBuf.rewind();
+    ((ByteBuffer) compressedDirectBuf).put(userBuf, userBufOff,
+        compressedDirectBufLen);
+
+    // Note how much data is being fed to snappy
+    userBufOff += compressedDirectBufLen;
+    userBufLen -= compressedDirectBufLen;
+  }
+
+  /**
+   * Does nothing.
+   */
+  @Override
+  public synchronized void setDictionary(byte[] b, int off, int len) {
+    // do nothing
+  }
+
+  /**
+   * Returns true if the input data buffer is empty and
+   * {@link #setInput(byte[], int, int)} should be called to
+   * provide more input.
+   *
+   * @return <code>true</code> if the input data buffer is empty and
+   *         {@link #setInput(byte[], int, int)} should be called in
+   *         order to provide more input.
+   */
+  @Override
+  public synchronized boolean needsInput() {
+    // Consume remaining compressed data?
+    if (uncompressedDirectBuf.remaining() > 0) {
+      return false;
+    }
+
+    // Check if snappy has consumed all input
+    if (compressedDirectBufLen <= 0) {
+      // Check if we have consumed all user-input
+      if (userBufLen <= 0) {
+        return true;
+      } else {
+        setInputFromSavedData();
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Returns <code>false</code>.
+   *
+   * @return <code>false</code>.
+   */
+  @Override
+  public synchronized boolean needsDictionary() {
+    return false;
+  }
+
+  /**
+   * Returns true if the end of the decompressed
+   * data output stream has been reached.
+   *
+   * @return <code>true</code> if the end of the decompressed
+   *         data output stream has been reached.
+   */
+  @Override
+  public synchronized boolean finished() {
+    return (finished && uncompressedDirectBuf.remaining() == 0);
+  }
+
+  /**
+   * Fills specified buffer with uncompressed data. Returns actual number
+   * of bytes of uncompressed data. A return value of 0 indicates that
+   * {@link #needsInput()} should be called in order to determine if more
+   * input data is required.
+   *
+   * @param b   Buffer for the compressed data
+   * @param off Start offset of the data
+   * @param len Size of the buffer
+   * @return The actual number of bytes of compressed data.
+   * @throws IOException
+   */
+  @Override
+  public synchronized int decompress(byte[] b, int off, int len)
+      throws IOException {
+    if (b == null) {
+      throw new NullPointerException();
+    }
+    if (off < 0 || len < 0 || off > b.length - len) {
+      throw new ArrayIndexOutOfBoundsException();
+    }
+
+    int n = 0;
+
+    // Check if there is uncompressed data
+    n = uncompressedDirectBuf.remaining();
+    if (n > 0) {
+      n = Math.min(n, len);
+      ((ByteBuffer) uncompressedDirectBuf).get(b, off, n);
+      return n;
+    }
+    if (compressedDirectBufLen > 0) {
+      // Re-initialize the snappy's output direct buffer
+      uncompressedDirectBuf.rewind();
+      uncompressedDirectBuf.limit(directBufferSize);
+
+      // Decompress data
+      n = decompressBytesDirect();
+      uncompressedDirectBuf.limit(n);
+
+      if (userBufLen <= 0) {
+        finished = true;
+      }
+
+      // Get atmost 'len' bytes
+      n = Math.min(n, len);
+      ((ByteBuffer) uncompressedDirectBuf).get(b, off, n);
+    }
+
+    return n;
+  }
+
+  /**
+   * Resets decompressor and input and output buffers so that a new set of
+   * input data can be processed.
+   */
+  @Override
+  public synchronized void reset() {
+    finished = false;
+    compressedDirectBufLen = 0;
+    uncompressedDirectBuf.limit(directBufferSize);
+    uncompressedDirectBuf.position(directBufferSize);
+    userBufOff = userBufLen = 0;
+  }
+
+  /**
+   * Closes the decompressor and discards any unprocessed input.
+   */
+  @Override
+  public synchronized void end() {
+    // do nothing
+  }
+
+  private native static void initIDs();
+
+  private native int decompressBytesDirect();
+}
diff --git a/src/core/org/apache/hadoop/io/nativeio/NativeIO.java b/src/core/org/apache/hadoop/io/nativeio/NativeIO.java
index 9557d047..d8823fe9 100644
--- a/src/core/org/apache/hadoop/io/nativeio/NativeIO.java
+++ b/src/core/org/apache/hadoop/io/nativeio/NativeIO.java
@@ -61,6 +61,15 @@ public class NativeIO {
   /* Data will be accessed once.  */
   public static final int POSIX_FADV_NOREUSE = 5; 
 
+  // Flags for clock_gettime from time.h
+  public static final int CLOCK_REALTIME           = 0;
+  public static final int CLOCK_MONOTONIC          = 1;
+  public static final int CLOCK_PROCESS_CPUTIME_ID = 2;
+  public static final int CLOCK_THREAD_CPUTIME_ID  = 3;
+  public static final int CLOCK_MONOTONIC_RAW      = 4;
+  public static final int CLOCK_REALTIME_COARSE    = 5;
+  public static final int CLOCK_MONOTONIC_COARSE   = 6;
+
 
   /* Wait upon writeout of all pages
      in the range before performing the
@@ -155,6 +164,12 @@ public static void link(File src, File dst) throws IOException {
     link(src.getAbsolutePath(), dst.getAbsolutePath());
   }
 
+  /**
+   * Wrapper around native clock_gettime()
+   */
+  public static native void clock_gettime(int which_clock,
+                                          TimeSpec tp) throws IOException;
+
 
   /**
    * Call posix_fadvise on the given file descriptor. See the manpage
@@ -198,6 +213,17 @@ public static void syncFileRangeIfPossible(
     }
   }
 
+  public static void clockGetTimeIfPossible(int which_clock,
+                                            TimeSpec tp) throws IOException {
+    if (nativeLoaded) {
+      clock_gettime(which_clock, tp);
+    } else {
+      throw new IOException("Native not loaded.");
+    }
+  }
+
+
+
   /**
    * Result type of the fstat call
    */
@@ -256,4 +282,16 @@ public int getHardLinks() {
       return this.hardlinks;
     }
   }
+
+  /**
+   * Result type of the clock_gettime call
+   */
+  public static class TimeSpec {
+    public long tv_sec = 0;
+    public long tv_nsec = 0;
+
+    public String toString() {
+      return "{tv_sec=" + tv_sec + "," + "tv_nsec=" + tv_nsec + "}";
+    }
+  }
 }
diff --git a/src/core/org/apache/hadoop/ipc/Client.java b/src/core/org/apache/hadoop/ipc/Client.java
index adca34f0..47d3434e 100644
--- a/src/core/org/apache/hadoop/ipc/Client.java
+++ b/src/core/org/apache/hadoop/ipc/Client.java
@@ -18,6 +18,8 @@
 
 package org.apache.hadoop.ipc;
 
+import java.net.NoRouteToHostException;
+import java.net.PortUnreachableException;
 import java.net.Socket;
 import java.net.InetSocketAddress;
 import java.net.SocketTimeoutException;
@@ -898,6 +900,14 @@ private IOException wrapException(InetSocketAddress addr,
       return (SocketTimeoutException)new SocketTimeoutException(
            "Call to " + addr + " failed on socket timeout exception: "
                       + exception).initCause(exception);
+    } else if (exception instanceof NoRouteToHostException) {
+      return (NoRouteToHostException)new NoRouteToHostException(
+           "Call to " + addr + " failed on NoRouteToHostException exception: "
+                      + exception).initCause(exception);
+    } else if (exception instanceof PortUnreachableException) {
+      return (PortUnreachableException)new PortUnreachableException(
+           "Call to " + addr + " failed on PortUnreachableException exception: "
+                      + exception).initCause(exception);
     } else {
       return (IOException)new IOException(
            "Call to " + addr + " failed on local exception: " + exception)
diff --git a/src/core/org/apache/hadoop/ipc/RPC.java b/src/core/org/apache/hadoop/ipc/RPC.java
index 95621998..42959135 100644
--- a/src/core/org/apache/hadoop/ipc/RPC.java
+++ b/src/core/org/apache/hadoop/ipc/RPC.java
@@ -29,6 +29,7 @@
 import java.net.NoRouteToHostException;
 import java.net.PortUnreachableException;
 import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
 import java.io.*;
 import java.util.Map;
 import java.util.HashMap;
@@ -107,7 +108,7 @@ public void readFields(DataInput in) throws IOException {
     }
 
     public void write(DataOutput out) throws IOException {
-      UTF8.writeString(out, methodName);
+      UTF8.writeStringOpt(out, methodName);
       out.writeInt(parameterClasses.length);
       for (int i = 0; i < parameterClasses.length; i++) {
         ObjectWritable.writeObject(out, parameters[i], parameterClasses[i],
@@ -224,9 +225,8 @@ private synchronized InetSocketAddress getAddress() {
           && address.getHostName() != null
           && System.currentTimeMillis() - this.timeLastDnsCheck > MIN_DNS_CHECK_INTERVAL_MSEC) {
         try {
-          String hostName = address.getHostName() + ":" + address.getPort();
-          InetSocketAddress newAddr = NetUtils.createSocketAddr(hostName);
-          if (!newAddr.equals(address)) {
+          InetSocketAddress newAddr = NetUtils.resolveAddress(address);
+          if (newAddr != null) {
             LOG.info("DNS change: " + newAddr);
             address = newAddr;
           }
@@ -261,7 +261,10 @@ public Object invoke(Object proxy, Method method, Object[] args)
       } catch (PortUnreachableException pue) {
         needCheckDnsUpdate = true;
         throw pue;
-      }
+      } catch (UnknownHostException uhe) {
+        needCheckDnsUpdate = true;
+        throw uhe;
+      } 
       if (logDebug) {
         long callTime = System.currentTimeMillis() - startTime;
         LOG.debug("Call: " + method.getName() + " " + callTime);
diff --git a/src/core/org/apache/hadoop/ipc/Server.java b/src/core/org/apache/hadoop/ipc/Server.java
index ab6094b6..d1fc307a 100644
--- a/src/core/org/apache/hadoop/ipc/Server.java
+++ b/src/core/org/apache/hadoop/ipc/Server.java
@@ -340,6 +340,7 @@ private class Listener extends Thread {
                                           //two cleanup runs
     private int backlogLength = conf.getInt("ipc.server.listen.queue.size", 128);
     private ExecutorService readPool;
+    volatile boolean cleanConnectionsAfterShutdown = true;
 
     public Listener() throws IOException {
       address = new InetSocketAddress(bindAddress, port);
@@ -527,9 +528,8 @@ else if (key.isReadable())
         selector= null;
         acceptChannel= null;
 
-        // clean up all connections
-        while (!connectionList.isEmpty()) {
-          closeConnection(connectionList.remove(0));
+        if (cleanConnectionsAfterShutdown) {
+          cleanConnections();
         }
         readPool.shutdownNow();
       }
@@ -640,6 +640,7 @@ synchronized void doStop() {
   private class Responder extends Thread {
     private Selector writeSelector;
     private int pending;         // connections waiting to register
+    volatile boolean responderExtension = false;
 
     final static int PURGE_INTERVAL = 900000; // 15mins
 
@@ -656,7 +657,7 @@ public void run() {
       SERVER.set(Server.this);
       long lastPurgeTime = 0;   // last check for old calls.
 
-      while (running) {
+      while (running || responderExtension) {
         try {
           waitPending();     // If a channel is being registered, wait.
           writeSelector.select(PURGE_INTERVAL);
@@ -877,6 +878,26 @@ private synchronized void waitPending() throws InterruptedException {
         wait();
       }
     }
+    
+    synchronized void doStop() {
+      try {
+        if (!this.isAlive())
+          return;
+        if (writeSelector != null) {
+          writeSelector.wakeup();
+          Thread.yield();
+        }
+        waitForConnections();
+        responder.responderExtension = false;
+        // best effort, if we didn't send everything within timeout
+        // just kill the reponder
+        responder.interrupt();
+        cleanConnections();
+      } catch (Throwable t) {
+        if (responder != null)
+          responder.interrupt();
+      }
+    }
   }
 
   /** Reads calls from a connection and queues them for handling. */
@@ -1237,6 +1258,36 @@ protected Server(String bindAddress, int port,
     // Create the responder here
     responder = new Responder();
   }
+  
+  void cleanConnections() {
+    synchronized (connectionList) {
+      // clean up all connections
+      while (!connectionList.isEmpty()) {
+        closeConnection(connectionList.remove(0));
+      }
+    }
+  }
+  
+  void waitForConnections() {
+    int retries = 10;
+    while (retries-- > 0) {
+      boolean connectionsClean = true;
+      synchronized (connectionList) {
+        for (Connection c : connectionList) {
+          if (!c.responseQueue.isEmpty()) {
+            connectionsClean = false;
+          }
+        }
+      }
+      if (connectionsClean)
+        break;
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        return;
+      }
+    }
+  }
 
   private void closeConnection(Connection connection) {
     synchronized (connectionList) {
@@ -1324,12 +1375,23 @@ public synchronized void waitForHandlers() throws InterruptedException {
   }
   
   public synchronized void stop() {
+    // by default interrupt handlers and stop the responder
     stop(true);
   }
 
   /** Stops the service.  No new calls will be handled after this is called. */
   public synchronized void stop(boolean interruptHandlers) {
     LOG.info("Stopping server on " + port);
+    
+    if (!interruptHandlers) {
+      // keep responder working
+      responder.responderExtension = true;
+      // do not purge connections in listener
+      listener.cleanConnectionsAfterShutdown = false;
+    } else {
+      responder.interrupt();
+    }
+    
     running = false;
     if (interruptHandlers && handlers != null) {
       for (int i = 0; i < handlerCount; i++) {
@@ -1341,12 +1403,15 @@ public synchronized void stop(boolean interruptHandlers) {
 
     listener.interrupt();
     listener.doStop();
-    responder.interrupt();
     notifyAll();
     if (this.rpcMetrics != null) {
       this.rpcMetrics.shutdown();
     }
   }
+  
+  public synchronized void stopResponder() {
+    responder.doStop();
+  }
 
   /** Wait for the server to be stopped.
    * Does not wait for all subthreads to finish.
@@ -1362,7 +1427,7 @@ public synchronized void join() throws InterruptedException {
    * Return the socket (ip+port) on which the RPC server is listening to.
    * @return the socket (ip+port) on which the RPC server is listening to.
    */
-  public synchronized InetSocketAddress getListenerAddress() {
+  public InetSocketAddress getListenerAddress() {
     return listener.getAddress();
   }
 
diff --git a/src/core/org/apache/hadoop/metrics/APITrace.java b/src/core/org/apache/hadoop/metrics/APITrace.java
new file mode 100644
index 00000000..ffce21b7
--- /dev/null
+++ b/src/core/org/apache/hadoop/metrics/APITrace.java
@@ -0,0 +1,296 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.metrics;
+
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.fs.FileStatus;
+
+/**
+ * Tracing class for recording client-side API calls and RPC calls.
+ */
+public class APITrace {
+  private static final Log API_TRACE_LOG = LogFactory.getLog(APITrace.class);
+  private static final long baseTime = System.nanoTime();
+  private static AtomicLong nextStreamId = new AtomicLong(1);
+  private static String pid = getPid();
+
+  // start auto(callIds)
+  public static final int CALL_COLLAPSED = 1;
+  public static final int CALL_getName = 2;
+  public static final int CALL_getFileBlockLocations = 3;
+  public static final int CALL_open = 4;
+  public static final int CALL_append = 5;
+  public static final int CALL_create = 6;
+  public static final int CALL_create1 = 7;
+  public static final int CALL_createNonRecursive = 8;
+  public static final int CALL_createNonRecursive1 = 9;
+  public static final int CALL_setReplication = 10;
+  public static final int CALL_hardLink = 11;
+  public static final int CALL_rename = 12;
+  public static final int CALL_delete = 13;
+  public static final int CALL_delete1 = 14;
+  public static final int CALL_listStatus = 15;
+  public static final int CALL_mkdirs = 16;
+  public static final int CALL_iterativeGetOpenFiles = 17;
+  public static final int CALL_getUsed = 18;
+  public static final int CALL_getDefaultBlockSize = 19;
+  public static final int CALL_getDefaultReplication = 20;
+  public static final int CALL_getContentSummary = 21;
+  public static final int CALL_getFileStatus = 22;
+  public static final int CALL_getFileChecksum = 23;
+  public static final int CALL_setVerifyChecksum = 24;
+  public static final int CALL_close = 25;
+  public static final int CALL_setOwner = 26;
+  public static final int CALL_setTimes = 27;
+  public static final int CALL_setPermission = 28;
+  public static final int CALL_seek = 29;
+  public static final int CALL_getPos = 30;
+  public static final int CALL_seekToNewSource = 31;
+  public static final int CALL_read = 32;
+  public static final int CALL_readFully = 33;
+  public static final int CALL_readFully1 = 34;
+  public static final int CALL_read1 = 35;
+  public static final int CALL_read2 = 36;
+  public static final int CALL_read3 = 37;
+  public static final int CALL_skip = 38;
+  public static final int CALL_available = 39;
+  public static final int CALL_close1 = 40;
+  public static final int CALL_mark = 41;
+  public static final int CALL_reset = 42;
+  public static final int CALL_sync = 43;
+  public static final int CALL_write = 44;
+  public static final int CALL_write1 = 45;
+  public static final int CALL_write2 = 46;
+  public static final int CALL_flush = 47;
+  public static final int CALL_close2 = 48;
+  // pseudo event for tracing of info besides API calls
+  public static final int COMMENT_msg = 49;
+
+
+  // we only support static methods
+  private APITrace() {};
+
+  private static String getPid() {
+    // Generally .getName() will return "UNIX-PID@MACHINE-NAME", but this is JVM specific.  If the
+    // string follows this format, we just return the UNIX-PID.  Otherwise, we return the entire ID.
+    String name = ManagementFactory.getRuntimeMXBean().getName();
+    String parts[] = name.split("@");
+    if (parts.length == 2) {
+      return parts[0];
+    }
+    return name;
+  }
+
+  /**
+   * Record a method call and its return value in the log.
+   *
+   * @param entry the System.nanoTime timestamp for method entry
+   * @param callIndex index into callTable
+   * @param returnValue value returned by traced method
+   * @param argValues arguments passed to traced method
+   * @param streamId unique identifier for stream, or -1 if not applicable
+   */
+  public static void logCall(long entryTime,
+                             long returnTime,
+                             int callIndex,
+                             Object returnValue,
+                             Object argValues[],
+                             long streamId) {
+    if (!API_TRACE_LOG.isInfoEnabled()) {
+      return;
+    }
+
+    // determine elapsed time
+    long elapsed = returnTime;
+    elapsed -= entryTime;
+    entryTime -= baseTime;
+    // TODO: for the first entry, we get negatives for entryTime.
+    // is this something weird in order the Java instantiates?
+
+    // append universal fields (i.e., ones that occur for every call)
+    StringBuilder line = new StringBuilder();
+    line.append(pid + ",");
+    line.append(entryTime + ",");
+    line.append(elapsed + ",");
+    line.append(callIndex + ",");
+    line.append(streamId + ",");
+    line.append(escape(returnValue));
+
+    // append the args to the method call
+    if (argValues != null) {
+      for (int i = 0; i < argValues.length; i++) {
+        line.append("," + escape(argValues[i]));
+      }
+    }
+
+    API_TRACE_LOG.info(line);
+  }
+
+  // convert 
+  private static String escape(Object val) {
+    if (val == null) {
+      return "null";
+    } else if (val instanceof TraceableStream) {
+      TraceableStream ts = (TraceableStream)val;
+      return ts.getStreamTracer().getStreamId().toString();
+    } else if (val instanceof FileStatus) {
+      FileStatus stat = (FileStatus)val;
+      String properties = "isdir=" + stat.isDir() + ",len=" + stat.getLen();
+      try {
+        return "#"+SimpleBase64.encode(properties.toString().getBytes("UTF-8"));
+      } catch (java.io.UnsupportedEncodingException e) {
+        return "CouldNotEncode";
+      }
+    } else if (val instanceof FileStatus[]) {
+      FileStatus stat[] = (FileStatus[])val;
+      return Integer.toString(stat.length);
+    } else {
+      try {
+        return "#"+SimpleBase64.encode(val.toString().getBytes("UTF-8"));
+      } catch (java.io.UnsupportedEncodingException e) {
+        return "CouldNotEncode";
+      }
+    }
+  }
+
+  protected static long nextStreamId() {
+    return nextStreamId.getAndIncrement();
+  }
+
+
+  /**
+   * Represents a call to a method we trace, and records time info, args, etc.
+   */
+  public static class CallEvent {
+    private long entryTime;
+
+    // CallEvent objects should be created at the beginning of a traced method
+    public CallEvent() {
+      entryTime = System.nanoTime();
+    }
+
+    public void logCall(int callIndex,
+                        Object returnValue,
+                        Object argValues[],
+                        long streamId,
+                        long returnTime) {
+      APITrace.logCall(entryTime, returnTime, callIndex,
+                       returnValue, argValues, streamId);
+    }
+
+    public void logCall(int callIndex,
+                        Object returnValue,
+                        Object argValues[],
+                        long streamId) {
+      long returnTime = System.nanoTime();
+      APITrace.logCall(entryTime, returnTime, callIndex,
+                       returnValue, argValues, streamId);
+    }
+
+    public void logCall(int callIndex,
+                       Object returnValue,
+                       Object argValues[]) {
+      logCall(callIndex, returnValue, argValues, -1);
+    }
+  }
+
+
+  public static interface TraceableStream {
+    StreamTracer getStreamTracer();
+  }
+
+
+  /**
+   * Interface for all tracing of streams.  This serves two purposes beyond what
+   * APITrace provides: (1) track stream IDs, (2) collapse many small calls.
+   * Collapsing many small calls is useful, as some workloads (e.g., HBase)
+   * perform many 1-byte writes.
+   */
+  public static class StreamTracer {
+    private long streamId;
+
+    // variables for collapsing calls
+    private CallEvent collapsedCall;
+    private int callCount;
+    private int byteCount;
+    private long returnTime;
+    private static final int maxByteCount = 4096;
+
+    public StreamTracer() {
+      streamId = nextStreamId();
+      reset();
+    }
+
+    public Long getStreamId() {
+      return streamId;
+    }
+
+    // log a call that cannot be collapsed
+    public synchronized void logCall(CallEvent event,
+                        int callIndex,
+                        Object returnValue,
+                        Object argValues[]) {
+      flush();
+      event.logCall(callIndex, returnValue, argValues, getStreamId());
+    }
+
+    // log an I/O call that can be collapsed with other calls
+    public synchronized void logIOCall(CallEvent call, long incVal) {
+      if (byteCount + incVal > maxByteCount) {
+        flush();
+      }
+
+      // increment aggregates that describe the I/Os
+      if (this.collapsedCall == null) {
+        this.collapsedCall = call;
+      }
+      callCount++;
+      byteCount += incVal;
+      returnTime = System.nanoTime();
+
+      if (byteCount >= maxByteCount) {
+        flush();
+      }
+    }
+
+    // write log entry for all the small calls that are buffered so far
+    private void flush() {
+      if (collapsedCall == null) {
+        return;
+      }
+      collapsedCall.logCall(CALL_COLLAPSED,
+                            null,
+                            new Object []{callCount, byteCount},
+                            getStreamId(),
+                            returnTime);
+      reset();
+    }
+
+    private void reset() {
+      collapsedCall = null;
+      callCount = 0;
+      byteCount = 0;
+      returnTime = 0;
+    }
+  }
+}
diff --git a/src/core/org/apache/hadoop/metrics/SimpleBase64.java b/src/core/org/apache/hadoop/metrics/SimpleBase64.java
new file mode 100644
index 00000000..c0c0fdfd
--- /dev/null
+++ b/src/core/org/apache/hadoop/metrics/SimpleBase64.java
@@ -0,0 +1,122 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.metrics;
+
+
+// This code was mostly copied from the Apache Base64 library.  We don't link
+// with the original Base64 jar, as that jar will not be in the classpaths of
+// the client (e.g., HBase) of HDFS.  As an unintentional side benefit, the
+// implementation here makes minor performance improvements over the original
+// since we do not need to be general purpose.  In particular, this version
+// computes the encoding with single call to a static method.  The original
+// keeps global state in a Base64 objects and requires multiple calls to an
+// instance method.
+class SimpleBase64 {
+  /**
+   * This array is a lookup table that translates 6-bit positive integer index
+   * values into their "Base64 Alphabet" equivalents as specified in Table 1 of
+   * RFC 2045.
+   * 
+   * Thanks to "commons" project in ws.apache.org for this code.
+   * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+   */
+  private static final byte[] STANDARD_ENCODE_TABLE = {
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+    'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
+  };
+
+  private static final int BYTES_PER_UNENCODED_BLOCK = 3;
+  private static final int BYTES_PER_ENCODED_BLOCK = 4;
+  private static final char PAD = '=';
+
+  /**
+   * Base64 uses 6-bit fields. 
+   */
+  /** Mask used to extract 6 bits, used when encoding */
+  private static final int MASK_6BITS = 0x3f;
+
+  public static String encode(byte[] in) throws java.io.UnsupportedEncodingException {
+    int inLen = in.length;
+    int padLen = ((BYTES_PER_UNENCODED_BLOCK -
+                   (inLen % BYTES_PER_UNENCODED_BLOCK)) %
+                  BYTES_PER_UNENCODED_BLOCK);
+    int outLen = (BYTES_PER_ENCODED_BLOCK * (inLen + padLen) /
+                  BYTES_PER_UNENCODED_BLOCK);
+
+    byte[] buffer = new byte[outLen];
+
+    for (int i=0; i<buffer.length; i++)
+      buffer[i] = '_';
+
+    byte[] encodeTable = STANDARD_ENCODE_TABLE;
+    int inPos = 0;
+    int pos = 0;
+    int bitWorkArea = 0;
+    int modulus = 0;
+
+    int lineLength = 0;
+    int currentLinePos = 0;
+
+    // iterate over main body of the bytes where we can map 3 input bytes to 4
+    // output bytes
+    for (int i = 0; i < in.length; i++) {
+      modulus = (modulus+1) % BYTES_PER_UNENCODED_BLOCK;
+      int b = in[inPos++];
+      if (b < 0) {
+        b += 256;
+      }
+      bitWorkArea = (bitWorkArea << 8) + b; //  BITS_PER_BYTE
+      if (0 == modulus) { // 3 bytes = 24 bits = 4 * 6 bits to extract
+        buffer[pos++] = encodeTable[(bitWorkArea >> 18) & MASK_6BITS];
+        buffer[pos++] = encodeTable[(bitWorkArea >> 12) & MASK_6BITS];
+        buffer[pos++] = encodeTable[(bitWorkArea >> 6) & MASK_6BITS];
+        buffer[pos++] = encodeTable[bitWorkArea & MASK_6BITS];
+      }
+    }
+
+    // handle corner case of end of string when it doesn't have an even number
+    // of bytes
+    switch (modulus) { // 0-2
+    case 1 : // 8 bits = 6 + 2
+      buffer[pos++] = encodeTable[(bitWorkArea >> 2) & MASK_6BITS]; // top 6 bits
+      buffer[pos++] = encodeTable[(bitWorkArea << 4) & MASK_6BITS]; // remaining 2 
+      // URL-SAFE skips the padding to further reduce size.
+      if (encodeTable == STANDARD_ENCODE_TABLE) {
+        buffer[pos++] = PAD;
+        buffer[pos++] = PAD;
+      }
+      break;
+
+    case 2 : // 16 bits = 6 + 6 + 4
+      buffer[pos++] = encodeTable[(bitWorkArea >> 10) & MASK_6BITS];
+      buffer[pos++] = encodeTable[(bitWorkArea >> 4) & MASK_6BITS];
+      buffer[pos++] = encodeTable[(bitWorkArea << 2) & MASK_6BITS];
+      // URL-SAFE skips the padding to further reduce size.
+      if (encodeTable == STANDARD_ENCODE_TABLE) {
+        buffer[pos++] = PAD;
+      }
+      break;
+    }
+
+    String v = new String(buffer, "UTF-8");
+    return v;
+  }
+}
\ No newline at end of file
diff --git a/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java b/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
index d65cce05..b3b091db 100644
--- a/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
+++ b/src/core/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
@@ -18,9 +18,9 @@
 package org.apache.hadoop.metrics.util;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import javax.management.Attribute;
 import javax.management.AttributeList;
@@ -60,7 +60,7 @@ public abstract class MetricsDynamicMBeanBase implements DynamicMBean {
   private final static String RESET_ALL_MIN_MAX_OP = "resetAllMinMax";
   private MetricsRegistry metricsRegistry;
   private MBeanInfo mbeanInfo;
-  private Map<String, MetricsBase> metricsRateAttributeMod;
+  private ConcurrentMap<String, MetricsBase> metricsRateAttributeMod;
   private int numEntriesInRegistry = 0;
   private String mbeanDescription;
   
@@ -76,7 +76,7 @@ private void updateMbeanInfoIfMetricsListChanged()  {
   }
   
   private void createMBeanInfo() {
-    metricsRateAttributeMod = new HashMap<String, MetricsBase>();
+    metricsRateAttributeMod = new ConcurrentHashMap<String, MetricsBase>();
     boolean needsMinMaxResetOperation = false;
     List<MBeanAttributeInfo> attributesInfo = new ArrayList<MBeanAttributeInfo>();
     MBeanOperationInfo[] operationsInfo = null;
diff --git a/src/core/org/apache/hadoop/net/IPv4AddressTruncationMapping.java b/src/core/org/apache/hadoop/net/IPv4AddressTruncationMapping.java
index 3c35b23d..6bb9565d 100644
--- a/src/core/org/apache/hadoop/net/IPv4AddressTruncationMapping.java
+++ b/src/core/org/apache/hadoop/net/IPv4AddressTruncationMapping.java
@@ -55,15 +55,22 @@ public List<String> resolve(List<String> names) {
       for (String name : names) {
         String rackName = NetworkTopology.DEFAULT_RACK;
         try {
-          String ip = InetAddress.getByName(name).getHostAddress();
-          LOG.debug("name: " + name + " ip: " + ip);
-          Matcher m = IPV4_FORMAT.matcher(ip);
-          boolean mat = m.find();
-          if (mat) {
-            rackName = RACK_HEADER + m.group(1);
+          Matcher nameMatcher = IPV4_FORMAT.matcher(name);
+          // If name is already an IPv4 address, just use it.
+          if (nameMatcher.find()) {
+            rackName = RACK_HEADER + nameMatcher.group(1);
           } else {
-            LOG.warn("Default rack is used for name: " + name + " ip: " + ip +
-                     " because of pattern mismatch.");
+            // If name is not already an IPv4 address, resolve it.
+            String ip = InetAddress.getByName(name).getHostAddress();
+            LOG.debug("name: " + name + " ip: " + ip);
+            Matcher m = IPV4_FORMAT.matcher(ip);
+            boolean mat = m.find();
+            if (mat) {
+              rackName = RACK_HEADER + m.group(1);
+            } else {
+              LOG.warn("Default rack is used for name: " + name + " ip: " + ip +
+                       " because of pattern mismatch.");
+            }
           }
         } catch (UnknownHostException e) {
           LOG.warn("Default rack is used for name: " + name, e);
diff --git a/src/core/org/apache/hadoop/net/NetUtils.java b/src/core/org/apache/hadoop/net/NetUtils.java
index 71bc5a2b..5ed58f05 100644
--- a/src/core/org/apache/hadoop/net/NetUtils.java
+++ b/src/core/org/apache/hadoop/net/NetUtils.java
@@ -32,6 +32,7 @@
 import java.nio.channels.SocketChannel;
 import java.util.Map.Entry;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.net.SocketFactory;
 
@@ -45,18 +46,28 @@
 import org.apache.hadoop.util.ReflectionUtils;
 
 public class NetUtils {
-	private static final Log LOG = LogFactory.getLog(NetUtils.class);
-	// Insure that Network Control bits in sock will never be used,
-	// allow to set them may cause issue on the network, killing network
-	// control traffic.
-	// NC bits are: 
-	// in TOS Dec: 192 and up.
-	public static final int IP_TOS_MAX_VALUE = 191;
-	public static final int NOT_SET_IP_TOS = -1;
-	
-	private static Map<String, String> hostToResolved = 
-			new HashMap<String, String>();
+  private static final Log LOG = LogFactory.getLog(NetUtils.class);
+  // Insure that Network Control bits in sock will never be used,
+  // allow to set them may cause issue on the network, killing network
+  // control traffic.
+  // NC bits are: 
+  // in TOS Dec: 192 and up.
+  public static final int IP_TOS_MAX_VALUE = 191;
+  public static final int NOT_SET_IP_TOS = -1;
+  public static final String DFS_CLIENT_TOS_CONF = "dfs.client.tos.value";
+
+  private static Map<String, String> hostToResolved = 
+      new HashMap<String, String>();
 
+  /**
+   * Check the tos value is valid, that is, in the -1~191 range
+   * @param tosValue
+   * @return
+   */
+  public static boolean isValidTOSValue(int tosValue) {
+    return tosValue >= NOT_SET_IP_TOS && tosValue <= IP_TOS_MAX_VALUE;
+  }
+  
   /**
    * Get the socket factory for the given class according to its
    * configuration parameter
@@ -141,7 +152,7 @@ public static InetSocketAddress createSocketAddr(String target) {
    *   <fs>://<host>:<port>/<path>
    */
   public static InetSocketAddress createSocketAddr(String target,
-                                                   int defaultPort) {
+      int defaultPort) {
     int colonIndex = target.indexOf(':');
     if (colonIndex < 0 && defaultPort == -1) {
       throw new RuntimeException("Not a host:port pair: " + target);
@@ -166,7 +177,7 @@ public static InetSocketAddress createSocketAddr(String target,
     if (port == -1) {
       port = defaultPort;
     }
-  
+
     if (getStaticResolution(hostname) != null) {
       hostname = getStaticResolution(hostname);
     }
@@ -185,9 +196,9 @@ public static InetSocketAddress createSocketAddr(String target,
    */
   @Deprecated
   public static String getServerAddress(Configuration conf,
-                                        String oldBindAddressName,
-                                        String oldPortName,
-                                        String newBindAddressName) {
+      String oldBindAddressName,
+      String oldPortName,
+      String newBindAddressName) {
     String oldAddr = conf.get(oldBindAddressName);
     String oldPort = conf.get(oldPortName);
     String newAddrPort = conf.get(newBindAddressName);
@@ -197,23 +208,23 @@ public static String getServerAddress(Configuration conf,
     String[] newAddrPortParts = newAddrPort.split(":",2);
     if (newAddrPortParts.length != 2) {
       throw new IllegalArgumentException("Invalid address/port: " + 
-                                         newAddrPort);
+          newAddrPort);
     }
     if (oldAddr == null) {
       oldAddr = newAddrPortParts[0];
     } else {
       LOG.warn("Configuration parameter " + oldBindAddressName +
-               " is deprecated. Use " + newBindAddressName + " instead.");
+          " is deprecated. Use " + newBindAddressName + " instead.");
     }
     if (oldPort == null) {
       oldPort = newAddrPortParts[1];
     } else {
       LOG.warn("Configuration parameter " + oldPortName +
-               " is deprecated. Use " + newBindAddressName + " instead.");      
+          " is deprecated. Use " + newBindAddressName + " instead.");      
     }
     return oldAddr + ":" + oldPort;
   }
-  
+
   /**
    * Adds a static resolution for host. This can be used for setting up
    * hostnames with names that are fake to point to a well known host. For e.g.
@@ -230,7 +241,7 @@ public static void addStaticResolution(String host, String resolvedName) {
       hostToResolved.put(host, resolvedName);
     }
   }
-  
+
   /**
    * Retrieves the resolved name for the passed host. The resolved name must
    * have been set earlier using 
@@ -243,7 +254,7 @@ public static String getStaticResolution(String host) {
       return hostToResolved.get(host);
     }
   }
-  
+
   /**
    * This is used to get all the resolutions that were added using
    * {@link NetUtils#addStaticResolution(String, String)}. The return
@@ -261,10 +272,10 @@ public static List <String[]> getAllStaticResolutions() {
       for (Entry<String, String> e : entries) {
         l.add(new String[] {e.getKey(), e.getValue()});
       }
-    return l;
+      return l;
     }
   }
-  
+
   /**
    * Returns InetSocketAddress that a client can use to 
    * connect to the server. Server.getListenerAddress() is not correct when
@@ -281,7 +292,7 @@ public static InetSocketAddress getConnectAddress(Server server) {
     }
     return addr;
   }
-  
+
   /**
    * Same as getInputStream(socket, socket.getSoTimeout()).<br><br>
    * 
@@ -303,10 +314,10 @@ public static InetSocketAddress getConnectAddress(Server server) {
    * @throws IOException
    */
   public static InputStream getInputStream(Socket socket) 
-                                           throws IOException {
+      throws IOException {
     return getInputStream(socket, socket.getSoTimeout());
   }
-  
+
   /**
    * Returns InputStream for the socket. If the socket has an associated
    * SocketChannel then it returns a 
@@ -327,11 +338,11 @@ public static InputStream getInputStream(Socket socket)
    * @throws IOException
    */
   public static InputStream getInputStream(Socket socket, long timeout) 
-                                           throws IOException {
+      throws IOException {
     return (socket.getChannel() == null) ? 
-          socket.getInputStream() : new SocketInputStream(socket, timeout);
+        socket.getInputStream() : new SocketInputStream(socket, timeout);
   }
-  
+
   /**
    * Same as getOutputStream(socket, 0). Timeout of zero implies write will
    * wait until data is available.<br><br>
@@ -354,10 +365,10 @@ public static InputStream getInputStream(Socket socket, long timeout)
    * @throws IOException
    */  
   public static OutputStream getOutputStream(Socket socket) 
-                                             throws IOException {
+      throws IOException {
     return getOutputStream(socket, 0);
   }
-  
+
   /**
    * Returns OutputStream for the socket. If the socket has an associated
    * SocketChannel then it returns a 
@@ -378,11 +389,11 @@ public static OutputStream getOutputStream(Socket socket)
    * @throws IOException   
    */
   public static OutputStream getOutputStream(Socket socket, long timeout) 
-                                             throws IOException {
+      throws IOException {
     return (socket.getChannel() == null) ? 
-            socket.getOutputStream() : new SocketOutputStream(socket, timeout);            
+        socket.getOutputStream() : new SocketOutputStream(socket, timeout);            
   }
-  
+
   /**
    * This is a drop-in replacement for 
    * {@link Socket#connect(SocketAddress, int)}.
@@ -401,31 +412,31 @@ public static OutputStream getOutputStream(Socket socket, long timeout)
    * @param timeout - timeout in milliseconds
    */
   public static void connect(Socket socket, 
-          					 SocketAddress endpoint, 
-          					 int timeout) throws IOException {
-	  connect(socket, endpoint, timeout, NOT_SET_IP_TOS);
+      SocketAddress endpoint, 
+      int timeout) throws IOException {
+    connect(socket, endpoint, timeout, NOT_SET_IP_TOS);
   }
-  
+
   public static void connect(Socket socket, 
-                             SocketAddress endpoint, 
-                             int timeout, 
-                             int ipTosValue) throws IOException {
+      SocketAddress endpoint, 
+      int timeout, 
+      int ipTosValue) throws IOException {
     if (socket == null || endpoint == null || timeout < 0 
-    		|| ipTosValue < NOT_SET_IP_TOS 
-    		|| ipTosValue > IP_TOS_MAX_VALUE) {
+        || ipTosValue < NOT_SET_IP_TOS 
+        || ipTosValue > IP_TOS_MAX_VALUE) {
       throw new IllegalArgumentException("Illegal argument for connect()");
     }
-    
+
     SocketChannel ch = socket.getChannel();
-    
+
     if (ch == null) {
       // let the default implementation handle it.
       socket.connect(endpoint, timeout);
     } else {
-    	// set the socket IP_TOS value
-    	if (ipTosValue != NOT_SET_IP_TOS) {
-    		LinuxSystemCall.setIPTOSVal(ch, ipTosValue);
-    	}
+      // set the socket IP_TOS value
+      if (ipTosValue != NOT_SET_IP_TOS) {
+        LinuxSystemCall.setIPTOSVal(ch, ipTosValue);
+      }
       SocketIOWithTimeout.connect(ch, endpoint, timeout);
     }
 
@@ -440,11 +451,11 @@ public static void connect(Socket socket,
       LOG.info("Detected a loopback TCP socket, disconnecting it");
       socket.close();
       throw new ConnectException(
-        "Localhost targeted connection resulted in a loopback. " +
-        "No daemon is listening on the target port.");
+          "Localhost targeted connection resulted in a loopback. " +
+          "No daemon is listening on the target port.");
     }
   }
-  
+
   /** 
    * Given a string representation of a host, return its ip address
    * in textual presentation.
@@ -465,7 +476,7 @@ public static String normalizeHostName(String name) {
       }
     }
   }
-  
+
   /** 
    * Given a collection of string representation of hosts, return a list of
    * corresponding IP addresses in the textual representation.
@@ -481,7 +492,22 @@ public static List<String> normalizeHostNames(Collection<String> names) {
     }
     return hostNames;
   }
-  
+
+  final static Map<InetAddress, Boolean> knownLocalAddrs = new ConcurrentHashMap<InetAddress, Boolean>();
+
+  public static boolean isLocalAddressWithCaching(InetAddress addr) {
+    if (knownLocalAddrs.containsKey(addr)) {
+      return true;
+    }
+    if (isLocalAddress(addr)) {
+      // add the address to known local address list
+      knownLocalAddrs.put(addr, Boolean.TRUE);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   public static boolean isLocalAddress(InetAddress addr) {
     // Check if the address is any local or loop back
     boolean local = addr.isAnyLocalAddress() || addr.isLoopbackAddress();
@@ -495,12 +521,30 @@ public static boolean isLocalAddress(InetAddress addr) {
     }   
     return local;
   }
-  
+
   public static int getIPTOS(Socket socket) throws IOException {
-	  return LinuxSystemCall.getIPTOSVal(socket);
+    return LinuxSystemCall.getIPTOSVal(socket);
   }
-  
+
   public static int getIPTOS(SocketChannel socketChannel) throws IOException {
-	  return LinuxSystemCall.getIPTOSVal(socketChannel);
+    return LinuxSystemCall.getIPTOSVal(socketChannel);
   }
+
+  public static InetSocketAddress resolveAddress(InetSocketAddress address) {
+    String hostName = address.getHostName() + ":" + address.getPort();
+    InetSocketAddress newAddr = createSocketAddr(hostName);
+    if (newAddr.isUnresolved()) {
+      LOG.warn("Address unresolvable: " + newAddr);
+    } else if (!newAddr.equals(address)) {
+      LOG.info("DNS changed from " + address + " to " + newAddr);
+      return newAddr;
+    } else {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("DNS Address unchanged: " + address);
+      }
+    }
+    return null;
+  }
+
+
 }
diff --git a/src/core/org/apache/hadoop/net/TopologyCache.java b/src/core/org/apache/hadoop/net/TopologyCache.java
new file mode 100644
index 00000000..9833a9c5
--- /dev/null
+++ b/src/core/org/apache/hadoop/net/TopologyCache.java
@@ -0,0 +1,92 @@
+package org.apache.hadoop.net;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.conf.Configuration;
+
+import org.apache.hadoop.util.ReflectionUtils;
+
+public class TopologyCache extends Configured {
+
+  public static final Log LOG =
+    LogFactory.getLog(TopologyCache.class);
+
+  protected ConcurrentMap<String, Node> hostnameToNodeMap = new ConcurrentHashMap<String, Node>();
+  protected NetworkTopology clusterMap = new NetworkTopology();
+  protected DNSToSwitchMapping dnsToSwitchMapping;
+  private Set<Node> nodesAtMaxLevel =
+    Collections.newSetFromMap(new ConcurrentHashMap<Node, Boolean>());
+
+  public TopologyCache(Configuration conf) {
+    super(conf);
+
+    dnsToSwitchMapping = ReflectionUtils.newInstance
+      (conf.getClass("topology.node.switch.mapping.impl", ScriptBasedMapping.class,
+                     DNSToSwitchMapping.class), conf);
+    LOG.info("DnsToSwitchMapping class = " + dnsToSwitchMapping.getClass().getName());
+  }
+
+
+  /**
+   * Return the Node in the network topology that corresponds to the hostname
+   */
+  public Node getNode(String name) {
+    Node n = hostnameToNodeMap.get(name);
+
+    // it's ok if multiple threads try to resolve the same host at the same time
+    // the assumption is that resolve() will return a canonical node object and
+    // the put operation is therefore idempotent
+    if (n == null) {
+      n = resolveAndGetNode(name);
+      hostnameToNodeMap.put(name, n);
+      // Make an entry for the node at the max level in the cache
+      nodesAtMaxLevel.add(
+        getParentNode(n, NetworkTopology.DEFAULT_HOST_LEVEL - 1));
+    }
+
+    return n;
+  }
+
+  private Node resolveAndGetNode(String name) {
+    List <String> rNameList = dnsToSwitchMapping.resolve(Arrays.asList(new String [] {name}));
+    String networkLoc = NodeBase.normalize(rNameList.get(0));
+    Node node = null;
+
+    // we depend on clusterMap to get a canonical node object
+    // we synchronize this section to guarantee that two concurrent
+    // insertions into the clusterMap don't happen (resulting in
+    // multiple copies of the same node being created and returned)
+    synchronized (clusterMap) {
+      while ((node = clusterMap.getNode(networkLoc+"/"+name)) == null) {
+        clusterMap.add(new NodeBase(name, networkLoc));
+      }
+    }
+
+    return node;
+  }
+
+  /**
+   * Returns a collection of nodes at the max level
+   */
+  public Collection<Node> getNodesAtMaxLevel() {
+    return nodesAtMaxLevel;
+  }
+
+  public static Node getParentNode(Node node, int level) {
+    for (int i = 0; i < level; ++i) {
+      node = node.getParent();
+    }
+    return node;
+  }
+}
diff --git a/src/core/org/apache/hadoop/util/DataChecksum.java b/src/core/org/apache/hadoop/util/DataChecksum.java
index 77727a41..1e4c4706 100644
--- a/src/core/org/apache/hadoop/util/DataChecksum.java
+++ b/src/core/org/apache/hadoop/util/DataChecksum.java
@@ -36,6 +36,7 @@ public class DataChecksum implements Checksum {
   public static final int HEADER_LEN = 5; /// 1 byte type and 4 byte len
   
   // checksum types
+  public static final int CHECKSUM_UNKNOWN = -1;
   public static final int CHECKSUM_NULL    = 0;
   public static final int CHECKSUM_CRC32   = 1;
   public static final int CHECKSUM_CRC32C  = 2;
@@ -50,16 +51,18 @@ public static DataChecksum newDataChecksum( int type, int bytesPerChecksum ) {
       return null;
     }
     
+    int checksumSize = getChecksumSizeByType(type);
+    
     switch ( type ) {
     case CHECKSUM_NULL :
       return new DataChecksum( CHECKSUM_NULL, new ChecksumNull(), 
-                               CHECKSUM_NULL_SIZE, bytesPerChecksum );
+          checksumSize, bytesPerChecksum );
     case CHECKSUM_CRC32 :
-      return new DataChecksum( CHECKSUM_CRC32, new CRC32(), 
-                               CHECKSUM_CRC32_SIZE, bytesPerChecksum );
+      return new DataChecksum(CHECKSUM_CRC32, new PureJavaCrc32(),
+          checksumSize, bytesPerChecksum );
     case CHECKSUM_CRC32C:
       return new DataChecksum( CHECKSUM_CRC32C, new PureJavaCrc32C(),
-                               CHECKSUM_CRC32C_SIZE, bytesPerChecksum);
+          checksumSize, bytesPerChecksum);
     default:
       return null;  
     }
@@ -70,19 +73,34 @@ public static DataChecksum newDataChecksum( int type, int bytesPerChecksum, Chec
     if ( bytesPerChecksum <= 0 ) {
       return null;
     }
+
+    int checksumSize = getChecksumSizeByType(type);
     
     switch ( type ) {
     case CHECKSUM_NULL :
       return new DataChecksum( CHECKSUM_NULL, new ChecksumNull(), 
-                               CHECKSUM_NULL_SIZE, bytesPerChecksum );
+          checksumSize, bytesPerChecksum );
     case CHECKSUM_CRC32 :
       return new DataChecksum( CHECKSUM_CRC32, sum, 
-                               CHECKSUM_CRC32_SIZE, bytesPerChecksum );
+          checksumSize, bytesPerChecksum );
     default:
       return null;  
     }
   }
   
+  public static int getChecksumSizeByType(int type) {
+    switch (type) {
+      case CHECKSUM_NULL:
+        return CHECKSUM_NULL_SIZE;
+      case CHECKSUM_CRC32:
+        return CHECKSUM_CRC32_SIZE;
+      case CHECKSUM_CRC32C:
+        return CHECKSUM_CRC32C_SIZE;
+      default:
+        return -1;
+    }
+  }
+  
   /**
    * Creates a DataChecksum from HEADER_LEN bytes from arr[offset].
    * @return DataChecksum of the type in the array or null in case of an error.
@@ -282,6 +300,12 @@ public void verifyChunkedSums(ByteBuffer data, ByteBuffer checksums,
       String fileName, long basePos)
   throws ChecksumException {
     if (size == 0) return;
+
+    if (data.isDirect() && checksums.isDirect() && NativeCrc32.isAvailable()) {
+      NativeCrc32.verifyChunkedSums(bytesPerChecksum, type, checksums, 
+          data, fileName, basePos);
+      return;
+    }
     
     if (data.hasArray() && checksums.hasArray()) {
       verifyChunkedSums(
@@ -290,7 +314,7 @@ public void verifyChunkedSums(ByteBuffer data, ByteBuffer checksums,
           fileName, basePos);
       return;
     }
-    
+ 
     int startDataPos = data.position();
     data.mark();
     checksums.mark();
diff --git a/src/core/org/apache/hadoop/util/DataDirFileReader.java b/src/core/org/apache/hadoop/util/DataDirFileReader.java
new file mode 100644
index 00000000..78d87981
--- /dev/null
+++ b/src/core/org/apache/hadoop/util/DataDirFileReader.java
@@ -0,0 +1,96 @@
+/**	
+ * 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.	
+ */
+package org.apache.hadoop.util;
+
+import java.io.*;
+import java.util.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class DataDirFileReader{
+
+  public static final Log LOG = LogFactory.getLog(DataDirFileReader.class);
+  private String directoryFile;
+  private String dirPaths;
+  private File file;
+  public DataDirFileReader(String dirFile) throws IOException{
+    directoryFile = dirFile.trim();
+    try {
+      file = new File(directoryFile);
+    } catch (Exception e) {
+      LOG.error("Received exception: ", e);
+      throw new IOException(e);
+    }
+  }
+
+  private void readFileToSet() throws IOException{
+    FileInputStream fis = new FileInputStream(file);
+    BufferedReader reader = null;
+    try {
+      reader = new BufferedReader(new InputStreamReader(fis));
+      String line;
+      //only the last line of the file is required since it contains the list
+      // of working datadirs. Anything before is not required. 
+      while ((line = reader.readLine()) != null) {
+        dirPaths = line.trim();
+      }
+    } catch (IOException e) {
+      LOG.error("Received exception: ", e);
+      throw new IOException(e);
+    }
+    finally {
+      if (reader != null) {
+        reader.close();
+      }
+      fis.close(); 
+    }
+  }
+
+  public String getNewDirectories() {
+    if (dirPaths != null) {
+      return dirPaths;
+    } else {
+      try {
+        this.readFileToSet();
+        return dirPaths;
+      } catch (Exception e) {
+        //Unable to get the new directories so the string would be empty.
+        LOG.error("Received exception: ", e);
+        return null;
+      }
+    }
+  }
+
+  public String[] getArrayOfCurrentDataDirectories() {
+    if (dirPaths != null) {
+      return dirPaths.split(",");
+    } else {
+      try {
+        this.readFileToSet();
+        return dirPaths.split(",");
+      } catch (Exception e) {
+        LOG.error("Received exception: ", e);
+        return null;
+      }
+    }
+  }
+
+  public long getLastModTimeStamp() {
+      return file.lastModified();
+  }
+}
diff --git a/src/core/org/apache/hadoop/util/DiskChecker.java b/src/core/org/apache/hadoop/util/DiskChecker.java
index 4c471dbc..e6da597c 100644
--- a/src/core/org/apache/hadoop/util/DiskChecker.java
+++ b/src/core/org/apache/hadoop/util/DiskChecker.java
@@ -84,6 +84,10 @@ public static void checkDir(File dir) throws DiskErrorException {
     if (!dir.canWrite())
       throw new DiskErrorException("directory is not writable: " 
                                    + dir.toString());
+    
+    if (!dir.canExecute())
+      throw new DiskErrorException("directory is not searchable: " 
+                                   + dir.toString());
   }
 
 }
diff --git a/src/core/org/apache/hadoop/util/HostsFileReader.java b/src/core/org/apache/hadoop/util/HostsFileReader.java
index d86f8f2b..bb50dfba 100644
--- a/src/core/org/apache/hadoop/util/HostsFileReader.java
+++ b/src/core/org/apache/hadoop/util/HostsFileReader.java
@@ -35,8 +35,15 @@ public class HostsFileReader {
   
   private static final Log LOG = LogFactory.getLog(HostsFileReader.class);
 
-  public HostsFileReader(String inFile, 
-                         String exFile) throws IOException {
+  public HostsFileReader(String inFile, String exFile) throws IOException {
+    this(inFile, exFile, false);
+  }
+
+  public HostsFileReader(String inFile, String exFile, boolean enforceValidation)
+      throws IOException {
+    if (enforceValidation) {
+      validateHostFiles(inFile, exFile);
+    }
     includes = new HashSet<String>();
     excludes = new HashSet<String>();
     includesFile = inFile;
@@ -47,6 +54,7 @@ public HostsFileReader(String inFile,
   private void readFileToSet(String filename, Set<String> set) throws IOException {
     File file = new File(filename);
     if (!file.exists()) {
+      LOG.warn("Reading hosts file: " + filename + " File does not exist");
       return;
     }
     FileInputStream fis = new FileInputStream(file);
@@ -67,7 +75,8 @@ private void readFileToSet(String filename, Set<String> set) throws IOException
             }
           }
         }
-      }   
+      } 
+      LOG.info("Reading hosts file: " + filename + ", read " + set.size() + " nodes");
     } finally {
       if (reader != null) {
         reader.close();
@@ -111,12 +120,14 @@ public synchronized void refresh() throws IOException {
       readFileToSet(includesFile, newIncludes);
       // switch the new hosts that are to be included
       includes = newIncludes;
+      LOG.info("Refreshing hosts - read: " + includes.size() + " includes hosts");
     }
     if (!excludesFile.equals("")) {
       Set<String> newExcludes = new HashSet<String>();
       readFileToSet(excludesFile, newExcludes);
       // switch the excluded hosts
       excludes = newExcludes;
+      LOG.info("Refreshing hosts - read: " + excludes.size() + " excludes hosts");
     }
   }
 
@@ -148,11 +159,48 @@ public synchronized void setExcludesFile(String excludesFile) {
     LOG.info("Setting the excludes file to " + excludesFile);
     this.excludesFile = excludesFile;
   }
+  
+  public synchronized void updateFileNames(String includesFile,
+      String excludesFile) throws IOException {
+    updateFileNames(includesFile, excludesFile, false);
+  }
 
-  public synchronized void updateFileNames(String includesFile, 
-                                           String excludesFile) 
-                                           throws IOException {
+  public synchronized void updateFileNames(String includesFile,
+      String excludesFile, boolean validate) throws IOException {
+    if (validate) {
+      validateHostFiles(includesFile, excludesFile);
+    }
     setIncludesFile(includesFile);
     setExcludesFile(excludesFile);
   }
+  
+  public static void validateHostFiles(String inFile, String exFile)
+      throws IOException {
+    File include = new File(inFile);
+    File exclude = new File(exFile);
+
+    String msg = "";
+    if (!inFile.equals("") && !include.exists())
+      msg += "Host includes file " + include + " does not exist!\n";
+    if (!exFile.equals("") && !exclude.exists())
+      msg += "Host excludes file " + exclude + " does not exist!\n";
+
+    if (!msg.isEmpty()) {
+      LOG.error(msg);
+      throw new IOException(msg);
+    }
+  }
+
+  /**
+   * Checks if a host is part of the cluster as per configuration.
+   * For this the host must be "included" and not "excluded".
+   * An empty includes files means the host is "included".
+   * @param host The host name.
+   * @return A boolean indicating if the host is allowed.
+   */
+  public synchronized boolean isAllowedHost(String host) {
+    boolean isIncluded = includes.isEmpty() || includes.contains(host);
+    boolean isExcluded = excludes.contains(host);
+    return isIncluded && !isExcluded;
+  }
 }
diff --git a/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java b/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
index bd40ad69..f1d6abee 100644
--- a/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
+++ b/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
@@ -24,6 +24,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
@@ -368,6 +369,38 @@ public String getProcessTreeDump() {
     return ret.toString();
   }
 
+  /**
+   * Get a count of the number of processes that have a commandline that
+   * matches a name.
+   *
+   * @param name Name to check the commandline contains
+   * @return Collection of strings concatenating the dump of information
+   *         of all the processes in the process-tree that match the
+   *         name
+   */
+  public Collection<String> getProcessNameContainsCount(String name) {
+    List<String> retProcessList = new ArrayList<String>();
+
+    // Get the list of processes
+    List<Integer> processList = getProcessList();
+    for (Integer proc : processList) {
+      // Get information for each process
+      ProcessInfo p = new ProcessInfo(proc);
+      if (constructProcessInfo(p, procfsDir) != null) {
+        if (p.getCmdLine(procfsDir).contains(name)) {
+          StringBuilder processSb = new StringBuilder();
+          processSb.append(String.format(PROCESSTREE_DUMP_FORMAT, p.getPid(),
+              p.getPpid(), p.getPgrpId(), p.getSessionId(), p.getName(),
+              p.getUtime(), p.getStime(), p.getVmem(), p.getRssmemPage(),
+              p.getCmdLine(procfsDir)));
+          retProcessList.add(processSb.toString());
+        }
+      }
+    }
+
+    return retProcessList;
+  }
+
   /**
    * Get the cumulative virtual memory used by all the processes in the
    * process-tree.
diff --git a/src/core/org/apache/hadoop/util/StringUtils.java b/src/core/org/apache/hadoop/util/StringUtils.java
index 6255f84f..509f0d8e 100644
--- a/src/core/org/apache/hadoop/util/StringUtils.java
+++ b/src/core/org/apache/hadoop/util/StringUtils.java
@@ -36,6 +36,7 @@
 import java.util.Collection;
 
 import org.apache.hadoop.fs.*;
+import org.apache.log4j.LogManager;
 
 /**
  * General string utils
@@ -610,6 +611,7 @@ public static void startupShutdownMessage(Class<?> clazz, String[] args,
       public void run() {
         LOG.info(toStartupShutdownString("SHUTDOWN_MSG: ", new String[]{
           "Shutting down " + classname + " at " + hostname}));
+        LogManager.shutdown();
       }
     });
   }
diff --git a/src/examples/org/apache/hadoop/examples/ExampleDriver.java b/src/examples/org/apache/hadoop/examples/ExampleDriver.java
index 694becb0..cd421c4c 100644
--- a/src/examples/org/apache/hadoop/examples/ExampleDriver.java
+++ b/src/examples/org/apache/hadoop/examples/ExampleDriver.java
@@ -61,6 +61,8 @@ public static void main(String argv[]){
       pgd.addClass("teragen", TeraGen.class, "Generate data for the terasort");
       pgd.addClass("terasort", TeraSort.class, "Run the terasort");
       pgd.addClass("teravalidate", TeraValidate.class, "Checking results of terasort");
+      pgd.addClass("sum", SumJob.class,
+                    "For testing the variable reducers code.");
       pgd.driver(argv);
       
       // Success
diff --git a/src/examples/org/apache/hadoop/examples/SumJob.java b/src/examples/org/apache/hadoop/examples/SumJob.java
new file mode 100644
index 00000000..3519e70a
--- /dev/null
+++ b/src/examples/org/apache/hadoop/examples/SumJob.java
@@ -0,0 +1,206 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.examples;
+
+import java.io.IOException;
+
+
+import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.mapred.*;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.LongWritable;
+import java.util.Iterator;
+import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.util.GenericOptionsParser;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
+
+public class SumJob extends Configured implements Tool  {
+  /** The path of the temporary directory for the job */
+  static final Path TMP_DIR = new Path(SumJob.class.getSimpleName() + "_TMP");
+
+  /**
+   * Mapper class for the SumJob.
+   */
+  public static class MyMapper
+    extends MapReduceBase
+    implements Mapper<LongWritable, LongWritable, LongWritable, LongWritable> {
+
+    /**
+     * Map task for the job
+     *
+     * @param key the input key.
+     * @param value the input value.
+     * @param output collects mapped keys and values.
+     * @param reporter facility to report progress.
+     * @throws IOException
+     */
+    public void map(LongWritable key, LongWritable value,
+                    OutputCollector<LongWritable, LongWritable> output,
+                    Reporter reporter) throws IOException {
+      output.collect(key, value);
+    }
+  }
+
+  /**
+   * Reducer class for SumJob
+   */
+  public static class MyReducer
+    extends MapReduceBase
+    implements Reducer<LongWritable, LongWritable, LongWritable, LongWritable> {
+    private long sum = 0;
+    private JobConf conf;
+
+    /** Store job configuration. */
+    @Override
+    public void configure(JobConf job) {
+      conf = job;
+    }
+
+    /**
+     * Reduce task for the job. It sums up all the numbers in its partitions
+     * and writes out the result
+     *
+     * @param key the key.
+     * @param values the list of values to reduce.
+     * @param output to collect keys and combined values.
+     * @param reporter facility to report progress.
+     * @throws IOException
+     */
+    public void reduce(LongWritable key, Iterator<LongWritable> values,
+                       OutputCollector<LongWritable, LongWritable> output,
+                       Reporter reporter) throws IOException {
+      while (values.hasNext()) {
+        long value = values.next().get();
+        this.sum = this.sum + value;
+      }
+      output.collect(key, new LongWritable(sum));
+    }
+  }
+
+  /**
+   * Runs the job to find the sum of integers between 1..N. Also checks if the
+   * sum is the same as (N*(N+1))/2
+   *
+   * @param args command specific arguments.
+   * @return A non-zero return value if the job fails
+   * @throws Exception
+   */
+  public int run (String args[]) throws Exception {
+    Configuration conf = new Configuration();
+    String[] otherArgs = new GenericOptionsParser(conf, args).
+                              getRemainingArgs();
+    if (otherArgs.length != 2) {
+      System.err.println("Usage: sum <numRecords> " +
+        "<numReduceTasks>");
+      ToolRunner.printGenericCommandUsage(System.err);
+      return -1;
+    }
+    int numRecords = Integer.parseInt(otherArgs[0]);
+    int numReduceTasks = Integer.parseInt(otherArgs[1]);
+
+    System.out.println("numRecords: " +  numRecords +
+      " numReduceTasks: " + numReduceTasks);
+
+    JobConf jobConf = new JobConf(this.getConf(), SumJob.class);
+    final FileSystem fs = FileSystem.get(jobConf);
+
+    if (!fs.mkdirs(TMP_DIR)) {
+      throw new IOException("Cannot create input directory " + TMP_DIR);
+    }
+
+    final Path inFile = new Path(TMP_DIR, "inp");
+
+    // If the input directory already exists, the Job would assume that the
+    // input directory has the right input files, and would not create them
+    // again.
+    if (!fs.exists(inFile)) {
+      SequenceFile.Writer writer = SequenceFile.createWriter(fs, jobConf, inFile,
+        LongWritable.class, LongWritable.class);
+
+      for (int i = 1; i <= numRecords; i++) {
+        writer.append(
+          new LongWritable(i%numReduceTasks ),
+          new LongWritable(i));
+      }
+      writer.close();
+    }
+
+    final Path outDir = new Path(TMP_DIR, "out");
+    if (fs.exists(outDir)) {
+      throw new IOException("Tmp directory " + fs.makeQualified(outDir)
+        + " already exists.  Please remove it first.");
+    }
+
+    SequenceFileInputFormat.setInputPaths(jobConf, inFile);
+    FileOutputFormat.setOutputPath(jobConf, outDir);
+    jobConf.setJobName("sum");
+    jobConf.setInputFormat(SequenceFileInputFormat.class);
+    jobConf.setOutputFormat(SequenceFileOutputFormat.class);
+    jobConf.setMapperClass(MyMapper.class);
+    jobConf.setCombinerClass(MyReducer.class);
+    jobConf.setReducerClass(MyReducer.class);
+    jobConf.setOutputKeyClass(LongWritable.class);
+    jobConf.setOutputValueClass(LongWritable.class);
+    jobConf.setNumReduceTasks(numReduceTasks);
+
+    final long startTime = System.currentTimeMillis();
+    JobClient.runJob(jobConf);
+    final double duration = (System.currentTimeMillis() - startTime)/1000.0;
+    System.out.println("Job Finished in " + duration + " seconds");
+
+    // Read outputs
+    Long finalSum = new Long(0);
+    // Get the list of all the files which are in the output directory
+    FileStatus fileStatuses[] = fs.listStatus(outDir);
+    for (FileStatus fileStatus : fileStatuses) {
+      // If the file name starts with "part", read it.
+      if (fileStatus.getPath().getName().startsWith("part")) {
+        Path outFile = fileStatus.getPath();
+        LongWritable key = new LongWritable();
+        LongWritable sum = new LongWritable();
+        SequenceFile.Reader reader = new SequenceFile.Reader(fs, outFile,
+                                                              jobConf);
+        try {
+          reader.next(key, sum);
+          finalSum += sum.get();
+        } finally {
+          reader.close();
+        }
+      }
+    }
+
+    System.err.println("Sum: " + finalSum);
+    Long expectedSum = new Long(((long)numRecords * (numRecords + 1)) / 2);
+    if (finalSum.equals(expectedSum)) {
+      System.err.println("Job Succeeded!");
+      return 0;
+    }
+    System.err.println("Job Failed! Expected Sum: " + expectedSum);
+    return 1;
+  }
+
+  public static void main(String[] args) throws Exception {
+    int res = ToolRunner.run(new SumJob(), args);
+    System.exit(res);
+  }
+}
diff --git a/src/hdfs/hdfs-default.xml b/src/hdfs/hdfs-default.xml
index 0d663881..97556422 100644
--- a/src/hdfs/hdfs-default.xml
+++ b/src/hdfs/hdfs-default.xml
@@ -15,6 +15,12 @@ e namespace mutations), "block"(trace block under/over replications and block
 creations/deletions), or "all".</description>
 </property>
 
+<property>
+  <name>dfs.access.time.touchable</name>
+  <value>true</value>
+  <description> This branch of HDFS supports touch changing file accessTime.</description>
+</property>
+
 <property>
   <name>dfs.secondary.http.address</name>
   <value>0.0.0.0:50090</value>
@@ -145,6 +151,18 @@ creations/deletions), or "all".</description>
   </description>
 </property>
 
+<property>
+  <name>dfs.name.dir.policy</name>
+  <value>0</value>
+  <description>Determines the DFS name node directory policy. 
+    0 - No enforcement
+    1 - Enforce that there should be at least two copies and they must be on 
+        different devices
+    2 - Enforce that there should be at least two copies on different devices
+        and at least one must be on an NFS device
+  </description>
+</property>
+
 <property>
   <name>dfs.name.dir</name>
   <value>${hadoop.tmp.dir}/dfs/name</value>
@@ -200,6 +218,17 @@ creations/deletions), or "all".</description>
   </description>
 </property>
 
+<property>
+  <name>dfs.datadir.confpath</name>
+  <value></value>
+  <description>Determines where on the local filesystem on the DFS data node
+  to locate the config file with the list of working directories. This is an
+  absolute path to that file and the data is stored in a new line deliminated
+  file. This allows for a dynamic list of directories without modifying the 
+  actual config file itself.
+  </description>
+</property>
+
 <property>
   <name>dfs.replication</name>
   <value>3</value>
@@ -403,15 +432,6 @@ creations/deletions), or "all".</description>
   </description>
 </property>
 
-<property>
-  <name>dfs.datanode.failed.volumes.tolerated</name>
-  <value>0</value>
-  <description>The number of volumes that are allowed to
-  fail before a datanode stops offering service. By default
-  any volume failure will cause a datanode to shutdown.
-  </description>
-</property>
-
 <property>
   <name>dfs.fastcopy.file.wait_time</name>
   <value>300000</value>
diff --git a/src/hdfs/org/apache/hadoop/hdfs/APITraceFileSystem.java b/src/hdfs/org/apache/hadoop/hdfs/APITraceFileSystem.java
new file mode 100644
index 00000000..baeb1d48
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/APITraceFileSystem.java
@@ -0,0 +1,941 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hdfs;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.metrics.APITrace;
+import org.apache.hadoop.metrics.APITrace.StreamTracer;
+import org.apache.hadoop.metrics.APITrace.TraceableStream;
+import org.apache.hadoop.util.Progressable;
+import org.apache.hadoop.util.ReflectionUtils;
+
+
+/**
+ *  Tracing class for recording client-side API calls and RPC calls.
+ *
+ *  We override the methods in FilterFileSystem which are interesting to trace.  In general, we
+ *  make an identical unmodified call to the underlying file system, log the method call and
+ *  results, and return the value that the underlying file system returned unmodified.  The
+ *  only exceptions are the calls which return streams (e.g., open or create).  For these calls,
+ *  we want to record I/O that is performed on streams, so we return special trace wrappers
+ #  around the streams returned returned by the underlying file system.
+*/
+public class APITraceFileSystem extends FilterFileSystem {
+  private static final String[] traceConfOpts = {"mapred.job.id",
+                                                 "mapred.task.id",
+                                                 "fs.default.name"};
+
+  APITraceFileSystem() throws IOException {
+  }
+
+  APITraceFileSystem(FileSystem fs) throws IOException {
+    super(fs);
+  }
+
+
+  /*
+   * Initialize an API-Trace File System
+   */
+  public void initialize(URI name, Configuration conf) throws IOException {
+    Class<?> clazz = conf.getClass("fs.apitrace.underlyingfs.impl",
+                                   DistributedFileSystem.class);
+    if (clazz == null) {
+      throw new IOException("No FileSystem for fs.apitrace.underlyingfs.impl.");
+    }
+
+    this.fs = (FileSystem)ReflectionUtils.newInstance(clazz, null); 
+    super.initialize(name, conf);
+
+    // trace conf options
+    for (String opt : traceConfOpts) {
+      APITrace.CallEvent ce = new APITrace.CallEvent();
+      ce.logCall(APITrace.COMMENT_msg, null,
+                 new Object[] {opt, conf.get(opt, "")});
+    }
+  }
+
+
+  public FileSystem getRawFileSystem() {
+    // TODO: I'm not sure if this is the correct behavior.
+
+    if (fs instanceof FilterFileSystem) {
+      return ((FilterFileSystem)fs).getRawFileSystem();
+    }
+    return fs;
+  }
+
+
+  // start auto(wrap:FileSystem)
+  public String getName() {
+    APITrace.CallEvent ce;
+    String rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.getName();
+
+    ce.logCall(APITrace.CALL_getName,
+               rv,
+               null);
+    return rv;
+  }
+
+
+  public BlockLocation[] getFileBlockLocations(FileStatus file, long start, 
+                                               long len) throws IOException {
+    APITrace.CallEvent ce;
+    BlockLocation[] rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.getFileBlockLocations(file, start, len);
+
+    ce.logCall(APITrace.CALL_getFileBlockLocations,
+               null,
+               new Object[] {
+                 start,
+                 len});
+    return rv;
+  }
+
+
+  public FSDataInputStream open(Path f, int bufferSize) throws IOException {
+    APITrace.CallEvent ce;
+    FSDataInputStream rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.open(f, bufferSize);
+    rv = new TraceFSDataInputStream(rv, new StreamTracer());
+
+    ce.logCall(APITrace.CALL_open,
+               rv,
+               new Object[] {
+                 f,
+                 bufferSize});
+    return rv;
+  }
+
+
+  public FSDataOutputStream append(Path f, int bufferSize, Progressable progress)
+    throws IOException {
+
+    APITrace.CallEvent ce;
+    FSDataOutputStream rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.append(f, bufferSize, progress);
+    rv = new TraceFSDataOutputStream(rv, new StreamTracer());
+
+    ce.logCall(APITrace.CALL_append,
+               rv,
+               new Object[] {
+                 f,
+                 bufferSize});
+    return rv;
+  }
+
+
+  public FSDataOutputStream create(Path f, FsPermission permission, 
+                                   boolean overwrite, int bufferSize, 
+                                   short replication, long blockSize, 
+                                   Progressable progress) throws IOException {
+    APITrace.CallEvent ce;
+    FSDataOutputStream rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.create(f, permission, overwrite, bufferSize, replication, 
+                      blockSize, progress);
+    rv = new TraceFSDataOutputStream(rv, new StreamTracer());
+
+    ce.logCall(APITrace.CALL_create,
+               rv,
+               new Object[] {
+                 f,
+                 overwrite,
+                 bufferSize,
+                 replication,
+                 blockSize});
+    return rv;
+  }
+
+
+  public FSDataOutputStream create(Path f, FsPermission permission, 
+                                   boolean overwrite, int bufferSize, 
+                                   short replication, long blockSize, 
+                                   int bytesPerChecksum, Progressable progress, 
+                                   boolean forceSync) throws IOException {
+    APITrace.CallEvent ce;
+    FSDataOutputStream rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.create(f, permission, overwrite, bufferSize, replication, 
+                      blockSize, bytesPerChecksum, progress, forceSync);
+    rv = new TraceFSDataOutputStream(rv, new StreamTracer());
+
+    ce.logCall(APITrace.CALL_create1,
+               rv,
+               new Object[] {
+                 f,
+                 overwrite,
+                 bufferSize,
+                 replication,
+                 blockSize,
+                 bytesPerChecksum,
+                 forceSync});
+    return rv;
+  }
+
+
+  @Deprecated public FSDataOutputStream createNonRecursive(Path f, 
+                                                           boolean overwrite, 
+                                                           int bufferSize, 
+                                                           short replication, 
+                                                           long blockSize, 
+                                                           Progressable progress, 
+                                                           boolean forceSync)
+    throws IOException {
+
+    APITrace.CallEvent ce;
+    FSDataOutputStream rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.createNonRecursive(f, overwrite, bufferSize, replication, 
+                                  blockSize, progress, forceSync);
+    rv = new TraceFSDataOutputStream(rv, new StreamTracer());
+
+    ce.logCall(APITrace.CALL_createNonRecursive,
+               rv,
+               new Object[] {
+                 f,
+                 overwrite,
+                 bufferSize,
+                 replication,
+                 blockSize,
+                 forceSync});
+    return rv;
+  }
+
+
+  @Deprecated public FSDataOutputStream createNonRecursive(Path f, 
+                                                           FsPermission permission, 
+                                                           boolean overwrite, 
+                                                           int bufferSize, 
+                                                           short replication, 
+                                                           long blockSize, 
+                                                           Progressable progress, 
+                                                           boolean forceSync, 
+                                                           boolean doParallelWrite)
+    throws IOException {
+
+    APITrace.CallEvent ce;
+    FSDataOutputStream rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.createNonRecursive(f, permission, overwrite, bufferSize, 
+                                  replication, blockSize, progress, 
+                                  forceSync, doParallelWrite);
+    rv = new TraceFSDataOutputStream(rv, new StreamTracer());
+
+    ce.logCall(APITrace.CALL_createNonRecursive1,
+               rv,
+               new Object[] {
+                 f,
+                 overwrite,
+                 bufferSize,
+                 replication,
+                 blockSize,
+                 forceSync,
+                 doParallelWrite});
+    return rv;
+  }
+
+
+  public boolean setReplication(Path src, short replication) throws IOException {
+    APITrace.CallEvent ce;
+    boolean rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.setReplication(src, replication);
+
+    ce.logCall(APITrace.CALL_setReplication,
+               rv,
+               new Object[] {
+                 src,
+                 replication});
+    return rv;
+  }
+
+
+  public boolean hardLink(Path src, Path dst) throws IOException {
+    APITrace.CallEvent ce;
+    boolean rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.hardLink(src, dst);
+
+    ce.logCall(APITrace.CALL_hardLink,
+               rv,
+               new Object[] {
+                 src,
+                 dst});
+    return rv;
+  }
+
+
+  public boolean rename(Path src, Path dst) throws IOException {
+    APITrace.CallEvent ce;
+    boolean rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.rename(src, dst);
+
+    ce.logCall(APITrace.CALL_rename,
+               rv,
+               new Object[] {
+                 src,
+                 dst});
+    return rv;
+  }
+
+
+  public boolean delete(Path f) throws IOException {
+    APITrace.CallEvent ce;
+    boolean rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.delete(f);
+
+    ce.logCall(APITrace.CALL_delete,
+               rv,
+               new Object[] {
+                 f});
+    return rv;
+  }
+
+
+  public boolean delete(Path f, boolean recursive) throws IOException {
+    APITrace.CallEvent ce;
+    boolean rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.delete(f, recursive);
+
+    ce.logCall(APITrace.CALL_delete1,
+               rv,
+               new Object[] {
+                 f,
+                 recursive});
+    return rv;
+  }
+
+
+  public FileStatus[] listStatus(Path f) throws IOException {
+    APITrace.CallEvent ce;
+    FileStatus[] rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.listStatus(f);
+
+    ce.logCall(APITrace.CALL_listStatus,
+               rv,
+               new Object[] {
+                 f});
+    return rv;
+  }
+
+
+  public boolean mkdirs(Path f, FsPermission permission) throws IOException {
+    APITrace.CallEvent ce;
+    boolean rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.mkdirs(f, permission);
+
+    ce.logCall(APITrace.CALL_mkdirs,
+               rv,
+               new Object[] {
+                 f});
+    return rv;
+  }
+
+
+  public OpenFileInfo[] iterativeGetOpenFiles(Path prefix, int millis, 
+                                              String start) throws IOException {
+    APITrace.CallEvent ce;
+    OpenFileInfo[] rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.iterativeGetOpenFiles(prefix, millis, start);
+
+    ce.logCall(APITrace.CALL_iterativeGetOpenFiles,
+               null,
+               new Object[] {
+                 prefix,
+                 millis,
+                 start});
+    return rv;
+  }
+
+
+  public long getUsed() throws IOException{
+    APITrace.CallEvent ce;
+    long rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.getUsed();
+
+    ce.logCall(APITrace.CALL_getUsed,
+               rv,
+               null);
+    return rv;
+  }
+
+
+  public long getDefaultBlockSize() {
+    APITrace.CallEvent ce;
+    long rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.getDefaultBlockSize();
+
+    ce.logCall(APITrace.CALL_getDefaultBlockSize,
+               rv,
+               null);
+    return rv;
+  }
+
+
+  public short getDefaultReplication() {
+    APITrace.CallEvent ce;
+    short rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.getDefaultReplication();
+
+    ce.logCall(APITrace.CALL_getDefaultReplication,
+               rv,
+               null);
+    return rv;
+  }
+
+
+  public ContentSummary getContentSummary(Path f) throws IOException {
+    APITrace.CallEvent ce;
+    ContentSummary rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.getContentSummary(f);
+
+    ce.logCall(APITrace.CALL_getContentSummary,
+               null,
+               new Object[] {
+                 f});
+    return rv;
+  }
+
+
+  public FileStatus getFileStatus(Path f) throws IOException {
+    APITrace.CallEvent ce;
+    FileStatus rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.getFileStatus(f);
+
+    ce.logCall(APITrace.CALL_getFileStatus,
+               rv,
+               new Object[] {
+                 f});
+    return rv;
+  }
+
+
+  public FileChecksum getFileChecksum(Path f) throws IOException {
+    APITrace.CallEvent ce;
+    FileChecksum rv;
+    ce = new APITrace.CallEvent();
+
+    rv = super.getFileChecksum(f);
+
+    ce.logCall(APITrace.CALL_getFileChecksum,
+               null,
+               new Object[] {
+                 f});
+    return rv;
+  }
+
+
+  public void setVerifyChecksum(boolean verifyChecksum) {
+    APITrace.CallEvent ce;
+    ce = new APITrace.CallEvent();
+
+    super.setVerifyChecksum(verifyChecksum);
+
+    ce.logCall(APITrace.CALL_setVerifyChecksum,
+               null,
+               new Object[] {
+                 verifyChecksum});
+  }
+
+
+  public void setOwner(Path p, String username, String groupname)
+    throws IOException {
+
+    APITrace.CallEvent ce;
+    ce = new APITrace.CallEvent();
+
+    super.setOwner(p, username, groupname);
+
+    ce.logCall(APITrace.CALL_setOwner,
+               null,
+               new Object[] {
+                 p,
+                 username,
+                 groupname});
+  }
+
+
+  public void setTimes(Path p, long mtime, long atime) throws IOException {
+    APITrace.CallEvent ce;
+    ce = new APITrace.CallEvent();
+
+    super.setTimes(p, mtime, atime);
+
+    ce.logCall(APITrace.CALL_setTimes,
+               null,
+               new Object[] {
+                 p,
+                 mtime,
+                 atime});
+  }
+
+
+  public void setPermission(Path p, FsPermission permission) throws IOException {
+    APITrace.CallEvent ce;
+    ce = new APITrace.CallEvent();
+
+    super.setPermission(p, permission);
+
+    ce.logCall(APITrace.CALL_setPermission,
+               null,
+               new Object[] {
+                 p});
+  }
+
+
+  // end auto
+
+
+  /*
+   *  Tracer for output streams returned by FileSystem.create().
+   * 
+   *  The underlying file system will return an FSDataOutputStream object upon create.
+   *  Rather than adding log statements to the logic of every FSDataOutputStream implementation we
+   *  might want to trace, we simply return a wrapper around the stream that the underlying FS
+   *  returned.  Our design is guided by three desirable properties for the wrapper:
+   *
+   *  (1) The wrapper must implement the FSDataOutputStream interface (requirement).
+   *  (2) The wrapper should have a relatively simple tracing API (desirable).
+   *  (3) The wrapper should never silently perform I/O without logging,
+   *      even if parent classes support new methods in the future (desirable).
+   *
+   *  In order to satisfy all three constraints, we need to provide two levels of wrappers
+   *  over the object returned by the underlying FS.  In order to satisfy constraint
+   *  (1), we return our own implementation of FSDataOutputStream as the higher-level wrapper.
+   *
+   *  Unfortunately, this wrapper alone is not sufficient as it does not meet requirement (2):
+   *  FSDataOutputStream inherits a broad API from java.io.DataOutputStream (e.g., we would need
+   *  to trace writeBoolean, writeFloat, writeUTF, etc if we traced at this level).  Also,
+   *  simply tracing at the FSDataOutputStream level would violate (3), as DataOutputStreams
+   *  automatically wrap an inner stream, so any new methods added to java.io.DataOutputStream
+   *  would be inherited by our implementation, meaning that I/O might occur without tracing.
+   *  
+   *  In order to satisfy (2) and (3), we use an implementation of java.io.OutputStream as our
+   *  lower-level wrapper.  This level performs all the necessary logging calls.
+   */
+  private static class TraceFSDataOutputStream extends FSDataOutputStream
+    implements TraceableStream {
+
+    private StreamTracer streamTracer;
+
+    private static class TraceFSOutputStream extends OutputStream
+      implements TraceableStream, Syncable {
+
+      private FSDataOutputStream out;
+      private StreamTracer streamTracer;
+
+      TraceFSOutputStream(FSDataOutputStream out, StreamTracer streamTracer) {
+        this.out = out;
+        this.streamTracer = streamTracer;
+      }
+
+      public StreamTracer getStreamTracer() {
+        return streamTracer;
+      }
+
+      // start auto(wrap:FSOutputStream)
+      public void sync() throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        out.sync();
+
+        streamTracer.logCall(ce, APITrace.CALL_sync,
+                             null,
+                             null);
+      }
+
+
+      public void write(int b) throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        out.write(b);
+
+        streamTracer.logIOCall(ce, 1);
+      }
+
+
+      public void write(byte[] b) throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        out.write(b);
+
+        streamTracer.logIOCall(ce, b.length);
+      }
+
+
+      public void write(byte[] b, int off, int len) throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        out.write(b, off, len);
+
+        streamTracer.logIOCall(ce, len);
+      }
+
+
+      public void flush() throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        out.flush();
+
+        streamTracer.logCall(ce, APITrace.CALL_flush,
+                             null,
+                             null);
+      }
+
+
+      public void close() throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        out.close();
+
+        streamTracer.logCall(ce, APITrace.CALL_close2,
+                             null,
+                             null);
+      }
+
+
+      // end auto
+    }
+
+    public TraceFSDataOutputStream(FSDataOutputStream out,
+                                   StreamTracer streamTracer) throws IOException {
+      super(new TraceFSOutputStream(out, streamTracer));
+      this.streamTracer = streamTracer;
+    }
+
+    public StreamTracer getStreamTracer() {
+      return streamTracer;
+    }
+  }
+
+
+
+  /*
+   *  Tracer for input streams returned by FileSystem.open().
+   * 
+   *  The underlying file system will return an FSDataInputStream object upon open.
+   *  Rather than adding log statements to the logic of every FSDataInputStream implementation we
+   *  might want to trace, we simply return a wrapper around the stream that the underlying FS
+   *  returned.  Our design is guided by three desirable properties for the wrapper:
+   *
+   *  (1) The wrapper must implement the FSDataInputStream interface (requirement).
+   *  (2) The wrapper should have a relatively simple tracing API (desirable).
+   *  (3) The wrapper should never silently perform I/O without logging,
+   *      even if parent classes support new methods in the future (desirable).
+   *
+   *  In order to satisfy all three constraints, we need to provide two levels of wrappers
+   *  over the object returned by the underlying FS.  In order to satisfy constraint
+   *  (1), we return our own implementation of FSDataInputStream as the higher-level wrapper.
+   *
+   *  Unfortunately, this wrapper alone is not sufficient as it does not meet requirement (2):
+   *  FSDataInputStream inherits a broad API from java.io.DataInputStream (e.g., we would need
+   *  to trace readBoolean, readFloat, readUTF, etc if we traced at this level).  Also,
+   *  simply tracing at the FSDataInputStream level would violate (3), as DataInputStreams
+   *  automatically wrap an inner stream, so any new methods added to java.io.DataInputStream
+   *  would be inherited by our implementation, meaning that I/O might occur without tracing.
+   *  
+   *  In order to satisfy (2) and (3), we use an implementation of hadoop.fs.FSInputStream as
+   *  our lower-level wrapper.  This level performs all the necessary logging calls.
+   */
+  private static class TraceFSDataInputStream extends FSDataInputStream
+    implements TraceableStream {
+
+    private StreamTracer streamTracer = null;
+
+    private static class TraceFSInputStream extends FSInputStream implements TraceableStream {
+      private FSDataInputStream in;
+      private StreamTracer streamTracer = null;
+
+      TraceFSInputStream(FSDataInputStream in, StreamTracer streamTracer) {
+        this.in = in;
+        this.streamTracer = streamTracer;
+      }
+
+      public StreamTracer getStreamTracer() {
+        return streamTracer;
+      }
+
+      // start auto(wrap:FSInputStream)
+      public void seek(long pos) throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        in.seek(pos);
+
+        streamTracer.logCall(ce, APITrace.CALL_seek,
+                             null,
+                             new Object[] {
+                               pos});
+      }
+
+
+      public long getPos() throws IOException {
+        return in.getPos();
+      }
+
+
+      public boolean seekToNewSource(long targetPos) throws IOException {
+        APITrace.CallEvent ce;
+        boolean rv;
+        ce = new APITrace.CallEvent();
+
+        rv = in.seekToNewSource(targetPos);
+
+        streamTracer.logCall(ce, APITrace.CALL_seekToNewSource,
+                             rv,
+                             new Object[] {
+                               targetPos});
+        return rv;
+      }
+
+
+      public int read(long position, byte[] buffer, int offset, int length)
+        throws IOException {
+
+        APITrace.CallEvent ce;
+        int rv;
+        ce = new APITrace.CallEvent();
+
+        rv = in.read(position, buffer, offset, length);
+
+        streamTracer.logCall(ce, APITrace.CALL_read,
+                             rv,
+                             new Object[] {
+                               position,
+                               offset,
+                               length});
+        return rv;
+      }
+
+
+      public void readFully(long position, byte[] buffer, int offset, int length)
+        throws IOException {
+
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        in.readFully(position, buffer, offset, length);
+
+        streamTracer.logCall(ce, APITrace.CALL_readFully,
+                             null,
+                             new Object[] {
+                               position,
+                               offset,
+                               length});
+      }
+
+
+      public void readFully(long position, byte[] buffer) throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        in.readFully(position, buffer);
+
+        streamTracer.logCall(ce, APITrace.CALL_readFully1,
+                             null,
+                             new Object[] {
+                               position});
+      }
+
+
+      public int read() throws IOException {
+        APITrace.CallEvent ce;
+        int rv;
+        ce = new APITrace.CallEvent();
+
+        rv = in.read();
+
+        if (rv >= 0) {
+          streamTracer.logIOCall(ce, 1);
+        } else {
+          streamTracer.logCall(ce, APITrace.CALL_read1,
+                               rv,
+                               null);
+        }
+        return rv;
+      }
+
+
+      public int read(byte[] b) throws IOException {
+        APITrace.CallEvent ce;
+        int rv;
+        ce = new APITrace.CallEvent();
+
+        rv = in.read(b);
+
+        if (rv >= 0) {
+          streamTracer.logIOCall(ce, rv);
+        } else {
+          streamTracer.logCall(ce, APITrace.CALL_read2,
+                               rv,
+                               null);
+        }
+        return rv;
+      }
+
+
+      public int read(byte[] b, int off, int len) throws IOException {
+        APITrace.CallEvent ce;
+        int rv;
+        ce = new APITrace.CallEvent();
+
+        rv = in.read(b, off, len);
+
+        if (rv >= 0) {
+          streamTracer.logIOCall(ce, rv);
+        } else {
+          streamTracer.logCall(ce, APITrace.CALL_read3,
+                               rv,
+                               new Object[] {
+                                 off,
+                                 len});
+        }
+        return rv;
+      }
+
+
+      public long skip(long n) throws IOException {
+        APITrace.CallEvent ce;
+        long rv;
+        ce = new APITrace.CallEvent();
+
+        rv = in.skip(n);
+
+        streamTracer.logCall(ce, APITrace.CALL_skip,
+                             rv,
+                             new Object[] {
+                               n});
+        return rv;
+      }
+
+
+      public int available() throws IOException {
+        APITrace.CallEvent ce;
+        int rv;
+        ce = new APITrace.CallEvent();
+
+        rv = in.available();
+
+        streamTracer.logCall(ce, APITrace.CALL_available,
+                             rv,
+                             null);
+        return rv;
+      }
+
+
+      public void close() throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        in.close();
+
+        streamTracer.logCall(ce, APITrace.CALL_close1,
+                             null,
+                             null);
+      }
+
+
+      public void mark(int readlimit) {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        in.mark(readlimit);
+
+        streamTracer.logCall(ce, APITrace.CALL_mark,
+                             null,
+                             new Object[] {
+                               readlimit});
+      }
+
+
+      public void reset() throws IOException {
+        APITrace.CallEvent ce;
+        ce = new APITrace.CallEvent();
+
+        in.reset();
+
+        streamTracer.logCall(ce, APITrace.CALL_reset,
+                             null,
+                             null);
+      }
+
+
+      // end auto
+    }
+
+    public TraceFSDataInputStream(FSDataInputStream in,
+                                  StreamTracer streamTracer) throws IOException {
+      super(new TraceFSInputStream(in, streamTracer));
+      this.streamTracer = streamTracer;
+    }
+
+    public StreamTracer getStreamTracer() {
+      return streamTracer;
+    }
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/BlockReader.java b/src/hdfs/org/apache/hadoop/hdfs/BlockReader.java
new file mode 100644
index 00000000..92cbe927
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/BlockReader.java
@@ -0,0 +1,557 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+
+import org.apache.hadoop.fs.FSInputChecker;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
+import org.apache.hadoop.hdfs.protocol.ReadBlockHeader;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.PureJavaCrc32;
+import org.apache.hadoop.hdfs.DFSClient.DataNodeSlowException;
+
+/** This is a wrapper around connection to datadone
+ * and understands checksum, offset etc
+ */
+public class BlockReader extends FSInputChecker {
+
+  private Socket dnSock; //for now just sending checksumOk.
+  private DataInputStream in;
+  protected DataChecksum checksum;
+  protected long lastChunkOffset = -1;
+  protected long lastChunkLen = -1;
+  private long lastSeqNo = -1;
+  private boolean transferBlockSize;
+
+  protected long startOffset;
+  protected long firstChunkOffset;
+  protected int bytesPerChecksum;
+  protected int checksumSize;
+  protected boolean gotEOS = false;
+  
+  protected boolean blkLenInfoUpdated = false;
+  protected boolean isBlockFinalized;
+  protected long updatedBlockLength;
+
+  byte[] skipBuf = null;
+  ByteBuffer checksumBytes = null;
+  int packetLen = 0;
+  int dataLeft = 0;
+  boolean isLastPacket = false;
+  protected long minSpeedBps;
+  protected long bytesRead;
+  protected long timeRead;
+  protected boolean slownessLoged;
+  
+  protected boolean isReadLocal = false;
+  protected boolean isReadRackLocal = false;
+  protected FileSystem.Statistics fsStats = null;
+  
+  private long artificialSlowdown = 0;
+  
+  // It's a temporary flag used for tests
+  public boolean ENABLE_THROW_FOR_SLOW = false;
+
+
+  void setArtificialSlowdown(long period) {
+    artificialSlowdown = period;
+  }
+
+
+  /* FSInputChecker interface */
+
+  /* same interface as inputStream java.io.InputStream#read()
+   * used by DFSInputStream#read()
+   * This violates one rule when there is a checksum error:
+   * "Read should not modify user buffer before successful read"
+   * because it first reads the data to user buffer and then checks
+   * the checksum.
+   */
+  @Override
+  public synchronized int read(byte[] buf, int off, int len)
+                               throws IOException {
+
+    //for the first read, skip the extra bytes at the front.
+    if (lastChunkLen < 0 && startOffset > firstChunkOffset) {
+      // Skip these bytes. But don't call this.skip()!
+      int toSkip = (int)(startOffset - firstChunkOffset);
+      if ( skipBuf == null ) {
+        skipBuf = new byte[bytesPerChecksum];
+      }
+      if ( super.read(skipBuf, 0, toSkip) != toSkip ) {
+        // should never happen
+        throw new IOException("Could not skip required number of bytes");
+      }
+      updateStatsAfterRead(toSkip);
+    }
+
+    boolean eosBefore = gotEOS;
+    int nRead = super.read(buf, off, len);
+    
+    // if gotEOS was set in the previous read and checksum is enabled :
+    if (dnSock != null && gotEOS && !eosBefore && nRead >= 0 && needChecksum()) {
+      //checksum is verified and there are no errors.
+      checksumOk(dnSock);
+    }
+    updateStatsAfterRead(nRead);
+    return nRead;
+  }
+
+  @Override
+  public synchronized long skip(long n) throws IOException {
+    /* How can we make sure we don't throw a ChecksumException, at least
+     * in majority of the cases?. This one throws. */
+    if ( skipBuf == null ) {
+      skipBuf = new byte[bytesPerChecksum];
+    }
+
+    long nSkipped = 0;
+    while ( nSkipped < n ) {
+      int toSkip = (int)Math.min(n-nSkipped, skipBuf.length);
+      int ret = read(skipBuf, 0, toSkip);
+      if ( ret <= 0 ) {
+        return nSkipped;
+      }
+      nSkipped += ret;
+    }
+    return nSkipped;
+  }
+
+  @Override
+  public int read() throws IOException {
+    throw new IOException("read() is not expected to be invoked. " +
+                          "Use read(buf, off, len) instead.");
+  }
+
+  @Override
+  public boolean seekToNewSource(long targetPos) throws IOException {
+    /* Checksum errors are handled outside the BlockReader.
+     * DFSInputStream does not always call 'seekToNewSource'. In the
+     * case of pread(), it just tries a different replica without seeking.
+     */
+    return false;
+  }
+
+  @Override
+  public void seek(long pos) throws IOException {
+    throw new IOException("Seek() is not supported in BlockInputChecker");
+  }
+
+  @Override
+  protected long getChunkPosition(long pos) {
+    throw new RuntimeException("getChunkPosition() is not supported, " +
+                               "since seek is not required");
+  }
+
+  public void setReadLocal(boolean isReadLocal) {
+    this.isReadLocal = isReadLocal;
+    if (isReadLocal) {
+      this.isReadRackLocal = true;
+    }
+  }
+
+  public void setReadRackLocal(boolean isReadSwitchLocal) {
+    this.isReadRackLocal = isReadSwitchLocal;
+  }
+
+  public void setFsStats(FileSystem.Statistics fsStats) {
+    this.fsStats = fsStats;
+  }
+
+  public boolean isBlkLenInfoUpdated() {
+    return blkLenInfoUpdated;
+  }
+
+  public boolean isBlockFinalized() {
+    return isBlockFinalized;
+  }
+
+  public long getUpdatedBlockLength() {
+    return updatedBlockLength;
+  }
+
+  public void resetBlockLenInfo() {
+    blkLenInfoUpdated = false;
+  }
+
+  /**
+   * Makes sure that checksumBytes has enough capacity
+   * and limit is set to the number of checksum bytes needed
+   * to be read.
+   */
+  private void adjustChecksumBytes(int dataLen) {
+    int requiredSize =
+      ((dataLen + bytesPerChecksum - 1)/bytesPerChecksum)*checksumSize;
+    if (checksumBytes == null || requiredSize > checksumBytes.capacity()) {
+      checksumBytes =  ByteBuffer.wrap(new byte[requiredSize]);
+    } else {
+      checksumBytes.clear();
+    }
+    checksumBytes.limit(requiredSize);
+  }
+  
+  /**
+   * Read the block length information from data stream
+   * 
+   * @throws IOException
+   */
+  private synchronized void readBlockSizeInfo() throws IOException {
+    if (!transferBlockSize) {
+      return;
+    }
+    blkLenInfoUpdated = true;
+    isBlockFinalized = in.readBoolean();
+    updatedBlockLength = in.readLong();
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("ifBlockComplete? " + isBlockFinalized + " block size: "
+          + updatedBlockLength);
+    }      
+  }
+
+  @Override
+  protected synchronized int readChunk(long pos, byte[] buf, int offset,
+                                       int len, byte[] checksumBuf)
+                                       throws IOException {
+    // Read one chunk.
+
+    if ( gotEOS ) {
+      if ( startOffset < 0 ) {
+        //This is mainly for debugging. can be removed.
+        throw new IOException( "BlockRead: already got EOS or an error" );
+      }
+      startOffset = -1;
+      return -1;
+    }
+
+    // Read one DATA_CHUNK.
+    long chunkOffset = lastChunkOffset;
+    if ( lastChunkLen > 0 ) {
+      chunkOffset += lastChunkLen;
+    }
+    if ( (pos + firstChunkOffset) != chunkOffset ) {
+      throw new IOException("Mismatch in pos : " + pos + " + " +
+                            firstChunkOffset + " != " + chunkOffset);
+    }
+
+    long startTime = System.currentTimeMillis();
+    // Read next packet if the previous packet has been read completely.
+    if (dataLeft <= 0) {
+      // check read speed
+      // Time only is counted in readChunk() not outside. It is to distinguish
+      // the cases between application to consume data slow or reading from
+      // data-nodes is slow. We don't want to throw exception in the former
+      // case. So the speed measurement here, actually is how much slower
+      // DFSClient reads data from datanodes than application to consume the
+      // data. That's the real slowness case users care about.
+      //
+      if (minSpeedBps > 0) {
+        bytesRead += packetLen;
+        if (bytesRead > DFSClient.NUM_BYTES_CHECK_READ_SPEED) {
+          if (timeRead > 0 && bytesRead * 1000 / timeRead < minSpeedBps) {
+            if (!slownessLoged) {
+              FileSystem.LogForCollect
+                  .info("Too slow when reading block. bytes: " + bytesRead
+                      + " time: " + timeRead + " msec. Path: "
+                      + super.file.getName());
+            }
+            if (this.isReadLocal) {
+              if (!slownessLoged) {
+                LOG.info("Not switch from a local datanode.");
+                slownessLoged = true;
+              }
+            } else if (this.isReadRackLocal) {
+              if (!slownessLoged) {
+                LOG.info("Not switch from a datanode from the same rack.");
+                slownessLoged = true;
+              }
+            } else {
+              if (!ENABLE_THROW_FOR_SLOW) {
+                if (!slownessLoged) {
+                  LOG.info("Won't swtich to another datanode for not disabled.");
+                  slownessLoged = true;
+                                   }
+              } else {
+                throw new DataNodeSlowException(
+                    "Block Reading Speed is too slow");
+              }
+            }
+          }
+          timeRead = 0;
+          bytesRead = 0;
+        }
+      }
+      
+      //Read packet headers.
+      packetLen = in.readInt();
+
+      if (packetLen == 0) {
+        // the end of the stream
+        gotEOS = true;
+        readBlockSizeInfo();
+        return 0;
+      }
+
+      long offsetInBlock = in.readLong();
+      long seqno = in.readLong();
+      boolean lastPacketInBlock = in.readBoolean();
+
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("DFSClient readChunk got seqno " + seqno +
+                  " offsetInBlock " + offsetInBlock +
+                  " lastPacketInBlock " + lastPacketInBlock +
+                  " packetLen " + packetLen);
+      }
+
+      int dataLen = in.readInt();
+
+      // Sanity check the lengths
+      if ( dataLen < 0 ||
+           ( (dataLen % bytesPerChecksum) != 0 && !lastPacketInBlock ) ||
+           (seqno != (lastSeqNo + 1)) ) {
+           throw new IOException("BlockReader: error in packet header" +
+                                 "(chunkOffset : " + chunkOffset +
+                                 ", dataLen : " + dataLen +
+                                 ", seqno : " + seqno +
+                                 " (last: " + lastSeqNo + "))");
+      }
+
+      lastSeqNo = seqno;
+      isLastPacket = lastPacketInBlock;
+      dataLeft = dataLen;
+      adjustChecksumBytes(dataLen);
+      if (dataLen > 0) {
+        IOUtils.readFully(in, checksumBytes.array(), 0,
+                          checksumBytes.limit());
+      }
+    }
+
+    int chunkLen = Math.min(dataLeft, bytesPerChecksum);
+
+    if ( chunkLen > 0 ) {
+      // len should be >= chunkLen
+      IOUtils.readFully(in, buf, offset, chunkLen);
+      checksumBytes.get(checksumBuf, 0, checksumSize);
+
+      // This is used by unit test to trigger race conditions.
+      if (artificialSlowdown != 0) {
+        DFSClient.sleepForUnitTest(artificialSlowdown);
+      }
+    }
+
+    dataLeft -= chunkLen;
+    lastChunkOffset = chunkOffset;
+    lastChunkLen = chunkLen;
+    
+    if (minSpeedBps > 0) {
+      this.timeRead += System.currentTimeMillis() - startTime;
+    }
+
+    if ((dataLeft == 0 && isLastPacket) || chunkLen == 0) {
+      gotEOS = true;
+      int expectZero = in.readInt();
+      assert expectZero == 0;
+      readBlockSizeInfo();
+    }
+    if ( chunkLen == 0 ) {
+      return -1;
+    }
+
+    return chunkLen;
+  }
+  
+  protected void updateStatsAfterRead(int bytesRead) {
+    if (fsStats == null) {
+      return;
+    }
+    if (isReadLocal) {
+      fsStats.incrementLocalBytesRead(bytesRead);
+    }
+    if (isReadRackLocal) {
+      fsStats.incrementRackLocalBytesRead(bytesRead);
+    }
+  }
+
+  private BlockReader( String file, long blockId, DataInputStream in,
+                       DataChecksum checksum, boolean verifyChecksum,
+                       long startOffset, long firstChunkOffset,
+                       Socket dnSock, long minSpeedBps,
+                       long dataTransferVersion ) {
+    super(new Path("/blk_" + blockId + ":of:" + file)/*too non path-like?*/,
+          1, verifyChecksum,
+          checksum.getChecksumSize() > 0? checksum : null,
+          checksum.getBytesPerChecksum(),
+          checksum.getChecksumSize());
+
+    this.dnSock = dnSock;
+    this.in = in;
+    this.checksum = checksum;
+    this.startOffset = Math.max( startOffset, 0 );
+    this.transferBlockSize =
+        (dataTransferVersion >= DataTransferProtocol.SEND_DATA_LEN_VERSION);      
+    this.firstChunkOffset = firstChunkOffset;
+    lastChunkOffset = firstChunkOffset;
+    lastChunkLen = -1;
+
+    bytesPerChecksum = this.checksum.getBytesPerChecksum();
+    checksumSize = this.checksum.getChecksumSize();
+
+    this.bytesRead = 0;
+    this.timeRead = 0;
+    this.minSpeedBps = minSpeedBps;
+    this.slownessLoged = false;
+  }
+
+  /**
+   * Public constructor
+   */
+  BlockReader(Path file, int numRetries) {
+    super(file, numRetries);
+  }
+   
+   protected BlockReader(Path file, int numRetries, DataChecksum checksum, boolean verifyChecksum) {
+     super(file,
+         numRetries,
+         verifyChecksum,
+         checksum.getChecksumSize() > 0? checksum : null, 
+         checksum.getBytesPerChecksum(),
+         checksum.getChecksumSize());       
+   }
+   
+
+  public static BlockReader newBlockReader(int dataTransferVersion,
+      int namespaceId,
+      Socket sock, String file, long blockId,
+      long genStamp, long startOffset, long len, int bufferSize) throws IOException {
+    return newBlockReader(dataTransferVersion, namespaceId,
+        sock, file, blockId, genStamp, startOffset, len, bufferSize,
+        true);
+  }
+
+  /** Java Doc required */
+  public static BlockReader newBlockReader( int dataTransferVersion,
+                                     int namespaceId,
+                                     Socket sock, String file, long blockId,
+                                     long genStamp,
+                                     long startOffset, long len,
+                                     int bufferSize, boolean verifyChecksum)
+                                     throws IOException {
+    return newBlockReader(dataTransferVersion, namespaceId,
+                          sock, file, blockId, genStamp,
+                          startOffset,
+                          len, bufferSize, verifyChecksum, "",
+                          -1);
+  }
+  
+  public static BlockReader newBlockReader( int dataTransferVersion,
+                                     int namespaceId,
+                                     Socket sock, String file,
+                                     long blockId,
+                                     long genStamp,
+                                     long startOffset, long len,
+                                     int bufferSize, boolean verifyChecksum,
+                                     String clientName, long minSpeedBps)
+                                     throws IOException {
+    // in and out will be closed when sock is closed (by the caller)
+    DataOutputStream out = new DataOutputStream(
+      new BufferedOutputStream(NetUtils.getOutputStream(sock,HdfsConstants.WRITE_TIMEOUT)));
+
+    //write the header.
+    ReadBlockHeader readBlockHeader = new ReadBlockHeader(
+        dataTransferVersion, namespaceId, blockId, genStamp, startOffset, len,
+        clientName);
+    readBlockHeader.writeVersionAndOpCode(out);
+    readBlockHeader.write(out);
+    out.flush();
+
+    //
+    // Get bytes in block, set streams
+    //
+
+    DataInputStream in = new DataInputStream(
+        new BufferedInputStream(NetUtils.getInputStream(sock),
+                                bufferSize));
+
+    if ( in.readShort() != DataTransferProtocol.OP_STATUS_SUCCESS ) {
+      throw new IOException("Got error in response to OP_READ_BLOCK " +
+                            "self=" + sock.getLocalSocketAddress() +
+                            ", remote=" + sock.getRemoteSocketAddress() +
+                            " for file " + file +
+                            " for block " + blockId);
+    }
+    DataChecksum checksum = DataChecksum.newDataChecksum( in , new PureJavaCrc32());
+    //Warning when we get CHECKSUM_NULL?
+
+    // Read the first chunk offset.
+    long firstChunkOffset = in.readLong();
+
+    if ( firstChunkOffset < 0 || firstChunkOffset > startOffset ||
+        firstChunkOffset >= (startOffset + checksum.getBytesPerChecksum())) {
+      throw new IOException("BlockReader: error in first chunk offset (" +
+                            firstChunkOffset + ") startOffset is " +
+                            startOffset + " for file " + file);
+    }
+
+    return new BlockReader(file, blockId, in, checksum, verifyChecksum,
+        startOffset, firstChunkOffset, sock, minSpeedBps, dataTransferVersion);
+  }
+
+  @Override
+  public synchronized void close() throws IOException {
+    startOffset = -1;
+    checksum = null;
+    // in will be closed when its Socket is closed.
+  }
+
+  /** kind of like readFully(). Only reads as much as possible.
+   * And allows use of protected readFully().
+   */
+  public int readAll(byte[] buf, int offset, int len) throws IOException {
+    return readFully(this, buf, offset, len);
+  }
+
+  /* When the reader reaches end of a block and there are no checksum
+   * errors, we send OP_STATUS_CHECKSUM_OK to datanode to inform that
+   * checksum was verified and there was no error.
+   */
+  private void checksumOk(Socket sock) {
+    try {
+      OutputStream out = NetUtils.getOutputStream(sock, HdfsConstants.WRITE_TIMEOUT);
+      byte buf[] = { (DataTransferProtocol.OP_STATUS_CHECKSUM_OK >>> 8) & 0xff,
+                     (DataTransferProtocol.OP_STATUS_CHECKSUM_OK) & 0xff };
+      out.write(buf);
+      out.flush();
+    } catch (IOException e) {
+      // its ok not to be able to send this.
+      LOG.debug("Could not write to datanode " + sock.getInetAddress() +
+                ": " + e.getMessage());
+    }
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/BlockReaderAccelerator.java b/src/hdfs/org/apache/hadoop/hdfs/BlockReaderAccelerator.java
index 460f2235..4a9df53b 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/BlockReaderAccelerator.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/BlockReaderAccelerator.java
@@ -40,7 +40,7 @@
 import org.apache.hadoop.security.AccessControlException;
 import org.apache.hadoop.security.UnixUserGroupInformation;
 import org.apache.hadoop.util.*;
-import org.apache.hadoop.hdfs.DFSClient.BlockReader;
+import org.apache.hadoop.hdfs.BlockReader;
 import org.apache.hadoop.hdfs.metrics.DFSClientMetrics;
 
 import org.apache.commons.logging.*;
@@ -133,14 +133,12 @@ public ByteBuffer readAll() throws IOException {
         new BufferedOutputStream(NetUtils.getOutputStream(sock,HdfsConstants.WRITE_TIMEOUT)));
 
     //write the header.
-    out.writeShort(dataTransferVersion);
-    out.write(DataTransferProtocol.OP_READ_BLOCK_ACCELERATOR);
-    out.writeInt(namespaceId);
-    out.writeLong(blk.getBlock().getBlockId());
-    out.writeLong(blk.getBlock().getGenerationStamp());
-    out.writeLong(startOffset);
-    out.writeLong(length);
-    Text.writeString(out, clientName);
+    ReadBlockAccelaratorHeader readBlockAccelaratorHeader =
+        new ReadBlockAccelaratorHeader(dataTransferVersion, namespaceId,
+            blk.getBlock().getBlockId(), blk.getBlock().getGenerationStamp(),
+            startOffset, length, clientName);
+    readBlockAccelaratorHeader.writeVersionAndOpCode(out);
+    readBlockAccelaratorHeader.write(out);
     out.flush();
     if (LOG.isDebugEnabled()) {
       LOG.debug("BlockReaderAccelerator client blkid " + blk.getBlock().getBlockId() +
diff --git a/src/hdfs/org/apache/hadoop/hdfs/BlockReaderLocal.java b/src/hdfs/org/apache/hadoop/hdfs/BlockReaderLocal.java
index def06e98..42c21598 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/BlockReaderLocal.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/BlockReaderLocal.java
@@ -17,47 +17,36 @@
  */
 package org.apache.hadoop.hdfs;
 
-import org.apache.hadoop.io.*;
-import org.apache.hadoop.io.retry.RetryPolicies;
-import org.apache.hadoop.io.retry.RetryPolicy;
-import org.apache.hadoop.io.retry.RetryProxy;
-import org.apache.hadoop.io.nativeio.NativeIO;
-import org.apache.hadoop.fs.*;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.ipc.*;
-import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.net.NodeBase;
-import org.apache.hadoop.conf.*;
-import org.apache.hadoop.hdfs.DistributedFileSystem.DiskStatus;
-import org.apache.hadoop.hdfs.protocol.*;
-import org.apache.hadoop.hdfs.server.common.HdfsConstants;
-import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.ChecksumException;
+import org.apache.hadoop.fs.FSInputChecker;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.metrics.DFSClientMetrics;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.BlockPathInfo;
+import org.apache.hadoop.hdfs.protocol.ClientDatanodeProtocol;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.server.datanode.BlockMetadataHeader;
-import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.datanode.BlockWithChecksumFileReader;
 import org.apache.hadoop.hdfs.server.datanode.FSDataset;
-import org.apache.hadoop.hdfs.server.namenode.NameNode;
-import org.apache.hadoop.hdfs.server.namenode.NotReplicatedYetException;
-import org.apache.hadoop.security.AccessControlException;
-import org.apache.hadoop.security.UnixUserGroupInformation;
-import org.apache.hadoop.util.*;
-import org.apache.hadoop.hdfs.DFSClient.BlockReader;
-import org.apache.hadoop.hdfs.metrics.DFSClientMetrics;
-
-import org.apache.commons.logging.*;
+import org.apache.hadoop.io.nativeio.NativeIO;
+import org.apache.hadoop.ipc.ProtocolProxy;
+import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.LRUCache;
+import org.apache.hadoop.util.PureJavaCrc32;
+import org.apache.hadoop.hdfs.BlockReader;
 
 import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.zip.CRC32;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.ConcurrentHashMap;
-import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
+import java.util.Arrays;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
-import javax.net.SocketFactory;
-import javax.security.auth.login.LoginException;
 
 /** This is a local block reader. if the DFS client is on
  * the same machine as the datanode, then the client can read
@@ -65,49 +54,152 @@
  * thorugh the datanode. This improves performance dramatically.
  */
 public class BlockReaderLocal extends BlockReader {
-
+  
   public static final Log LOG = LogFactory.getLog(DFSClient.class);
+  public static final Object lock = new Object();
+
+  static final class LocalBlockKey {
+    private int namespaceid;
+    private Block block;
+
+    LocalBlockKey(int namespaceid, Block block) {
+      this.namespaceid = namespaceid;
+      this.block = block;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+
+      if (!(o instanceof LocalBlockKey)) {
+        return false;
+      }
+
+      LocalBlockKey that = (LocalBlockKey) o;
+      return this.namespaceid == that.namespaceid &&
+          this.block.equals(that.block);
+    }
 
-  private Configuration conf;
+    @Override
+    public int hashCode() {
+      return 31 * namespaceid + block.hashCode();
+    }
+
+    @Override
+    public String toString() {
+      return namespaceid + ":" + block.toString();
+    }
+  }
+
+  private static final LRUCache<LocalBlockKey, BlockPathInfo> cache =
+      new LRUCache<LocalBlockKey, BlockPathInfo>(10000);
+
+  private static class LocalDatanodeInfo {
+    private volatile ProtocolProxy<ClientDatanodeProtocol> datanode;
+    private boolean namespaceIdSupported;
+
+    LocalDatanodeInfo() {
+    }
+
+    public BlockPathInfo getOrComputePathInfo(
+        int namespaceid,
+        Block block,
+        DatanodeInfo node,
+        Configuration conf
+    ) throws IOException {
+      LocalBlockKey blockKey = new LocalBlockKey(namespaceid, block);
+      BlockPathInfo pathinfo = cache.get(blockKey);
+      if (pathinfo != null) {
+        return pathinfo;
+      }
+      // make RPC to local datanode to find local pathnames of blocks
+      ClientDatanodeProtocol proxy = getDatanodeProxy(node, conf);
+      try {
+        if (namespaceIdSupported) {
+          pathinfo = proxy.getBlockPathInfo(namespaceid, block);
+        } else {
+          pathinfo =  proxy.getBlockPathInfo(block);
+        }
+        if (pathinfo != null) {
+          if (LOG.isDebugEnabled()) {
+            LOG.debug("Cached location of block " + blockKey + " as " +
+                pathinfo);
+          }
+          setBlockLocalPathInfo(blockKey, pathinfo);
+        }
+
+      } catch (IOException ioe) {
+        datanode = null;
+        RPC.stopProxy(proxy);
+        throw ioe;
+      }
+      return pathinfo;
+    }
+
+    private synchronized ClientDatanodeProtocol getDatanodeProxy(
+        DatanodeInfo node, Configuration conf
+    ) throws IOException{
+
+      if (datanode == null) {
+        datanode = DFSClient.createClientDNProtocolProxy(node, conf, 0);
+        this.namespaceIdSupported = datanode.isMethodSupported(
+            "getBlockPathInfo", int.class, Block.class
+        );
+      }
+      return datanode.getProxy();
+    }
+
+    private void setBlockLocalPathInfo(LocalBlockKey b, BlockPathInfo info) {
+      cache.put(b, info);
+    }
+
+    private void removeBlockLocalPathInfo(int namespaceid, Block block) {
+      cache.remove(new LocalBlockKey(namespaceid, block));
+    }
+  }
+  
+  private static int BYTE_BUFFER_LENGTH = 4 * 1024;
+  private ByteBuffer byteBuffer = null;
+  private ByteBuffer checksumBuffer = null;
+  
   private long length;
-  private BlockPathInfo pathinfo;
-  private FileInputStream dataIn;  // reader for the data file
-  private FileInputStream checksumIn;
+  private final FileChannel dataFileChannel;  // reader for the data file
+  private final FileDescriptor dataFileDescriptor;
+  private FileChannel checksumFileChannel;
   private boolean clearOsBuffer;
+  private boolean positionalReadMode;
   private DFSClientMetrics metrics;
-  
-  static private volatile ProtocolProxy<ClientDatanodeProtocol> datanode;
-  static private final LRUCache<Block, BlockPathInfo> cache = 
-    new LRUCache<Block, BlockPathInfo>(10000);
+
   static private final Path src = new Path("/BlockReaderLocal:localfile");
-  
+
   /**
    * The only way this object can be instantiated.
    */
-  public static BlockReaderLocal newBlockReader(Configuration conf,
-    String file, int namespaceid, Block blk, DatanodeInfo node, 
-    long startOffset, long length,
-    DFSClientMetrics metrics, boolean verifyChecksum,
-    boolean clearOsBuffer) throws IOException {
-    // check in cache first
-    BlockPathInfo pathinfo = cache.get(blk);
-
-    if (pathinfo == null) {
-      // cache the connection to the local data for eternity.
-      if (datanode == null) {
-        datanode = DFSClient.createClientDNProtocolProxy(node, conf, 0);
-      }
-      // make RPC to local datanode to find local pathnames of blocks
-      if (datanode.isMethodSupported("getBlockPathInfo", int.class, Block.class)) {
-        pathinfo = datanode.getProxy().getBlockPathInfo(namespaceid, blk);
-      } else {
-        pathinfo = datanode.getProxy().getBlockPathInfo(blk);
-      }
-      if (pathinfo != null) {
-        cache.put(blk, pathinfo);
-      }
+  public static BlockReaderLocal newBlockReader(
+      Configuration conf,
+      String file,
+      int namespaceid,
+      Block blk,
+      DatanodeInfo node,
+      long startOffset,
+      long length,
+      DFSClientMetrics metrics,
+      boolean verifyChecksum,
+      boolean clearOsBuffer,
+      boolean positionalReadMode) throws IOException {
+
+    LocalDatanodeInfo localDatanodeInfo = getLocalDatanodeInfo(node);
+
+    BlockPathInfo pathinfo = localDatanodeInfo.getOrComputePathInfo(namespaceid,
+        blk, node, conf);
+    if (pathinfo.getMetaPath().equals("")) {
+      // TODO: support inline checksum files.
+      LOG.warn("Fail to read block " + blk + " using short circuit.");
+      return null;
     }
-    
+
     // check to see if the file exists. It may so happen that the
     // HDFS file has been deleted and this block-lookup is occuring
     // on behalf of a new HDFS file. This time, the block file could
@@ -117,109 +209,150 @@ public static BlockReaderLocal newBlockReader(Configuration conf,
     try {
 
       // get a local file system
+      FileChannel dataFileChannel;
+      FileDescriptor dataFileDescriptor;
       File blkfile = new File(pathinfo.getBlockPath());
-      FileInputStream dataIn = new FileInputStream(blkfile);
+      FileInputStream fis = new FileInputStream(blkfile);
+      dataFileChannel = fis.getChannel();
+      dataFileDescriptor = fis.getFD();
       
       if (LOG.isDebugEnabled()) {
         LOG.debug("New BlockReaderLocal for file " +
-                  blkfile + " of size " + blkfile.length() +
+            pathinfo.getBlockPath() + " of size " + blkfile.length() +
                   " startOffset " + startOffset +
                   " length " + length);
       }
 
       if (verifyChecksum) {
-      
+
         // get the metadata file
         File metafile = new File(pathinfo.getMetaPath());
         FileInputStream checksumIn = new FileInputStream(metafile);
-    
+
         // read and handle the common header here. For now just a version
-        BlockMetadataHeader header = BlockMetadataHeader.readHeader(new DataInputStream(checksumIn), new PureJavaCrc32());
+        BlockMetadataHeader header = BlockMetadataHeader.readHeader(
+            new DataInputStream(checksumIn), new PureJavaCrc32());
         short version = header.getVersion();
-      
-        if (version != FSDataset.METADATA_VERSION) {
+
+        if (version != FSDataset.FORMAT_VERSION_NON_INLINECHECKSUM) {
           LOG.warn("Wrong version (" + version + ") for metadata file for "
               + blk + " ignoring ...");
         }
         DataChecksum checksum = header.getChecksum();
 
         return new BlockReaderLocal(conf, file, blk, startOffset, length,
-            pathinfo, metrics, checksum, verifyChecksum, dataIn, checksumIn,
-            clearOsBuffer);
+            pathinfo, metrics, checksum, verifyChecksum, dataFileChannel,
+            dataFileDescriptor, checksumIn.getChannel(), clearOsBuffer,
+            positionalReadMode);
       }
       else {
         return new BlockReaderLocal(conf, file, blk, startOffset, length,
-            pathinfo, metrics, dataIn, clearOsBuffer);
+            pathinfo, metrics, dataFileChannel, dataFileDescriptor,
+            clearOsBuffer, positionalReadMode);
       }
-      
+
     } catch (FileNotFoundException e) {
-      cache.remove(blk);    // remove from cache
+      localDatanodeInfo.removeBlockLocalPathInfo(namespaceid, blk);
       DFSClient.LOG.warn("BlockReaderLoca: Removing " + blk +
-                         " from cache because local file " +
-                         pathinfo.getBlockPath() + 
-                         " could not be opened.");
+          " from cache because local file " +
+          pathinfo.getBlockPath() +
+          " could not be opened.");
       throw e;
     }
   }
 
+  // ipc port to LocalDatanodeInfo mapping to properly handles the
+  // case of multiple data nodes running on a local machine
+  private static ConcurrentMap<Integer, LocalDatanodeInfo>
+      ipcPortToLocalDatanodeInfo =
+      new ConcurrentHashMap<Integer, LocalDatanodeInfo>();
+
+  private static LocalDatanodeInfo getLocalDatanodeInfo(DatanodeInfo node) {
+    LocalDatanodeInfo ldInfo = ipcPortToLocalDatanodeInfo.get(
+        node.getIpcPort());
+
+    if (ldInfo == null) {
+      LocalDatanodeInfo miss = new LocalDatanodeInfo();
+      ldInfo = ipcPortToLocalDatanodeInfo.putIfAbsent(node.getIpcPort(), miss);
+      if(ldInfo == null) {
+        ldInfo = miss;
+      }
+    }
+    return ldInfo;
+  }
+
   private BlockReaderLocal(Configuration conf, String hdfsfile, Block block,      
                           long startOffset, long length,
                           BlockPathInfo pathinfo, DFSClientMetrics metrics,
-                          FileInputStream dataIn, boolean clearOsBuffer)
+                          FileChannel dataFileChannel, FileDescriptor dataFileDescriptor,
+                          boolean clearOsBuffer, boolean positionalReadMode)
                           throws IOException {
     super(
         src, // dummy path, avoid constructing a Path object dynamically
         1);
-    
-    this.pathinfo = pathinfo;
+
     this.startOffset = startOffset;
     this.length = length;    
     this.metrics = metrics;
-    this.dataIn = dataIn;
-    this.clearOsBuffer = clearOsBuffer;
-    
-    dataIn.skip(startOffset);
+    this.dataFileChannel = dataFileChannel;
+    this.dataFileDescriptor = dataFileDescriptor;
+    this.clearOsBuffer = clearOsBuffer;   
+    this.positionalReadMode = positionalReadMode;
+    if (!positionalReadMode) {
+      this.dataFileChannel.position(startOffset);
+    }
   }
   
   private BlockReaderLocal(Configuration conf, String hdfsfile, Block block,      
                           long startOffset, long length,
                           BlockPathInfo pathinfo, DFSClientMetrics metrics,
                           DataChecksum checksum, boolean verifyChecksum,
-                          FileInputStream dataIn, FileInputStream checksumIn,
-                          boolean clearOsBuffer)
+                          FileChannel dataFileChannel, FileDescriptor dataFileDescriptor,
+                          FileChannel checksumFileChannel, boolean clearOsBuffer,
+                          boolean positionalReadMode)
                           throws IOException {
     super(
         src, // dummy path, avoid constructing a Path object dynamically
-        1, 
+        1,
         checksum,
         verifyChecksum);
 
-    this.pathinfo = pathinfo;
     this.startOffset = startOffset;
-    this.length = length;    
+    this.length = length;
     this.metrics = metrics;
     
-    this.dataIn = dataIn;
-    this.checksumIn = checksumIn;
+    this.dataFileChannel = dataFileChannel;
+    this.dataFileDescriptor = dataFileDescriptor;
+    this.checksumFileChannel = checksumFileChannel;
+    if (verifyChecksum) {
+      checksumBuffer = ByteBuffer.allocate(checksum.getChecksumSize());
+    }
     this.checksum = checksum;
     this.clearOsBuffer = clearOsBuffer;
-    
+    this.positionalReadMode = positionalReadMode;
+
     long blockLength = pathinfo.getNumBytes();
-       
+
     /* If bytesPerChecksum is very large, then the metadata file
-     * is mostly corrupted. For now just truncate bytesPerchecksum to
-     * blockLength.
-     */        
+    * is mostly corrupted. For now just truncate bytesPerchecksum to
+    * blockLength.
+    */
     bytesPerChecksum = checksum.getBytesPerChecksum();
     if (bytesPerChecksum > 10*1024*1024 && bytesPerChecksum > blockLength){
       checksum = DataChecksum.newDataChecksum(checksum.getChecksumType(),
-                                 Math.max((int)blockLength, 10*1024*1024),
-                              new PureJavaCrc32());
-      bytesPerChecksum = checksum.getBytesPerChecksum();        
+          Math.max((int)blockLength, 10*1024*1024),
+          new PureJavaCrc32());
+      bytesPerChecksum = checksum.getBytesPerChecksum();
     }
 
     checksumSize = checksum.getChecksumSize();
     
+    if (positionalReadMode) {
+      // We don't need to set initial offsets of the file if
+      // the reader is for positional reads.
+      return;
+    }
+
     // if the requested size exceeds the currently known length of the file
     // then check the blockFile to see if its length has grown. This can
     // occur if the file is being concurrently written to while it is being
@@ -230,10 +363,10 @@ private BlockReaderLocal(Configuration conf, String hdfsfile, Block block,
       File blkFile = new File(pathinfo.getBlockPath());
       long newlength = blkFile.length();
       LOG.warn("BlockReaderLocal found short block " + blkFile +
-               " requested offset " +
-               startOffset + " length " + length +
-               " but known size of block is " + blockLength +
-               ", size on disk is " + newlength);
+          " requested offset " +
+          startOffset + " length " + length +
+          " but known size of block is " + blockLength +
+          ", size on disk is " + newlength);
       if (newlength > blockLength) {
         blockLength = newlength;
         pathinfo.setNumBytes(newlength);
@@ -243,13 +376,13 @@ private BlockReaderLocal(Configuration conf, String hdfsfile, Block block,
     if (startOffset < 0 || startOffset > endOffset
         || (length + startOffset) > endOffset) {
       String msg = " Offset " + startOffset + " and length " + length
-      + " don't match block " + block + " ( blockLen " + endOffset + " )";
+          + " don't match block " + block + " ( blockLen " + endOffset + " )";
       LOG.warn("BlockReaderLocal requested with incorrect offset: " + msg);
       throw new IOException(msg);
     }
-   
+
     firstChunkOffset = (startOffset - (startOffset % bytesPerChecksum));
-      
+
     if (length >= 0) {
       // Make sure endOffset points to end of a checksumed chunk.
       long tmpLen = startOffset + length;
@@ -263,29 +396,58 @@ private BlockReaderLocal(Configuration conf, String hdfsfile, Block block,
 
     // seek to the right offsets
     if (firstChunkOffset > 0) {
-      dataIn.getChannel().position(firstChunkOffset);
+      dataFileChannel.position(firstChunkOffset);
       
       long checksumSkip = (firstChunkOffset / bytesPerChecksum) * checksumSize;
       // note blockInStream is  seeked when created below
       if (checksumSkip > 0) {
-        checksumIn.skip(checksumSkip);
+        checksumFileChannel.position(checksumSkip + checksumFileChannel.position());
       }
     }
 
     lastChunkOffset = firstChunkOffset;
     lastChunkLen = -1;
   }
+
+  private int readChannel(ByteBuffer bb) throws IOException {
+      return dataFileChannel.read(bb);
+  }
+  
+  private int readStream(byte[] buf, int off, int len) throws IOException {
+    if (positionalReadMode) {
+      throw new IOException(
+          "Try to do sequential read using a block reader for positional read.");
+    }
+
+    // If no more than 4KB is read, we first write to an internal
+    // byte array and execute a mem copy to user buffer. Otherwise,
+    // we create a byte buffer wrapping the user array.
+    //
+    if (len <= BYTE_BUFFER_LENGTH) {
+      if (byteBuffer == null) {
+        byteBuffer = ByteBuffer.allocate(BYTE_BUFFER_LENGTH);
+      }
+      byteBuffer.clear();
+      byteBuffer.limit(len);
+      int retValue = readChannel(byteBuffer);
+      byteBuffer.flip();
+      byteBuffer.get(buf, off, retValue);
+      return retValue;
+    } else {
+      return readChannel(ByteBuffer.wrap(buf, off, len));
+    }
+  }
   
   @Override
   public synchronized int read(byte[] buf, int off, int len)
-                           throws IOException {    
+      throws IOException {
     if (LOG.isDebugEnabled()) {
       LOG.debug("BlockChecksumFileSystem read off " + off + " len " + len);
-    }   
+    }
     metrics.readsFromLocalFile.inc();
     int byteRead;
     if (checksum == null) {
-      byteRead = dataIn.read(buf, off, len);
+      byteRead = readStream(buf, off, len);
       updateStatsAfterRead(byteRead);
     }
     else {
@@ -293,25 +455,126 @@ public synchronized int read(byte[] buf, int off, int len)
     }
     if (clearOsBuffer) {
       // drop all pages from the OS buffer cache
-      NativeIO.posixFadviseIfPossible(dataIn.getFD(), off, len, 
+      NativeIO.posixFadviseIfPossible(dataFileDescriptor, off, len, 
                                       NativeIO.POSIX_FADV_DONTNEED);
     }
     return byteRead;
   }
   
+  public synchronized int read(long pos, byte[] buf, int off, int len)
+      throws IOException {
+    if (!positionalReadMode) {
+      throw new IOException(
+          "Try to do positional read using a block reader forsequantial read.");
+    }
+
+    if (checksum == null) {
+      try {
+        dataFileChannel.position(pos);
+        // One extra object creation is made here. However, since pread()'s
+        // length tends to be 30K or larger, usually we are comfortable
+        // with the costs.
+        //
+        return readChannel(ByteBuffer.wrap(buf, off, len));
+      } catch (IOException ioe) {
+        LOG.warn("Block local read exceptoin", ioe);
+        throw ioe;
+      }
+    } else {
+      long extraBytesHead = pos % bytesPerChecksum;
+      int numChunks = (int)((extraBytesHead + len - 1) / bytesPerChecksum) + 1;
+      ByteBuffer bbData = ByteBuffer.allocate(numChunks * bytesPerChecksum);
+      ByteBuffer bbChecksum = ByteBuffer.allocate(numChunks * checksumSize);
+      int bytesLastChunk;
+      byte[] dataBuffer, checksumBuffer;
+      int remain;
+      int dataRead;
+      int chunksRead;
+      
+      // read data
+      dataFileChannel.position(pos - extraBytesHead);
+      
+      remain = numChunks * bytesPerChecksum;
+      dataRead = 0;
+      do {
+        int actualRead = dataFileChannel.read(bbData);
+        if (actualRead == -1) {
+          // the end of the stream
+          break;
+        }
+        remain -= actualRead;
+        dataRead += actualRead;
+      } while (remain > 0);
+
+      // calculate the real data read
+      bytesLastChunk = dataRead % bytesPerChecksum;
+      chunksRead = dataRead / bytesPerChecksum;
+      if (bytesLastChunk == 0) {
+        bytesLastChunk = bytesPerChecksum;
+      } else {
+        chunksRead++;
+      }
+
+      bbData.flip();
+      dataBuffer = bbData.array();
+      
+      // read checksum
+      checksumFileChannel.position(BlockMetadataHeader.getHeaderSize()
+          + (pos - extraBytesHead) / bytesPerChecksum * checksumSize);
+      remain = chunksRead * checksumSize;
+      do {  
+        int checksumRead = checksumFileChannel.read(bbChecksum);
+        if (checksumRead < 0) {
+          throw new IOException("Meta file seems to be shorter than expected");
+        }
+        remain -= checksumRead;
+      } while (remain > 0);
+      bbChecksum.flip();
+      checksumBuffer = bbChecksum.array();
+      
+      // Verify checksum
+      for (int i = 0; i < chunksRead; i++) {
+        int bytesCheck = (i == chunksRead - 1) ? bytesLastChunk
+            : bytesPerChecksum;
+        checksum.reset();
+        checksum.update(dataBuffer, i * bytesPerChecksum, bytesCheck);
+        if (FSInputChecker.checksum2long(checksumBuffer, i * checksumSize,
+            checksumSize) != checksum.getValue()) {
+          throw new ChecksumException("Checksum doesn't match", i
+              * bytesPerChecksum);
+        }
+      }
+      
+      // copy to destination buffer and return
+      int bytesRead = Math.min(dataRead - (int) extraBytesHead, len);
+      System.arraycopy(dataBuffer, (int)extraBytesHead, buf, off, bytesRead);
+      
+      return bytesRead;
+    }
+  }
+  
   @Override
   public synchronized long skip(long n) throws IOException {
     if (LOG.isDebugEnabled()) {
       LOG.debug("BlockChecksumFileSystem skip " + n);
     }
     if (checksum == null) {
-      return dataIn.skip(n);
+      long currentPos = dataFileChannel.position();
+      long fileSize = dataFileChannel.size();
+      long newPos = currentPos + n;
+      long skipped = n;
+      if (newPos > fileSize) {
+        skipped = fileSize - currentPos;
+        newPos = fileSize;
+      }
+      dataFileChannel.position(newPos);
+      return skipped;
     }
     else {
       return super.skip(n);
     }
   }
-  
+
   @Override
   public synchronized void seek(long n) throws IOException {
     if (LOG.isDebugEnabled()) {
@@ -323,7 +586,7 @@ public synchronized void seek(long n) throws IOException {
   @Override
   protected synchronized int readChunk(long pos, byte[] buf, int offset,
                                        int len, byte[] checksumBuf)
-                                       throws IOException {
+      throws IOException {
     if (LOG.isDebugEnabled()) {
       LOG.debug("Reading chunk from position " + pos + " at offset " +
           offset + " with length " + len);
@@ -339,35 +602,39 @@ protected synchronized int readChunk(long pos, byte[] buf, int offset,
     }
 
     if (checksumBuf.length != checksumSize) {
-      throw new IOException("Cannot read checksum into provided buffer. The buffer must be exactly '" +
+      throw new IOException("Cannot read checksum into provided buffer. " +
+          "The buffer must be exactly '" +
           checksumSize + "' bytes long to hold the checksum bytes.");
     }
-    
+
     if ( (pos + firstChunkOffset) != lastChunkOffset ) {
-      throw new IOException("Mismatch in pos : " + pos + " + " + 
-                            firstChunkOffset + " != " + lastChunkOffset);
+      throw new IOException("Mismatch in pos : " + pos + " + " +
+          firstChunkOffset + " != " + lastChunkOffset);
     }
     
-    int nRead = dataIn.read(buf, offset, bytesPerChecksum);
+    int nRead = readStream(buf, offset, bytesPerChecksum);
     if (nRead < bytesPerChecksum) {
       gotEOS = true;
-      
+
     }
-    
+
     lastChunkOffset += nRead;
     lastChunkLen = nRead;
-    
+
     // If verifyChecksum is false, we omit reading the checksum
-    if (checksumIn != null) {
-      int nChecksumRead = checksumIn.read(checksumBuf);
-      
+    if (checksumFileChannel != null) {
+      checksumBuffer.clear();
+      int nChecksumRead = checksumFileChannel.read(checksumBuffer);
+      checksumBuffer.flip();
+      checksumBuffer.get(checksumBuf, 0, checksumBuf.length);
+
       if (nChecksumRead != checksumSize) {
-        throw new IOException("Could not read checksum at offset " + 
-            checksumIn.getChannel().position() + " from the meta file.");      
+        throw new IOException("Could not read checksum at offset " +
+            checksumFileChannel.position() + " from the meta file.");
       }
     }
-       
-    return nRead;    
+
+    return nRead;
   }
 
   /**
@@ -377,7 +644,7 @@ protected synchronized int readChunk(long pos, byte[] buf, int offset,
    * currently invoked only by the FSDataInputStream ScatterGather api.
    */
   public ByteBuffer readAll() throws IOException {
-    MappedByteBuffer bb = dataIn.getChannel().map(FileChannel.MapMode.READ_ONLY,
+    MappedByteBuffer bb = dataFileChannel.map(FileChannel.MapMode.READ_ONLY,
                                  startOffset, length);
     return bb;  
   }
@@ -387,10 +654,10 @@ public synchronized void close() throws IOException {
     if (LOG.isDebugEnabled()) {
       LOG.debug("BlockChecksumFileSystem close");
     }
-    dataIn.close();
-    if (checksumIn != null) {
-      checksumIn.close();
+    dataFileChannel.close();
+    if (checksumFileChannel != null) {
+      checksumFileChannel.close();
     }
-  }  
+  }
 }
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java b/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
index 3d67481f..16fcad90 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.hdfs;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -27,24 +26,16 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
 import java.util.AbstractMap;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Random;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
-import java.util.zip.CRC32;
 
 import javax.net.SocketFactory;
 import javax.security.auth.login.LoginException;
@@ -53,14 +44,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockLocation;
-import org.apache.hadoop.fs.BlockMissingException;
-import org.apache.hadoop.fs.ChecksumException;
 import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FSInputChecker;
-import org.apache.hadoop.fs.FSInputStream;
-import org.apache.hadoop.fs.FSOutputSummer;
-import org.apache.hadoop.fs.FileAlreadyExistsException;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.OpenFileInfo;
@@ -68,12 +53,12 @@
 import org.apache.hadoop.fs.MD5MD5CRC32FileChecksum;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RemoteIterator;
-import org.apache.hadoop.fs.Syncable;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdfs.DistributedFileSystem.DiskStatus;
 import org.apache.hadoop.hdfs.metrics.DFSClientMetrics;
 import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
 import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.BlockChecksumHeader;
 import org.apache.hadoop.hdfs.protocol.ClientDatanodeProtocol;
 import org.apache.hadoop.hdfs.protocol.ClientProtocol;
 import org.apache.hadoop.hdfs.protocol.CorruptFileBlocks;
@@ -91,21 +76,15 @@
 import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
 import org.apache.hadoop.hdfs.protocol.LocatedDirectoryListing;
 import org.apache.hadoop.hdfs.protocol.NSQuotaExceededException;
-import org.apache.hadoop.hdfs.protocol.ReadBlockHeader;
-import org.apache.hadoop.hdfs.protocol.WriteBlockHeader;
 import org.apache.hadoop.hdfs.protocol.ProtocolCompatible;
-import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlock;
-import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlocks;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.namenode.LeaseExpiredException;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
-import org.apache.hadoop.hdfs.server.namenode.NotReplicatedYetException;
 import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.MD5Hash;
-import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.retry.RetryPolicies;
 import org.apache.hadoop.io.retry.RetryPolicy;
 import org.apache.hadoop.io.retry.RetryProxy;
@@ -120,9 +99,7 @@
 import org.apache.hadoop.security.UnixUserGroupInformation;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.Daemon;
-import org.apache.hadoop.util.DataChecksum;
 import org.apache.hadoop.util.Progressable;
-import org.apache.hadoop.util.PureJavaCrc32;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.StringUtils;
 
@@ -140,9 +117,9 @@
 public class DFSClient implements FSConstants, java.io.Closeable {
   public static final Log LOG = LogFactory.getLog(DFSClient.class);
   public static final int MAX_BLOCK_ACQUIRE_FAILURES = 3;
-  private static final int TCP_WINDOW_SIZE = 128 * 1024; // 128 KB
-  private static final long NUM_BYTES_CHECK_READ_SPEED = 128 * 1024;
-  private static byte[] emptyByteArray = new byte[0];
+  static final int TCP_WINDOW_SIZE = 128 * 1024; // 128 KB
+  static final long NUM_BYTES_CHECK_READ_SPEED = 128 * 1024;
+  static byte[] emptyByteArray = new byte[0];
   
   public ClientProtocol namenode;
   private ClientProtocol rpcNamenode;
@@ -154,32 +131,33 @@ public class DFSClient implements FSConstants, java.io.Closeable {
   static Random r = new Random();
   final String clientName;
   final LeaseChecker leasechecker;
-  private Configuration conf;
-  private long defaultBlockSize;
+  Configuration conf;
+  long defaultBlockSize;
   private short defaultReplication;
-  private SocketFactory socketFactory;
-  private int socketTimeout;
-  private int socketReadExtentionTimeout;
-  private int datanodeWriteTimeout;
-  private int datanodeWriteExtentionTimeout;
-  private int timeoutValue;  // read timeout for the socket
+  SocketFactory socketFactory;
+  int socketTimeout;
+  int socketReadExtentionTimeout;
+  int datanodeWriteTimeout;
+  int datanodeWriteExtentionTimeout;
+  int timeoutValue;  // read timeout for the socket
   final int writePacketSize;
   final long minReadSpeedBps;
-  private final FileSystem.Statistics stats;
-  private int maxBlockAcquireFailures;
-  private final int hdfsTimeout;    // timeout value for a DFS operation.
+  final FileSystem.Statistics stats;
+  int maxBlockAcquireFailures;
+  final int hdfsTimeout;    // timeout value for a DFS operation.
   // The amount of time to wait before aborting a close file.
   private final long closeFileTimeout;
   private long namenodeVersion = ClientProtocol.versionID;
-  private DFSClientMetrics metrics = new DFSClientMetrics();
+  DFSClientMetrics metrics;
   protected Integer dataTransferVersion = -1;
-  private boolean shortCircuitLocalReads = false;
-  private final InetAddress localHost;
+  boolean shortCircuitLocalReads = false;
+  boolean shortcircuitDisableWhenFail = true;
+  final InetAddress localHost;
   private InetSocketAddress nameNodeAddr;
   private DatanodeInfo pseuDatanodeInfoForLocalhost;
   private String localhostNetworkLocation = null;
   DNSToSwitchMapping dnsToSwitchMapping = null;
-  private int ipTosValue = NetUtils.NOT_SET_IP_TOS;
+  int ipTosValue = NetUtils.NOT_SET_IP_TOS;
 
   /**
    * This variable tracks the number of failures for each thread of 
@@ -194,7 +172,7 @@ public class DFSClient implements FSConstants, java.io.Closeable {
    * capped at maxBlockAcquireFailures
    * 
    */
-  private static ThreadLocal<Integer> dfsInputStreamfailures = 
+  static ThreadLocal<Integer> dfsInputStreamfailures = 
     new ThreadLocal<Integer>();
 
   /**
@@ -209,7 +187,7 @@ public static ClientProtocol createNamenode( InetSocketAddress nameNodeAddr,
       Configuration conf) throws IOException {
     try {
       return createNamenode(createRPCNamenode(nameNodeAddr, conf,
-        UnixUserGroupInformation.login(conf, true)).getProxy());
+              UnixUserGroupInformation.login(conf, true)).getProxy(), conf);
     } catch (LoginException e) {
       throw (IOException)(new IOException().initCause(e));
     }
@@ -262,10 +240,13 @@ public static ProtocolProxy<ClientProtocol> createRPCNamenode(InetSocketAddress
         NetUtils.getSocketFactory(conf, ClientProtocol.class));
   }
 
-  private static ClientProtocol createNamenode(ClientProtocol rpcNamenode)
+  private static ClientProtocol createNamenode(ClientProtocol rpcNamenode,
+      Configuration conf)
     throws IOException {
+    long sleepTime = conf.getLong("dfs.client.rpc.retry.sleep",
+        LEASE_SOFTLIMIT_PERIOD);
     RetryPolicy createPolicy = RetryPolicies.retryUpToMaximumCountWithFixedSleep(
-        5, LEASE_SOFTLIMIT_PERIOD, TimeUnit.MILLISECONDS);
+        5, sleepTime, TimeUnit.MILLISECONDS);
 
     Map<Class<? extends Exception>,RetryPolicy> remoteExceptionToPolicyMap =
       new HashMap<Class<? extends Exception>, RetryPolicy>();
@@ -347,6 +328,8 @@ public DFSClient(InetSocketAddress nameNodeAddr, Configuration conf,
       Configuration conf, FileSystem.Statistics stats)
     throws IOException {
     this.conf = conf;
+    this.metrics = new DFSClientMetrics(conf.getBoolean(
+        "dfs.client.metrics.enable", false));
     this.stats = stats;
     this.socketTimeout = conf.getInt("dfs.socket.timeout",
                                      HdfsConstants.READ_TIMEOUT);
@@ -420,19 +403,25 @@ public DFSClient(InetSocketAddress nameNodeAddr, Configuration conf,
     if (this.shortCircuitLocalReads) {
       LOG.debug("Configured to shortcircuit reads to " + localHost);
     }
+    this.shortcircuitDisableWhenFail = conf.getBoolean(
+        "dfs.read.shortcircuit.fallbackwhenfail", true);
     this.leasechecker = new LeaseChecker(this.clientName, this.conf);
     // by default, if the ipTosValue is less than 0(for example -1), 
     // we will not set it in the socket.
-    this.ipTosValue = conf.getInt("dfs.client.tos.value", 
+    this.ipTosValue = conf.getInt(NetUtils.DFS_CLIENT_TOS_CONF, 
     							  NetUtils.NOT_SET_IP_TOS);
     if (this.ipTosValue > NetUtils.IP_TOS_MAX_VALUE) {
-    	LOG.warn("dfs.client.tos.value " + ipTosValue + 
+    	LOG.warn(NetUtils.DFS_CLIENT_TOS_CONF + " " + ipTosValue + 
     			 " exceeds the max allowed value " + NetUtils.IP_TOS_MAX_VALUE + 
     			 ", will not take affect");
     	this.ipTosValue = NetUtils.NOT_SET_IP_TOS;
     }
   }
-  
+
+  public ClientProtocol getNameNodeRPC() {
+    return this.namenode;
+  }
+
   private void getNameNode() throws IOException {
     if (nameNodeAddr != null) {
       // The lock is to make sure namenode, namenodeProtocolProxy
@@ -444,7 +433,7 @@ private void getNameNode() throws IOException {
       //
       synchronized (namenodeProxySyncObj) {
         createRPCNamenodeIfCompatible(nameNodeAddr, conf, ugi);
-        this.namenode = createNamenode(this.rpcNamenode);
+        this.namenode = createNamenode(this.rpcNamenode, conf);
       }
     }
     if (LOG.isDebugEnabled()) {
@@ -480,7 +469,7 @@ public boolean isOpen() {
     return clientRunning;
   }
 
-  private void checkOpen() throws IOException {
+  protected void checkOpen() throws IOException {
     if (!clientRunning) {
       IOException result = new IOException("Filesystem closed");
       throw result;
@@ -629,8 +618,8 @@ public DFSInputStream open(String src) throws IOException {
   DFSInputStream open(LocatedBlocksWithMetaInfo blocks) throws IOException {
     checkOpen();
     incFileReadToStats();
-    return new DFSInputStream(blocks, conf.getInt("io.file.buffer.size", 4096),
-        true);
+    return new DFSInputStream(this, blocks,
+    		conf.getInt("io.file.buffer.size", 4096), true);
   }
 
   /**
@@ -646,7 +635,7 @@ DFSInputStream open(String src, int buffersize, boolean verifyChecksum,
 
     incFileReadToStats();
     // Get block info from namenode
-    return new DFSInputStream(src, buffersize, verifyChecksum, clearOsBuffer);
+    return new DFSInputStream(this, src, buffersize, verifyChecksum, clearOsBuffer);
   }
 
   /**
@@ -926,7 +915,7 @@ public OutputStream create(String src,
         }
       }
 
-      OutputStream result = new DFSOutputStream(src, masked,
+      OutputStream result = new DFSOutputStream(this, src, masked,
           overwrite, createParent, replication, blockSize, progress, buffersize,
           bytesPerChecksum, forceSync, doParallelWrites, favoredNodeInfos);
       leasechecker.put(src, result);
@@ -965,6 +954,9 @@ public OutputStream create(String src,
    */
   boolean recoverLease(String src, boolean discardLastBlock) throws IOException {
     checkOpen();
+    // We remove the file from local lease checker. Usually it is already been
+    // removed by the client but we want to be extra safe.
+    leasechecker.remove(src);
 
     if (this.namenodeProtocolProxy == null) {
       return versionBasedRecoverLease(src);
@@ -1162,7 +1154,7 @@ OutputStream append(String src, int buffersize, Progressable progress
         lastBlock = namenode.append(src, clientName);
       }
 
-      OutputStream result = new DFSOutputStream(src, buffersize, progress,
+      OutputStream result = new DFSOutputStream(this, src, buffersize, progress,
           lastBlock, stat, conf.getInt("io.bytes.per.checksum", 512), namespaceId);
       leasechecker.put(src, result);
       success = true;
@@ -1251,6 +1243,19 @@ public boolean hardLink(String src, String dst) throws IOException {
     } 
   }
   
+  /**
+   * See {@link ClientProtocol#getHardLinkedFiles(String)}.
+   */
+  public String[] getHardLinkedFiles(String src) throws IOException {
+    checkOpen();
+    try {
+      return namenode.getHardLinkedFiles(src);
+    } catch (RemoteException re) {
+      throw re.unwrapRemoteException(AccessControlException.class,
+          NSQuotaExceededException.class, DSQuotaExceededException.class);
+    }
+  }
+
   /**
    * Rename file or directory.
    * See {@link ClientProtocol#rename(String, String)}.
@@ -1639,6 +1644,9 @@ public static MD5MD5CRC32FileChecksum getFileChecksum(
     //get all block locations
     final LocatedBlocks locatedBlocks = callGetBlockLocations(
         namenode, src, 0, Long.MAX_VALUE, isMetaInfoSuppoted(namenodeProxy));
+    if (locatedBlocks == null) {
+    	throw new IOException("Null block locations, mostly because non-existent file " + src);
+    }
     int namespaceId = 0;
     if (locatedBlocks instanceof LocatedBlocksWithMetaInfo) {
       LocatedBlocksWithMetaInfo lBlocks = (LocatedBlocksWithMetaInfo)locatedBlocks;
@@ -1664,32 +1672,33 @@ public static MD5MD5CRC32FileChecksum getFileChecksum(
 
       boolean done = false;
       for(int j = 0; !done && j < datanodes.length; j++) {
-        //connect to a datanode
         final Socket sock = socketFactory.createSocket();
-        NetUtils.connect(sock,
-                         NetUtils.createSocketAddr(datanodes[j].getName()),
-                         timeout);
-        sock.setSoTimeout(timeout);
+        DataOutputStream out = null;
+        DataInputStream in = null;
 
-        DataOutputStream out = new DataOutputStream(
-            new BufferedOutputStream(NetUtils.getOutputStream(sock),
-                                     DataNode.SMALL_BUFFER_SIZE));
-        DataInputStream in = new DataInputStream(NetUtils.getInputStream(sock));
-
-        // get block MD5
         try {
+          // connect to a datanode
+          NetUtils.connect(sock,
+              NetUtils.createSocketAddr(datanodes[j].getName()), timeout);
+          sock.setSoTimeout(timeout);
+
+          out = new DataOutputStream(new BufferedOutputStream(
+              NetUtils.getOutputStream(sock), DataNode.SMALL_BUFFER_SIZE));
+          in = new DataInputStream(NetUtils.getInputStream(sock));
+
+          // get block MD5
           if (LOG.isDebugEnabled()) {
             LOG.debug("write to " + datanodes[j].getName() + ": "
                 + DataTransferProtocol.OP_BLOCK_CHECKSUM +
                 ", block=" + block);
           }
-          out.writeShort(dataTransferVersion);
-          out.write(DataTransferProtocol.OP_BLOCK_CHECKSUM);
-          if (dataTransferVersion >= DataTransferProtocol.FEDERATION_VERSION) {
-            out.writeInt(namespaceId);
-          }
-          out.writeLong(block.getBlockId());
-          out.writeLong(block.getGenerationStamp());
+          
+          /* Write the header */
+          BlockChecksumHeader blockChecksumHeader = new BlockChecksumHeader(
+              dataTransferVersion, namespaceId, block.getBlockId(),
+              block.getGenerationStamp());
+          blockChecksumHeader.writeVersionAndOpCode(out);
+          blockChecksumHeader.write(out);
           out.flush();
 
           final short reply = in.readShort();
@@ -1961,6 +1970,13 @@ private void methodBasedSaveNamespace(boolean force, boolean uncompressed)
   public void refreshNodes() throws IOException {
     namenode.refreshNodes();
   }
+  
+  /**
+   * Roll edit log at the namenode manually.
+   */
+  public void rollEditLog() throws IOException {
+    namenode.rollEditLogAdmin();
+  }
 
   /**
    * Dumps DFS data structures into specified file.
@@ -2109,7 +2125,7 @@ public void setTimes(String src, long mtime, long atime) throws IOException {
     }
   }
 
-  private int numNodeLeft(DatanodeInfo nodes[],
+  protected int numNodeLeft(DatanodeInfo nodes[],
       AbstractMap<DatanodeInfo, DatanodeInfo> deadNodes) {
     int nodesLeft = 0;
     if (nodes != null) {
@@ -2126,7 +2142,7 @@ private int numNodeLeft(DatanodeInfo nodes[],
    * Pick the best node from which to stream the data.
    * Entries in <i>nodes</i> are already in the priority order
    */
-  private DatanodeInfo bestNode(DatanodeInfo nodes[],
+  static DatanodeInfo bestNode(DatanodeInfo nodes[],
                                 AbstractMap<DatanodeInfo, DatanodeInfo> deadNodes)
                                 throws IOException {
     if (nodes != null) {
@@ -2254,540 +2270,6 @@ public String toString() {
     }
   }
 
-  private static class DataNodeSlowException extends IOException {
-    public DataNodeSlowException(String msg) {
-      super(msg);
-    }
-  }
-  
-  /** Utility class to encapsulate data node info and its ip address. */
-  private static class DNAddrPair {
-    DatanodeInfo info;
-    InetSocketAddress addr;
-    DNAddrPair(DatanodeInfo info, InetSocketAddress addr) {
-      this.info = info;
-      this.addr = addr;
-    }
-  }
-
-  /** This is a wrapper around connection to datadone
-   * and understands checksum, offset etc
-   */
-  public static class BlockReader extends FSInputChecker {
-
-    private Socket dnSock; //for now just sending checksumOk.
-    private DataInputStream in;
-    protected DataChecksum checksum;
-    protected long lastChunkOffset = -1;
-    protected long lastChunkLen = -1;
-    private long lastSeqNo = -1;
-    private boolean transferBlockSize;
-
-    protected long startOffset;
-    protected long firstChunkOffset;
-    protected int bytesPerChecksum;
-    protected int checksumSize;
-    protected boolean gotEOS = false;
-    
-    protected boolean blkLenInfoUpdated = false;
-    protected boolean isBlockFinalized;
-    protected long updatedBlockLength;
-
-    byte[] skipBuf = null;
-    ByteBuffer checksumBytes = null;
-    int packetLen = 0;
-    int dataLeft = 0;
-    boolean isLastPacket = false;
-    protected long minSpeedBps;
-    protected long bytesRead;
-    protected long timeRead;
-    protected boolean slownessLoged;
-    
-    protected boolean isReadLocal = false;
-    protected boolean isReadRackLocal = false;
-    protected FileSystem.Statistics fsStats = null;
-    
-    private long artificialSlowdown = 0;
-    
-    // It's a temporary flag used for tests
-    public boolean ENABLE_THROW_FOR_SLOW = false;
-
-
-    void setArtificialSlowdown(long period) {
-      artificialSlowdown = period;
-    }
-
-
-    /* FSInputChecker interface */
-
-    /* same interface as inputStream java.io.InputStream#read()
-     * used by DFSInputStream#read()
-     * This violates one rule when there is a checksum error:
-     * "Read should not modify user buffer before successful read"
-     * because it first reads the data to user buffer and then checks
-     * the checksum.
-     */
-    @Override
-    public synchronized int read(byte[] buf, int off, int len)
-                                 throws IOException {
-
-      //for the first read, skip the extra bytes at the front.
-      if (lastChunkLen < 0 && startOffset > firstChunkOffset) {
-        // Skip these bytes. But don't call this.skip()!
-        int toSkip = (int)(startOffset - firstChunkOffset);
-        if ( skipBuf == null ) {
-          skipBuf = new byte[bytesPerChecksum];
-        }
-        if ( super.read(skipBuf, 0, toSkip) != toSkip ) {
-          // should never happen
-          throw new IOException("Could not skip required number of bytes");
-        }
-        updateStatsAfterRead(toSkip);
-      }
-
-      boolean eosBefore = gotEOS;
-      int nRead = super.read(buf, off, len);
-      
-      // if gotEOS was set in the previous read and checksum is enabled :
-      if (dnSock != null && gotEOS && !eosBefore && nRead >= 0 && needChecksum()) {
-        //checksum is verified and there are no errors.
-        checksumOk(dnSock);
-      }
-      updateStatsAfterRead(nRead);
-      return nRead;
-    }
-
-    @Override
-    public synchronized long skip(long n) throws IOException {
-      /* How can we make sure we don't throw a ChecksumException, at least
-       * in majority of the cases?. This one throws. */
-      if ( skipBuf == null ) {
-        skipBuf = new byte[bytesPerChecksum];
-      }
-
-      long nSkipped = 0;
-      while ( nSkipped < n ) {
-        int toSkip = (int)Math.min(n-nSkipped, skipBuf.length);
-        int ret = read(skipBuf, 0, toSkip);
-        if ( ret <= 0 ) {
-          return nSkipped;
-        }
-        nSkipped += ret;
-      }
-      return nSkipped;
-    }
-
-    @Override
-    public int read() throws IOException {
-      throw new IOException("read() is not expected to be invoked. " +
-                            "Use read(buf, off, len) instead.");
-    }
-
-    @Override
-    public boolean seekToNewSource(long targetPos) throws IOException {
-      /* Checksum errors are handled outside the BlockReader.
-       * DFSInputStream does not always call 'seekToNewSource'. In the
-       * case of pread(), it just tries a different replica without seeking.
-       */
-      return false;
-    }
-
-    @Override
-    public void seek(long pos) throws IOException {
-      throw new IOException("Seek() is not supported in BlockInputChecker");
-    }
-
-    @Override
-    protected long getChunkPosition(long pos) {
-      throw new RuntimeException("getChunkPosition() is not supported, " +
-                                 "since seek is not required");
-    }
-
-    public void setReadLocal(boolean isReadLocal) {
-      this.isReadLocal = isReadLocal;
-      if (isReadLocal) {
-        this.isReadRackLocal = true;
-      }
-    }
-
-    public void setReadRackLocal(boolean isReadSwitchLocal) {
-      this.isReadRackLocal = isReadSwitchLocal;
-    }
-
-    public void setFsStats(FileSystem.Statistics fsStats) {
-      this.fsStats = fsStats;
-    }
-
-    public boolean isBlkLenInfoUpdated() {
-      return blkLenInfoUpdated;
-    }
-
-    public boolean isBlockFinalized() {
-      return isBlockFinalized;
-    }
-
-    public long getUpdatedBlockLength() {
-      return updatedBlockLength;
-    }
-
-    public void resetBlockLenInfo() {
-      blkLenInfoUpdated = false;
-    }
-
-    /**
-     * Makes sure that checksumBytes has enough capacity
-     * and limit is set to the number of checksum bytes needed
-     * to be read.
-     */
-    private void adjustChecksumBytes(int dataLen) {
-      int requiredSize =
-        ((dataLen + bytesPerChecksum - 1)/bytesPerChecksum)*checksumSize;
-      if (checksumBytes == null || requiredSize > checksumBytes.capacity()) {
-        checksumBytes =  ByteBuffer.wrap(new byte[requiredSize]);
-      } else {
-        checksumBytes.clear();
-      }
-      checksumBytes.limit(requiredSize);
-    }
-    
-    /**
-     * Read the block length information from data stream
-     * 
-     * @throws IOException
-     */
-    private synchronized void readBlockSizeInfo() throws IOException {
-      if (!transferBlockSize) {
-        return;
-      }
-      blkLenInfoUpdated = true;
-      isBlockFinalized = in.readBoolean();
-      updatedBlockLength = in.readLong();
-      if (LOG.isDebugEnabled()) {
-        LOG.debug("ifBlockComplete? " + isBlockFinalized + " block size: "
-            + updatedBlockLength);
-      }      
-    }
-
-    @Override
-    protected synchronized int readChunk(long pos, byte[] buf, int offset,
-                                         int len, byte[] checksumBuf)
-                                         throws IOException {
-      // Read one chunk.
-
-      if ( gotEOS ) {
-        if ( startOffset < 0 ) {
-          //This is mainly for debugging. can be removed.
-          throw new IOException( "BlockRead: already got EOS or an error" );
-        }
-        startOffset = -1;
-        return -1;
-      }
-
-      // Read one DATA_CHUNK.
-      long chunkOffset = lastChunkOffset;
-      if ( lastChunkLen > 0 ) {
-        chunkOffset += lastChunkLen;
-      }
-      if ( (pos + firstChunkOffset) != chunkOffset ) {
-        throw new IOException("Mismatch in pos : " + pos + " + " +
-                              firstChunkOffset + " != " + chunkOffset);
-      }
-
-      long startTime = System.currentTimeMillis();
-      // Read next packet if the previous packet has been read completely.
-      if (dataLeft <= 0) {
-        // check read speed
-        // Time only is counted in readChunk() not outside. It is to distinguish
-        // the cases between application to consume data slow or reading from
-        // data-nodes is slow. We don't want to throw exception in the former
-        // case. So the speed measurement here, actually is how much slower
-        // DFSClient reads data from datanodes than application to consume the
-        // data. That's the real slowness case users care about.
-        //
-        if (minSpeedBps > 0) {
-          bytesRead += packetLen;
-          if (bytesRead > NUM_BYTES_CHECK_READ_SPEED) {
-            if (timeRead > 0 && bytesRead * 1000 / timeRead < minSpeedBps) {
-              if (!slownessLoged) {
-                FileSystem.LogForCollect
-                    .info("Too slow when reading block. bytes: " + bytesRead
-                        + " time: " + timeRead + " msec. Path: "
-                        + super.file.getName());
-              }
-              if (this.isReadLocal) {
-                if (!slownessLoged) {
-                  LOG.info("Not switch from a local datanode.");
-                  slownessLoged = true;
-                }
-              } else if (this.isReadRackLocal) {
-                if (!slownessLoged) {
-                  LOG.info("Not switch from a datanode from the same rack.");
-                  slownessLoged = true;
-                }
-              } else {
-                if (!ENABLE_THROW_FOR_SLOW) {
-                  if (!slownessLoged) {
-                    LOG.info("Won't swtich to another datanode for not disabled.");
-                    slownessLoged = true;
-                                     }
-                } else {
-                  throw new DataNodeSlowException(
-                      "Block Reading Speed is too slow");
-                }
-              }
-            }
-            timeRead = 0;
-            bytesRead = 0;
-          }
-        }
-        
-        //Read packet headers.
-        packetLen = in.readInt();
-
-        if (packetLen == 0) {
-          // the end of the stream
-          gotEOS = true;
-          readBlockSizeInfo();
-          return 0;
-        }
-
-        long offsetInBlock = in.readLong();
-        long seqno = in.readLong();
-        boolean lastPacketInBlock = in.readBoolean();
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug("DFSClient readChunk got seqno " + seqno +
-                    " offsetInBlock " + offsetInBlock +
-                    " lastPacketInBlock " + lastPacketInBlock +
-                    " packetLen " + packetLen);
-        }
-
-        int dataLen = in.readInt();
-
-        // Sanity check the lengths
-        if ( dataLen < 0 ||
-             ( (dataLen % bytesPerChecksum) != 0 && !lastPacketInBlock ) ||
-             (seqno != (lastSeqNo + 1)) ) {
-             throw new IOException("BlockReader: error in packet header" +
-                                   "(chunkOffset : " + chunkOffset +
-                                   ", dataLen : " + dataLen +
-                                   ", seqno : " + seqno +
-                                   " (last: " + lastSeqNo + "))");
-        }
-
-        lastSeqNo = seqno;
-        isLastPacket = lastPacketInBlock;
-        dataLeft = dataLen;
-        adjustChecksumBytes(dataLen);
-        if (dataLen > 0) {
-          IOUtils.readFully(in, checksumBytes.array(), 0,
-                            checksumBytes.limit());
-        }
-      }
-
-      int chunkLen = Math.min(dataLeft, bytesPerChecksum);
-
-      if ( chunkLen > 0 ) {
-        // len should be >= chunkLen
-        IOUtils.readFully(in, buf, offset, chunkLen);
-        checksumBytes.get(checksumBuf, 0, checksumSize);
-
-        // This is used by unit test to trigger race conditions.
-        if (artificialSlowdown != 0) {
-          sleepForUnitTest(artificialSlowdown);
-        }
-      }
-
-      dataLeft -= chunkLen;
-      lastChunkOffset = chunkOffset;
-      lastChunkLen = chunkLen;
-      
-      if (minSpeedBps > 0) {
-        this.timeRead += System.currentTimeMillis() - startTime;
-      }
-
-      if ((dataLeft == 0 && isLastPacket) || chunkLen == 0) {
-        gotEOS = true;
-        int expectZero = in.readInt();
-        assert expectZero == 0;
-        readBlockSizeInfo();
-      }
-      if ( chunkLen == 0 ) {
-        return -1;
-      }
-
-      return chunkLen;
-    }
-    
-    protected void updateStatsAfterRead(int bytesRead) {
-      if (fsStats == null) {
-        return;
-      }
-      if (isReadLocal) {
-        fsStats.incrementLocalBytesRead(bytesRead);
-      }
-      if (isReadRackLocal) {
-        fsStats.incrementRackLocalBytesRead(bytesRead);
-      }
-    }
-
-    private BlockReader( String file, long blockId, DataInputStream in,
-                         DataChecksum checksum, boolean verifyChecksum,
-                         long startOffset, long firstChunkOffset,
-                         Socket dnSock, long minSpeedBps,
-                         long dataTransferVersion ) {
-      super(new Path("/blk_" + blockId + ":of:" + file)/*too non path-like?*/,
-            1, verifyChecksum,
-            checksum.getChecksumSize() > 0? checksum : null,
-            checksum.getBytesPerChecksum(),
-            checksum.getChecksumSize());
-
-      this.dnSock = dnSock;
-      this.in = in;
-      this.checksum = checksum;
-      this.startOffset = Math.max( startOffset, 0 );
-      this.transferBlockSize =
-          (dataTransferVersion >= DataTransferProtocol.SEND_DATA_LEN_VERSION);      
-      this.firstChunkOffset = firstChunkOffset;
-      lastChunkOffset = firstChunkOffset;
-      lastChunkLen = -1;
-
-      bytesPerChecksum = this.checksum.getBytesPerChecksum();
-      checksumSize = this.checksum.getChecksumSize();
-
-      this.bytesRead = 0;
-      this.timeRead = 0;
-      this.minSpeedBps = minSpeedBps;
-      this.slownessLoged = false;
-    }
-
-    /**
-     * Public constructor
-     */
-    BlockReader(Path file, int numRetries) {
-      super(file, numRetries);
-    }
-     
-     protected BlockReader(Path file, int numRetries, DataChecksum checksum, boolean verifyChecksum) {
-       super(file,
-           numRetries,
-           verifyChecksum,
-           checksum.getChecksumSize() > 0? checksum : null, 
-           checksum.getBytesPerChecksum(),
-           checksum.getChecksumSize());       
-     }
-     
-
-    public static BlockReader newBlockReader(int dataTransferVersion,
-        int namespaceId,
-        Socket sock, String file, long blockId,
-        long genStamp, long startOffset, long len, int bufferSize) throws IOException {
-      return newBlockReader(dataTransferVersion, namespaceId,
-          sock, file, blockId, genStamp, startOffset, len, bufferSize,
-          true);
-    }
-
-    /** Java Doc required */
-    public static BlockReader newBlockReader( int dataTransferVersion,
-                                       int namespaceId,
-                                       Socket sock, String file, long blockId,
-                                       long genStamp,
-                                       long startOffset, long len,
-                                       int bufferSize, boolean verifyChecksum)
-                                       throws IOException {
-      return newBlockReader(dataTransferVersion, namespaceId,
-                            sock, file, blockId, genStamp,
-                            startOffset,
-                            len, bufferSize, verifyChecksum, "",
-                            -1);
-    }
-    
-    public static BlockReader newBlockReader( int dataTransferVersion,
-                                       int namespaceId,
-                                       Socket sock, String file,
-                                       long blockId,
-                                       long genStamp,
-                                       long startOffset, long len,
-                                       int bufferSize, boolean verifyChecksum,
-                                       String clientName, long minSpeedBps)
-                                       throws IOException {
-      // in and out will be closed when sock is closed (by the caller)
-      DataOutputStream out = new DataOutputStream(
-        new BufferedOutputStream(NetUtils.getOutputStream(sock,HdfsConstants.WRITE_TIMEOUT)));
-
-      //write the header.
-      ReadBlockHeader readBlockHeader = new ReadBlockHeader(
-          dataTransferVersion, namespaceId, blockId, genStamp, startOffset, len,
-          clientName);
-      readBlockHeader.writeVersionAndOpCode(out);
-      readBlockHeader.write(out);
-      out.flush();
-
-      //
-      // Get bytes in block, set streams
-      //
-
-      DataInputStream in = new DataInputStream(
-          new BufferedInputStream(NetUtils.getInputStream(sock),
-                                  bufferSize));
-
-      if ( in.readShort() != DataTransferProtocol.OP_STATUS_SUCCESS ) {
-        throw new IOException("Got error in response to OP_READ_BLOCK " +
-                              "self=" + sock.getLocalSocketAddress() +
-                              ", remote=" + sock.getRemoteSocketAddress() +
-                              " for file " + file +
-                              " for block " + blockId);
-      }
-      DataChecksum checksum = DataChecksum.newDataChecksum( in , new PureJavaCrc32());
-      //Warning when we get CHECKSUM_NULL?
-
-      // Read the first chunk offset.
-      long firstChunkOffset = in.readLong();
-
-      if ( firstChunkOffset < 0 || firstChunkOffset > startOffset ||
-          firstChunkOffset >= (startOffset + checksum.getBytesPerChecksum())) {
-        throw new IOException("BlockReader: error in first chunk offset (" +
-                              firstChunkOffset + ") startOffset is " +
-                              startOffset + " for file " + file);
-      }
-
-      return new BlockReader(file, blockId, in, checksum, verifyChecksum,
-          startOffset, firstChunkOffset, sock, minSpeedBps, dataTransferVersion);
-    }
-
-    @Override
-    public synchronized void close() throws IOException {
-      startOffset = -1;
-      checksum = null;
-      // in will be closed when its Socket is closed.
-    }
-
-    /** kind of like readFully(). Only reads as much as possible.
-     * And allows use of protected readFully().
-     */
-    public int readAll(byte[] buf, int offset, int len) throws IOException {
-      return readFully(this, buf, offset, len);
-    }
-
-    /* When the reader reaches end of a block and there are no checksum
-     * errors, we send OP_STATUS_CHECKSUM_OK to datanode to inform that
-     * checksum was verified and there was no error.
-     */
-    private void checksumOk(Socket sock) {
-      try {
-        OutputStream out = NetUtils.getOutputStream(sock, HdfsConstants.WRITE_TIMEOUT);
-        byte buf[] = { (DataTransferProtocol.OP_STATUS_CHECKSUM_OK >>> 8) & 0xff,
-                       (DataTransferProtocol.OP_STATUS_CHECKSUM_OK) & 0xff };
-        out.write(buf);
-        out.flush();
-      } catch (IOException e) {
-        // its ok not to be able to send this.
-        LOG.debug("Could not write to datanode " + sock.getInetAddress() +
-                  ": " + e.getMessage());
-      }
-    }
-  }
-
   /**
    * Checks that the given block range covers the given file segment and
    * consists of contiguous blocks. This function assumes that the length
@@ -2839,2994 +2321,141 @@ static void checkBlockRange(List<LocatedBlock> blockRange,
     }
   }
 
-  /****************************************************************
-   * DFSInputStream provides bytes from a named file.  It handles
-   * negotiation of the namenode and various datanodes as necessary.
-   ****************************************************************/
-  public class DFSInputStream extends FSInputStream {
-    private Socket s = null;
-    private boolean closed = false;
-
-    private String src = null;
-    private long prefetchSize = 10 * defaultBlockSize;
-    private BlockReader blockReader = null;
-    private boolean verifyChecksum;
-    private boolean clearOsBuffer;
-    private DFSLocatedBlocks locatedBlocks = null;
-    private DatanodeInfo currentNode = null;
-    private Block currentBlock = null;
-    private boolean isCurrentBlockUnderConstruction;
-    private long pos = 0;
-    private long blockEnd = -1;
-    private LocatedBlocks blocks = null;
-    private int namespaceId;  // the namespace that this file belongs to
-
-    private int timeWindow = 3000; // wait time window (in msec) if BlockMissingException is caught
-
-    /* XXX Use of CocurrentHashMap is temp fix. Need to fix
-     * parallel accesses to DFSInputStream (through ptreads) properly */
-    private ConcurrentHashMap<DatanodeInfo, DatanodeInfo> deadNodes =
-               new ConcurrentHashMap<DatanodeInfo, DatanodeInfo>();
-    private int buffersize = 1;
-
-    private byte[] oneByteBuf = new byte[1]; // used for 'int read()'
-
-    void addToDeadNodes(DatanodeInfo dnInfo) {
-      deadNodes.put(dnInfo, dnInfo);
+  public static class DFSDataInputStream extends FSDataInputStream {
+    DFSDataInputStream(DFSInputStream in)
+      throws IOException {
+      super(in);
     }
 
-    DFSInputStream(String src, int buffersize, boolean verifyChecksum,
-                   boolean clearOsBuffer) throws IOException {
-      this.src = src;
-      init(buffersize, verifyChecksum, clearOsBuffer);
+    /**
+     * Returns the datanode from which the stream is currently reading.
+     */
+    public DatanodeInfo getCurrentDatanode() {
+      return ((DFSInputStream)in).getCurrentDatanode();
     }
 
     /**
-     * Used for snapshot
+     * Returns the block containing the target position.
      */
-    DFSInputStream(LocatedBlocksWithMetaInfo blocks, int buffersize,
-        boolean verifyChecksum) throws IOException {
-      this.blocks = blocks;
-      this.namespaceId = blocks.getNamespaceID();
-      updateDataTransferProtocolVersionIfNeeded(blocks.getDataProtocolVersion());
-      getNewNameNodeIfNeeded(blocks.getMethodFingerPrint());
-      init(buffersize, verifyChecksum, false);
+    public Block getCurrentBlock() {
+      return ((DFSInputStream)in).getCurrentBlock();
     }
 
+    /**
+     * Return collection of blocks that has already been located.
+     */
+    public synchronized List<LocatedBlock> getAllBlocks() throws IOException {
+      return ((DFSInputStream)in).getAllBlocks();
+    }
 
-    private void init(int buffersize, boolean verifyChecksum,
-                      boolean clearOsBuffer) throws IOException {
-      this.verifyChecksum = verifyChecksum;
-      this.buffersize = buffersize;
-      this.clearOsBuffer = clearOsBuffer;
-      prefetchSize = conf.getLong("dfs.read.prefetch.size", prefetchSize);
-      timeWindow = conf.getInt("dfs.client.baseTimeWindow.waitOn.BlockMissingException", timeWindow);
-      try {
-        openInfo();
-      } catch (IOException e) {
-        incReadExpCntToStats();
+    @Override
+    public boolean isUnderConstruction() throws IOException {
+      return ((DFSInputStream)in).isUnderConstruction();
+    }
 
-        throw e;
-      }
+    public long getFileLength() {
+      return ((DFSInputStream)in).getFileLength();
     }
+  }
 
-    /**
-     * Grab the open-file info from namenode
-     */
-    synchronized void openInfo() throws IOException {
-      if (src == null && blocks == null) {
-        throw new IOException("No fine provided to open");
-      }
+  /**
+   * Encapsulate multiple output streams into one object.
+   */
+  class MultiDataOutputStream {
+    DataOutputStream[] streams;
+    volatile int errorSlot;
 
-      LocatedBlocks newInfo = src != null ? 
-                              getLocatedBlocks(src, 0, prefetchSize) : blocks;
-      if (newInfo == null) {
-        throw new IOException("Cannot open filename " + src);
-      }
+    MultiDataOutputStream(DataOutputStream[] outs) {
+      this.streams = outs;
+      this.errorSlot = -1;       // no errors so far
+    }
 
-      // I think this check is not correct. A file could have been appended to
-      // between two calls to openInfo().
-      if (locatedBlocks != null && !locatedBlocks.isUnderConstruction() &&
-          !newInfo.isUnderConstruction()) {
-        Iterator<LocatedBlock> oldIter = locatedBlocks.getLocatedBlocks().iterator();
-        Iterator<LocatedBlock> newIter = newInfo.getLocatedBlocks().iterator();
-        while (oldIter.hasNext() && newIter.hasNext()) {
-          if (! oldIter.next().getBlock().equals(newIter.next().getBlock())) {
-            throw new IOException("Blocklist for " + src + " has changed!");
-          }
-        }
-      }
+    DataOutputStream get(int i) {
+      return streams[i];
+    }
 
-      // if the file is under construction, then fetch size of last block
-      // from datanode.
-      if (newInfo.isUnderConstruction() && newInfo.locatedBlockCount() > 0) {
-        LocatedBlock last = newInfo.get(newInfo.locatedBlockCount()-1);
-        if (last.getLocations().length > 0) {
-          try {
-            Block newBlock = getBlockInfo(last);
-            // only if the block has data (not null)
-            if (newBlock != null) {
-              long newBlockSize = newBlock.getNumBytes();
-              newInfo.setLastBlockSize(newBlock.getBlockId(), newBlockSize);
-            }
-          } catch (IOException e) {
-            LOG.debug("DFSClient file " + src + 
-                      " is being concurrently append to" +
-                      " but datanodes probably does not have block " +
-                      last.getBlock(), e);
-          }
-        }
-      }
-      this.locatedBlocks = new DFSLocatedBlocks(newInfo);
-      this.currentNode = null;
+    void set(int i, DataOutputStream st) {
+      streams[i] = st;
     }
-    
-    private void checkLocatedBlocks(LocatedBlocks locatedBlocks)
-        throws IOException {
-      if (null == locatedBlocks) {
-        return;
-      }
-      if(!locatedBlocks.isUnderConstruction()) {
-        return;
-      }
-      List<LocatedBlock> lbs = locatedBlocks.getLocatedBlocks();
-      if (lbs == null) {
-        return;
-      }
-      for (int i = 0; i < lbs.size() - 1; i++) {
-        if (lbs.get(i).getBlockSize() <= 1) {
-          throw new IOException(
-              "File is under construction and namenode hasn't received the second last block yet.");
+
+    void write(byte[] buf, int off, int len) throws IOException {
+      for (int i = 0; i < streams.length; i++) {
+        try {
+          streams[i].write(buf, off, len);
+        } catch (IOException e) {
+          errorSlot = i;
+          throw e;
         }
       }
     }
-    
-    private LocatedBlocks getLocatedBlocks(String src, long start, long length)
-    throws IOException {
-      try {
-        if (namenodeProtocolProxy != null &&
-              namenodeProtocolProxy.isMethodSupported("openAndFetchMetaInfo",
-                String.class, long.class, long.class)) {
-          LocatedBlocksWithMetaInfo locs = 
-            namenode.openAndFetchMetaInfo(src, start, length);
-          if (locs != null) {
-            this.namespaceId = locs.getNamespaceID();
-            updateDataTransferProtocolVersionIfNeeded(locs.getDataProtocolVersion());
-            getNewNameNodeIfNeeded(locs.getMethodFingerPrint());
-          }
-          checkLocatedBlocks(locs);
-          return locs;
-        } else if (namenodeProtocolProxy != null && 
-            namenodeProtocolProxy.isMethodSupported("open", String.class,
-                long.class, long.class)) {
-          VersionedLocatedBlocks locs = namenode.open(src, start, length);
-          if (locs != null) {
-            updateDataTransferProtocolVersionIfNeeded(locs.getDataProtocolVersion());
-          }
-          checkLocatedBlocks(locs);
-          return locs;
-        } else {
-          LocatedBlocks locs = namenode.getBlockLocations(src, start, length);
-          checkLocatedBlocks(locs);
-          return locs;
+
+    void writeInt(int v) throws IOException  {
+      for (int i = 0; i < streams.length; i++) {
+        try {
+          streams[i].writeInt(v);
+        } catch (IOException e) {
+          errorSlot = i;
+          throw e;
         }
-      } catch(RemoteException re) {
-        throw re.unwrapRemoteException(AccessControlException.class,
-                                      FileNotFoundException.class);
       }
     }
-    
-    /** Get block info from a datanode */
-    private Block getBlockInfo(LocatedBlock locatedblock) throws IOException {
-      if (locatedblock == null || locatedblock.getLocations().length == 0) {
-        return null;
-      }
-      int replicaNotFoundCount = locatedblock.getLocations().length;
-
-      for(DatanodeInfo datanode : locatedblock.getLocations()) {
-        ProtocolProxy<ClientDatanodeProtocol> cdp = null;
 
+    void flush() throws IOException {
+      for (int i = 0; i < streams.length; i++) {
         try {
-          cdp = createClientDNProtocolProxy(datanode, conf, socketTimeout);
-
-          final Block newBlock;
-          if (cdp.isMethodSupported("getBlockInfo", int.class, Block.class)) {
-            newBlock = cdp.getProxy().getBlockInfo(
-                namespaceId, locatedblock.getBlock());
-          } else {
-            newBlock = cdp.getProxy().getBlockInfo(locatedblock.getBlock());
-          }
-
-          if (newBlock == null) {
-            // special case : replica might not be on the DN, treat as 0 length
-            replicaNotFoundCount--;
-          } else {
-            return newBlock;
-          }
-        }
-        catch(IOException ioe) {
-          if (DFSClient.LOG.isDebugEnabled()) {
-            DFSClient.LOG.debug("Failed to getBlockInfo from datanode "
-                + datanode + " for block " + locatedblock.getBlock(), ioe);
-          }
-        } finally {
-          if (cdp != null) {
-            RPC.stopProxy(cdp.getProxy());
-          }
-        }
-      }
-
-      // Namenode told us about these locations, but none know about the replica
-      // means that we hit the race between pipeline creation start and end.
-      // we require all because some other exception could have happened
-      // on a DN that has it.  we want to report that error
-      if (replicaNotFoundCount == 0) {
-        return null;
-      }
-
-      throw new IOException("Cannot obtain block info for " + locatedblock);
-    }
-
-    /**
-     * Returns whether the file opened is under construction.
-     */
-    public synchronized boolean isUnderConstruction() {
-      return locatedBlocks.isUnderConstruction();
-    }
-
-    public long getFileLength() {
-      return locatedBlocks.getFileLength();
-    }
-
-    public DFSLocatedBlocks fetchLocatedBlocks() {
-      return locatedBlocks;
-    }
-
-    /**
-     * Returns the datanode from which the stream is currently reading.
-     */
-    public DatanodeInfo getCurrentDatanode() {
-      return currentNode;
-    }
-
-    /**
-     * Returns the block containing the target position.
-     */
-    public Block getCurrentBlock() {
-      return currentBlock;
-    }
-
-    /**
-     * Return collection of blocks that has already been located.
-     */
-    synchronized List<LocatedBlock> getAllBlocks() throws IOException {
-      return getBlockRange(0, this.getFileLength());
-    }
-
-    /**
-     * Get block at the specified position. Fetch it from the namenode if not
-     * cached.
-     * 
-     * @param offset
-     * @param updatePosition
-     * @param throwWhenNoFound
-     *          when no block found for the offset return null instead of
-     *          throwing an exception
-     * @return located block
-     * @throws IOException
-     */
-    private LocatedBlock getBlockAt(long offset, boolean updatePosition,
-        boolean throwWhenNotFound)    throws IOException {
-      assert (locatedBlocks != null) : "locatedBlocks is null";
-      // search cached blocks first
-      LocatedBlock blk = locatedBlocks.getBlockContainingOffset(offset);
-      if (blk == null) { // block is not cached
-        // fetch more blocks
-        LocatedBlocks newBlocks;
-        newBlocks = getLocatedBlocks(src, offset, prefetchSize);
-        if (newBlocks == null) {
-          if (!throwWhenNotFound) {
-            return null;
-          }
-          throw new IOException("Could not find target position " + offset);
-        }
-        locatedBlocks.insertRange(newBlocks.getLocatedBlocks());
-        locatedBlocks.setFileLength(newBlocks.getFileLength());
-      }
-      blk = locatedBlocks.getBlockContainingOffset(offset);
-      if (blk == null) {
-        if (!throwWhenNotFound) {
-          return null;
-        }
-        throw new IOException("Failed to determine location for block at "
-            + "offset=" + offset);
-      }
-      if (updatePosition) {
-        // update current position
-        this.pos = offset;
-        this.blockEnd = blk.getStartOffset() + blk.getBlockSize() - 1;
-        this.currentBlock = blk.getBlock();
-        isCurrentBlockUnderConstruction = locatedBlocks
-            .isUnderConstructionBlock(this.currentBlock);
-      }
-      return blk;
-    }
-
-    /**
-     * Get blocks in the specified range. The locations of all blocks
-     * overlapping with the given segment of the file are retrieved. Fetch them
-     * from the namenode if not cached.
-     *
-     * @param offset the offset of the segment to read
-     * @param length the length of the segment to read
-     * @return consequent segment of located blocks
-     * @throws IOException
-     */
-    private List<LocatedBlock> getBlockRange(final long offset,
-        final long length) throws IOException {
-      List<LocatedBlock> blockRange = new ArrayList<LocatedBlock>();
-      // Zero length. Not sure this ever happens in practice.
-      if (length == 0)
-        return blockRange;
-
-      // A defensive measure to ensure that we never loop here eternally.
-      // With a 256 M block size, 10000 blocks will correspond to 2.5 TB.
-      // No one should read this much data at once in practice.
-      int maxLoops = 10000;
-
-      // Copy locatedBlocks to a local data structure. This ensures that 
-      // a concurrent invocation of openInfo() works OK, the reason being
-      // that openInfo may completely replace locatedBlocks.
-      DFSLocatedBlocks locatedBlocks = this.locatedBlocks;
-
-      if (locatedBlocks == null) {
-        // Make this an IO exception because this is input/output code error.
-        throw new IOException("locatedBlocks is null");
-      }
-
-      long remaining = length;
-      long curOff = offset;
-      while (remaining > 0) {
-        // a defensive check to bail out of this loop at all costs
-        if (--maxLoops < 0) {
-          String msg = "Failed to getBlockRange at offset " + offset +
-                       ", length=" + length +
-                       ", curOff=" + curOff +
-                       ", remaining=" + remaining +
-                       ". Aborting...";
-          LOG.warn(msg);
-          throw new IOException(msg); 
-        }
-
-        LocatedBlock blk = locatedBlocks.getBlockContainingOffset(curOff);
-        if (blk == null) {
-          LocatedBlocks newBlocks;
-          newBlocks = getLocatedBlocks(src, curOff, remaining);
-          if (newBlocks == null) {
-            throw new IOException("Could not get block locations for curOff=" +
-                curOff + ", remaining=" + remaining + " (offset=" + offset +
-                ")");
-          }
-          locatedBlocks.insertRange(newBlocks.getLocatedBlocks());
-          continue;
-        }
-
-        blockRange.add(blk);
-        long bytesRead = blk.getStartOffset() + blk.getBlockSize() - curOff;
-        remaining -= bytesRead;
-        curOff += bytesRead;
-      }
-
-      checkBlockRange(blockRange, offset, length);
-
-      return blockRange;
-    }
-
-    private synchronized DatanodeInfo blockSeekTo(long target) throws IOException {
-      return blockSeekTo(target, true);
-    }
-    
-    /**
-     * Open a DataInputStream to a DataNode so that it can be read from.
-     * We get block ID and the IDs of the destinations at startup, from the namenode.
-     */
-    private synchronized DatanodeInfo blockSeekTo(long target,
-        boolean throwWhenNotFound) throws IOException {
-      // We only allow to seek before the end of the file, or the end of the file
-      // and allowSeedtoEnd, which is the case called by available().
-      //
-      if (target > getFileLength() || (target == getFileLength() && throwWhenNotFound)) {
-        throw new IOException("Attempted to read past end of file");
-      }
-
-      if ( blockReader != null ) {
-        blockReader.close();
-        blockReader = null;
-      }
-
-      if (s != null) {
-        s.close();
-        s = null;
-      }
-
-      //
-      // Compute desired block.
-      //
-      LocatedBlock targetBlock = getBlockAt(target, true, throwWhenNotFound);
-      // Given target<= fileLength, when and only whenallowSeektoEnd is true and
-      // there is no block for the file yet, getBlockAt() returns null, in this
-      // case we should simply return null.
-      //
-      if (targetBlock == null) {
-        assert target == 0;
-        return null;
-      }
-      assert (target==this.pos) : "Wrong postion " + pos + " expect " + target;
-      long offsetIntoBlock = target - targetBlock.getStartOffset();
-
-      //
-      // Connect to best DataNode for desired Block, with potential offset
-      //
-      DatanodeInfo chosenNode = null;
-      while (s == null) {
-        DNAddrPair retval = chooseDataNode(targetBlock);
-        chosenNode = retval.info;
-        InetSocketAddress targetAddr = retval.addr;
-
-        // try reading the block locally. if this fails, then go via
-        // the datanode
-        Block blk = targetBlock.getBlock();
-        try {
-          if (LOG.isDebugEnabled()) {
-            LOG.warn("blockSeekTo shortCircuitLocalReads " + shortCircuitLocalReads +
-                     " localhost " + localHost +
-                     " targetAddr " + targetAddr);
-          }
-          if (shortCircuitLocalReads && localHost != null &&
-              (targetAddr.equals(localHost) ||
-               targetAddr.getHostName().startsWith("localhost"))) {
-            blockReader = BlockReaderLocal.newBlockReader(conf, src, namespaceId, blk,
-                                                   chosenNode,
-                                                   offsetIntoBlock,
-                                                   blk.getNumBytes() - offsetIntoBlock,
-                                                   metrics, 
-                                                   this.verifyChecksum,
-                                                   this.clearOsBuffer);
-            blockReader.setReadLocal(true);
-            blockReader.setFsStats(stats);
-            return chosenNode;
-          }
-        } catch (IOException ex) {
-          LOG.info("Failed to read block " + targetBlock.getBlock() +
-                   " on local machine " + localHost +
-                   ". Try via the datanode on " + targetAddr + ":"
-                    + StringUtils.stringifyException(ex));
-        }
-
-        try {
-          s = socketFactory.createSocket();
-          NetUtils.connect(s, targetAddr, socketTimeout, ipTosValue);
-          s.setSoTimeout(socketTimeout);
-
-          long minReadSpeedBps = (numNodeLeft(targetBlock.getLocations(),
-              deadNodes) > 1) ? DFSClient.this.minReadSpeedBps : -1;
-          blockReader = BlockReader.newBlockReader(
-              getDataTransferProtocolVersion(), namespaceId,
-              s, src, blk.getBlockId(),
-              blk.getGenerationStamp(),
-              offsetIntoBlock, blk.getNumBytes() - offsetIntoBlock,
-              buffersize, verifyChecksum,
-              clientName, minReadSpeedBps);
-          boolean isLocalHost = NetUtils.isLocalAddress(targetAddr.getAddress());
-          blockReader.setReadLocal(isLocalHost);
-          if (!isLocalHost) {
-            blockReader
-                .setReadRackLocal(isInLocalRack(targetAddr.getAddress()));
-          }
-          blockReader.setFsStats(stats);
-
-          return chosenNode;
-        } catch (IOException ex) {
-          // Put chosen node into dead list, continue
-          LOG.warn("Failed to connect to " + targetAddr, ex);
-          addToDeadNodes(chosenNode);
-          if (s != null) {
-            try {
-              s.close();
-            } catch (IOException iex) {
-            }
-          }
-          s = null;
-        }
-      }
-      return chosenNode;
-    }
-
-    /**
-     * Close it down!
-     */
-    @Override
-    public synchronized void close() throws IOException {
-      if (closed) {
-        return;
-      }
-      checkOpen();
-
-      if ( blockReader != null ) {
-        blockReader.close();
-        blockReader = null;
-      }
-
-      if (s != null) {
-        s.close();
-        s = null;
-      }
-      super.close();
-      closed = true;
-    }
-
-    @Override
-    public synchronized int read() throws IOException {
-      int ret = read( oneByteBuf, 0, 1 );
-      return ( ret <= 0 ) ? -1 : (oneByteBuf[0] & 0xff);
-    }
-
-    /* This is a used by regular read() and handles ChecksumExceptions.
-     * name readBuffer() is chosen to imply similarity to readBuffer() in
-     * ChecksuFileSystem
-     */
-    private synchronized int readBuffer(byte buf[], int off, int len)
-                                                    throws IOException {
-      IOException ioe;
-
-      /* we retry current node only once. So this is set to true only here.
-       * Intention is to handle one common case of an error that is not a
-       * failure on datanode or client : when DataNode closes the connection
-       * since client is idle. If there are other cases of "non-errors" then
-       * then a datanode might be retried by setting this to true again.
-       */
-      boolean retryCurrentNode = true;
-
-      while (true) {
-        // retry as many times as seekToNewSource allows.
-        try {
-          int bytesRead = blockReader.read(buf, off, len);
-          
-          // update length of file under construction if needed
-          if (isCurrentBlockUnderConstruction
-              && blockReader.isBlkLenInfoUpdated()) {
-            locatedBlocks.setLastBlockSize(currentBlock.getBlockId(),
-                blockReader.getUpdatedBlockLength());
-            this.blockEnd = locatedBlocks.getFileLength() - 1;
-            blockReader.resetBlockLenInfo();
-            // if the last block is finalized, get file info from name-node.
-            // It is necessary because there might be new blocks added to
-            // the file. The client needs to check with the name-node whether
-            // it is the case, or the file has been finalized.
-            if (blockReader.isBlockFinalized() && src != null) {
-              openInfo();
-            }
-            
-          }
-          return bytesRead;     
-        } catch (DataNodeSlowException dnse) {
-          LOG.warn("Node " + currentNode + " is too slow when reading blk "
-              + this.currentBlock + ". Try another datanode.");
-          ioe = dnse;
-          retryCurrentNode = false;
-        } catch ( ChecksumException ce ) {
-          LOG.warn("Found Checksum error for " + currentBlock + " from " +
-                   currentNode.getName() + " at " + ce.getPos());
-          reportChecksumFailure(src, currentBlock, currentNode);
-          ioe = ce;
-          retryCurrentNode = false;
-        } catch ( IOException e ) {
-          if (!retryCurrentNode) {
-            LOG.warn("Exception while reading from " + currentBlock +
-                     " of " + src + " from " + currentNode + ": " +
-                     StringUtils.stringifyException(e));
-          }
-          ioe = e;
-        }
-        boolean sourceFound = false;
-        if (retryCurrentNode) {
-          /* possibly retry the same node so that transient errors don't
-           * result in application level failures (e.g. Datanode could have
-           * closed the connection because the client is idle for too long).
-           */
-          sourceFound = seekToBlockSource(pos, len != 0);
-        } else {
-          addToDeadNodes(currentNode);
-          sourceFound = seekToNewSource(pos, len != 0);
-        }
-        if (!sourceFound) {
-          throw ioe;
-        } else {
-          incReadExpCntToStats();
-
-        }
-        retryCurrentNode = false;
-      }
-    }
-
-    /**
-     * Read the entire buffer.
-     */
-    @Override
-    public synchronized int read(byte buf[], int off, int len) throws IOException {
-      checkOpen();
-      if (closed) {
-        incReadExpCntToStats();
-
-        throw new IOException("Stream closed");
-      }
-      dfsInputStreamfailures.set(0);
-			long start = System.currentTimeMillis();
-      
-      if (pos < getFileLength() || (pos == getFileLength() && len == 0)) {
-        int retries = 2;
-        while (retries > 0) {
-          try {
-            // If position equals or is larger than the end position of the
-            // block, we try to seek to the next block, unless:
-            // 1. user tries to read 0 bytes (usually by available() call), AND
-            // 2. there is at least a known block for the file (blockEnd != -1), AND
-            // 3. pos is the end of the file, AND
-            // 4. the end of the block is the end of the file
-            //    (the current block is the known last block of the file)
-            // For this case, we want to stay in the current block, as in the case
-            // that it is the last block (which is almost always true given
-            // len == 0), the current block is the under-construction block whose size
-            // you want to update.
-            //
-            if (len == 0) { // called by available()
-              if (blockEnd == -1 // No current block selected
-                  || pos == getFileLength()) { // at the end of the file
-                currentNode = blockSeekTo(pos, false);
-                if (currentNode == null) {
-                  // In this case, user wants to know available information of
-                  // the file, but the file doesn't have any block created yet (it
-                  // is a 0 size file). Simply 0 should be returned.
-                  return 0;
-                }
-              } else {
-                throw new IOException(
-                    "Try to read 0 bytes while current position is not the end of the file");
-              }
-            } else if (pos > blockEnd) {
-              currentNode = blockSeekTo(pos, true);
-            }
-            
-            int realLen = (int) Math.min((long) len, (blockEnd - pos + 1L));
-            int result = readBuffer(buf, off, realLen);
-
-            if (result >= 0) {
-              pos += result;
-            } else if (len != 0){
-              // got a EOS from reader though we expect more data on it.
-              throw new IOException("Unexpected EOS from the reader");
-            }
-            if (stats != null && result != -1) {
-              stats.incrementBytesRead(result);
-            }
-            long timeval = System.currentTimeMillis() - start;
-            metrics.incReadTime(timeval);
-            metrics.incReadSize(result);
-            metrics.incReadOps();
-            return (result >= 0) ? result : 0;
-          } catch (ChecksumException ce) {
-            incReadExpCntToStats();
-
-            throw ce;
-          } catch (IOException e) {
-            incReadExpCntToStats();
-
-            if (retries == 1) {
-              LOG.warn("DFS Read: " + StringUtils.stringifyException(e));
-            }
-            blockEnd = -1;
-            if (currentNode != null) { addToDeadNodes(currentNode); }
-            if (--retries == 0) {
-              throw e;
-            }
-          }
-        }
-      }
-      return -1;
-    }
-
-
-    private DNAddrPair chooseDataNode(LocatedBlock block)
-      throws IOException {
-      while (true) {
-        DatanodeInfo[] nodes = block.getLocations();
-        DatanodeInfo chosenNode = null;
-        try {
-          chosenNode = bestNode(nodes, deadNodes);
-          InetSocketAddress targetAddr =
-                            NetUtils.createSocketAddr(chosenNode.getName());
-          return new DNAddrPair(chosenNode, targetAddr);
-        } catch (IOException ie) {
-          int failureTimes = dfsInputStreamfailures.get();
-          String blockInfo = block.getBlock() + " file=" + src;
-          if (failureTimes >= maxBlockAcquireFailures) {
-            throw new BlockMissingException(src, "Could not obtain block: " + 
-                blockInfo, block.getStartOffset());
-          }
-
-          if (nodes == null || nodes.length == 0) {
-            LOG.info("No node available for block: " + blockInfo);
-          }
-          LOG.info("Could not obtain block " + block.getBlock() +
-                   " from node:  " +
-                   (chosenNode == null ? "" : chosenNode.getHostName()) + ie +
-                   ". Will get new block locations from namenode and retry...");       
-          try {
-            // Introducing a random factor to the wait time before another retry.
-            // The wait time is dependent on # of failures and a random factor.
-            // At the first time of getting a BlockMissingException, the wait time
-            // is a random number between 0..3000 ms. If the first retry
-            // still fails, we will wait 3000 ms grace period before the 2nd retry.
-            // Also at the second retry, the waiting window is expanded to 6000 ms
-            // alleviating the request rate from the server. Similarly the 3rd retry
-            // will wait 6000ms grace period before retry and the waiting window is
-            // expanded to 9000ms.
-            // waitTime = grace period for the last round of attempt + 
-            // expanding time window for each failure
-            double waitTime = timeWindow * failureTimes + 
-              timeWindow * (failureTimes + 1) * r.nextDouble(); 
-            LOG.warn("DFS chooseDataNode: got # " + (failureTimes + 1) + 
-                " IOException, will wait for " + waitTime + " msec.", ie);
-						Thread.sleep((long)waitTime);
-          } catch (InterruptedException iex) {
-          }
-          deadNodes.clear(); //2nd option is to remove only nodes[blockId]
-          openInfo();
-          block = getBlockAt(block.getStartOffset(), false, true);
-          dfsInputStreamfailures.set(failureTimes+1);
-          continue;
-        }
-      }
-    }
-
-    private void fetchBlockByteRange(LocatedBlock block, long start,
-                                     long end, byte[] buf, int offset) throws IOException {
-      //
-      // Connect to best DataNode for desired Block, with potential offset
-      //
-      Socket dn = null;
-
-      while (true) {
-        // cached block locations may have been updated by chooseDatNode()
-        // or fetchBlockAt(). Always get the latest list of locations at the
-        // start of the loop.
-        block = getBlockAt(block.getStartOffset(), false, true);
-        DNAddrPair retval = chooseDataNode(block);
-        DatanodeInfo chosenNode = retval.info;
-        InetSocketAddress targetAddr = retval.addr;
-        BlockReader reader = null;
-        int len = (int) (end - start + 1);
-
-        try {
-           if (LOG.isDebugEnabled()) {
-             LOG.debug("fetchBlockByteRange shortCircuitLocalReads " +
-                      shortCircuitLocalReads +
-                      " localhst " + localHost +
-                      " targetAddr " + targetAddr);
-           }
-           // first try reading the block locally.
-           if (shortCircuitLocalReads && NetUtils.isLocalAddress(targetAddr.getAddress())) {
-             reader = BlockReaderLocal.newBlockReader(conf, src,
-                                                  namespaceId, block.getBlock(),
-                                                  chosenNode,
-                                                  start,
-                                                  len,
-                                                  metrics,
-                                                  verifyChecksum,
-                                                  this.clearOsBuffer);
-             reader.setReadLocal(true);
-             reader.setFsStats(stats);
-
-            } else {
-              // go to the datanode
-              dn = socketFactory.createSocket();
-              NetUtils.connect(dn, targetAddr, socketTimeout, ipTosValue);
-              dn.setSoTimeout(socketTimeout);
-              reader = BlockReader.newBlockReader(getDataTransferProtocolVersion(),
-                                              namespaceId,
-                                              dn, src,
-                                              block.getBlock().getBlockId(),
-                                              block.getBlock().getGenerationStamp(),
-                                              start, len, buffersize,
-                                              verifyChecksum, clientName,
-                                              DFSClient.this.minReadSpeedBps);
-              boolean isLocalHost = NetUtils.isLocalAddress(targetAddr.getAddress());
-              reader.setReadLocal(isLocalHost);
-              if (!isLocalHost) {
-                reader
-                    .setReadRackLocal(isInLocalRack(targetAddr.getAddress()));
-              }
-              reader.setFsStats(stats);
-            }
-            int nread = reader.readAll(buf, offset, len);
-            if (nread != len) {
-              throw new IOException("truncated return from reader.read(): " +
-                                    "excpected " + len + ", got " + nread);
-            }
-            return;
-        } catch (ChecksumException e) {
-          LOG.warn("fetchBlockByteRange(). Got a checksum exception for " +
-                   src + " at " + block.getBlock() + ":" +
-                   e.getPos() + " from " + chosenNode.getName());
-          reportChecksumFailure(src, block.getBlock(), chosenNode);
-        } catch (IOException e) {
-          LOG.warn("Failed to connect to " + targetAddr +
-                   " for file " + src +
-                   " for block " + block.getBlock().getBlockId() + ":"  +
-                   StringUtils.stringifyException(e));
-        } finally {
-          IOUtils.closeStream(reader);
-          IOUtils.closeSocket(dn);
-        }
-        // Put chosen node into dead list, continue
-        addToDeadNodes(chosenNode);
-      }
-    }
-
-    /**
-     * This is highly optimized for preads. Reduce number of buffercopies.
-     * Its is similar to doing a scatter/gather kind of io, all data to be
-     * returned in a ByteBuffer.
-     */
-    private ByteBuffer fetchBlockByteRangeScatterGather(LocatedBlock block, 
-                        long start, long len) throws IOException {
-      //
-      // Connect to best DataNode for desired Block, with potential offset
-      //
-      Socket dn = null;
-
-      while (true) {
-        // cached block locations may have been updated by chooseDatNode()
-        // or fetchBlockAt(). Always get the latest list of locations at the
-        // start of the loop.
-        block = getBlockAt(block.getStartOffset(), false, true);
-        DNAddrPair retval = chooseDataNode(block);
-        DatanodeInfo chosenNode = retval.info;
-        InetSocketAddress targetAddr = retval.addr;
-        ByteBuffer result = null;
-        BlockReaderLocal localReader = null;
-        BlockReaderAccelerator remoteReader = null;
-
-         try {
-           if (LOG.isDebugEnabled()) {
-             LOG.debug("fetchBlockByteRangeScatterGather " +
-                      " localhst " + localHost +
-                      " targetAddr " + targetAddr);
-           }
-           
-           // first try reading the block locally.
-           if (shortCircuitLocalReads && 
-               NetUtils.isLocalAddress(targetAddr.getAddress())) {
-             localReader = BlockReaderLocal.newBlockReader(conf, src,
-                                                  namespaceId, block.getBlock(),
-                                                  chosenNode,
-                                                  start,
-                                                  len,
-                                                  metrics,
-                                                  verifyChecksum,
-                                                  this.clearOsBuffer);
-             localReader.setReadLocal(true);
-             localReader.setFsStats(stats);
-             result = localReader.readAll();
-
-           } else {
-           
-             // go to the datanode
-             dn = socketFactory.createSocket();
-             NetUtils.connect(dn, targetAddr, socketTimeout,ipTosValue);
-             dn.setSoTimeout(socketTimeout);
-             remoteReader = new BlockReaderAccelerator(conf,
-                                            targetAddr,
-                                            chosenNode,
-                                            getDataTransferProtocolVersion(),
-                                            namespaceId, clientName,
-                                            dn, src,
-                                            block,
-                                            start, len,
-                                            verifyChecksum, metrics);
-             result = remoteReader.readAll();
-            }
-            if (result.remaining() != len) {
-              throw new IOException("truncated return from reader.read(): " +
-                                  "expected " + len + ", got " + 
-                                    result.remaining());
-            }
-            if (NetUtils.isLocalAddress(targetAddr.getAddress())) {
-              stats.incrementLocalBytesRead(len);
-              stats.incrementRackLocalBytesRead(len);
-            } else if (isInLocalRack(targetAddr.getAddress())) {
-              stats.incrementRackLocalBytesRead(len);
-            }
-
-            return result;
-        } catch (ChecksumException e) {
-          LOG.warn("fetchBlockByteRangeScatterGather(). Got a checksum exception for " +
-                   src + " at " + block.getBlock() + ":" +
-                   e.getPos() + " from " + chosenNode.getName());
-          reportChecksumFailure(src, block.getBlock(), chosenNode);
-        } catch (IOException e) {
-          LOG.warn("Failed to connect to " + targetAddr +
-                   " for file " + src +
-                   " for block " + block.getBlock().getBlockId() + ":"  +
-                   StringUtils.stringifyException(e));
-        } finally {
-          IOUtils.closeStream(localReader);
-          IOUtils.closeStream(remoteReader);
-          IOUtils.closeSocket(dn);
-        }
-        incReadExpCntToStats();
-        // Put chosen node into dead list, continue
-        addToDeadNodes(chosenNode);
-      }
-    }
-
-    /**
-     * Read bytes starting from the specified position.
-     *
-     * @param position start read from this position
-     * @param buffer read buffer
-     * @param offset offset into buffer
-     * @param length number of bytes to read
-     *
-     * @return actual number of bytes read
-     */
-    @Override
-    public int read(long position, byte[] buffer, int offset, int length)
-      throws IOException {      
-      // sanity checks
-      checkOpen();
-      if (closed) {
-        throw new IOException("Stream closed");
-      }
-      dfsInputStreamfailures.set(0);
-			long start = System.currentTimeMillis();
-      long filelen = getFileLength();
-      if ((position < 0) || (position >= filelen)) {
-        return -1;
-      }
-      int realLen = length;
-      if ((position + length) > filelen) {
-        realLen = (int)(filelen - position);
-      }
-      // determine the block and byte range within the block
-      // corresponding to position and realLen
-      List<LocatedBlock> blockRange = getBlockRange(position, realLen);
-      int remaining = realLen;
-      for (LocatedBlock blk : blockRange) {
-        long targetStart = position - blk.getStartOffset();
-        long bytesToRead = Math.min(remaining, blk.getBlockSize() - targetStart);
-        fetchBlockByteRange(blk, targetStart,
-                            targetStart + bytesToRead - 1, buffer, offset);
-        remaining -= bytesToRead;
-        position += bytesToRead;
-        offset += bytesToRead;
-      }
-      assert remaining == 0 : "Wrong number of bytes read.";
-      if (stats != null) {
-        stats.incrementBytesRead(realLen);
-      }
-      long timeval = System.currentTimeMillis() - start;
-      metrics.incPreadTime(timeval);
-      metrics.incPreadSize(realLen);
-      metrics.incPreadOps();
-      return realLen;
-    }
-
-    /**
-     * Read bytes starting from the specified position. This is optimized
-     * for fast preads from an application with minimum of buffer copies.
-     *
-     * @param position start read from this position
-     * @param length number of bytes to read
-     *
-     * @return A list of Byte Buffers that represent all the data that was
-     * read from the underlying system.
-     */
-    @Override
-    public List<ByteBuffer> readFullyScatterGather(long position, int length)
-      throws IOException {      
-
-      // if the server does not support scatter-gather, 
-      // then use default implementation from FSDataInputStream.
-      if (dataTransferVersion < DataTransferProtocol.SCATTERGATHER_VERSION) {
-        return super.readFullyScatterGather(position, length);
-      }
-      // sanity checks
-      checkOpen();
-      if (closed) {
-        throw new IOException("Stream closed");
-      }
-      dfsInputStreamfailures.set(0);
-      long start = System.currentTimeMillis();
-      long filelen = getFileLength();
-      if ((position < 0) || (position > filelen)) {
-        String msg = " Invalid position " + position +
-                     ". File " + src + " is of size " + filelen;
-        LOG.warn(msg);
-        throw new IOException(msg);
-      }
-      List<ByteBuffer> results = new LinkedList<ByteBuffer>();
-      int realLen = length;
-      if ((position + length) > filelen) {
-        realLen = (int)(filelen - position);
-      }
-      // determine the block and byte range within the block
-      // corresponding to position and realLen
-      List<LocatedBlock> blockRange = getBlockRange(position, realLen);
-      int remaining = realLen;
-      for (LocatedBlock blk : blockRange) {
-        long targetStart = position - blk.getStartOffset();
-        long bytesToRead = Math.min(remaining, blk.getBlockSize() - targetStart);
-        ByteBuffer bb = fetchBlockByteRangeScatterGather(blk, targetStart,
-                            bytesToRead);
-        results.add(bb);
-        remaining -= bytesToRead;
-        position += bytesToRead;
-      }
-      assert remaining == 0 : "Wrong number of bytes read.";
-      if (stats != null) {
-        stats.incrementBytesRead(realLen);
-      }
-      long timeval = System.currentTimeMillis() - start;
-      metrics.incPreadTime(timeval);
-      metrics.incPreadSize(realLen);
-      metrics.incPreadOps();
-      return results;
-    }
-
-    @Override
-    public long skip(long n) throws IOException {
-      if ( n > 0 ) {
-        long curPos = getPos();
-        long fileLen = getFileLength();
-        if( n+curPos > fileLen ) {
-          n = fileLen - curPos;
-        }
-        seek(curPos+n);
-        return n;
-      }
-      return n < 0 ? -1 : 0;
-    }
-
-    /**
-     * Seek to a new arbitrary location
-     */
-    @Override
-    public synchronized void seek(long targetPos) throws IOException {
-      if (targetPos > getFileLength()) {
-        throw new IOException("Cannot seek after EOF");
-      }
-      boolean done = false;
-      if (pos <= targetPos && targetPos <= blockEnd) {
-        //
-        // If this seek is to a positive position in the current
-        // block, and this piece of data might already be lying in
-        // the TCP buffer, then just eat up the intervening data.
-        //
-        int diff = (int)(targetPos - pos);
-        if (diff <= TCP_WINDOW_SIZE) {
-          try {
-            pos += blockReader.skip(diff);
-            if (pos == targetPos) {
-              done = true;
-            }
-          } catch (IOException e) {//make following read to retry
-            incReadExpCntToStats();
-
-            LOG.debug("Exception while seek to " + targetPos + " from "
-                      + currentBlock +" of " + src + " from " + currentNode +
-                      ": " + StringUtils.stringifyException(e));
-          }
-        }
-      }
-      if (!done) {
-        pos = targetPos;
-        blockEnd = -1;
-      }
-    }
-
-    /**
-     * Same as {@link #seekToNewSource(long)} except that it does not exclude
-     * the current datanode and might connect to the same node.
-     */
-    private synchronized boolean seekToBlockSource(long targetPos,
-        boolean throwWhenNotFound) throws IOException {
-      currentNode = blockSeekTo(targetPos, throwWhenNotFound);
-      return true;
-    }
-
-    /**
-     * Seek to given position on a node other than the current node.  If
-     * a node other than the current node is found, then returns true.
-     * If another node could not be found, then returns false.
-     */
-    @Override
-    public synchronized boolean seekToNewSource(long targetPos) throws IOException {
-      return seekToNewSource(targetPos, true);
-    }
-    
-    /**
-     * Seek to given position on a node other than the current node.  If
-     * a node other than the current node is found, then returns true.
-     * If another node could not be found, then returns false.
-     */
-    public synchronized boolean seekToNewSource(long targetPos,
-        boolean throwWhenNotFound) throws IOException {
-      boolean markedDead = deadNodes.containsKey(currentNode);
-      addToDeadNodes(currentNode);
-      DatanodeInfo oldNode = currentNode;
-      DatanodeInfo newNode = blockSeekTo(targetPos, throwWhenNotFound);
-      if (!markedDead) {
-        /* remove it from deadNodes. blockSeekTo could have cleared
-         * deadNodes and added currentNode again. Thats ok. */
-        deadNodes.remove(oldNode);
-      }
-      if (!oldNode.getStorageID().equals(newNode.getStorageID())) {
-        currentNode = newNode;
-        return true;
-      } else {
-        return false;
-      }
-    }    
-
-    /**
-     */
-    @Override
-    public synchronized long getPos() throws IOException {
-      return pos;
-    }
-
-    /**
-     * WARNING: This method does not work with files larger than 2GB.
-     * Use getFileLength() - getPos() instead.
-     */
-    @Override
-    public synchronized int available() throws IOException {
-      if (closed) {
-        throw new IOException("Stream closed");
-      }
-      long length = getFileLength() - pos;
-      
-      if (!isUnderConstruction() || length > 0) {
-        return (int) length;
-      }
-
-      read(emptyByteArray);
-      return (int) (getFileLength() - pos);
-    }
-
-    /**
-     * We definitely don't support marks
-     */
-    @Override
-    public boolean markSupported() {
-      return false;
-    }
-    @Override
-    public void mark(int readLimit) {
-    }
-    @Override
-    public void reset() throws IOException {
-      throw new IOException("Mark/reset not supported");
-    }
-  }
-
-  public static class DFSDataInputStream extends FSDataInputStream {
-    DFSDataInputStream(DFSInputStream in)
-      throws IOException {
-      super(in);
-    }
-
-    /**
-     * Returns the datanode from which the stream is currently reading.
-     */
-    public DatanodeInfo getCurrentDatanode() {
-      return ((DFSInputStream)in).getCurrentDatanode();
-    }
-
-    /**
-     * Returns the block containing the target position.
-     */
-    public Block getCurrentBlock() {
-      return ((DFSInputStream)in).getCurrentBlock();
-    }
-
-    /**
-     * Return collection of blocks that has already been located.
-     */
-    public synchronized List<LocatedBlock> getAllBlocks() throws IOException {
-      return ((DFSInputStream)in).getAllBlocks();
-    }
-
-    @Override
-    public boolean isUnderConstruction() throws IOException {
-      return ((DFSInputStream)in).isUnderConstruction();
-    }
-
-    public long getFileLength() {
-      return ((DFSInputStream)in).getFileLength();
-    }
-  }
-
-  /**
-   * Encapsulate multiple output streams into one object.
-   */
-  class MultiDataOutputStream {
-    DataOutputStream[] streams;
-    volatile int errorSlot;
-
-    MultiDataOutputStream(DataOutputStream[] outs) {
-      this.streams = outs;
-      this.errorSlot = -1;       // no errors so far
-    }
-
-    DataOutputStream get(int i) {
-      return streams[i];
-    }
-
-    void set(int i, DataOutputStream st) {
-      streams[i] = st;
-    }
-
-    void write(byte[] buf, int off, int len) throws IOException {
-      for (int i = 0; i < streams.length; i++) {
-        try {
-          streams[i].write(buf, off, len);
-        } catch (IOException e) {
-          errorSlot = i;
-          throw e;
-        }
-      }
-    }
-
-    void writeInt(int v) throws IOException  {
-      for (int i = 0; i < streams.length; i++) {
-        try {
-          streams[i].writeInt(v);
-        } catch (IOException e) {
-          errorSlot = i;
-          throw e;
-        }
-      }
-    }
-
-    void flush() throws IOException {
-      for (int i = 0; i < streams.length; i++) {
-        try {
-          streams[i].flush();
-        } catch (IOException e) {
-          errorSlot = i;
-          throw e;
-        }
-      }
-    }
-
-    void close() throws IOException {
-      for (int i = 0; i < streams.length; i++) {
-        try {
-          streams[i].close();
-        } catch (IOException e) {
-          errorSlot = i;
-          throw e;
-        }
-      }
-    }
-
-    /** Returns the slot number of the file descriptor that encountered
-     * an error. Returns -1 if there were no error.
-     */
-    int getErrorIndex() {
-      return errorSlot;
-    }
-  }
-
-  /**
-   * Encapsulate multiple input streams into one object.
-   */
-  class MultiDataInputStream {
-    DataInputStream[] streams;
-
-    MultiDataInputStream(DataInputStream[] ins) {
-      this.streams = ins;
-    }
-
-    DataInputStream get(int i) {
-      return streams[i];
-    }
-
-    int size() {
-      return streams.length;
-    }
-
-    void set(int i, DataInputStream st) {
-      streams[i] = st;
-    }
-
-    void close() throws IOException {
-      for (int i = 0; i < streams.length; i++) {
-        streams[i].close();
-      }
-    }
-  }
-
-  /****************************************************************
-   * DFSOutputStream creates files from a stream of bytes.
-   *
-   * The client application writes data that is cached internally by
-   * this stream. Data is broken up into packets, each packet is
-   * typically 64K in size. A packet comprises of chunks. Each chunk
-   * is typically 512 bytes and has an associated checksum with it.
-   *
-   * When a client application fills up the currentPacket, it is
-   * enqueued into dataQueue.  The DataStreamer thread picks up
-   * packets from the dataQueue, sends it to the first datanode in
-   * the pipeline and moves it from the dataQueue to the ackQueue.
-   * The ResponseProcessor receives acks from the datanodes. When an
-   * successful ack for a packet is received from all datanodes, the
-   * ResponseProcessor removes the corresponding packet from the
-   * ackQueue.
-   *
-   * In case of error, all outstanding packets and moved from
-   * ackQueue. A new pipeline is setup by eliminating the bad
-   * datanode from the original pipeline. The DataStreamer now
-   * starts sending packets from the dataQueue.
-  ****************************************************************/
-  class DFSOutputStream extends FSOutputSummer implements Syncable, Replicable {
-    private Socket[] s;
-    boolean closed = false;
-
-    private String src;
-    private MultiDataOutputStream blockStream;
-    private MultiDataInputStream blockReplyStream;
-    private Block block;
-    final private long blockSize;
-    private DataChecksum checksum;
-    private LinkedList<Packet> dataQueue = new LinkedList<Packet>();
-    private LinkedList<Packet> ackQueue = new LinkedList<Packet>();
-    private int numPendingHeartbeats = 0;
-    private long lastPacketSentTime = 0;
-    private final long packetTimeout
-      = conf.getLong("dfs.client.packet.timeout", 15000); // 15 seconds
-    private Packet currentPacket = null;
-    private int maxPackets = 80; // each packet 64K, total 5MB
-    // private int maxPackets = 1000; // each packet 64K, total 64MB
-    private DataStreamer streamer = new DataStreamer();;
-    private ResponseProcessor response = null;
-    private long currentSeqno = 0;
-    private long lastQueuedSeqno = -1;
-    private long lastAckedSeqno = -1;
-    private long bytesCurBlock = 0; // bytes writen in current block
-    private int packetSize = 0; // write packet size, including the header.
-    private int chunksPerPacket = 0;
-    private DatanodeInfo[] nodes = null; // list of targets for current block
-    private DatanodeInfo[] favoredNodes = null; // put replicas here if possible
-    private volatile boolean hasError = false;
-    private volatile int errorIndex = 0;
-    private volatile IOException lastException = null;
-    private long artificialSlowdown = 0;
-    private long lastFlushOffset = 0; // offset when flush was invoked
-    private boolean persistBlocks = false; // persist blocks on namenode
-    private int recoveryErrorCount = 0; // number of times block recovery failed
-    private final int maxRecoveryErrorCount
-      = conf.getInt("dfs.client.block.recovery.retries", 5); // try block recovery 5 times
-    private volatile boolean appendChunk = false;   // appending to existing partial block
-    private long initialFileSize = 0; // at time of file open
-    private Progressable progress;
-    private short blockReplication; // replication factor of file
-    private long lastBlkOffset = 0; // end pos of last block already sent
-
-    private boolean forceSync;
-    private boolean doParallelWrites = false;
-    
-    private int namespaceId;  // the namespace that the file belongs to
-
-    private void setLastException(IOException e) {
-      if (lastException == null) {
-        lastException = e;
-      }
-    }
-    
-    public void setOffsets(long offset) {
-      LOG.info("set last block offsets in file: " + src + " pos: " + offset);
-      lastBlkOffset = offset;
-    }
-
-    private class Packet {
-      ByteBuffer buffer;           // only one of buf and buffer is non-null
-      byte[]  buf;
-      long    seqno;               // sequencenumber of buffer in block
-      long    offsetInBlock;       // offset in block
-      boolean lastPacketInBlock;   // is this the last packet in block?
-      int     numChunks;           // number of chunks currently in packet
-      int     maxChunks;           // max chunks in packet
-      int     dataStart;
-      int     dataPos;
-      int     checksumStart;
-      int     checksumPos;
-
-      private static final long HEART_BEAT_SEQNO = -1L;
-
-      /**
-       *  create a heartbeat packet
-       */
-      Packet() {
-        this.lastPacketInBlock = false;
-        this.numChunks = 0;
-        this.offsetInBlock = 0;
-        this.seqno = HEART_BEAT_SEQNO;
-
-        buffer = null;
-        int packetSize = DataNode.PKT_HEADER_LEN + SIZE_OF_INTEGER;
-        buf = new byte[packetSize];
-
-        checksumStart = dataStart = packetSize;
-        checksumPos = checksumStart;
-        dataPos = dataStart;
-        maxChunks = 0;
-      }
-
-     // create a new packet
-      Packet(int pktSize, int chunksPerPkt, long offsetInBlock)
-      throws IOException {
-        this.lastPacketInBlock = false;
-        this.numChunks = 0;
-        this.offsetInBlock = offsetInBlock;
-        this.seqno = currentSeqno;
-        currentSeqno++;
-
-        buffer = null;
-        buf = new byte[pktSize];
-
-        checksumStart = DataNode.PKT_HEADER_LEN + SIZE_OF_INTEGER;
-        checksumPos = checksumStart;
-        dataStart = checksumStart + chunksPerPkt * checksum.getChecksumSize();
-        dataPos = dataStart;
-        maxChunks = chunksPerPkt;
-      }
-
-      void writeData(byte[] inarray, int off, int len) {
-        if ( dataPos + len > buf.length) {
-          throw new BufferOverflowException();
-        }
-        System.arraycopy(inarray, off, buf, dataPos, len);
-        dataPos += len;
-      }
-
-      void  writeChecksum(byte[] inarray, int off, int len) {
-        if (checksumPos + len > dataStart) {
-          throw new BufferOverflowException();
-        }
-        System.arraycopy(inarray, off, buf, checksumPos, len);
-        checksumPos += len;
-      }
-
-      /**
-       * Returns ByteBuffer that contains one full packet, including header.
-       * @throws IOException
-       */
-      ByteBuffer getBuffer() throws IOException {
-        /* Once this is called, no more data can be added to the packet.
-         * setting 'buf' to null ensures that.
-         * This is called only when the packet is ready to be sent.
-         */
-        if (buffer != null) {
-          return buffer;
-        }
-
-        //prepare the header and close any gap between checksum and data.
-
-        int dataLen = dataPos - dataStart;
-        int checksumLen = checksumPos - checksumStart;
-
-        if (checksumPos != dataStart) {
-          /* move the checksum to cover the gap.
-           * This can happen for the last packet.
-           */
-          System.arraycopy(buf, checksumStart, buf,
-                           dataStart - checksumLen , checksumLen);
-        }
-
-        int pktLen = SIZE_OF_INTEGER + dataLen + checksumLen;
-
-        //normally dataStart == checksumPos, i.e., offset is zero.
-        buffer = ByteBuffer.wrap(buf, dataStart - checksumPos,
-													 DataNode.PKT_HEADER_LEN + pktLen);
-        buf = null;
-        buffer.mark();
-
-        /* write the header and data length.
-         * The format is described in comment before DataNode.BlockSender
-         */
-        buffer.putInt(pktLen);  // pktSize
-        buffer.putLong(offsetInBlock);
-        buffer.putLong(seqno);
-
-        if (dataTransferVersion >= getDataTransferProtocolVersion()) {
-	        byte booleanFieldValue = 0x00;
-
-	        if (lastPacketInBlock) {
-			booleanFieldValue |= DataNode.isLastPacketInBlockMask;
-	        }
-	        if (forceSync) {
-			booleanFieldValue |= DataNode.forceSyncMask;
-	        }
-	        buffer.put(booleanFieldValue);
-        } else {
-		buffer.put((byte) (lastPacketInBlock? 1: 0));
-        }
-
-        //end of pkt header
-        buffer.putInt(dataLen); // actual data length, excluding checksum.
-        buffer.reset();
-        return buffer;
-      }
-
-      private long getEndPosInCurrBlk() {
-        return offsetInBlock + (dataPos - dataStart);
-      }
-      
-      /**
-       * Check if this packet is a heart beat packet
-       * @return true if the sequence number is HEART_BEAT_SEQNO
-       */
-      private boolean isHeartbeatPacket() {
-        return seqno == HEART_BEAT_SEQNO;
-      }
-    }
-
-    /** Decide if the write pipeline supports bidirectional heartbeat or not */
-    private boolean supportClientHeartbeat() throws IOException {
-      return getDataTransferProtocolVersion() >=
-                   DataTransferProtocol.CLIENT_HEARTBEAT_VERSION;
-    }
-
-    /**
-     * Check if the last outstanding packet has not received an ack before
-     * it is timed out.
-     * If true, for now just log it.
-     * We will provide a decent solution to this later on.
-     */
-    private void checkIfLastPacketTimeout() {
-       synchronized (ackQueue) {
-               if( !ackQueue.isEmpty()  && (
-                               System.currentTimeMillis() - lastPacketSentTime > packetTimeout) ) {
-               LOG.warn("Packet " + ackQueue.getLast().seqno +
-                               " of " + block + " is timed out");
-               }
-       }
-    }
-
-
-    //
-    // The DataStreamer class is responsible for sending data packets to the
-    // datanodes in the pipeline. It retrieves a new blockid and block locations
-    // from the namenode, and starts streaming packets to the pipeline of
-    // Datanodes. Every packet has a sequence number associated with
-    // it. When all the packets for a block are sent out and acks for each
-    // if them are received, the DataStreamer closes the current block.
-    //
-    private class DataStreamer extends Daemon {
-
-      private volatile boolean closed = false;
-      private long lastPacket;
-      private boolean doSleep;
-
-      DataStreamer() throws IOException {
-        // explicitly invoke RPC so avoiding RPC in waitForWork
-        // that might cause timeout
-        getDataTransferProtocolVersion();
-      }
-
-      private void waitForWork() throws IOException {
-        if ( supportClientHeartbeat() ) {  // send heart beat
-          long now = System.currentTimeMillis();
-          while ((!closed && !hasError && clientRunning
-              && dataQueue.size() == 0  &&
-              (blockStream == null || (
-                  blockStream != null && now - lastPacket < timeoutValue/2)))
-                  || doSleep) {
-            long timeout = timeoutValue/2 - (now-lastPacket);
-            timeout = timeout <= 0 ? 1000 : timeout;
-
-            try {
-              dataQueue.wait(timeout);
-              checkIfLastPacketTimeout();
-              now = System.currentTimeMillis();
-            } catch (InterruptedException  e) {
-            }
-            doSleep = false;
-          }
-        } else { // no sending heart beat
-          while ((!closed && !hasError && clientRunning
-              && dataQueue.size() == 0) || doSleep) {
-            try {
-              dataQueue.wait(1000);
-            } catch (InterruptedException  e) {
-            }
-            doSleep = false;
-          }
-        }
-      }
-
-      public void run() {
-        while (!closed && clientRunning) {
-
-          // if the Responder encountered an error, shutdown Responder
-          if (hasError && response != null) {
-            try {
-              response.close();
-              response.join();
-              response = null;
-            } catch (InterruptedException  e) {
-            }
-          }
-
-          Packet one = null;
-          synchronized (dataQueue) {
-
-            // process IO errors if any
-            doSleep = processDatanodeError(hasError, false);
-
-            try {
-              // wait for a packet to be sent.
-              waitForWork();
-
-              if (closed || hasError || !clientRunning) {
-                continue;
-              }
-
-              // get packet to be sent.
-              if (dataQueue.isEmpty()) {
-                one = new Packet();  // heartbeat packet
-              } else {
-                one = dataQueue.getFirst(); // regular data packet
-              }
-              long offsetInBlock = one.offsetInBlock;
-
-              // get new block from namenode.
-              if (blockStream == null) {
-                LOG.debug("Allocating new block: " + src + "  pos: " + lastBlkOffset);
-
-                nodes = nextBlockOutputStream(src);
-                this.setName("DataStreamer for file " + src +
-                             " block " + block);
-                response = new ResponseProcessor(nodes);
-                response.start();
-              }
-
-              if (offsetInBlock >= blockSize) {
-                throw new IOException("BlockSize " + blockSize +
-                                      " is smaller than data size. " +
-                                      " Offset of packet in block " +
-                                      offsetInBlock +
-                                      " Aborting file " + src);
-              }
-
-              ByteBuffer buf = one.getBuffer();
-
-              // write out data to remote datanode
-              blockStream.write(buf.array(), buf.position(), buf.remaining());
-
-              if (one.lastPacketInBlock) {
-                blockStream.writeInt(0); // indicate end-of-block
-              }
-              blockStream.flush();
-              lastPacket = System.currentTimeMillis();
-              if (LOG.isDebugEnabled()) {
-                LOG.debug("DataStreamer block " + block +
-                          " wrote packet seqno:" + one.seqno +
-                          " size:" + buf.remaining() +
-                          " offsetInBlock:" + one.offsetInBlock +
-                          " lastPacketInBlock:" + one.lastPacketInBlock);
-              }
-
-              // move packet from dataQueue to ackQueue
-              if (!one.isHeartbeatPacket()) {
-                dataQueue.removeFirst();
-                dataQueue.notifyAll();
-                synchronized (ackQueue) {
-                  ackQueue.addLast(one);
-                  lastPacketSentTime = System.currentTimeMillis();
-                  ackQueue.notifyAll();
-                }
-              } else {
-                synchronized (ackQueue) {
-                  numPendingHeartbeats++;
-                  ackQueue.notifyAll();                  
-                }
-
-                LOG.info("Sending a heartbeat packet for block " + block);
-              }
-            } catch (Throwable e) {
-              incWriteExpCntToStats();
-
-              LOG.warn("DataStreamer Exception: " +
-                       StringUtils.stringifyException(e));
-              if (e instanceof IOException) {
-                setLastException((IOException)e);
-              }
-              hasError = true;
-              if (blockStream != null) {
-                // find the first datanode to which we could not write data.
-                int possibleError =  blockStream.getErrorIndex();
-                if (possibleError != -1) {
-                  errorIndex = possibleError;
-                  LOG.warn("DataStreamer bad datanode in pipeline:" +
-                           possibleError);
-                }
-              }
-            }
-          }
-
-          if (closed || hasError || !clientRunning) {
-            continue;
-          }
-
-          // Is this block full?
-          if (one.lastPacketInBlock) {
-            synchronized (ackQueue) {
-              while (!hasError && ackQueue.size() != 0 && clientRunning) {
-                try {
-                  ackQueue.wait();   // wait for acks to arrive from datanodes
-                } catch (InterruptedException  e) {
-                }
-              }
-            }
-            LOG.debug("Closing old block " + block);
-            this.setName("DataStreamer for file " + src);
-
-            response.close();        // ignore all errors in Response
-            try {
-              response.join();
-              response = null;
-            } catch (InterruptedException  e) {
-            }
-            
-            if (closed || hasError || !clientRunning) {
-              continue;
-            }
-
-            synchronized (dataQueue) {
-              try {
-                blockStream.close();
-                blockReplyStream.close();
-              } catch (IOException e) {
-              }
-              nodes = null;
-              response = null;
-              blockStream = null;
-              blockReplyStream = null;
-            }
-          }
-          
-          if (progress != null) { progress.progress(); }
-
-          // This is used by unit test to trigger race conditions.
-          if (artificialSlowdown != 0 && clientRunning) {
-            sleepForUnitTest(artificialSlowdown);
-          }
-        }
-      }
-
-      // shutdown thread
-      void close() {
-        closed = true;
-        synchronized (dataQueue) {
-          dataQueue.notifyAll();
-        }
-        synchronized (ackQueue) {
-          ackQueue.notifyAll();
-        }
-        this.interrupt();
-      }
-    }
-
-    //
-    // Processes reponses from the datanodes.  A packet is removed
-    // from the ackQueue when its response arrives.
-    //
-    private class ResponseProcessor extends Thread {
-
-      private volatile boolean closed = false;
-      private DatanodeInfo[] targets = null;
-      private boolean lastPacketInBlock = false;
-
-      ResponseProcessor (DatanodeInfo[] targets) {
-        this.targets = targets;
-      }
-
-      public void run() {
-
-        this.setName("ResponseProcessor for block " + block);
-
-        while (!closed && clientRunning && !lastPacketInBlock) {
-          // process responses from datanodes.
-          int recordError = 0;
-          try {
-            long seqno = 0;
-            synchronized (ackQueue) {
-              while (!closed && clientRunning && ackQueue.isEmpty() &&
-                     numPendingHeartbeats == 0) {
-                try {
-                  ackQueue.wait();
-                } catch (InterruptedException e) {
-                  // If the thread is being interrupted when waiting for
-                  // packet, we log the exception and treat it as a normal
-                  // exception.
-                  //
-                  LOG.info("ResponseProcessor thread interrupted when " +
-                           "waiting for new packets");
-                  throw e;
-                }
-              }
-            }
-            if (closed || !clientRunning) {
-              break;
-            }
-
-            if (!doParallelWrites) {
-              // verify seqno from datanode
-              seqno = blockReplyStream.get(0).readLong();
-              LOG.debug("DFSClient received ack for seqno " + seqno);
-              if (seqno == Packet.HEART_BEAT_SEQNO && !supportClientHeartbeat()) {
-                continue;
-              }
-              // regular ack
-              // processes response status from all datanodes.
-              for (int i = 0; i < targets.length && clientRunning; i++) {
-                short reply = blockReplyStream.get(0).readShort();
-                if (reply != DataTransferProtocol.OP_STATUS_SUCCESS) {
-                  recordError = i; // first bad datanode
-                  throw new IOException("Bad response " + reply + " for block "
-                      + block + " from datanode " + targets[i].getName());
-                }
-              }
-            } else {
-              // The client is writing to all replicas in parallel. It also
-              // expects an ack from all replicas.
-              long lastsn = 0;
-              assert blockReplyStream.size() > 0;
-              for (int i = 0; i < blockReplyStream.size(); i++) {
-                recordError = i; // remember the current slot
-                seqno = blockReplyStream.get(i).readLong();
-                if (LOG.isDebugEnabled()) {
-                  LOG.debug("DFSClient for block " + block + " " + seqno);
-                }
-                if (i != 0 && seqno != -2 && seqno != lastsn) {
-                  String msg = "Responses from datanodes do not match "
-                      + " this replica acked " + seqno
-                      + " but previous replica acked " + lastsn;
-                  LOG.warn(msg);
-                  throw new IOException(msg);
-                }
-                short reply = blockReplyStream.get(i).readShort();
-                if (reply != DataTransferProtocol.OP_STATUS_SUCCESS) {
-                  recordError = i; // first bad datanode
-                  throw new IOException("Bad parallel response " + reply
-                      + " for block " + block + " from datanode "
-                      + targets[i].getName());
-                }
-                lastsn = seqno;
-              }
-            }
-
-            assert seqno != -2 :
-              "Ack for unkown seqno should be a failed ack!";
-            if (seqno == Packet.HEART_BEAT_SEQNO) {  // a heartbeat ack
-              assert supportClientHeartbeat();
-              synchronized(ackQueue) {
-                assert numPendingHeartbeats > 0;
-                numPendingHeartbeats--;
-              }
-              continue;
-            }
-
-            Packet one = null;
-            synchronized (ackQueue) {
-              assert !ackQueue.isEmpty();
-              one = ackQueue.getFirst();
-            }
-            if (one.seqno != seqno) {
-              throw new IOException("Responseprocessor: Expecting seqno " +
-                  " for block " + block +
-                  one.seqno + " but received " + seqno);
-            }
-            lastPacketInBlock = one.lastPacketInBlock;
-
-            if (lastPacketInBlock) {
-              if (LOG.isDebugEnabled()) {
-                LOG
-                    .debug("Update pos in file: " + src + " curBlckOffset: "
-                        + lastBlkOffset + " blockSize: "
-                        + one.getEndPosInCurrBlk());
-              }
-              lastBlkOffset += one.getEndPosInCurrBlk();
-            }
-
-            synchronized (ackQueue) {
-              assert seqno == lastAckedSeqno + 1;
-              lastAckedSeqno = seqno;
-              
-              ackQueue.removeFirst();
-              ackQueue.notifyAll();
-            }
-
-          } catch (Exception e) {
-            if (!closed) {
-              hasError = true;
-              errorIndex = recordError;
-              if (e instanceof IOException) {
-                setLastException((IOException)e);
-              }
-              LOG.warn("DFSOutputStream ResponseProcessor exception " +
-                       " for block " + block +
-                        StringUtils.stringifyException(e));
-              closed = true;
-            }
-          }
-
-          synchronized (dataQueue) {
-            dataQueue.notifyAll();
-          }
-          synchronized (ackQueue) {
-            ackQueue.notifyAll();
-          }
-        }
-      }
-
-      void close() {
-        closed = true;
-        this.interrupt();
-      }
-    }
-
-    // If this stream has encountered any errors so far, shutdown
-    // threads and mark stream as closed. Returns true if we should
-    // sleep for a while after returning from this call.
-    //
-    private boolean processDatanodeError(boolean hasError, boolean isAppend) {
-      if (!hasError) {
-        return false;
-      }
-      if (response != null) {
-        LOG.info("Error Recovery for block " + block +
-                 " waiting for responder to exit. ");
-        return true;
-      }
-      incWriteExpCntToStats();
-
-      if (errorIndex >= 0) {
-        LOG.warn("Error Recovery for block " + block
-            + " bad datanode[" + errorIndex + "] "
-            + (nodes == null? "nodes == null": nodes[errorIndex].getName()));
-      }
-
-      if (blockStream != null) {
-        try {
-          blockStream.close();
-          blockReplyStream.close();
-        } catch (IOException e) {
-        }
-      }
-      blockStream = null;
-      blockReplyStream = null;
-
-      // move packets from ack queue to front of the data queue
-      synchronized (ackQueue) {
-        if (!ackQueue.isEmpty()) {
-          LOG.info("First unacked packet in " + block + " starts at "
-                 + ackQueue.getFirst().offsetInBlock);
-          dataQueue.addAll(0, ackQueue);
-          ackQueue.clear();
-        }
-        numPendingHeartbeats = 0;
-      }
-
-      boolean success = false;
-      while (!success && clientRunning) {
-        DatanodeInfo[] newnodes = null;
-        if (nodes == null) {
-          String msg = "Could not get block locations. " +
-                                          "Source file \"" + src
-                                          + "\" - Aborting...";
-          LOG.warn(msg);
-          setLastException(new IOException(msg));
-          closed = true;
-          if (streamer != null) streamer.close();
-          return false;
-        }
-        StringBuilder pipelineMsg = new StringBuilder();
-        for (int j = 0; j < nodes.length; j++) {
-          pipelineMsg.append(nodes[j].getName());
-          if (j < nodes.length - 1) {
-            pipelineMsg.append(", ");
-          }
-        }
-        // remove bad datanode from list of datanodes.
-        // If errorIndex was not set (i.e. appends), then do not remove
-        // any datanodes
-        //
-        if (errorIndex < 0) {
-          newnodes = nodes;
-        } else {
-          if (nodes.length <= 1) {
-            lastException = new IOException("All datanodes " + pipelineMsg +
-                                            " are bad. Aborting...");
-            closed = true;
-            if (streamer != null) streamer.close();
-            return false;
-          }
-          LOG.warn("Error Recovery for block " + block +
-                   " in pipeline " + pipelineMsg +
-                   ": bad datanode " + nodes[errorIndex].getName());
-          newnodes =  new DatanodeInfo[nodes.length-1];
-          System.arraycopy(nodes, 0, newnodes, 0, errorIndex);
-          System.arraycopy(nodes, errorIndex+1, newnodes, errorIndex,
-              newnodes.length-errorIndex);
-        }
-
-        // Tell the primary datanode to do error recovery
-        // by stamping appropriate generation stamps.
-        //
-        LocatedBlock newBlock = null;
-        ProtocolProxy<ClientDatanodeProtocol> primary =  null;
-        DatanodeInfo primaryNode = null;
-        try {
-          // Pick the "least" datanode as the primary datanode to avoid deadlock.
-          primaryNode = Collections.min(Arrays.asList(newnodes));
-		/* considering pipeline recovery needs 3 RPCs to DataNodes
-		 * and 2 RPCs to NameNode; So rpcTimeout sets to be 5 times of
-		 * client socketTimeout
-		 */
-          int recoverTimeout = 5*socketTimeout;
-          primary = createClientDNProtocolProxy(primaryNode, conf,
-              recoverTimeout);
-          if (primary.isMethodSupported("recoverBlock", int.class, Block.class,
-              boolean.class, DatanodeInfo[].class, long.class)) {
-            // The deadline is up to RPC time out minus one socket timeout
-            // to be more conservative.
-            newBlock = primary.getProxy().recoverBlock(namespaceId, block,
-                isAppend, newnodes,
-                System.currentTimeMillis() + recoverTimeout - socketTimeout);
-          } else if (primary.isMethodSupported("recoverBlock", int.class, Block.class, boolean.class, DatanodeInfo[].class)) {
-            newBlock = primary.getProxy().recoverBlock(
-                namespaceId, block, isAppend, newnodes);
-          } else {
-            newBlock = primary.getProxy().recoverBlock(block, isAppend, newnodes);
-          }
-          long nextByteToSend = dataQueue.isEmpty() ? 
-              bytesCurBlock : dataQueue.getFirst().offsetInBlock;
-          if (nextByteToSend > newBlock.getBlockSize()) {
-            LOG.warn("Missing bytes! Error Recovery for block " + block +
-                " end up with " +
-                newBlock.getBlockSize() + " bytes but client already sent " +
-                nextByteToSend + " bytes and data queue is " +
-                (dataQueue.isEmpty() ? "" : "not ") + "empty.");
-          }
+          streams[i].flush();
         } catch (IOException e) {
-          incWriteExpCntToStats();
-
-          LOG.warn("Failed recovery attempt #" + recoveryErrorCount +
-              " from primary datanode " + primaryNode, e);
-          recoveryErrorCount++;
-          if (recoveryErrorCount > maxRecoveryErrorCount) {
-            if (nodes.length > 1) {
-              // if the primary datanode failed, remove it from the list.
-              // The original bad datanode is left in the list because it is
-              // conservative to remove only one datanode in one iteration.
-              for (int j = 0; j < nodes.length; j++) {
-                if (nodes[j].equals(primaryNode)) {
-                  errorIndex = j; // forget original bad node.
-                }
-              }
-              // remove primary node from list
-              newnodes =  new DatanodeInfo[nodes.length-1];
-              System.arraycopy(nodes, 0, newnodes, 0, errorIndex);
-              System.arraycopy(nodes, errorIndex+1, newnodes, errorIndex,
-                               newnodes.length-errorIndex);
-              nodes = newnodes;
-              LOG.warn("Error Recovery for block " + block + " failed " +
-                       " because recovery from primary datanode " +
-                       primaryNode + " failed " + recoveryErrorCount +
-                       " times. " + " Pipeline was " + pipelineMsg +
-                       ". Marking primary datanode as bad.");
-              recoveryErrorCount = 0;
-              errorIndex = -1;
-              return true;          // sleep when we return from here
-            }
-            String emsg = "Error Recovery for block " + block + " failed " +
-                          " because recovery from primary datanode " +
-                          primaryNode + " failed " + recoveryErrorCount +
-                          " times. "  + " Pipeline was " + pipelineMsg +
-                          ". Aborting...";
-            LOG.warn(emsg);
-            lastException = new IOException(emsg);
-            closed = true;
-            if (streamer != null) streamer.close();
-            return false;       // abort with IOexception
-          }
-          LOG.warn("Error Recovery for block " + block + " failed " +
-                   " because recovery from primary datanode " +
-                   primaryNode + " failed " + recoveryErrorCount +
-                   " times. "  + " Pipeline was " + pipelineMsg +
-                   ". Will retry...");
-          return true;          // sleep when we return from here
-        } finally {
-          if (primary != null) {
-            RPC.stopProxy(primary.getProxy());
-          }
-        }
-        recoveryErrorCount = 0; // block recovery successful
-
-        // If the block recovery generated a new generation stamp, use that
-        // from now on.  Also, setup new pipeline
-        //
-        if (newBlock != null) {
-          block = newBlock.getBlock();
-          nodes = newBlock.getLocations();
-        }
-
-        this.hasError = false;
-        lastException = null;
-        errorIndex = 0;
-        success = createBlockOutputStream(nodes, clientName, true);
-      }
-
-      response = new ResponseProcessor(nodes);
-      response.start();
-      return false; // do not sleep, continue processing
-    }
-
-    private void isClosed() throws IOException {
-      if ((closed || !clientRunning) && lastException != null) {
-          throw lastException;
-      }
-    }
-
-    //
-    // returns the list of targets, if any, that is being currently used.
-    //
-    DatanodeInfo[] getPipeline() {
-      synchronized (dataQueue) {
-        if (nodes == null) {
-          return null;
-        }
-        DatanodeInfo[] value = new DatanodeInfo[nodes.length];
-        for (int i = 0; i < nodes.length; i++) {
-          value[i] = nodes[i];
-        }
-        return value;
-      }
-    }
-
-    private DFSOutputStream(String src, long blockSize, Progressable progress,
-        int bytesPerChecksum, short replication, boolean forceSync,
-        boolean doParallelWrites, DatanodeInfo[] favoredNodes)
-    throws IOException {
-      super(new CRC32(), bytesPerChecksum, 4);
-      this.forceSync = forceSync;
-      this.doParallelWrites = doParallelWrites;
-      this.src = src;
-      this.blockSize = blockSize;
-      this.blockReplication = replication;
-      this.progress = progress;
-      if (progress != null) {
-        LOG.debug("Set non-null progress callback on DFSOutputStream "+src);
-      }
-
-      this.favoredNodes = favoredNodes;
-
-      if ( bytesPerChecksum < 1 || blockSize % bytesPerChecksum != 0) {
-        throw new IOException("io.bytes.per.checksum(" + bytesPerChecksum +
-                              ") and blockSize(" + blockSize +
-                              ") do not match. " + "blockSize should be a " +
-                              "multiple of io.bytes.per.checksum");
-
-      }
-      checksum = DataChecksum.newDataChecksum(DataChecksum.CHECKSUM_CRC32,
-                                              bytesPerChecksum,
-                                              new PureJavaCrc32());
-    }
-    
-    /**
-     * Create a new output stream to the given DataNode.
-     * @see ClientProtocol#create(String, FsPermission, String, boolean, short, long)
-     */
-    DFSOutputStream(String src, int buffersize, Progressable progress,
-        LocatedBlock lastBlock, FileStatus stat, int bytesPerChecksum)
-        throws IOException {
-      this(src, buffersize, progress, lastBlock, stat, bytesPerChecksum, 0);
-    }
-
-    /**
-     * Create a new output stream to the given DataNode.
-     * @see ClientProtocol#create(String, FsPermission, String, boolean, short, long)
-     */
-    DFSOutputStream(String src, FsPermission masked, boolean overwrite,
-        boolean createParent, short replication, long blockSize,
-        Progressable progress,int buffersize, int bytesPerChecksum,
-        boolean forceSync, boolean doParallelWrites,
-        DatanodeInfo[] favoredNodes) throws IOException {
-      this(src, blockSize, progress, bytesPerChecksum, replication,forceSync,
-           doParallelWrites, favoredNodes);
-
-      computePacketChunkSize(writePacketSize, bytesPerChecksum);
-
-      try {
-        if (namenodeProtocolProxy != null && 
-              namenodeProtocolProxy.isMethodSupported("create", String.class, 
-                 FsPermission.class, String.class, boolean.class, boolean.class,
-                 short.class, long.class)) {
-          namenode.create(src, masked, clientName, overwrite,
-                          createParent, replication, blockSize);
-        } else {
-          namenode.create(src, masked, clientName, overwrite,
-                          replication, blockSize);
-        }
-      } catch(RemoteException re) {
-        incWriteExpCntToStats();
-
-        throw re.unwrapRemoteException(AccessControlException.class,
-                                       FileAlreadyExistsException.class,
-                                       FileNotFoundException.class,
-                                       NSQuotaExceededException.class,
-                                       DSQuotaExceededException.class);
-      }
-      streamer.start();
-    }
-
-    /**
-     * Create a new output stream to the given DataNode with namespace id.
-     */
-    DFSOutputStream(String src, int buffersize, Progressable progress,
-        LocatedBlock lastBlock, FileStatus stat,
-        int bytesPerChecksum, int namespaceId) throws IOException {
-      this(src, stat.getBlockSize(), progress, bytesPerChecksum,
-          stat.getReplication(), false, false, null);
-      initialFileSize = stat.getLen(); // length of file when opened
-      this.namespaceId = namespaceId;
-      //
-      // The last partial block of the file has to be filled.
-      //
-      if (lastBlock != null) {
-        block = lastBlock.getBlock();
-        long usedInLastBlock = stat.getLen() % blockSize;
-        int freeInLastBlock = (int)(blockSize - usedInLastBlock);
-
-        // calculate the amount of free space in the pre-existing
-        // last crc chunk
-        int usedInCksum = (int)(stat.getLen() % bytesPerChecksum);
-        int freeInCksum = bytesPerChecksum - usedInCksum;
-
-        // if there is space in the last block, then we have to
-        // append to that block
-        if (freeInLastBlock > blockSize) {
-          throw new IOException("The last block for file " +
-                                src + " is full.");
-        }
-
-        // indicate that we are appending to an existing block
-        bytesCurBlock = lastBlock.getBlockSize();
-
-        if (usedInCksum > 0 && freeInCksum > 0) {
-          // if there is space in the last partial chunk, then
-          // setup in such a way that the next packet will have only
-          // one chunk that fills up the partial chunk.
-          //
-          computePacketChunkSize(0, freeInCksum);
-          resetChecksumChunk(freeInCksum);
-          this.appendChunk = true;
-        } else {
-          // if the remaining space in the block is smaller than
-          // that expected size of of a packet, then create
-          // smaller size packet.
-          //
-          computePacketChunkSize(Math.min(writePacketSize, freeInLastBlock),
-                                 bytesPerChecksum);
-        }
-
-        // setup pipeline to append to the last block
-        nodes = lastBlock.getLocations();
-        errorIndex = -1;   // no errors yet.
-        if (nodes.length < 1) {
-          throw new IOException("Unable to retrieve blocks locations" +
-                                " for append to last block " + block +
-                                " of file " + src);
-
-        }
-        // keep trying to setup a pipeline until you know all DNs are dead
-        while (processDatanodeError(true, true)) {
-          try {
-            Thread.sleep(1000);
-          } catch (InterruptedException  e) {
-          }
-        }
-        if (lastException != null) {
-          throw lastException;
-        }
-      }
-      else {
-        computePacketChunkSize(writePacketSize, bytesPerChecksum);
-      }
-      
-      long blockOffset = stat.getLen();
-      blockOffset -= blockOffset % blockSize;
-      setOffsets(blockOffset);
-      streamer.start();
-    }
-
-    private void computePacketChunkSize(int psize, int csize) {
-      int chunkSize = csize + checksum.getChecksumSize();
-      int n = DataNode.PKT_HEADER_LEN + SIZE_OF_INTEGER;
-      chunksPerPacket = Math.max((psize - n + chunkSize-1)/chunkSize, 1);
-      packetSize = n + chunkSize*chunksPerPacket;
-      if (LOG.isDebugEnabled()) {
-        LOG.debug("computePacketChunkSize: src=" + src +
-                  ", chunkSize=" + chunkSize +
-                  ", chunksPerPacket=" + chunksPerPacket +
-                  ", packetSize=" + packetSize);
-      }
-    }
-
-    /**
-     * Open a DataOutputStream to a DataNode so that it can be written to.
-     * This happens when a file is created and each time a new block is allocated.
-     * Must get block ID and the IDs of the destinations from the namenode.
-     * Returns the list of target datanodes.
-     */
-    private DatanodeInfo[] nextBlockOutputStream(String client) throws IOException {
-      LocatedBlock lb = null;
-      boolean retry = false;
-      DatanodeInfo[] nodes;
-      ArrayList<DatanodeInfo> excludedNodes = new ArrayList<DatanodeInfo>();
-      int count = conf.getInt("dfs.client.block.write.retries", 3);
-      boolean success;
-      do {
-        hasError = false;
-        lastException = null;
-        errorIndex = 0;
-        retry = false;
-        nodes = null;
-        success = false;
-
-        long startTime = System.currentTimeMillis();
-
-        DatanodeInfo[] excluded = excludedNodes.toArray(new DatanodeInfo[0]);
-        lb = locateFollowingBlock(startTime, excluded.length > 0 ? excluded
-            : null);
-        block = lb.getBlock();
-        nodes = lb.getLocations();
-
-        //
-        // Connect to first DataNode in the list.
-        //
-        success = createBlockOutputStream(nodes, clientName, false);
-
-        if (!success) {
-          LOG.info("Abandoning block " + block + " for file " + src);
-          namenode.abandonBlock(block, src, clientName);
-
-          if (errorIndex < nodes.length) {
-            LOG.debug("Excluding datanode " + nodes[errorIndex]);
-            excludedNodes.add(nodes[errorIndex]);
-          }
-
-          // Connection failed.  Let's wait a little bit and retry
-          retry = true;
-        }
-      } while (retry && --count >= 0);
-
-      if (!success) {
-        throw new IOException("Unable to create new block.");
-      }
-      return nodes;
-    }
-
-    // For pipelined writes, connects to the first datanode in the pipeline.
-    // For parallel writes, connect to all specified datanodes.
-    // Returns true if success, otherwise return failure.
-    //
-    private boolean createBlockOutputStream(DatanodeInfo[] nodes, String client,
-                    boolean recoveryFlag) {
-      String firstBadLink = "";
-      if (LOG.isDebugEnabled()) {
-        for (int i = 0; i < nodes.length; i++) {
-          LOG.debug("pipeline = " + nodes[i].getName());
-        }
-      }
-
-      // persist blocks on namenode on next flush
-      persistBlocks = true;
-      boolean result = false;
-      int curNode = 0;
-      int length = 0;
-      int pipelineDepth;
-      if (doParallelWrites) {
-        length = nodes.length; // connect to all datanodes
-        pipelineDepth = 1;
-      } else {
-        length = 1; // connect to only the first datanode
-        pipelineDepth = nodes.length;
-      }
-      DataOutputStream[] tmpOut = new DataOutputStream[length];
-      DataInputStream[] replyIn = new DataInputStream[length];
-      Socket[] sockets = new Socket[length];
-
-      try {
-        for (curNode = 0; curNode < length;  curNode++) {
-
-          LOG.debug("Connecting to " + nodes[curNode].getName());
-          InetSocketAddress target = NetUtils.createSocketAddr(nodes[curNode].getName());
-          Socket s = socketFactory.createSocket();
-          sockets[curNode] = s;
-          timeoutValue = socketReadExtentionTimeout * pipelineDepth + socketTimeout;
-          NetUtils.connect(s, target, timeoutValue, ipTosValue);
-          s.setSoTimeout(timeoutValue);
-          s.setSendBufferSize(DEFAULT_DATA_SOCKET_SIZE);
-          LOG.debug("Send buf size " + s.getSendBufferSize());
-          long writeTimeout = datanodeWriteExtentionTimeout *
-                              pipelineDepth + datanodeWriteTimeout;
-
-          //
-          // Xmit header info to datanode (see DataXceiver.java)
-          //
-          DataOutputStream out = new DataOutputStream(
-            new BufferedOutputStream(NetUtils.getOutputStream(s, writeTimeout),
-                                     DataNode.SMALL_BUFFER_SIZE));
-          tmpOut[curNode] = out;
-          DataInputStream brs = new DataInputStream(NetUtils.getInputStream(s));
-          replyIn[curNode] = brs;
-
-          int version = getDataTransferProtocolVersion();
-          WriteBlockHeader header = new WriteBlockHeader(version,
-              namespaceId, block.getBlockId(), block.getGenerationStamp(),
-              pipelineDepth, recoveryFlag, false, null, pipelineDepth - 1,
-              nodes, client);
-          header.writeVersionAndOpCode(out);
-          header.write(out);
-          checksum.writeHeader(out);
-          out.flush();
-
-          // receive ack for connect
-          firstBadLink = Text.readString(brs);
-          if (firstBadLink.length() != 0) {
-            throw new IOException("Bad connect ack with firstBadLink " +
-                                  firstBadLink);
-          }
-        }
-        result = true;     // success
-        blockStream = new MultiDataOutputStream(tmpOut);
-        blockReplyStream = new MultiDataInputStream(replyIn);
-        this.s = sockets;
-
-      } catch (IOException ie) {
-
-        LOG.info("Exception in createBlockOutputStream " + nodes[curNode].getName() + " " +
-                 " for file " + src +
-                 ie);
-
-        incWriteExpCntToStats();
-        
-        // find the datanode that matches
-        if (firstBadLink.length() != 0) {
-          for (int i = 0; i < nodes.length; i++) {
-            if (nodes[i].getName().equals(firstBadLink)) {
-              errorIndex = i;
-              break;
-            }
-          }
-        } else {
-          // if we are doing parallel writes, then record the datanode that is bad
-          errorIndex = curNode;
-        }
-        hasError = true;
-        setLastException(ie);
-        blockReplyStream = null;
-        result = false;
-      } finally {
-        if (!result) {
-          for (int i = 0; i < sockets.length; i++) {
-            IOUtils.closeSocket(sockets[i]);
-          }
-          this.s = null;
-        }
-      }
-      return result;
-    }
-
-    private LocatedBlock locateFollowingBlock(long start,
-                                              DatanodeInfo[] excludedNodes
-                                              ) throws IOException {
-      int retries = conf.getInt("dfs.client.block.write.locateFollowingBlock.retries", 5);
-      long sleeptime = 400;
-      while (true) {
-        long localstart = System.currentTimeMillis();
-        while (true) {
-          try {
-            VersionedLocatedBlock loc = null;
-            if (namenodeProtocolProxy != null
-                && namenodeProtocolProxy.isMethodSupported(
-                    "addBlockAndFetchMetaInfo", String.class, String.class,
-                    DatanodeInfo[].class, DatanodeInfo[].class, long.class,
-                    Block.class)) {
-             loc = namenode.addBlockAndFetchMetaInfo(src, clientName,
-                  excludedNodes, favoredNodes, this.lastBlkOffset, getLastBlock());
-            } else if (namenodeProtocolProxy != null
-                && namenodeProtocolProxy.isMethodSupported(
-                    "addBlockAndFetchMetaInfo", String.class, String.class,
-                    DatanodeInfo[].class, DatanodeInfo[].class, long.class)) {
-              loc = namenode.addBlockAndFetchMetaInfo(src, clientName,
-                  excludedNodes, favoredNodes, this.lastBlkOffset);
-            } else if (namenodeProtocolProxy != null
-                && namenodeProtocolProxy.isMethodSupported(
-                    "addBlockAndFetchMetaInfo", String.class, String.class,
-                    DatanodeInfo[].class, long.class)) {
-              loc = namenode.addBlockAndFetchMetaInfo(src, clientName,
-                  excludedNodes, this.lastBlkOffset);
-            } else if (namenodeProtocolProxy != null
-                && namenodeProtocolProxy.isMethodSupported(
-                    "addBlockAndFetchMetaInfo", String.class, String.class,
-                    DatanodeInfo[].class)) {
-              loc = namenode.addBlockAndFetchMetaInfo(src, clientName,
-                  excludedNodes);
-            } else if (namenodeProtocolProxy != null
-                && namenodeProtocolProxy.isMethodSupported(
-                    "addBlockAndFetchVersion", String.class, String.class,
-                    DatanodeInfo[].class)) {
-              loc = namenode.addBlockAndFetchVersion(src, clientName,
-                  excludedNodes);
-            } else if (namenodeProtocolProxy != null
-                && namenodeProtocolProxy.isMethodSupported("addBlock",
-                    String.class, String.class, DatanodeInfo[].class)) {
-              return namenode.addBlock(src, clientName, excludedNodes);
-            } else {
-              return namenode.addBlock(src, clientName);
-            }
-            updateDataTransferProtocolVersionIfNeeded(loc.getDataProtocolVersion());
-            if (loc instanceof LocatedBlockWithMetaInfo) {
-              LocatedBlockWithMetaInfo metaLoc = (LocatedBlockWithMetaInfo)loc;
-              this.namespaceId = metaLoc.getNamespaceID();
-              getNewNameNodeIfNeeded(metaLoc.getMethodFingerPrint());
-            }
-            return loc;
-          } catch (RemoteException e) {
-            IOException ue =
-              e.unwrapRemoteException(FileNotFoundException.class,
-                                      AccessControlException.class,
-                                      NSQuotaExceededException.class,
-                                      DSQuotaExceededException.class);
-            if (ue != e) {
-              throw ue; // no need to retry these exceptions
-            }
-
-            if (NotReplicatedYetException.class.getName().
-                equals(e.getClassName())) {
-
-                if (retries == 0) {
-                  throw e;
-                } else {
-                  --retries;
-                  LOG.info(StringUtils.stringifyException(e));
-                  if (System.currentTimeMillis() - localstart > 5000) {
-                    LOG.info("Waiting for replication for "
-                        + (System.currentTimeMillis() - localstart) / 1000
-                        + " seconds");
-                  }
-                  try {
-                    LOG.warn("NotReplicatedYetException sleeping " + src
-                        + " retries left " + retries);
-                    Thread.sleep(sleeptime);
-                    sleeptime *= 2;
-                  } catch (InterruptedException ie) {
-                  }
-                }
-            } else {
-              throw e;
-            }
-          }
-        }
-      }
-    }
-
-    @Override
-    protected void incMetrics(int len){
-    	metrics.incWriteOps();
-    	metrics.incWriteSize(len);
-    }
-    // @see FSOutputSummer#writeChunk()
-    @Override
-    protected synchronized void writeChunk(byte[] b, int offset, int len, byte[] checksum)
-                                                          throws IOException {
-      checkOpen();
-      isClosed();
- 
-
-      int cklen = checksum.length;
-      int bytesPerChecksum = this.checksum.getBytesPerChecksum();
-      if (len > bytesPerChecksum) {
-        throw new IOException("writeChunk() buffer size is " + len +
-                              " is larger than supported  bytesPerChecksum " +
-                              bytesPerChecksum);
-      }
-      if (checksum.length != this.checksum.getChecksumSize()) {
-        throw new IOException("writeChunk() checksum size is supposed to be " +
-                              this.checksum.getChecksumSize() +
-                              " but found to be " + checksum.length);
-      }
-
-      synchronized (dataQueue) {
-
-        // If queue is full, then wait till we can create  enough space
-        while (!closed && dataQueue.size() + ackQueue.size()  > maxPackets) {
-          try {
-            dataQueue.wait(packetTimeout);
-            checkIfLastPacketTimeout();
-          } catch (InterruptedException  e) {
-          }
-        }
-        isClosed();
-        
-        if (currentPacket == null) {
-          currentPacket = new Packet(packetSize, chunksPerPacket, bytesCurBlock);
-          if (LOG.isDebugEnabled()) {
-            LOG.debug("DFSClient writeChunk allocating new packet seqno=" +
-                      currentPacket.seqno +
-                      ", src=" + src +
-                      ", packetSize=" + packetSize +
-                      ", chunksPerPacket=" + chunksPerPacket +
-                      ", bytesCurBlock=" + bytesCurBlock +
-                      ", forceSync=" + forceSync +
-                      ", doParallelWrites=" + doParallelWrites +
-                      ", len=" + len +
-                      ", blocksize=" + blockSize);
-          }
-        }
-
-        currentPacket.writeChecksum(checksum, 0, cklen);
-        currentPacket.writeData(b, offset, len);
-        currentPacket.numChunks++;
-        bytesCurBlock += len;
-
-        // If packet is full, enqueue it for transmission
-        if (currentPacket.numChunks == currentPacket.maxChunks ||
-            bytesCurBlock == blockSize) {
-          if (LOG.isDebugEnabled()) {
-            LOG.debug("DFSClient writeChunk packet full seqno=" +
-                      currentPacket.seqno +
-                      ", src=" + src +
-                      ", bytesCurBlock=" + bytesCurBlock +
-                      ", blockSize=" + blockSize +
-                      ", appendChunk=" + appendChunk);
-          }
-          //
-          // if we allocated a new packet because we encountered a block
-          // boundary, reset bytesCurBlock.
-          //
-          if (bytesCurBlock == blockSize) {
-            currentPacket.lastPacketInBlock = true;
-            bytesCurBlock = 0;
-            lastFlushOffset = 0;
-          }
-          enqueueCurrentPacket();
-
-          // If this was the first write after reopening a file, then the above
-          // write filled up any partial chunk. Tell the summer to generate full
-          // crc chunks from now on.
-          if (appendChunk) {
-            appendChunk = false;
-            resetChecksumChunk(bytesPerChecksum);
-          }
-          int psize = Math.min((int)(blockSize-bytesCurBlock), writePacketSize);
-          computePacketChunkSize(psize, bytesPerChecksum);
-        }
-      }
-
-      //LOG.debug("DFSClient writeChunk done length " + len +
-      //          " checksum length " + cklen);
-    }
-
-    private synchronized void enqueueCurrentPacket() {
-      synchronized (dataQueue) {
-        if (currentPacket == null) return;
-        dataQueue.addLast(currentPacket);
-        dataQueue.notifyAll();
-        lastQueuedSeqno = currentPacket.seqno;
-        currentPacket = null;
-      }
-    }
-
-    /**
-     * All data is written out to datanodes. It is not guaranteed
-     * that data has been flushed to persistent store on the
-     * datanode. Block allocations are persisted on namenode.
-     */
-    public void sync() throws IOException {
-    	long start = System.currentTimeMillis();
-      try {
-        long toWaitFor;
-        synchronized (this) {
-          /* Record current blockOffset. This might be changed inside
-           * flushBuffer() where a partial checksum chunk might be flushed.
-           * After the flush, reset the bytesCurBlock back to its previous value,
-           * any partial checksum chunk will be sent now and in next packet.
-           */
-          long saveOffset = bytesCurBlock;
-          Packet oldCurrentPacket = currentPacket;
-
-          // flush checksum buffer, but keep checksum buffer intact
-          flushBuffer(true);
-          // bytesCurBlock potentially incremented if there was buffered data
-
-          if (LOG.isDebugEnabled()) {
-            LOG.debug("DFSClient flush() : saveOffset " + saveOffset +
-                      " bytesCurBlock " + bytesCurBlock +
-                      " lastFlushOffset " + lastFlushOffset);
-          }
-
-          // Flush only if we haven't already flushed till this offset.
-          if (lastFlushOffset != bytesCurBlock) {
-            assert bytesCurBlock > lastFlushOffset;
-            // record the valid offset of this flush
-            lastFlushOffset = bytesCurBlock;
-            enqueueCurrentPacket();
-          } else {
-            // just discard the current packet since it is already been sent.
-            if (oldCurrentPacket == null && currentPacket != null) {
-              // If we didn't previously have a packet queued, and now we do,
-              // but we don't plan on sending it, then we should not
-              // skip a sequence number for it!
-              currentSeqno--;
-            }
-            currentPacket = null;
-          }
-          // Restore state of stream. Record the last flush offset
-          // of the last full chunk that was flushed.
-          //
-          bytesCurBlock = saveOffset;
-          toWaitFor = lastQueuedSeqno;
-        }
-        waitForAckedSeqno(toWaitFor);
-
-        // If any new blocks were allocated since the last flush,
-        // then persist block locations on namenode.
-        //
-        boolean willPersist;
-        synchronized (this) {
-          willPersist = persistBlocks;
-          persistBlocks = false;
-        }
-        if (willPersist) {
-          namenode.fsync(src, clientName);
-        }
-        long timeval = System.currentTimeMillis() - start;
-        metrics.incSyncTime(timeval);
-      } catch (IOException e) {
-          lastException = new IOException("IOException flush:", e);
-          closed = true;
-          closeThreads();
+          errorSlot = i;
           throw e;
-      }
-    }
-    
-    private Block getLastBlock() {
-      return this.block;
-    }
-
-    /**
-     * Returns the number of replicas of current block. This can be different
-     * from the designated replication factor of the file because the NameNode
-     * does not replicate the block to which a client is currently writing to.
-     * The client continues to write to a block even if a few datanodes in the
-     * write pipeline have failed. If the current block is full and the next
-     * block is not yet allocated, then this API will return 0 because there are
-     * no replicas in the pipeline.
-     */
-    public int getNumCurrentReplicas() throws IOException {
-      synchronized(dataQueue) {
-        if (nodes == null) {
-          return blockReplication;
-        }
-        return nodes.length;
-      }
-    }
-
-    /**
-     * Waits till all existing data is flushed and confirmations
-     * received from datanodes.
-     */
-    private void flushInternal() throws IOException {
-      isClosed();
-      checkOpen();
-
-      long toWaitFor;
-      synchronized (this) {
-        enqueueCurrentPacket();
-        toWaitFor = lastQueuedSeqno;
-      }
-
-      waitForAckedSeqno(toWaitFor);
-    }
-
-    private void waitForAckedSeqno(long seqnumToWaitFor) throws IOException {
-      boolean interrupted = false;
-
-      synchronized (ackQueue) {
-        while (!closed) {
-          isClosed();
-          if (lastAckedSeqno >= seqnumToWaitFor) {
-            break;
-          }
-          try {
-            ackQueue.wait();
-          } catch (InterruptedException ie) {
-            interrupted = true;
-          }
         }
       }
-
-      if (interrupted) {
-        Thread.currentThread().interrupt();
-      }
-      isClosed();
     }
 
-    /**
-     * Closes this output stream and releases any system
-     * resources associated with this stream.
-     */
-    @Override
-    public void close() throws IOException {
-      if (closed) {
-        IOException e = lastException;
-        if (e == null)
-          return;
-        else
+    void close() throws IOException {
+      for (int i = 0; i < streams.length; i++) {
+        try {
+          streams[i].close();
+        } catch (IOException e) {
+          errorSlot = i;
           throw e;
-      }
-
-      try {
-        closeInternal();
-        leasechecker.remove(src);
-
-        if (s != null) {
-          for (int i = 0; i < s.length; i++) {
-            s[i].close();
-          }
-          s = null;
         }
-      } catch (IOException e) {
-        lastException = e;
-        throw e;
       }
     }
 
-    /**
-     * Harsh abort method that should only be used from tests - this
-     * is in order to prevent pipeline recovery when eg a DN shuts down.
-     */
-    void abortForTests() throws IOException {
-      streamer.close();
-      response.close();
-      closed = true;
-    }
-
-    /**
-     * Aborts this output stream and releases any system
-     * resources associated with this stream.
+    /** Returns the slot number of the file descriptor that encountered
+     * an error. Returns -1 if there were no error.
      */
-    synchronized void abort() throws IOException {
-      if (closed) {
-        return;
-      }
-      setLastException(new IOException("Lease timeout of " +
-                                       (hdfsTimeout/1000) + " seconds expired."));
-      closeThreads();
-    }
-
-
-    // shutdown datastreamer and responseprocessor threads.
-    private void closeThreads() throws IOException {
-      try {
-        if (streamer != null) {
-          streamer.close();
-          streamer.join();
-        }
-
-        // shutdown response after streamer has exited.
-        if (response != null) {
-          response.close();
-          response.join();
-          response = null;
-        }
-      } catch (InterruptedException e) {
-        throw new IOException("Failed to shutdown response thread");
-      }
+    int getErrorIndex() {
+      return errorSlot;
     }
+  }
 
-    /**
-     * Closes this output stream and releases any system
-     * resources associated with this stream.
-     */
-    private synchronized void closeInternal() throws IOException {
-      checkOpen();
-      isClosed();
-
-      try {
-          flushBuffer();       // flush from all upper layers
-
-          // Mark that this packet is the last packet in block.
-          // If there are no outstanding packets and the last packet
-          // was not the last one in the current block, then create a
-          // packet with empty payload.
-          synchronized (dataQueue) {
-            if (currentPacket == null && bytesCurBlock != 0) {
-              currentPacket = new Packet(packetSize, chunksPerPacket,
-			bytesCurBlock);
-            }
-            if (currentPacket != null) {
-              currentPacket.lastPacketInBlock = true;
-            }
-          }
-        flushInternal();             // flush all data to Datanodes
-        isClosed(); // check to see if flushInternal had any exceptions
-        closed = true; // allow closeThreads() to showdown threads
-
-        closeThreads();
-
-        synchronized (dataQueue) {
-          if (blockStream != null) {
-            blockStream.writeInt(0); // indicate end-of-block to datanode
-            blockStream.close();
-            blockReplyStream.close();
-          }
-          if (s != null) {
-            for (int i = 0; i < s.length; i++) {
-              s[i].close();
-            }
-            s = null;
-          }
-        }
-
-        streamer = null;
-        blockStream = null;
-        blockReplyStream = null;
+  /**
+   * Encapsulate multiple input streams into one object.
+   */
+  class MultiDataInputStream {
+    DataInputStream[] streams;
 
-        closeFile(src, lastBlkOffset, getLastBlock());
-      } finally {
-        closed = true;
-      }
+    MultiDataInputStream(DataInputStream[] ins) {
+      this.streams = ins;
     }
 
-    void setArtificialSlowdown(long period) {
-      artificialSlowdown = period;
+    DataInputStream get(int i) {
+      return streams[i];
     }
 
-    synchronized void setChunksPerPacket(int value) {
-      chunksPerPacket = Math.min(chunksPerPacket, value);
-      packetSize = DataNode.PKT_HEADER_LEN + SIZE_OF_INTEGER +
-						 (checksum.getBytesPerChecksum() +
-							checksum.getChecksumSize()) * chunksPerPacket;
+    int size() {
+      return streams.length;
     }
 
-    synchronized void setTestFilename(String newname) {
-      src = newname;
+    void set(int i, DataInputStream st) {
+      streams[i] = st;
     }
 
-    /**
-     * Returns the size of a file as it was when this stream was opened
-     */
-    long getInitialLen() {
-      return initialFileSize;
+    void close() throws IOException {
+      for (int i = 0; i < streams.length; i++) {
+        streams[i].close();
+      }
     }
   }
 
@@ -5958,4 +2587,11 @@ public String toString() {
     return getClass().getSimpleName() + "[clientName=" + clientName
         + ", ugi=" + ugi + "]";
   }
+  
+  static class DataNodeSlowException extends IOException {
+	  public DataNodeSlowException(String msg) {
+	    super(msg);
+	 }
+  }
+ 
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/DFSInputStream.java b/src/hdfs/org/apache/hadoop/hdfs/DFSInputStream.java
new file mode 100644
index 00000000..cb4f5d83
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/DFSInputStream.java
@@ -0,0 +1,1389 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.hadoop.fs.BlockMissingException;
+import org.apache.hadoop.fs.ChecksumException;
+import org.apache.hadoop.fs.FSInputStream;
+import org.apache.hadoop.hdfs.BlockReader;
+import org.apache.hadoop.hdfs.DFSClient.DataNodeSlowException;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.ClientDatanodeProtocol;
+import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
+import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlocks;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.ipc.ProtocolProxy;
+import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.util.StringUtils;
+import org.mortbay.log.Log;
+
+/****************************************************************
+ * DFSInputStream provides bytes from a named file.  It handles
+ * negotiation of the namenode and various datanodes as necessary.
+ ****************************************************************/
+public class DFSInputStream extends FSInputStream {
+  private Socket s = null;
+  private boolean closed = false;
+  
+  private final DFSClient dfsClient;
+
+  private String src = null;
+  private long prefetchSize;
+  private BlockReader blockReader = null;
+  private ConcurrentHashMap<Long, BlockReaderLocal> localBlockReaders =
+      new ConcurrentHashMap<Long, BlockReaderLocal>(0, 0.75f, 2);
+  private boolean verifyChecksum;
+  private boolean clearOsBuffer;
+  private DFSLocatedBlocks locatedBlocks = null;
+  private DatanodeInfo currentNode = null;
+  private Block currentBlock = null;
+  private boolean isCurrentBlockUnderConstruction;
+  private long pos = 0;
+  private long blockEnd = -1;
+  private LocatedBlocks blocks = null;
+  private int namespaceId;  // the namespace that this file belongs to
+
+  private int timeWindow = 3000; // wait time window (in msec) if BlockMissingException is caught
+
+  /* XXX Use of CocurrentHashMap is temp fix. Need to fix
+   * parallel accesses to DFSInputStream (through ptreads) properly */
+  private ConcurrentHashMap<DatanodeInfo, DatanodeInfo> deadNodes =
+             new ConcurrentHashMap<DatanodeInfo, DatanodeInfo>(0, 0.75f, 1);
+  private int buffersize = 1;
+
+  private byte[] oneByteBuf = new byte[1]; // used for 'int read()'
+
+  void addToDeadNodes(DatanodeInfo dnInfo) {
+    deadNodes.put(dnInfo, dnInfo);
+  }
+
+  DFSInputStream(DFSClient dfsClient, String src, int buffersize, boolean verifyChecksum,
+                 boolean clearOsBuffer) throws IOException {
+    this.src = src;
+    this.dfsClient = dfsClient;    
+    init(buffersize, verifyChecksum, clearOsBuffer);
+  }
+
+  /**
+   * Used for snapshot
+   */
+  DFSInputStream(DFSClient dfsClient, LocatedBlocksWithMetaInfo blocks, int buffersize,
+      boolean verifyChecksum) throws IOException {
+    this.blocks = blocks;
+    this.namespaceId = blocks.getNamespaceID();
+    this.dfsClient = dfsClient;
+    
+    dfsClient.updateDataTransferProtocolVersionIfNeeded(blocks.getDataProtocolVersion());
+    dfsClient.getNewNameNodeIfNeeded(blocks.getMethodFingerPrint());
+    init(buffersize, verifyChecksum, false);
+  }
+
+
+  private void init(int buffersize, boolean verifyChecksum,
+                    boolean clearOsBuffer) throws IOException {
+    this.verifyChecksum = verifyChecksum;
+    this.buffersize = buffersize;
+    this.clearOsBuffer = clearOsBuffer;
+    prefetchSize = dfsClient.conf.getLong("dfs.read.prefetch.size",
+    		10 * dfsClient.defaultBlockSize);
+    timeWindow = dfsClient.conf.getInt(
+    		"dfs.client.baseTimeWindow.waitOn.BlockMissingException",
+    		timeWindow);
+
+    try {
+      openInfo();
+    } catch (IOException e) {
+      dfsClient.incReadExpCntToStats();
+      throw e;
+    }
+  }
+
+  /**
+   * Grab the open-file info from namenode
+   */
+  synchronized void openInfo() throws IOException {
+    if (src == null && blocks == null) {
+      throw new IOException("No fine provided to open");
+    }
+
+    LocatedBlocks newInfo = src != null ? 
+                            getLocatedBlocks(src, 0, prefetchSize) : blocks;
+    if (newInfo == null) {
+      throw new IOException("Cannot open filename " + src);
+    }
+
+    // I think this check is not correct. A file could have been appended to
+    // between two calls to openInfo().
+    if (locatedBlocks != null && !locatedBlocks.isUnderConstruction() &&
+        !newInfo.isUnderConstruction()) {
+      Iterator<LocatedBlock> oldIter = locatedBlocks.getLocatedBlocks().iterator();
+      Iterator<LocatedBlock> newIter = newInfo.getLocatedBlocks().iterator();
+      while (oldIter.hasNext() && newIter.hasNext()) {
+        if (! oldIter.next().getBlock().equals(newIter.next().getBlock())) {
+          throw new IOException("Blocklist for " + src + " has changed!");
+        }
+      }
+    }
+
+    // if the file is under construction, then fetch size of last block
+    // from datanode.
+    if (newInfo.isUnderConstruction() && newInfo.locatedBlockCount() > 0) {
+      LocatedBlock last = newInfo.get(newInfo.locatedBlockCount()-1);
+      if (last.getLocations().length > 0) {
+        try {
+          Block newBlock = getBlockInfo(last);
+          // only if the block has data (not null)
+          if (newBlock != null) {
+            long newBlockSize = newBlock.getNumBytes();
+            newInfo.setLastBlockSize(newBlock.getBlockId(), newBlockSize);
+          }
+        } catch (IOException e) {
+          DFSClient.LOG.debug("DFSClient file " + src + 
+                    " is being concurrently append to" +
+                    " but datanodes probably does not have block " +
+                    last.getBlock(), e);
+        }
+      }
+    }
+    this.locatedBlocks = new DFSLocatedBlocks(newInfo);
+    this.currentNode = null;
+  }
+  
+  private void checkLocatedBlocks(LocatedBlocks locatedBlocks)
+      throws IOException {
+    if (null == locatedBlocks) {
+      return;
+    }
+    if(!locatedBlocks.isUnderConstruction()) {
+      return;
+    }
+    List<LocatedBlock> lbs = locatedBlocks.getLocatedBlocks();
+    if (lbs == null) {
+      return;
+    }
+    for (int i = 0; i < lbs.size() - 1; i++) {
+      if (lbs.get(i).getBlockSize() <= 1) {
+        throw new IOException(
+            "File is under construction and namenode hasn't received the second last block yet.");
+      }
+    }
+  }
+  
+  private LocatedBlocks getLocatedBlocks(String src, long start, long length)
+  throws IOException {
+    try {
+      if (dfsClient.namenodeProtocolProxy != null &&
+          dfsClient.namenodeProtocolProxy.isMethodSupported("openAndFetchMetaInfo",
+              String.class, long.class, long.class)) {
+        LocatedBlocksWithMetaInfo locs = 
+            dfsClient.namenode.openAndFetchMetaInfo(src, start, length);
+        if (locs != null) {
+          this.namespaceId = locs.getNamespaceID();
+          dfsClient.updateDataTransferProtocolVersionIfNeeded(locs.getDataProtocolVersion());
+          dfsClient.getNewNameNodeIfNeeded(locs.getMethodFingerPrint());
+        }
+        checkLocatedBlocks(locs);
+        return locs;
+      } else if (dfsClient.namenodeProtocolProxy != null && 
+          dfsClient.namenodeProtocolProxy.isMethodSupported("open", String.class,
+              long.class, long.class)) {
+        VersionedLocatedBlocks locs = dfsClient.namenode.open(src, start, length);
+        if (locs != null) {
+          dfsClient.updateDataTransferProtocolVersionIfNeeded(locs.getDataProtocolVersion());
+        }
+        checkLocatedBlocks(locs);
+        return locs;
+      } else {
+        LocatedBlocks locs = dfsClient.namenode.getBlockLocations(src, start, length);
+        checkLocatedBlocks(locs);
+        return locs;
+      }
+    } catch(RemoteException re) {
+      throw re.unwrapRemoteException(AccessControlException.class,
+                                    FileNotFoundException.class);
+    }
+  }
+  
+  /** Get block info from a datanode */
+  private Block getBlockInfo(LocatedBlock locatedblock) throws IOException {
+    if (locatedblock == null || locatedblock.getLocations().length == 0) {
+      return null;
+    }
+    int replicaNotFoundCount = locatedblock.getLocations().length;
+
+    for(DatanodeInfo datanode : locatedblock.getLocations()) {
+      ProtocolProxy<ClientDatanodeProtocol> cdp = null;
+
+      try {
+        cdp = DFSClient.createClientDNProtocolProxy(datanode,
+            dfsClient.conf, dfsClient.socketTimeout);
+
+        final Block newBlock;
+        if (cdp.isMethodSupported("getBlockInfo", int.class, Block.class)) {
+          newBlock = cdp.getProxy().getBlockInfo(
+              namespaceId, locatedblock.getBlock());
+        } else {
+          newBlock = cdp.getProxy().getBlockInfo(locatedblock.getBlock());
+        }
+
+        if (newBlock == null) {
+          // special case : replica might not be on the DN, treat as 0 length
+          replicaNotFoundCount--;
+        } else {
+          return newBlock;
+        }
+      }
+      catch(IOException ioe) {
+        if (DFSClient.LOG.isDebugEnabled()) {
+          DFSClient.LOG.debug("Failed to getBlockInfo from datanode "
+              + datanode + " for block " + locatedblock.getBlock(), ioe);
+        }
+      } finally {
+        if (cdp != null) {
+          RPC.stopProxy(cdp.getProxy());
+        }
+      }
+    }
+
+    // Namenode told us about these locations, but none know about the replica
+    // means that we hit the race between pipeline creation start and end.
+    // we require all because some other exception could have happened
+    // on a DN that has it.  we want to report that error
+    if (replicaNotFoundCount == 0) {
+      return null;
+    }
+
+    throw new IOException("Cannot obtain block info for " + locatedblock);
+  }
+
+  /**
+   * Returns whether the file opened is under construction.
+   */
+  public synchronized boolean isUnderConstruction() {
+    return locatedBlocks.isUnderConstruction();
+  }
+
+  public long getFileLength() {
+    return locatedBlocks.getFileLength();
+  }
+
+  public DFSLocatedBlocks fetchLocatedBlocks() {
+    return locatedBlocks;
+  }
+
+  /**
+   * Returns the datanode from which the stream is currently reading.
+   */
+  public DatanodeInfo getCurrentDatanode() {
+    return currentNode;
+  }
+
+  /**
+   * Returns the block containing the target position.
+   */
+  public Block getCurrentBlock() {
+    return currentBlock;
+  }
+
+  /**
+   * Return collection of blocks that has already been located.
+   */
+  synchronized List<LocatedBlock> getAllBlocks() throws IOException {
+    return getBlockRange(0, this.getFileLength());
+  }
+
+  /**
+   * Get block at the specified position. Fetch it from the namenode if not
+   * cached.
+   * 
+   * @param offset
+   * @param updatePosition
+   * @param throwWhenNoFound
+   *          when no block found for the offset return null instead of
+   *          throwing an exception
+   * @return located block
+   * @throws IOException
+   */
+  private LocatedBlock getBlockAt(long offset, boolean updatePosition,
+      boolean throwWhenNotFound)
+      throws IOException {
+    assert (locatedBlocks != null) : "locatedBlocks is null";
+    // search cached blocks first
+    LocatedBlock blk = locatedBlocks.getBlockContainingOffset(offset);
+    if (blk == null) { // block is not cached
+      // fetch more blocks
+      LocatedBlocks newBlocks;
+      newBlocks = getLocatedBlocks(src, offset, prefetchSize);
+      if (newBlocks == null) {
+        if (!throwWhenNotFound) {
+          return null;
+        }
+        throw new IOException("Could not find target position " + offset);
+      }
+      locatedBlocks.insertRange(newBlocks.getLocatedBlocks());
+      locatedBlocks.setFileLength(newBlocks.getFileLength());
+    }
+    blk = locatedBlocks.getBlockContainingOffset(offset);
+    if (blk == null) {
+      if (!throwWhenNotFound) {
+        return null;
+      }
+      throw new IOException("Failed to determine location for block at "
+          + "offset=" + offset);
+    }
+    if (updatePosition) {
+      // update current position
+      this.pos = offset;
+      this.blockEnd = blk.getStartOffset() + blk.getBlockSize() - 1;
+      this.currentBlock = blk.getBlock();
+      isCurrentBlockUnderConstruction = locatedBlocks
+          .isUnderConstructionBlock(this.currentBlock);
+    }
+    return blk;
+
+  }
+
+  /**
+   * Get blocks in the specified range. The locations of all blocks
+   * overlapping with the given segment of the file are retrieved. Fetch them
+   * from the namenode if not cached.
+   *
+   * @param offset the offset of the segment to read
+   * @param length the length of the segment to read
+   * @return consequent segment of located blocks
+   * @throws IOException
+   */
+  private List<LocatedBlock> getBlockRange(final long offset,
+      final long length) throws IOException {
+    List<LocatedBlock> blockRange = new ArrayList<LocatedBlock>();
+    // Zero length. Not sure this ever happens in practice.
+    if (length == 0)
+      return blockRange;
+
+    // A defensive measure to ensure that we never loop here eternally.
+    // With a 256 M block size, 10000 blocks will correspond to 2.5 TB.
+    // No one should read this much data at once in practice.
+    int maxLoops = 10000;
+
+    // Copy locatedBlocks to a local data structure. This ensures that 
+    // a concurrent invocation of openInfo() works OK, the reason being
+    // that openInfo may completely replace locatedBlocks.
+    DFSLocatedBlocks locatedBlocks = this.locatedBlocks;
+
+    if (locatedBlocks == null) {
+      // Make this an IO exception because this is input/output code error.
+      throw new IOException("locatedBlocks is null");
+    }
+
+    long remaining = length;
+    long curOff = offset;
+    while (remaining > 0) {
+      // a defensive check to bail out of this loop at all costs
+      if (--maxLoops < 0) {
+        String msg = "Failed to getBlockRange at offset " + offset +
+                     ", length=" + length +
+                     ", curOff=" + curOff +
+                     ", remaining=" + remaining +
+                     ". Aborting...";
+        DFSClient.LOG.warn(msg);
+        throw new IOException(msg); 
+      }
+
+      LocatedBlock blk = locatedBlocks.getBlockContainingOffset(curOff);
+      if (blk == null) {
+        LocatedBlocks newBlocks;
+        newBlocks = getLocatedBlocks(src, curOff, remaining);
+        if (newBlocks == null) {
+          throw new IOException("Could not get block locations for curOff=" +
+              curOff + ", remaining=" + remaining + " (offset=" + offset +
+              ")");
+        }
+        locatedBlocks.insertRange(newBlocks.getLocatedBlocks());
+        continue;
+      }
+
+      blockRange.add(blk);
+      long bytesRead = blk.getStartOffset() + blk.getBlockSize() - curOff;
+      remaining -= bytesRead;
+      curOff += bytesRead;
+    }
+
+    DFSClient.checkBlockRange(blockRange, offset, length);
+
+    return blockRange;
+  }
+
+  protected synchronized DatanodeInfo blockSeekTo(long target) throws IOException {
+    return blockSeekTo(target, true);
+  }
+  
+  /**
+   * Open a DataInputStream to a DataNode so that it can be read from.
+   * We get block ID and the IDs of the destinations at startup, from the namenode.
+   */
+  private synchronized DatanodeInfo blockSeekTo(long target,
+      boolean throwWhenNotFound) throws IOException {
+    // We only allow to seek before the end of the file, or the end of the file
+    // and allowSeedtoEnd, which is the case called by available().
+    //
+    if (target > getFileLength() || (target == getFileLength() && throwWhenNotFound)) {
+      throw new IOException("Attempted to read past end of file");
+    }
+
+    if ( blockReader != null ) {
+      blockReader.close();
+      blockReader = null;
+    }
+
+    if (s != null) {
+      s.close();
+      s = null;
+    }
+
+    //
+    // Compute desired block.
+    //
+    LocatedBlock targetBlock = getBlockAt(target, true, throwWhenNotFound);
+    // Given target<= fileLength, when and only whenallowSeektoEnd is true and
+    // there is no block for the file yet, getBlockAt() returns null, in this
+    // case we should simply return null.
+    //
+    if (targetBlock == null) {
+      assert target == 0;
+      return null;
+    }
+    assert (target==this.pos) : "Wrong postion " + pos + " expect " + target;
+    long offsetIntoBlock = target - targetBlock.getStartOffset();
+
+    //
+    // Connect to best DataNode for desired Block, with potential offset
+    //
+    DatanodeInfo chosenNode = null;
+    while (s == null) {
+      DNAddrPair retval = chooseDataNode(targetBlock);
+      chosenNode = retval.info;
+      InetSocketAddress targetAddr = retval.addr;
+
+      // try reading the block locally. if this fails, then go via
+      // the datanode
+      Block blk = targetBlock.getBlock();
+      try {
+        if (DFSClient.LOG.isDebugEnabled()) {
+          DFSClient.LOG.warn("blockSeekTo shortCircuitLocalReads "
+                   + dfsClient.shortCircuitLocalReads +
+                   " localhost " + dfsClient.localHost +
+                   " targetAddr " + targetAddr);
+        }
+        if (dfsClient.shortCircuitLocalReads && dfsClient.localHost != null &&
+            (targetAddr.equals(dfsClient.localHost) ||
+             targetAddr.getHostName().startsWith("localhost"))) {
+          blockReader = BlockReaderLocal.newBlockReader(dfsClient.conf, src,
+                                                 namespaceId, blk,
+                                                 chosenNode,
+                                                 offsetIntoBlock,
+                                                 blk.getNumBytes() - offsetIntoBlock,
+                                                 dfsClient.metrics, 
+                                                 this.verifyChecksum,
+                                                 this.clearOsBuffer,
+                                                 false);
+          if (blockReader != null) {
+            blockReader.setReadLocal(true);
+            blockReader.setFsStats(dfsClient.stats);
+            return chosenNode;
+          } else if (!dfsClient.shortcircuitDisableWhenFail) {
+            throw new IOException(
+                "Short circuit local read not supported for inline checksum file.");
+          }
+        }
+      } catch (IOException ex) {
+        DFSClient.LOG.info("Failed to read block " + targetBlock.getBlock() +
+                 " on local machine " + dfsClient.localHost +
+                 ". Try via the datanode on " + targetAddr + ":"
+                  + StringUtils.stringifyException(ex));
+      }
+
+      try {
+        s = dfsClient.socketFactory.createSocket();
+        NetUtils.connect(s, targetAddr, dfsClient.socketTimeout,
+            dfsClient.ipTosValue);
+        s.setSoTimeout(dfsClient.socketTimeout);
+
+        long minReadSpeedBps = (dfsClient.numNodeLeft(targetBlock.getLocations(),
+            deadNodes) > 1) ? dfsClient.minReadSpeedBps : -1;
+        blockReader = BlockReader.newBlockReader(
+            dfsClient.getDataTransferProtocolVersion(), namespaceId,
+            s, src, blk.getBlockId(),
+            blk.getGenerationStamp(),
+            offsetIntoBlock, blk.getNumBytes() - offsetIntoBlock,
+            buffersize, verifyChecksum,
+            dfsClient.clientName, minReadSpeedBps);
+        boolean isLocalHost = NetUtils.isLocalAddressWithCaching(targetAddr
+            .getAddress());
+        blockReader.setReadLocal(isLocalHost);
+        if (!isLocalHost) {
+          blockReader
+              .setReadRackLocal(dfsClient.isInLocalRack(targetAddr.getAddress()));
+        }
+        blockReader.setFsStats(dfsClient.stats);
+
+        return chosenNode;
+      } catch (IOException ex) {
+        // Put chosen node into dead list, continue
+        DFSClient.LOG.warn("Failed to connect to " + targetAddr, ex);
+        addToDeadNodes(chosenNode);
+        if (s != null) {
+          try {
+            s.close();
+          } catch (IOException iex) {
+          }
+        }
+        s = null;
+      }
+    }
+    return chosenNode;
+  }
+
+  /**
+   * Close it down!
+   */
+  @Override
+  public synchronized void close() throws IOException {
+    if (closed) {
+      return;
+    }
+    dfsClient.checkOpen();
+
+    if ( blockReader != null ) {
+      blockReader.close();
+      blockReader = null;
+    }
+    
+    for (BlockReaderLocal brl : localBlockReaders.values()) {
+      try {
+        brl.close();
+      } catch (IOException ioe) {
+        Log.warn("Error when closing local block reader", ioe);
+      }
+    }
+    localBlockReaders = null;
+
+    if (s != null) {
+      s.close();
+      s = null;
+    }
+    super.close();
+    closed = true;
+  }
+
+  @Override
+  public synchronized int read() throws IOException {
+    int ret = read( oneByteBuf, 0, 1 );
+    return ( ret <= 0 ) ? -1 : (oneByteBuf[0] & 0xff);
+  }
+
+  /* This is a used by regular read() and handles ChecksumExceptions.
+   * name readBuffer() is chosen to imply similarity to readBuffer() in
+   * ChecksuFileSystem
+   */
+  private synchronized int readBuffer(byte buf[], int off, int len)
+                                                  throws IOException {
+    IOException ioe;
+
+    /* we retry current node only once. So this is set to true only here.
+     * Intention is to handle one common case of an error that is not a
+     * failure on datanode or client : when DataNode closes the connection
+     * since client is idle. If there are other cases of "non-errors" then
+     * then a datanode might be retried by setting this to true again.
+     */
+    boolean retryCurrentNode = true;
+
+    while (true) {
+      // retry as many times as seekToNewSource allows.
+      try {
+        int bytesRead = blockReader.read(buf, off, len);
+        
+        // update length of file under construction if needed
+        if (isCurrentBlockUnderConstruction
+            && blockReader.isBlkLenInfoUpdated()) {
+          locatedBlocks.setLastBlockSize(currentBlock.getBlockId(),
+              blockReader.getUpdatedBlockLength());
+          this.blockEnd = locatedBlocks.getFileLength() - 1;
+          blockReader.resetBlockLenInfo();
+          // if the last block is finalized, get file info from name-node.
+          // It is necessary because there might be new blocks added to
+          // the file. The client needs to check with the name-node whether
+          // it is the case, or the file has been finalized.
+          if (blockReader.isBlockFinalized() && src != null) {
+            openInfo();
+          }
+          
+        }
+        return bytesRead;     
+      } catch (DataNodeSlowException dnse) {
+        DFSClient.LOG.warn("Node " + currentNode + " is too slow when reading blk "
+            + this.currentBlock + ". Try another datanode.");
+        ioe = dnse;
+        retryCurrentNode = false;
+      } catch ( ChecksumException ce ) {
+        DFSClient.LOG.warn("Found Checksum error for " + currentBlock + " from " +
+                 currentNode.getName() + " at " + ce.getPos());
+        dfsClient.reportChecksumFailure(src, currentBlock, currentNode);
+        ioe = ce;
+        retryCurrentNode = false;
+      } catch ( IOException e ) {
+        if (!retryCurrentNode) {
+          DFSClient.LOG.warn("Exception while reading from " + currentBlock +
+                   " of " + src + " from " + currentNode + ": " +
+                   StringUtils.stringifyException(e));
+        }
+        ioe = e;
+      }
+      boolean sourceFound = false;
+      if (retryCurrentNode) {
+        /* possibly retry the same node so that transient errors don't
+         * result in application level failures (e.g. Datanode could have
+         * closed the connection because the client is idle for too long).
+         */
+        sourceFound = seekToBlockSource(pos, len != 0);
+      } else {
+        addToDeadNodes(currentNode);
+        sourceFound = seekToNewSource(pos, len != 0);
+      }
+      if (!sourceFound) {
+        throw ioe;
+      } else {
+        dfsClient.incReadExpCntToStats();
+
+      }
+      retryCurrentNode = false;
+    }
+  }
+
+  /**
+   * Read the entire buffer.
+   */
+  @Override
+  public synchronized int read(byte buf[], int off, int len) throws IOException {
+    dfsClient.checkOpen();
+    if (closed) {
+      dfsClient.incReadExpCntToStats();
+
+      throw new IOException("Stream closed");
+    }
+    DFSClient.dfsInputStreamfailures.set(0);
+			long start = System.currentTimeMillis();
+    
+    if (pos < getFileLength() || (pos == getFileLength() && len == 0)) {
+      int retries = 2;
+      while (retries > 0) {
+        try {
+          // If position equals or is larger than the end position of the
+          // block, we try to seek to the next block, unless:
+          // 1. user tries to read 0 bytes (usually by available() call), AND
+          // 2. there is at least a known block for the file (blockEnd != -1), AND
+          // 3. pos is the end of the file, AND
+          // 4. the end of the block is the end of the file
+          //    (the current block is the known last block of the file)
+          // For this case, we want to stay in the current block, as in the case
+          // that it is the last block (which is almost always true given
+          // len == 0), the current block is the under-construction block whose size
+          // you want to update.
+          //
+          if (len == 0) { // called by available()
+            if (blockEnd == -1 // No current block selected
+                || pos == getFileLength()) { // at the end of the file
+              currentNode = blockSeekTo(pos, false);
+              if (currentNode == null) {
+                // In this case, user wants to know available information of
+                // the file, but the file doesn't have any block created yet (it
+                // is a 0 size file). Simply 0 should be returned.
+                return 0;
+              }
+            } else {
+              throw new IOException(
+                  "Try to read 0 bytes while current position is not the end of the file");
+            }
+          } else if (pos > blockEnd) {
+            currentNode = blockSeekTo(pos, true);
+          }
+          
+          int realLen = (int) Math.min((long) len, (blockEnd - pos + 1L));
+          int result = readBuffer(buf, off, realLen);
+
+          if (result >= 0) {
+            pos += result;
+          } else if (len != 0){
+            // got a EOS from reader though we expect more data on it.
+            throw new IOException("Unexpected EOS from the reader");
+          }
+          if (dfsClient.stats != null && result != -1) {
+            dfsClient.stats.incrementBytesRead(result);
+          }
+          long timeval = System.currentTimeMillis() - start;
+          dfsClient.metrics.incReadTime(timeval);
+          dfsClient.metrics.incReadSize(result);
+          dfsClient.metrics.incReadOps();
+          return (result >= 0) ? result : 0;
+        } catch (ChecksumException ce) {
+          dfsClient.incReadExpCntToStats();
+
+          throw ce;
+        } catch (IOException e) {
+          dfsClient.incReadExpCntToStats();
+
+          if (retries == 1) {
+            DFSClient.LOG.warn("DFS Read: " + StringUtils.stringifyException(e));
+          }
+          blockEnd = -1;
+          if (currentNode != null) { addToDeadNodes(currentNode); }
+          if (--retries == 0) {
+            throw e;
+          }
+        }
+      }
+    }
+    return -1;
+  }
+
+
+  private DNAddrPair chooseDataNode(LocatedBlock block)
+    throws IOException {
+    while (true) {
+      DatanodeInfo[] nodes = block.getLocations();
+      DatanodeInfo chosenNode = null;
+      try {
+        chosenNode = DFSClient.bestNode(nodes, deadNodes);
+        InetSocketAddress targetAddr =
+                          NetUtils.createSocketAddr(chosenNode.getName());
+        return new DNAddrPair(chosenNode, targetAddr);
+      } catch (IOException ie) {
+        int failureTimes = DFSClient.dfsInputStreamfailures.get();
+        String blockInfo = block.getBlock() + " file=" + src;
+        if (failureTimes >= dfsClient.maxBlockAcquireFailures
+            || failureTimes >= block.getLocations().length) {
+          throw new BlockMissingException(src, "Could not obtain block: " + 
+              blockInfo, block.getStartOffset());
+        }
+
+        if (nodes == null || nodes.length == 0) {
+          DFSClient.LOG.info("No node available for block: " + blockInfo);
+        }
+        DFSClient.LOG.info("Could not obtain block " + block.getBlock() +
+                 " from node:  " +
+                 (chosenNode == null ? "" : chosenNode.getHostName()) + ie +
+                 ". Will get new block locations from namenode and retry...");       
+        try {
+          // Introducing a random factor to the wait time before another retry.
+          // The wait time is dependent on # of failures and a random factor.
+          // At the first time of getting a BlockMissingException, the wait time
+          // is a random number between 0..3000 ms. If the first retry
+          // still fails, we will wait 3000 ms grace period before the 2nd retry.
+          // Also at the second retry, the waiting window is expanded to 6000 ms
+          // alleviating the request rate from the server. Similarly the 3rd retry
+          // will wait 6000ms grace period before retry and the waiting window is
+          // expanded to 9000ms.
+          // waitTime = grace period for the last round of attempt + 
+          // expanding time window for each failure
+          double waitTime = timeWindow * failureTimes + 
+            timeWindow * (failureTimes + 1) * DFSClient.r.nextDouble(); 
+          DFSClient.LOG.warn("DFS chooseDataNode: got # " + (failureTimes + 1) + 
+              " IOException, will wait for " + waitTime + " msec.", ie);
+						Thread.sleep((long)waitTime);
+        } catch (InterruptedException iex) {
+        }
+        // Following statements seem to make the method thread unsafe, but
+        // not all the callers hold the lock to call the method. Shall we
+        // fix it?
+        //
+        deadNodes.clear(); //2nd option is to remove only nodes[blockId]
+        openInfo();
+        block = getBlockAt(block.getStartOffset(), false, true);
+        DFSClient.dfsInputStreamfailures.set(failureTimes+1);
+        continue;
+      }
+    }
+  }
+
+  private void fetchBlockByteRange(LocatedBlock block, long start,
+                                   long end, byte[] buf, int offset) throws IOException {
+    //
+    // Connect to best DataNode for desired Block, with potential offset
+    //
+    Socket dn = null;
+
+    while (true) {
+      // cached block locations may have been updated by chooseDatNode()
+      // or fetchBlockAt(). Always get the latest list of locations at the
+      // start of the loop.
+      block = getBlockAt(block.getStartOffset(), false, true);
+      DNAddrPair retval = chooseDataNode(block);
+      DatanodeInfo chosenNode = retval.info;
+      InetSocketAddress targetAddr = retval.addr;
+      BlockReader reader = null;
+      int len = (int) (end - start + 1);
+      
+      try {
+         if (DFSClient.LOG.isDebugEnabled()) {
+           DFSClient.LOG.debug("fetchBlockByteRange shortCircuitLocalReads " +
+                    dfsClient.shortCircuitLocalReads +
+                    " localhst " + dfsClient.localHost +
+                    " targetAddr " + targetAddr);
+         }
+         // first try reading the block locally.
+         if (dfsClient.shortCircuitLocalReads && 
+             NetUtils.isLocalAddressWithCaching(targetAddr.getAddress())) {
+           reader = BlockReaderLocal.newBlockReader(dfsClient.conf, src,
+                                                namespaceId, block.getBlock(),
+                                                chosenNode,
+                                                start,
+                                                len,
+                                                dfsClient.metrics,
+                                                verifyChecksum,
+                                                this.clearOsBuffer,
+                                                false);
+           if (reader != null) {
+             reader.setReadLocal(true);
+             reader.setFsStats(dfsClient.stats);
+          } else if (!dfsClient.shortcircuitDisableWhenFail) {
+            throw new IOException(
+                "Short circuit local read not supported for this scase");
+          }
+         }
+         if (reader == null) {
+            // go to the datanode
+
+            dn = dfsClient.socketFactory.createSocket();
+            NetUtils.connect(dn, targetAddr, dfsClient.socketTimeout,
+                dfsClient.ipTosValue);
+            dn.setSoTimeout(dfsClient.socketTimeout);
+            reader = BlockReader.newBlockReader(dfsClient.getDataTransferProtocolVersion(),
+                                            namespaceId,
+                                            dn, src,
+                                            block.getBlock().getBlockId(),
+                                            block.getBlock().getGenerationStamp(),
+                                            start, len, buffersize,
+                                            verifyChecksum, dfsClient.clientName,
+                                            dfsClient.minReadSpeedBps);
+            boolean isLocalHost = NetUtils.isLocalAddressWithCaching(targetAddr
+              .getAddress());
+            reader.setReadLocal(isLocalHost);
+            if (!isLocalHost) {
+              reader.setReadRackLocal(
+                  dfsClient.isInLocalRack(targetAddr.getAddress()));
+            }
+            reader.setFsStats(dfsClient.stats);
+          }
+          int nread = reader.readAll(buf, offset, len);
+          if (nread != len) {
+            throw new IOException("truncated return from reader.read(): " +
+                                  "excpected " + len + ", got " + nread);
+          }
+          return;
+      } catch (ChecksumException e) {
+        DFSClient.LOG.warn("fetchBlockByteRange(). Got a checksum exception for " +
+                 src + " at " + block.getBlock() + ":" +
+                 e.getPos() + " from " + chosenNode.getName());
+        dfsClient.reportChecksumFailure(src, block.getBlock(), chosenNode);
+      } catch (IOException e) {
+        DFSClient.LOG.warn("Failed to connect to " + targetAddr +
+                 " for file " + src +
+                 " for block " + block.getBlock().getBlockId() + ":"  +
+                 StringUtils.stringifyException(e));
+      } finally {
+        IOUtils.closeStream(reader);
+        IOUtils.closeSocket(dn);
+      }
+      // Put chosen node into dead list, continue
+      addToDeadNodes(chosenNode);
+    }
+  }
+
+  /**
+   * This is highly optimized for preads. Reduce number of buffercopies.
+   * Its is similar to doing a scatter/gather kind of io, all data to be
+   * returned in a ByteBuffer.
+   */
+  private ByteBuffer fetchBlockByteRangeScatterGather(LocatedBlock block, 
+                      long start, long len) throws IOException {
+    //
+    // Connect to best DataNode for desired Block, with potential offset
+    //
+    Socket dn = null;
+
+    while (true) {
+      // cached block locations may have been updated by chooseDatNode()
+      // or fetchBlockAt(). Always get the latest list of locations at the
+      // start of the loop.
+      block = getBlockAt(block.getStartOffset(), false, true);
+      DNAddrPair retval = chooseDataNode(block);
+      DatanodeInfo chosenNode = retval.info;
+      InetSocketAddress targetAddr = retval.addr;
+      ByteBuffer result = null;
+      BlockReaderLocal localReader = null;
+      BlockReaderAccelerator remoteReader = null;
+
+       try {
+         if (DFSClient.LOG.isDebugEnabled()) {
+           DFSClient.LOG.debug("fetchBlockByteRangeScatterGather " +
+                    " localhst " + dfsClient.localHost +
+                    " targetAddr " + targetAddr);
+         }
+         
+         // first try reading the block locally.
+         if (dfsClient.shortCircuitLocalReads && 
+             NetUtils.isLocalAddressWithCaching(targetAddr.getAddress())) {
+           localReader = BlockReaderLocal.newBlockReader(dfsClient.conf, src,
+                                                namespaceId, block.getBlock(),
+                                                chosenNode,
+                                                start,
+                                                len,
+                                                dfsClient.metrics,
+                                                verifyChecksum,
+                                                this.clearOsBuffer,
+                                                false);
+           if (localReader != null) {
+             localReader.setReadLocal(true);
+             localReader.setFsStats(dfsClient.stats);
+             result = localReader.readAll();
+           } else if (!dfsClient.shortcircuitDisableWhenFail) {
+            throw new IOException(
+                "Short circuit local read not supported for this scase");
+           }
+         }
+         if (localReader == null) {
+
+           // go to the datanode
+           dn = dfsClient.socketFactory.createSocket();
+           NetUtils.connect(dn, targetAddr, dfsClient.socketTimeout,
+               dfsClient.ipTosValue);
+           dn.setSoTimeout(dfsClient.socketTimeout);
+           remoteReader = new BlockReaderAccelerator(dfsClient.conf,
+                                          targetAddr,
+                                          chosenNode,
+                                          dfsClient.getDataTransferProtocolVersion(),
+                                          namespaceId, dfsClient.clientName,
+                                          dn, src,
+                                          block,
+                                          start, len,
+                                          verifyChecksum, dfsClient.metrics);
+           result = remoteReader.readAll();
+          }
+          if (result.remaining() != len) {
+            throw new IOException("truncated return from reader.read(): " +
+                                "expected " + len + ", got " + 
+                                  result.remaining());
+          }
+          if (NetUtils.isLocalAddressWithCaching(targetAddr.getAddress())) {
+            dfsClient.stats.incrementLocalBytesRead(len);
+            dfsClient.stats.incrementRackLocalBytesRead(len);
+          } else if (dfsClient.isInLocalRack(targetAddr.getAddress())) {
+            dfsClient.stats.incrementRackLocalBytesRead(len);
+          }
+
+          return result;
+      } catch (ChecksumException e) {
+        DFSClient.LOG.warn("fetchBlockByteRangeScatterGather(). Got a checksum exception for " +
+                 src + " at " + block.getBlock() + ":" +
+                 e.getPos() + " from " + chosenNode.getName());
+        dfsClient.reportChecksumFailure(src, block.getBlock(), chosenNode);
+      } catch (IOException e) {
+        DFSClient.LOG.warn("Failed to connect to " + targetAddr +
+                 " for file " + src +
+                 " for block " + block.getBlock().getBlockId() + ":"  +
+                 StringUtils.stringifyException(e));
+      } finally {
+        IOUtils.closeStream(localReader);
+        IOUtils.closeStream(remoteReader);
+        IOUtils.closeSocket(dn);
+      }
+       dfsClient.incReadExpCntToStats();
+      // Put chosen node into dead list, continue
+      addToDeadNodes(chosenNode);
+    }
+  }
+  
+  /**
+   * Check whether the pread operation qualifies the local read using cached
+   * local block reader pool and execute the read if possible. The condition is:
+   * 
+   * 1. short circuit read is enabled 2. checksum verification is disabled 3.
+   * Only read from one block.
+   * 
+   * (Condition 2 and 3 can be potentially relaxed as improvements)
+   * 
+   * It will first check whether there is a local block reader cached for the
+   * block. Otherwise, it first tries to determine whether the block qualifies
+   * local short circuit read. If yes, create a local block reader and insert it
+   * to the local block reader map. Finally, it reads data using the block
+   * reader from the cached or created local block reader.
+   * 
+   * @param blockRange
+   * @param position
+   * @param buffer
+   * @param offset
+   * @param length
+   * @param realLen
+   * @param startTime
+   * @return true if the data is read using local block reader pool. Otherwise,
+   *         false.
+   * @throws IOException
+   */
+  private boolean tryPreadFromLocal(List<LocatedBlock> blockRange,
+      long position, byte[] buffer, int offset, int length, int realLen,
+      long startTime) throws IOException {
+    if (!dfsClient.shortCircuitLocalReads || blockRange.size() != 1) {
+      return false;
+    }
+    // Try to optimize by using cached local block readers.
+    LocatedBlock lb = blockRange.get(0);
+    BlockReaderLocal brl = localBlockReaders.get(lb.getStartOffset());
+    if (brl == null) {
+      // Try to create a new local block reader for the block and
+      // put it to the block reader map.
+      DNAddrPair retval = chooseDataNode(lb);
+      DatanodeInfo chosenNode = retval.info;
+      InetSocketAddress targetAddr = retval.addr;
+      if (NetUtils.isLocalAddressWithCaching(targetAddr.getAddress())) {
+        BlockReaderLocal newBrl = BlockReaderLocal.newBlockReader(
+            dfsClient.conf, src, namespaceId, lb.getBlock(), chosenNode,
+            startTime, realLen, dfsClient.metrics, verifyChecksum,
+            this.clearOsBuffer, true);
+        newBrl.setReadLocal(true);
+        newBrl.setFsStats(dfsClient.stats);
+
+        // Put the new block reader to the map if another thread didn't put
+        // another one for the same block in it. Otherwise, reuse the one
+        // created by another thread and close the current one.
+        //
+        brl = localBlockReaders.putIfAbsent(lb.getStartOffset(), newBrl);
+        if (brl == null) {
+          brl = newBrl;
+        } else {
+          newBrl.close();
+        }
+      }
+    }
+    if (brl != null) {
+      int nread = -1;
+      try {
+        nread = brl.read(position - lb.getStartOffset(), buffer, offset,
+            realLen);
+      } catch (IOException ioe) {
+        Log.warn("Exception when issuing local read", ioe);
+        // We are conservative here so for any exception, we close the
+        // local block reader and remove it from the reader list to isolate
+        // the failure of one reader from future reads.
+        localBlockReaders.remove(lb.getStartOffset(), brl);
+        brl.close();
+        throw ioe;
+      }
+      if (nread != realLen) {
+        throw new IOException("truncated return from reader.read(): "
+            + "excpected " + length + ", got " + nread);
+      }
+    }
+    return (brl != null);
+  }
+
+  /**
+   * Read bytes starting from the specified position.
+   *
+   * @param position start read from this position
+   * @param buffer read buffer
+   * @param offset offset into buffer
+   * @param length number of bytes to read
+   *
+   * @return actual number of bytes read
+   */
+  @Override
+  public int read(long position, byte[] buffer, int offset, int length)
+    throws IOException {      
+    // sanity checks
+    dfsClient.checkOpen();
+    if (closed) {
+      throw new IOException("Stream closed");
+    }
+    DFSClient.dfsInputStreamfailures.set(0);
+			long start = System.currentTimeMillis();
+    long filelen = getFileLength();
+    if ((position < 0) || (position >= filelen)) {
+      return -1;
+    }
+    int realLen = length;
+    if ((position + length) > filelen) {
+      realLen = (int)(filelen - position);
+    }
+
+    // determine the block and byte range within the block
+    // corresponding to position and realLen
+    List<LocatedBlock> blockRange = getBlockRange(position, realLen);
+    
+    if (!tryPreadFromLocal(blockRange, position, buffer, offset, length,
+        realLen, start)) {
+      // non-local or multiple block read.
+      int remaining = realLen;
+      for (LocatedBlock blk : blockRange) {
+        long targetStart = position - blk.getStartOffset();
+        long bytesToRead = Math.min(remaining, blk.getBlockSize() - targetStart);
+        fetchBlockByteRange(blk, targetStart,
+                            targetStart + bytesToRead - 1, buffer, offset);
+        remaining -= bytesToRead;
+        position += bytesToRead;
+        offset += bytesToRead;
+      }
+      assert remaining == 0 : "Wrong number of bytes read.";
+    }
+    
+    if (dfsClient.stats != null) {
+      dfsClient.stats.incrementBytesRead(realLen);
+    }
+    long timeval = System.currentTimeMillis() - start;
+    dfsClient.metrics.incPreadTime(timeval);
+    dfsClient.metrics.incPreadSize(realLen);
+    dfsClient.metrics.incPreadOps();
+    return realLen;
+  }
+
+  /**
+   * Read bytes starting from the specified position. This is optimized
+   * for fast preads from an application with minimum of buffer copies.
+   *
+   * @param position start read from this position
+   * @param length number of bytes to read
+   *
+   * @return A list of Byte Buffers that represent all the data that was
+   * read from the underlying system.
+   */
+  @Override
+  public List<ByteBuffer> readFullyScatterGather(long position, int length)
+    throws IOException {      
+
+    // if the server does not support scatter-gather, 
+    // then use default implementation from FSDataInputStream.
+    if (dfsClient.dataTransferVersion < DataTransferProtocol.SCATTERGATHER_VERSION) {
+      return super.readFullyScatterGather(position, length);
+    }
+    // sanity checks
+    dfsClient.checkOpen();
+    if (closed) {
+      throw new IOException("Stream closed");
+    }
+    DFSClient.dfsInputStreamfailures.set(0);
+    long start = System.currentTimeMillis();
+    long filelen = getFileLength();
+    if ((position < 0) || (position > filelen)) {
+      String msg = " Invalid position " + position +
+                   ". File " + src + " is of size " + filelen;
+      DFSClient.LOG.warn(msg);
+      throw new IOException(msg);
+    }
+    List<ByteBuffer> results = new LinkedList<ByteBuffer>();
+    int realLen = length;
+    if ((position + length) > filelen) {
+      realLen = (int)(filelen - position);
+    }
+    // determine the block and byte range within the block
+    // corresponding to position and realLen
+    List<LocatedBlock> blockRange = getBlockRange(position, realLen);
+    int remaining = realLen;
+    for (LocatedBlock blk : blockRange) {
+      long targetStart = position - blk.getStartOffset();
+      long bytesToRead = Math.min(remaining, blk.getBlockSize() - targetStart);
+      ByteBuffer bb = fetchBlockByteRangeScatterGather(blk, targetStart,
+                          bytesToRead);
+      results.add(bb);
+      remaining -= bytesToRead;
+      position += bytesToRead;
+    }
+    assert remaining == 0 : "Wrong number of bytes read.";
+    if (dfsClient.stats != null) {
+      dfsClient.stats.incrementBytesRead(realLen);
+    }
+    long timeval = System.currentTimeMillis() - start;
+    dfsClient.metrics.incPreadTime(timeval);
+    dfsClient.metrics.incPreadSize(realLen);
+    dfsClient.metrics.incPreadOps();
+    return results;
+  }
+
+  @Override
+  public long skip(long n) throws IOException {
+    if ( n > 0 ) {
+      long curPos = getPos();
+      long fileLen = getFileLength();
+      if( n+curPos > fileLen ) {
+        n = fileLen - curPos;
+      }
+      seek(curPos+n);
+      return n;
+    }
+    return n < 0 ? -1 : 0;
+  }
+
+  /**
+   * Seek to a new arbitrary location
+   */
+  @Override
+  public synchronized void seek(long targetPos) throws IOException {
+    if (targetPos > getFileLength()) {
+      throw new IOException("Cannot seek after EOF");
+    }
+    boolean done = false;
+    if (pos <= targetPos && targetPos <= blockEnd) {
+      //
+      // If this seek is to a positive position in the current
+      // block, and this piece of data might already be lying in
+      // the TCP buffer, then just eat up the intervening data.
+      //
+      int diff = (int)(targetPos - pos);
+      if (diff <= DFSClient.TCP_WINDOW_SIZE) {
+        try {
+          pos += blockReader.skip(diff);
+          if (pos == targetPos) {
+            done = true;
+          }
+        } catch (IOException e) {//make following read to retry
+          dfsClient.incReadExpCntToStats();
+
+          DFSClient.LOG.debug("Exception while seek to " + targetPos + " from "
+                    + currentBlock +" of " + src + " from " + currentNode +
+                    ": " + StringUtils.stringifyException(e));
+        }
+      }
+    }
+    if (!done) {
+      pos = targetPos;
+      blockEnd = -1;
+    }
+  }
+
+  /**
+   * Same as {@link #seekToNewSource(long)} except that it does not exclude
+   * the current datanode and might connect to the same node.
+   */
+  private synchronized boolean seekToBlockSource(long targetPos,
+      boolean throwWhenNotFound) throws IOException {
+    currentNode = blockSeekTo(targetPos, throwWhenNotFound);
+    return true;
+  }
+
+  /**
+   * Seek to given position on a node other than the current node.  If
+   * a node other than the current node is found, then returns true.
+   * If another node could not be found, then returns false.
+   */
+  @Override
+  public synchronized boolean seekToNewSource(long targetPos) throws IOException {
+    return seekToNewSource(targetPos, true);
+  }
+  
+  /**
+   * Seek to given position on a node other than the current node.  If
+   * a node other than the current node is found, then returns true.
+   * If another node could not be found, then returns false.
+   */
+  public synchronized boolean seekToNewSource(long targetPos,
+      boolean throwWhenNotFound) throws IOException {
+    boolean markedDead = deadNodes.containsKey(currentNode);
+    addToDeadNodes(currentNode);
+    DatanodeInfo oldNode = currentNode;
+    DatanodeInfo newNode = blockSeekTo(targetPos, throwWhenNotFound);
+    if (!markedDead) {
+      /* remove it from deadNodes. blockSeekTo could have cleared
+       * deadNodes and added currentNode again. Thats ok. */
+      deadNodes.remove(oldNode);
+    }
+    if (!oldNode.getStorageID().equals(newNode.getStorageID())) {
+      currentNode = newNode;
+      return true;
+    } else {
+      return false;
+    }
+  }    
+
+  /**
+   */
+  @Override
+  public synchronized long getPos() throws IOException {
+    return pos;
+  }
+
+  /**
+   * WARNING: This method does not work with files larger than 2GB.
+   * Use getFileLength() - getPos() instead.
+   */
+  @Override
+  public synchronized int available() throws IOException {
+    if (closed) {
+      throw new IOException("Stream closed");
+    }
+    long length = getFileLength() - pos;
+    
+    if (!isUnderConstruction() || length > 0) {
+      return (int) length;
+    }
+
+    read(DFSClient.emptyByteArray);
+    return (int) (getFileLength() - pos);
+  }
+
+  /**
+   * We definitely don't support marks
+   */
+  @Override
+  public boolean markSupported() {
+    return false;
+  }
+  @Override
+  public void mark(int readLimit) {
+  }
+  @Override
+  public void reset() throws IOException {
+    throw new IOException("Mark/reset not supported");
+  }
+  
+  /** Utility class to encapsulate data node info and its ip address. */
+  private static class DNAddrPair {
+    DatanodeInfo info;
+    InetSocketAddress addr;
+    DNAddrPair(DatanodeInfo info, InetSocketAddress addr) {
+      this.info = info;
+      this.addr = addr;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/hdfs/org/apache/hadoop/hdfs/DFSOutputStream.java b/src/hdfs/org/apache/hadoop/hdfs/DFSOutputStream.java
new file mode 100644
index 00000000..080e4296
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -0,0 +1,1815 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs;
+
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.zip.CRC32;
+
+import org.apache.hadoop.fs.FSOutputSummer;
+import org.apache.hadoop.fs.FileAlreadyExistsException;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.Syncable;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.DFSClient.MultiDataInputStream;
+import org.apache.hadoop.hdfs.DFSClient.MultiDataOutputStream;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.ClientDatanodeProtocol;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.DSQuotaExceededException;
+import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlockWithMetaInfo;
+import org.apache.hadoop.hdfs.protocol.NSQuotaExceededException;
+import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlock;
+import org.apache.hadoop.hdfs.protocol.WriteBlockHeader;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.namenode.NotReplicatedYetException;
+import org.apache.hadoop.hdfs.server.protocol.BlockAlreadyCommittedException;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.ipc.ProtocolProxy;
+import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.util.Daemon;
+import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.Progressable;
+import org.apache.hadoop.util.PureJavaCrc32;
+import org.apache.hadoop.util.StringUtils;
+
+/****************************************************************
+ * DFSOutputStream creates files from a stream of bytes.
+ *
+ * The client application writes data that is cached internally by
+ * this stream. Data is broken up into packets, each packet is
+ * typically 64K in size. A packet comprises of chunks. Each chunk
+ * is typically 512 bytes and has an associated checksum with it.
+ *
+ * When a client application fills up the currentPacket, it is
+ * enqueued into dataQueue.  The DataStreamer thread picks up
+ * packets from the dataQueue, sends it to the first datanode in
+ * the pipeline and moves it from the dataQueue to the ackQueue.
+ * The ResponseProcessor receives acks from the datanodes. When an
+ * successful ack for a packet is received from all datanodes, the
+ * ResponseProcessor removes the corresponding packet from the
+ * ackQueue.
+ *
+ * In case of error, all outstanding packets and moved from
+ * ackQueue. A new pipeline is setup by eliminating the bad
+ * datanode from the original pipeline. The DataStreamer now
+ * starts sending packets from the dataQueue.
+****************************************************************/
+class DFSOutputStream extends FSOutputSummer implements Syncable, Replicable {
+  private final DFSClient dfsClient;
+  private Socket[] s;
+  boolean closed = false;
+
+  private String src;
+  private MultiDataOutputStream blockStream;
+  private MultiDataInputStream blockReplyStream;
+  private Block block;
+  final private long blockSize;
+  private DataChecksum checksum;
+  private LinkedList<Packet> dataQueue = new LinkedList<Packet>();
+  private LinkedList<Packet> ackQueue = new LinkedList<Packet>();
+  private int numPendingHeartbeats = 0;
+  private long lastPacketSentTime = 0;
+  private final long packetTimeout;
+  private Packet currentPacket = null;
+  private int maxPackets = 80; // each packet 64K, total 5MB
+  // private int maxPackets = 1000; // each packet 64K, total 64MB
+  private DataStreamer streamer;
+  private ResponseProcessor response = null;
+  private long currentSeqno = 0;
+  private long lastQueuedSeqno = -1;
+  private long lastAckedSeqno = -1;
+  private long bytesCurBlock = 0; // bytes writen in current block
+  private int packetSize = 0; // write packet size, including the header.
+  private int chunksPerPacket = 0;
+  private DatanodeInfo[] nodes = null; // list of targets for current block
+  private DatanodeInfo[] favoredNodes = null; // put replicas here if possible
+  private volatile boolean hasError = false;
+  private volatile int errorIndex = 0;
+  volatile IOException lastException = null;
+  private long artificialSlowdown = 0;
+  private long lastFlushOffset = 0; // offset when flush was invoked
+  private boolean persistBlocks = false; // persist blocks on namenode
+  private int recoveryErrorCount = 0; // number of times block recovery failed
+  private final int maxRecoveryErrorCount;
+  private volatile boolean appendChunk = false;   // appending to existing partial block
+  private long initialFileSize = 0; // at time of file open
+  private Progressable progress;
+  private short blockReplication; // replication factor of file
+  private long lastBlkOffset = 0; // end pos of last block already sent
+
+  private boolean forceSync;
+  private boolean doParallelWrites = false;
+  
+  private int namespaceId;  // the namespace that the file belongs to
+
+  private void setLastException(IOException e) {
+    if (lastException == null) {
+      lastException = e;
+    }
+  }
+  
+  public void setOffsets(long offset) {
+    DFSClient.LOG.info("set last block offsets in file: " + src + " pos: " + offset);
+    lastBlkOffset = offset;
+  }
+
+  private class Packet {
+    ByteBuffer buffer;           // only one of buf and buffer is non-null
+    byte[]  buf;
+    long    seqno;               // sequencenumber of buffer in block
+    long    offsetInBlock;       // offset in block
+    boolean lastPacketInBlock;   // is this the last packet in block?
+    int     numChunks;           // number of chunks currently in packet
+    int     maxChunks;           // max chunks in packet
+    int     dataStart;
+    int     dataPos;
+    int     checksumStart;
+    int     checksumPos;
+
+    private static final long HEART_BEAT_SEQNO = -1L;
+
+    /**
+     *  create a heartbeat packet
+     */
+    Packet() {
+      this.lastPacketInBlock = false;
+      this.numChunks = 0;
+      this.offsetInBlock = 0;
+      this.seqno = HEART_BEAT_SEQNO;
+
+      buffer = null;
+      int packetSize = DataNode.PKT_HEADER_LEN + DFSClient.SIZE_OF_INTEGER;
+      buf = new byte[packetSize];
+
+      checksumStart = dataStart = packetSize;
+      checksumPos = checksumStart;
+      dataPos = dataStart;
+      maxChunks = 0;
+    }
+
+   // create a new packet
+    Packet(int pktSize, int chunksPerPkt, long offsetInBlock)
+    throws IOException {
+      this.lastPacketInBlock = false;
+      this.numChunks = 0;
+      this.offsetInBlock = offsetInBlock;
+      this.seqno = currentSeqno;
+      currentSeqno++;
+
+      buffer = null;
+      buf = new byte[pktSize];
+
+      checksumStart = DataNode.PKT_HEADER_LEN + DFSClient.SIZE_OF_INTEGER;
+      checksumPos = checksumStart;
+      dataStart = checksumStart + chunksPerPkt * checksum.getChecksumSize();
+      dataPos = dataStart;
+      maxChunks = chunksPerPkt;
+    }
+
+    void writeData(byte[] inarray, int off, int len) {
+      if ( dataPos + len > buf.length) {
+        throw new BufferOverflowException();
+      }
+      System.arraycopy(inarray, off, buf, dataPos, len);
+      dataPos += len;
+    }
+
+    void  writeChecksum(byte[] inarray, int off, int len) {
+      if (checksumPos + len > dataStart) {
+        throw new BufferOverflowException();
+      }
+      System.arraycopy(inarray, off, buf, checksumPos, len);
+      checksumPos += len;
+    }
+
+    /**
+     * Returns ByteBuffer that contains one full packet, including header.
+     * @throws IOException
+     */
+    ByteBuffer getBuffer() throws IOException {
+      /* Once this is called, no more data can be added to the packet.
+       * setting 'buf' to null ensures that.
+       * This is called only when the packet is ready to be sent.
+       */
+      if (buffer != null) {
+        return buffer;
+      }
+
+      //prepare the header and close any gap between checksum and data.
+
+      int dataLen = dataPos - dataStart;
+      int checksumLen = checksumPos - checksumStart;
+
+      if (checksumPos != dataStart) {
+        /* move the checksum to cover the gap.
+         * This can happen for the last packet.
+         */
+        System.arraycopy(buf, checksumStart, buf,
+                         dataStart - checksumLen , checksumLen);
+      }
+
+      int pktLen = DFSClient.SIZE_OF_INTEGER + dataLen + checksumLen;
+
+      //normally dataStart == checksumPos, i.e., offset is zero.
+      buffer = ByteBuffer.wrap(buf, dataStart - checksumPos,
+													 DataNode.PKT_HEADER_LEN + pktLen);
+      buf = null;
+      buffer.mark();
+
+      /* write the header and data length.
+       * The format is described in comment before DataNode.BlockSender
+       */
+      buffer.putInt(pktLen);  // pktSize
+      buffer.putLong(offsetInBlock);
+      buffer.putLong(seqno);
+
+      if (dfsClient.dataTransferVersion >= dfsClient.getDataTransferProtocolVersion()) {
+	        byte booleanFieldValue = 0x00;
+
+	        if (lastPacketInBlock) {
+	          booleanFieldValue |= DataNode.isLastPacketInBlockMask;
+	        }
+	        if (forceSync) {
+	          booleanFieldValue |= DataNode.forceSyncMask;
+	        }
+	          buffer.put(booleanFieldValue);
+      } else {
+        buffer.put((byte) (lastPacketInBlock? 1: 0));
+      }
+
+      //end of pkt header
+      buffer.putInt(dataLen); // actual data length, excluding checksum.
+      buffer.reset();
+      return buffer;
+    }
+
+    private long getEndPosInCurrBlk() {
+      return offsetInBlock + (dataPos - dataStart);
+    }
+    
+    /**
+     * Check if this packet is a heart beat packet
+     * @return true if the sequence number is HEART_BEAT_SEQNO
+     */
+    private boolean isHeartbeatPacket() {
+      return seqno == HEART_BEAT_SEQNO;
+    }
+  }
+
+  /** Decide if the write pipeline supports bidirectional heartbeat or not */
+  private boolean supportClientHeartbeat() throws IOException {
+    return dfsClient.getDataTransferProtocolVersion() >=
+                 DataTransferProtocol.CLIENT_HEARTBEAT_VERSION;
+  }
+
+  /**
+   * Check if the last outstanding packet has not received an ack before
+   * it is timed out.
+   * If true, for now just log it.
+   * We will provide a decent solution to this later on.
+   */
+  private void checkIfLastPacketTimeout() {
+     synchronized (ackQueue) {
+             if( !ackQueue.isEmpty()  && (
+                             System.currentTimeMillis() - lastPacketSentTime > packetTimeout) ) {
+               DFSClient.LOG.warn("Packet " + ackQueue.getLast().seqno +
+                             " of " + block + " is timed out");
+             }
+     }
+  }
+
+
+  //
+  // The DataStreamer class is responsible for sending data packets to the
+  // datanodes in the pipeline. It retrieves a new blockid and block locations
+  // from the namenode, and starts streaming packets to the pipeline of
+  // Datanodes. Every packet has a sequence number associated with
+  // it. When all the packets for a block are sent out and acks for each
+  // if them are received, the DataStreamer closes the current block.
+  //
+  private class DataStreamer extends Daemon {
+
+    private volatile boolean closed = false;
+    private long lastPacket;
+    private boolean doSleep;
+
+    DataStreamer() throws IOException {
+      // explicitly invoke RPC so avoiding RPC in waitForWork
+      // that might cause timeout
+      dfsClient.getDataTransferProtocolVersion();
+    }
+
+    private void waitForWork() throws IOException {
+      if ( supportClientHeartbeat() ) {  // send heart beat
+        long now = System.currentTimeMillis();
+        while ((!closed && !hasError && dfsClient.clientRunning
+            && dataQueue.size() == 0  &&
+            (blockStream == null || (
+                blockStream != null && now - lastPacket < dfsClient.timeoutValue/2)))
+                || doSleep) {
+          long timeout = dfsClient.timeoutValue/2 - (now-lastPacket);
+          timeout = timeout <= 0 ? 1000 : timeout;
+
+          try {
+            dataQueue.wait(timeout);
+            checkIfLastPacketTimeout();
+            now = System.currentTimeMillis();
+          } catch (InterruptedException  e) {
+          }
+          doSleep = false;
+        }
+      } else { // no sending heart beat
+        while ((!closed && !hasError && dfsClient.clientRunning
+            && dataQueue.size() == 0) || doSleep) {
+          try {
+            dataQueue.wait(1000);
+          } catch (InterruptedException  e) {
+          }
+          doSleep = false;
+        }
+      }
+    }
+
+    public void run() {
+      while (!closed && dfsClient.clientRunning) {
+
+        // if the Responder encountered an error, shutdown Responder
+        if (hasError && response != null) {
+          try {
+            response.close();
+            response.join();
+            response = null;
+          } catch (InterruptedException  e) {
+          }
+        }
+
+        Packet one = null;
+        synchronized (dataQueue) {
+
+          // process IO errors if any
+          doSleep = processDatanodeError(hasError, false);
+
+          try {
+            // wait for a packet to be sent.
+            waitForWork();
+
+            if (closed || hasError || !dfsClient.clientRunning) {
+              continue;
+            }
+
+            // get packet to be sent.
+            if (dataQueue.isEmpty()) {
+              one = new Packet();  // heartbeat packet
+            } else {
+              one = dataQueue.getFirst(); // regular data packet
+            }
+            long offsetInBlock = one.offsetInBlock;
+
+            // get new block from namenode.
+            if (blockStream == null) {
+              DFSClient.LOG.debug("Allocating new block: " + src + "  pos: " + lastBlkOffset);
+
+              nodes = nextBlockOutputStream(src);
+              this.setName("DataStreamer for file " + src +
+                           " block " + block);
+              response = new ResponseProcessor(nodes);
+              response.start();
+            }
+
+            if (offsetInBlock >= blockSize) {
+              throw new IOException("BlockSize " + blockSize +
+                                    " is smaller than data size. " +
+                                    " Offset of packet in block " +
+                                    offsetInBlock +
+                                    " Aborting file " + src);
+            }
+
+            ByteBuffer buf = one.getBuffer();
+
+            // write out data to remote datanode
+            blockStream.write(buf.array(), buf.position(), buf.remaining());
+
+            if (one.lastPacketInBlock) {
+              blockStream.writeInt(0); // indicate end-of-block
+            }
+            blockStream.flush();
+            lastPacket = System.currentTimeMillis();
+            if (DFSClient.LOG.isDebugEnabled()) {
+              DFSClient.LOG.debug("DataStreamer block " + block +
+                        " wrote packet seqno:" + one.seqno +
+                        " size:" + buf.remaining() +
+                        " offsetInBlock:" + one.offsetInBlock +
+                        " lastPacketInBlock:" + one.lastPacketInBlock);
+            }
+
+            // move packet from dataQueue to ackQueue
+            if (!one.isHeartbeatPacket()) {
+              dataQueue.removeFirst();
+              dataQueue.notifyAll();
+              synchronized (ackQueue) {
+                ackQueue.addLast(one);
+                lastPacketSentTime = System.currentTimeMillis();
+                ackQueue.notifyAll();
+              }
+            } else {
+              synchronized (ackQueue) {
+                numPendingHeartbeats++;
+                ackQueue.notifyAll();                  
+              }
+
+              DFSClient.LOG.info("Sending a heartbeat packet for block " + block);
+            }
+          } catch (Throwable e) {
+            dfsClient.incWriteExpCntToStats();
+
+            DFSClient.LOG.warn("DataStreamer Exception: " +
+                     StringUtils.stringifyException(e));
+            if (e instanceof IOException) {
+              setLastException((IOException)e);
+            }
+            hasError = true;
+            if (blockStream != null) {
+              // find the first datanode to which we could not write data.
+              int possibleError =  blockStream.getErrorIndex();
+              if (possibleError != -1) {
+                errorIndex = possibleError;
+                DFSClient.LOG.warn("DataStreamer bad datanode in pipeline:" +
+                         possibleError);
+              }
+            }
+          }
+        }
+
+        if (closed || hasError || !dfsClient.clientRunning) {
+          continue;
+        }
+
+        // Is this block full?
+        if (one.lastPacketInBlock) {
+          synchronized (ackQueue) {
+            while (!hasError && ackQueue.size() != 0 && dfsClient.clientRunning) {
+              try {
+                ackQueue.wait();   // wait for acks to arrive from datanodes
+              } catch (InterruptedException  e) {
+              }
+            }
+          }
+          DFSClient.LOG.debug("Closing old block " + block);
+          this.setName("DataStreamer for file " + src);
+
+          response.close();        // ignore all errors in Response
+          try {
+            response.join();
+            response = null;
+          } catch (InterruptedException  e) {
+          }
+          
+          if (closed || hasError || !dfsClient.clientRunning) {
+            continue;
+          }
+
+          synchronized (dataQueue) {
+            try {
+              blockStream.close();
+              blockReplyStream.close();
+            } catch (IOException e) {
+            }
+            nodes = null;
+            response = null;
+            blockStream = null;
+            blockReplyStream = null;
+          }
+        }
+        
+        if (progress != null) { progress.progress(); }
+
+        // This is used by unit test to trigger race conditions.
+        if (artificialSlowdown != 0 && dfsClient.clientRunning) {
+          DFSClient.sleepForUnitTest(artificialSlowdown);
+        }
+      }
+    }
+
+    // shutdown thread
+    void close() {
+      closed = true;
+      synchronized (dataQueue) {
+        dataQueue.notifyAll();
+      }
+      synchronized (ackQueue) {
+        ackQueue.notifyAll();
+      }
+      this.interrupt();
+    }
+  }
+
+  //
+  // Processes reponses from the datanodes.  A packet is removed
+  // from the ackQueue when its response arrives.
+  //
+  private class ResponseProcessor extends Thread {
+
+    private volatile boolean closed = false;
+    private DatanodeInfo[] targets = null;
+    private boolean lastPacketInBlock = false;
+
+    ResponseProcessor (DatanodeInfo[] targets) {
+      this.targets = targets;
+    }
+
+    public void run() {
+
+      this.setName("ResponseProcessor for block " + block);
+
+      while (!closed && dfsClient.clientRunning && !lastPacketInBlock) {
+        // process responses from datanodes.
+        int recordError = 0;
+        try {
+          long seqno = 0;
+          synchronized (ackQueue) {
+            while (!closed && dfsClient.clientRunning && ackQueue.isEmpty() &&
+                   numPendingHeartbeats == 0) {
+              try {
+                ackQueue.wait();
+              } catch (InterruptedException e) {
+                // If the thread is being interrupted when waiting for
+                // packet, we log the exception and treat it as a normal
+                // exception.
+                //
+                DFSClient.LOG.info("ResponseProcessor thread interrupted when " +
+                         "waiting for new packets");
+                throw e;
+              }
+            }
+          }
+          if (closed || !dfsClient.clientRunning) {
+            break;
+          }
+
+          if (!doParallelWrites) {
+            // verify seqno from datanode
+            seqno = blockReplyStream.get(0).readLong();
+            DFSClient.LOG.debug("DFSClient received ack for seqno " + seqno);
+            if (seqno == Packet.HEART_BEAT_SEQNO && !supportClientHeartbeat()) {
+              continue;
+            }
+            // regular ack
+            // processes response status from all datanodes.
+            for (int i = 0; i < targets.length && dfsClient.clientRunning; i++) {
+              short reply = blockReplyStream.get(0).readShort();
+              if (reply != DataTransferProtocol.OP_STATUS_SUCCESS) {
+                recordError = i; // first bad datanode
+                throw new IOException("Bad response " + reply + " for block "
+                    + block + " from datanode " + targets[i].getName());
+              }
+            }
+          } else {
+            // The client is writing to all replicas in parallel. It also
+            // expects an ack from all replicas.
+            long lastsn = 0;
+            assert blockReplyStream.size() > 0;
+            for (int i = 0; i < blockReplyStream.size(); i++) {
+              recordError = i; // remember the current slot
+              seqno = blockReplyStream.get(i).readLong();
+              if (DFSClient.LOG.isDebugEnabled()) {
+                DFSClient.LOG.debug("DFSClient for block " + block + " " + seqno);
+              }
+              if (i != 0 && seqno != -2 && seqno != lastsn) {
+                String msg = "Responses from datanodes do not match "
+                    + " this replica acked " + seqno
+                    + " but previous replica acked " + lastsn;
+                DFSClient.LOG.warn(msg);
+                throw new IOException(msg);
+              }
+              short reply = blockReplyStream.get(i).readShort();
+              if (reply != DataTransferProtocol.OP_STATUS_SUCCESS) {
+                recordError = i; // first bad datanode
+                throw new IOException("Bad parallel response " + reply
+                    + " for block " + block + " from datanode "
+                    + targets[i].getName());
+              }
+              lastsn = seqno;
+            }
+          }
+
+          assert seqno != -2 :
+            "Ack for unkown seqno should be a failed ack!";
+          if (seqno == Packet.HEART_BEAT_SEQNO) {  // a heartbeat ack
+            assert supportClientHeartbeat();
+            synchronized(ackQueue) {
+              assert numPendingHeartbeats > 0;
+              numPendingHeartbeats--;
+            }
+            continue;
+          }
+
+          Packet one = null;
+          synchronized (ackQueue) {
+            assert !ackQueue.isEmpty();
+            one = ackQueue.getFirst();
+          }
+          if (one.seqno != seqno) {
+            throw new IOException("Responseprocessor: Expecting seqno " +
+                " for block " + block +
+                one.seqno + " but received " + seqno);
+          }
+          lastPacketInBlock = one.lastPacketInBlock;
+
+          if (lastPacketInBlock) {
+            if (DFSClient.LOG.isDebugEnabled()) {
+              DFSClient.LOG
+                  .debug("Update pos in file: " + src + " curBlckOffset: "
+                      + lastBlkOffset + " blockSize: "
+                      + one.getEndPosInCurrBlk());
+            }
+            lastBlkOffset += one.getEndPosInCurrBlk();
+          }
+
+          synchronized (ackQueue) {
+            assert seqno == lastAckedSeqno + 1;
+            lastAckedSeqno = seqno;
+            
+            ackQueue.removeFirst();
+            ackQueue.notifyAll();
+          }
+
+        } catch (Exception e) {
+          if (!closed) {
+            hasError = true;
+            errorIndex = recordError;
+            if (e instanceof IOException) {
+              setLastException((IOException)e);
+            }
+            DFSClient.LOG.warn("DFSOutputStream ResponseProcessor exception " +
+                     " for block " + block +
+                      StringUtils.stringifyException(e));
+            closed = true;
+          }
+        }
+
+        synchronized (dataQueue) {
+          dataQueue.notifyAll();
+        }
+        synchronized (ackQueue) {
+          ackQueue.notifyAll();
+        }
+      }
+    }
+
+    void close() {
+      closed = true;
+      this.interrupt();
+    }
+  }
+
+  // If this stream has encountered any errors so far, shutdown
+  // threads and mark stream as closed. Returns true if we should
+  // sleep for a while after returning from this call.
+  //
+  private boolean processDatanodeError(boolean hasError, boolean isAppend) {
+    if (!hasError) {
+      return false;
+    }
+    if (response != null) {
+      DFSClient.LOG.info("Error Recovery for block " + block +
+               " waiting for responder to exit. ");
+      return true;
+    }
+    dfsClient.incWriteExpCntToStats();
+
+    if (errorIndex >= 0) {
+      DFSClient.LOG.warn("Error Recovery for block " + block
+          + " bad datanode[" + errorIndex + "] "
+          + (nodes == null? "nodes == null": nodes[errorIndex].getName()));
+    }
+
+    if (blockStream != null) {
+      try {
+        blockStream.close();
+        blockReplyStream.close();
+      } catch (IOException e) {
+      }
+    }
+    blockStream = null;
+    blockReplyStream = null;
+
+    // move packets from ack queue to front of the data queue
+    synchronized (ackQueue) {
+      if (!ackQueue.isEmpty()) {
+        DFSClient.LOG.info("First unacked packet in " + block + " starts at "
+               + ackQueue.getFirst().offsetInBlock);
+        dataQueue.addAll(0, ackQueue);
+        ackQueue.clear();
+      }
+      numPendingHeartbeats = 0;
+    }
+
+    boolean success = false;
+    while (!success && dfsClient.clientRunning) {
+      DatanodeInfo[] newnodes = null;
+      if (nodes == null) {
+        String msg = "Could not get block locations. " +
+                                        "Source file \"" + src
+                                        + "\" - Aborting...";
+        DFSClient.LOG.warn(msg);
+        setLastException(new IOException(msg));
+        closed = true;
+        if (streamer != null) streamer.close();
+        return false;
+      }
+      StringBuilder pipelineMsg = new StringBuilder();
+      for (int j = 0; j < nodes.length; j++) {
+        pipelineMsg.append(nodes[j].getName());
+        if (j < nodes.length - 1) {
+          pipelineMsg.append(", ");
+        }
+      }
+      // remove bad datanode from list of datanodes.
+      // If errorIndex was not set (i.e. appends), then do not remove
+      // any datanodes
+      //
+      if (errorIndex < 0) {
+        newnodes = nodes;
+      } else {
+        if (nodes.length <= 1) {
+          lastException = new IOException("All datanodes " + pipelineMsg +
+                                          " are bad. Aborting...");
+          closed = true;
+          if (streamer != null) streamer.close();
+          return false;
+        }
+        DFSClient.LOG.warn("Error Recovery for block " + block +
+                 " in pipeline " + pipelineMsg +
+                 ": bad datanode " + nodes[errorIndex].getName());
+        newnodes =  new DatanodeInfo[nodes.length-1];
+        System.arraycopy(nodes, 0, newnodes, 0, errorIndex);
+        System.arraycopy(nodes, errorIndex+1, newnodes, errorIndex,
+            newnodes.length-errorIndex);
+      }
+
+      // Tell the primary datanode to do error recovery
+      // by stamping appropriate generation stamps.
+      //
+      LocatedBlock newBlock = null;
+      ProtocolProxy<ClientDatanodeProtocol> primary =  null;
+      DatanodeInfo primaryNode = null;
+      try {
+        // Pick the "least" datanode as the primary datanode to avoid deadlock.
+        primaryNode = Collections.min(Arrays.asList(newnodes));
+		/* considering pipeline recovery needs 3 RPCs to DataNodes
+		 * and 2 RPCs to NameNode; So rpcTimeout sets to be 5 times of
+		 * client socketTimeout
+		 */
+        int recoverTimeout = 5*dfsClient.socketTimeout;
+        primary = DFSClient.createClientDNProtocolProxy(primaryNode,
+            dfsClient.conf, recoverTimeout);
+        try {
+          if (primary.isMethodSupported("recoverBlock", int.class, Block.class,
+              boolean.class, DatanodeInfo[].class, long.class)) {
+            // The deadline is up to RPC time out minus one socket timeout
+            // to be more conservative.
+            newBlock = primary.getProxy().recoverBlock(namespaceId, block,
+                isAppend, newnodes,
+                System.currentTimeMillis() + recoverTimeout - dfsClient.socketTimeout);
+          } else if (primary.isMethodSupported("recoverBlock", int.class, Block.class, boolean.class, DatanodeInfo[].class)) {
+            newBlock = primary.getProxy().recoverBlock(
+                namespaceId, block, isAppend, newnodes);
+          } else {
+            newBlock = primary.getProxy().recoverBlock(block, isAppend, newnodes);
+          }
+        } catch (RemoteException re) {
+          if (re.unwrapRemoteException() instanceof BlockAlreadyCommittedException) {
+            throw new BlockAlreadyCommittedException(re);
+          } else {
+            throw re;
+          }
+        }
+        if (newBlock == null) {
+          throw new IOException("all datanodes do not have the block");
+        }
+        long nextByteToSend = dataQueue.isEmpty() ? 
+            bytesCurBlock : dataQueue.getFirst().offsetInBlock;
+        if (nextByteToSend > newBlock.getBlockSize()) {
+          DFSClient.LOG.warn("Missing bytes! Error Recovery for block " + block +
+              " end up with " +
+              newBlock.getBlockSize() + " bytes but client already sent " +
+              nextByteToSend + " bytes and data queue is " +
+              (dataQueue.isEmpty() ? "" : "not ") + "empty.");
+        }
+      } catch (BlockAlreadyCommittedException e) {
+        dfsClient.incWriteExpCntToStats();
+
+        DFSClient.LOG
+            .warn("Error Recovery for block "
+                + block
+                + " failed "
+                + " because block is already committed according to primary datanode "
+                + primaryNode + ". " + " Pipeline was " + pipelineMsg
+                + ". Aborting...", e);
+
+        lastException = e;
+        closed = true;
+        if (streamer != null) streamer.close();
+        return false;       // abort with IOexception
+      } catch (IOException e) {
+        dfsClient.incWriteExpCntToStats();
+
+        DFSClient.LOG.warn("Failed recovery attempt #" + recoveryErrorCount +
+            " from primary datanode " + primaryNode, e);
+        recoveryErrorCount++;
+        if (recoveryErrorCount > maxRecoveryErrorCount) {
+          if (nodes.length > 1) {
+            // if the primary datanode failed, remove it from the list.
+            // The original bad datanode is left in the list because it is
+            // conservative to remove only one datanode in one iteration.
+            for (int j = 0; j < nodes.length; j++) {
+              if (nodes[j].equals(primaryNode)) {
+                errorIndex = j; // forget original bad node.
+              }
+            }
+            // remove primary node from list
+            newnodes =  new DatanodeInfo[nodes.length-1];
+            System.arraycopy(nodes, 0, newnodes, 0, errorIndex);
+            System.arraycopy(nodes, errorIndex+1, newnodes, errorIndex,
+                             newnodes.length-errorIndex);
+            nodes = newnodes;
+            DFSClient.LOG.warn("Error Recovery for block " + block + " failed " +
+                     " because recovery from primary datanode " +
+                     primaryNode + " failed " + recoveryErrorCount +
+                     " times. " + " Pipeline was " + pipelineMsg +
+                     ". Marking primary datanode as bad.");
+            recoveryErrorCount = 0;
+            errorIndex = -1;
+            return true;          // sleep when we return from here
+          }
+          String emsg = "Error Recovery for block " + block + " failed " +
+                        " because recovery from primary datanode " +
+                        primaryNode + " failed " + recoveryErrorCount +
+                        " times. "  + " Pipeline was " + pipelineMsg +
+                        ". Aborting...";
+          DFSClient.LOG.warn(emsg);
+          lastException = new IOException(emsg);
+          closed = true;
+          if (streamer != null) streamer.close();
+          return false;       // abort with IOexception
+        }
+        DFSClient.LOG.warn("Error Recovery for block " + block + " failed " +
+                 " because recovery from primary datanode " +
+                 primaryNode + " failed " + recoveryErrorCount +
+                 " times. "  + " Pipeline was " + pipelineMsg +
+                 ". Will retry...");
+        return true;          // sleep when we return from here
+      } finally {
+        if (primary != null) {
+          RPC.stopProxy(primary.getProxy());
+        }
+      }
+      recoveryErrorCount = 0; // block recovery successful
+
+      // If the block recovery generated a new generation stamp, use that
+      // from now on.  Also, setup new pipeline
+      //
+      if (newBlock != null) {
+        block = newBlock.getBlock();
+        nodes = newBlock.getLocations();
+      }
+
+      this.hasError = false;
+      lastException = null;
+      errorIndex = 0;
+      success = createBlockOutputStream(nodes, dfsClient.clientName, true);
+    }
+
+    response = new ResponseProcessor(nodes);
+    response.start();
+    return false; // do not sleep, continue processing
+  }
+
+  private void isClosed() throws IOException {
+    if ((closed || !dfsClient.clientRunning) && lastException != null) {
+        throw lastException;
+    }
+  }
+
+  //
+  // returns the list of targets, if any, that is being currently used.
+  //
+  DatanodeInfo[] getPipeline() {
+    synchronized (dataQueue) {
+      if (nodes == null) {
+        return null;
+      }
+      DatanodeInfo[] value = new DatanodeInfo[nodes.length];
+      for (int i = 0; i < nodes.length; i++) {
+        value[i] = nodes[i];
+      }
+      return value;
+    }
+  }
+
+  private DFSOutputStream(DFSClient dfsClient, String src, long blockSize,
+      Progressable progress, int bytesPerChecksum, short replication, boolean forceSync,
+      boolean doParallelWrites, DatanodeInfo[] favoredNodes)
+  throws IOException {
+    super(new PureJavaCrc32(), bytesPerChecksum, 4);
+    this.dfsClient = dfsClient;
+    this.forceSync = forceSync;
+    this.doParallelWrites = doParallelWrites;
+    this.src = src;
+    this.blockSize = blockSize;
+    this.blockReplication = replication;
+    this.progress = progress;
+    
+    streamer = new DataStreamer();
+    
+    packetTimeout =
+        dfsClient.conf.getLong("dfs.client.packet.timeout", 15000); // 15 seconds
+    // try block recovery 5 times:
+    maxRecoveryErrorCount =
+        dfsClient.conf.getInt("dfs.client.block.recovery.retries", 5);
+    
+    if (progress != null) {
+      DFSClient.LOG.debug("Set non-null progress callback on DFSOutputStream "+src);
+    }
+
+    this.favoredNodes = favoredNodes;
+
+    if ( bytesPerChecksum < 1 || blockSize % bytesPerChecksum != 0) {
+      throw new IOException("io.bytes.per.checksum(" + bytesPerChecksum +
+                            ") and blockSize(" + blockSize +
+                            ") do not match. " + "blockSize should be a " +
+                            "multiple of io.bytes.per.checksum");
+
+    }
+    checksum = DataChecksum.newDataChecksum(FSConstants.CHECKSUM_TYPE,
+                                            bytesPerChecksum,
+                                            new PureJavaCrc32());
+  }
+  
+  /**
+   * Create a new output stream to the given DataNode.
+   * @see ClientProtocol#create(String, FsPermission, String, boolean, short, long)
+   */
+  DFSOutputStream(DFSClient dfsClient, String src, int buffersize,
+      Progressable progress, LocatedBlock lastBlock, FileStatus stat,
+      int bytesPerChecksum)
+      throws IOException {
+    this(dfsClient, src, buffersize, progress, lastBlock, stat, bytesPerChecksum, 0);
+  }
+
+  /**
+   * Create a new output stream to the given DataNode.
+   * @see ClientProtocol#create(String, FsPermission, String, boolean, short, long)
+   */
+  DFSOutputStream(DFSClient dfsClient, String src, FsPermission masked,
+      boolean overwrite, boolean createParent, short replication, long blockSize,
+      Progressable progress,int buffersize, int bytesPerChecksum,
+      boolean forceSync, boolean doParallelWrites,
+      DatanodeInfo[] favoredNodes) throws IOException {
+    this(dfsClient, src, blockSize, progress, bytesPerChecksum, replication,
+        forceSync, doParallelWrites, favoredNodes);
+
+    computePacketChunkSize(dfsClient.writePacketSize, bytesPerChecksum);
+
+    try {
+      if (dfsClient.namenodeProtocolProxy != null && 
+            dfsClient.namenodeProtocolProxy.isMethodSupported("create", String.class, 
+               FsPermission.class, String.class, boolean.class, boolean.class,
+               short.class, long.class)) {
+        dfsClient.namenode.create(src, masked, dfsClient.clientName, overwrite,
+                        createParent, replication, blockSize);
+      } else {
+        dfsClient.namenode.create(src, masked, dfsClient.clientName, overwrite,
+                        replication, blockSize);
+      }
+    } catch(RemoteException re) {
+      dfsClient.incWriteExpCntToStats();
+
+      throw re.unwrapRemoteException(AccessControlException.class,
+                                     FileAlreadyExistsException.class,
+                                     FileNotFoundException.class,
+                                     NSQuotaExceededException.class,
+                                     DSQuotaExceededException.class);
+    }
+    streamer.start();
+  }
+
+  /**
+   * Create a new output stream to the given DataNode with namespace id.
+   */
+  DFSOutputStream(DFSClient dfsClient, String src, int buffersize,
+      Progressable progress, LocatedBlock lastBlock, FileStatus stat,
+      int bytesPerChecksum, int namespaceId) throws IOException {
+    this(dfsClient, src, stat.getBlockSize(), progress, bytesPerChecksum,
+        stat.getReplication(), false, false, null);
+    initialFileSize = stat.getLen(); // length of file when opened
+    this.namespaceId = namespaceId;
+    //
+    // The last partial block of the file has to be filled.
+    //
+    if (lastBlock != null) {
+      block = lastBlock.getBlock();
+      long usedInLastBlock = stat.getLen() % blockSize;
+      int freeInLastBlock = (int)(blockSize - usedInLastBlock);
+
+      // calculate the amount of free space in the pre-existing
+      // last crc chunk
+      int usedInCksum = (int)(stat.getLen() % bytesPerChecksum);
+      int freeInCksum = bytesPerChecksum - usedInCksum;
+
+      // if there is space in the last block, then we have to
+      // append to that block
+      if (freeInLastBlock > blockSize) {
+        throw new IOException("The last block for file " +
+                              src + " is full.");
+      }
+
+      // indicate that we are appending to an existing block
+      bytesCurBlock = lastBlock.getBlockSize();
+
+      if (usedInCksum > 0 && freeInCksum > 0) {
+        // if there is space in the last partial chunk, then
+        // setup in such a way that the next packet will have only
+        // one chunk that fills up the partial chunk.
+        //
+        computePacketChunkSize(0, freeInCksum);
+        resetChecksumChunk(freeInCksum);
+        this.appendChunk = true;
+      } else {
+        // if the remaining space in the block is smaller than
+        // that expected size of of a packet, then create
+        // smaller size packet.
+        //
+        computePacketChunkSize(Math.min(dfsClient.writePacketSize, freeInLastBlock),
+                               bytesPerChecksum);
+      }
+
+      // setup pipeline to append to the last block
+      nodes = lastBlock.getLocations();
+      errorIndex = -1;   // no errors yet.
+      if (nodes.length < 1) {
+        throw new IOException("Unable to retrieve blocks locations" +
+                              " for append to last block " + block +
+                              " of file " + src);
+
+      }
+      // keep trying to setup a pipeline until you know all DNs are dead
+      while (processDatanodeError(true, true)) {
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException  e) {
+        }
+      }
+      if (lastException != null) {
+        throw lastException;
+      }
+    }
+    else {
+      computePacketChunkSize(dfsClient.writePacketSize, bytesPerChecksum);
+    }
+    
+    long blockOffset = stat.getLen();
+    blockOffset -= blockOffset % blockSize;
+    setOffsets(blockOffset);
+    streamer.start();
+  }
+
+  private void computePacketChunkSize(int psize, int csize) {
+    int chunkSize = csize + checksum.getChecksumSize();
+    int n = DataNode.PKT_HEADER_LEN + DFSClient.SIZE_OF_INTEGER;
+    chunksPerPacket = Math.max((psize - n + chunkSize-1)/chunkSize, 1);
+    packetSize = n + chunkSize*chunksPerPacket;
+    if (DFSClient.LOG.isDebugEnabled()) {
+      DFSClient.LOG.debug("computePacketChunkSize: src=" + src +
+                ", chunkSize=" + chunkSize +
+                ", chunksPerPacket=" + chunksPerPacket +
+                ", packetSize=" + packetSize);
+    }
+  }
+
+  /**
+   * Open a DataOutputStream to a DataNode so that it can be written to.
+   * This happens when a file is created and each time a new block is allocated.
+   * Must get block ID and the IDs of the destinations from the namenode.
+   * Returns the list of target datanodes.
+   */
+  private DatanodeInfo[] nextBlockOutputStream(String client) throws IOException {
+    LocatedBlock lb = null;
+    boolean retry = false;
+    DatanodeInfo[] nodes;
+    ArrayList<DatanodeInfo> excludedNodes = new ArrayList<DatanodeInfo>();
+    int count = dfsClient.conf.getInt("dfs.client.block.write.retries", 3);
+    boolean success;
+    do {
+      hasError = false;
+      lastException = null;
+      errorIndex = 0;
+      retry = false;
+      nodes = null;
+      success = false;
+
+      long startTime = System.currentTimeMillis();
+
+      DatanodeInfo[] excluded = excludedNodes.toArray(new DatanodeInfo[0]);
+      lb = locateFollowingBlock(startTime, excluded.length > 0 ? excluded
+          : null);
+      block = lb.getBlock();
+      nodes = lb.getLocations();
+
+      //
+      // Connect to first DataNode in the list.
+      //
+      success = createBlockOutputStream(nodes, dfsClient.clientName, false);
+
+      if (!success) {
+        DFSClient.LOG.info("Abandoning block " + block + " for file " + src);
+        dfsClient.namenode.abandonBlock(block, src, dfsClient.clientName);
+
+        if (errorIndex < nodes.length) {
+          DFSClient.LOG.debug("Excluding datanode " + nodes[errorIndex]);
+          excludedNodes.add(nodes[errorIndex]);
+        }
+        // Connection failed.  Let's wait a little bit and retry
+        retry = true;
+      }
+    } while (retry && --count >= 0);
+
+    if (!success && nodes != null) {
+      // in the last fail time, we will retry with the remaining nodes.
+      while (nodes.length > 1 && !success) {
+        if (errorIndex >= nodes.length) {
+          break;
+        }
+        
+        DatanodeInfo[] remainingNodes = new DatanodeInfo[nodes.length - 1];
+        for (int i = 0; i < errorIndex; i++) {
+          remainingNodes[i] = nodes[i];
+        }
+        
+        for (int i = errorIndex + 1; i < nodes.length; i++) {
+          remainingNodes[i - 1] = nodes[i];
+        }
+        
+        nodes = remainingNodes;
+        success = createBlockOutputStream(nodes, dfsClient.clientName, false);
+      }
+    }
+    
+    if (!success) {
+      throw new IOException("Unable to create new block.");
+    }
+    return nodes;
+  }
+
+  // For pipelined writes, connects to the first datanode in the pipeline.
+  // For parallel writes, connect to all specified datanodes.
+  // Returns true if success, otherwise return failure.
+  //
+  private boolean createBlockOutputStream(DatanodeInfo[] nodes, String client,
+                  boolean recoveryFlag) {
+    String firstBadLink = "";
+    if (DFSClient.LOG.isDebugEnabled()) {
+      for (int i = 0; i < nodes.length; i++) {
+        DFSClient.LOG.debug("pipeline = " + nodes[i].getName());
+      }
+    }
+
+    // persist blocks on namenode on next flush
+    persistBlocks = true;
+    boolean result = false;
+    int curNode = 0;
+    int length = 0;
+    int pipelineDepth;
+    if (doParallelWrites) {
+      length = nodes.length; // connect to all datanodes
+      pipelineDepth = 1;
+    } else {
+      length = 1; // connect to only the first datanode
+      pipelineDepth = nodes.length;
+    }
+    DataOutputStream[] tmpOut = new DataOutputStream[length];
+    DataInputStream[] replyIn = new DataInputStream[length];
+    Socket[] sockets = new Socket[length];
+
+    try {
+      for (curNode = 0; curNode < length;  curNode++) {
+
+        DFSClient.LOG.debug("Connecting to " + nodes[curNode].getName());
+        InetSocketAddress target = NetUtils.createSocketAddr(nodes[curNode].getName());
+        Socket s = dfsClient.socketFactory.createSocket();
+        sockets[curNode] = s;
+        dfsClient.timeoutValue = dfsClient.socketReadExtentionTimeout *
+            pipelineDepth + dfsClient.socketTimeout;
+        NetUtils.connect(s, target, dfsClient.timeoutValue, dfsClient.ipTosValue);
+        s.setSoTimeout(dfsClient.timeoutValue);
+        s.setSendBufferSize(DFSClient.DEFAULT_DATA_SOCKET_SIZE);
+        DFSClient.LOG.debug("Send buf size " + s.getSendBufferSize());
+        long writeTimeout = dfsClient.datanodeWriteExtentionTimeout *
+                            pipelineDepth + dfsClient.datanodeWriteTimeout;
+
+        //
+        // Xmit header info to datanode (see DataXceiver.java)
+        //
+        DataOutputStream out = new DataOutputStream(
+          new BufferedOutputStream(NetUtils.getOutputStream(s, writeTimeout),
+                                   DataNode.SMALL_BUFFER_SIZE));
+        tmpOut[curNode] = out;
+        DataInputStream brs = new DataInputStream(NetUtils.getInputStream(s));
+        replyIn[curNode] = brs;
+
+        int version = dfsClient.getDataTransferProtocolVersion();
+        WriteBlockHeader header = new WriteBlockHeader(version,
+            namespaceId, block.getBlockId(), block.getGenerationStamp(),
+            pipelineDepth, recoveryFlag, false, null, pipelineDepth - 1,
+            nodes, client);
+        header.writeVersionAndOpCode(out);
+        header.write(out);
+        checksum.writeHeader(out);
+        out.flush();
+
+        // receive ack for connect
+        firstBadLink = Text.readString(brs);
+        if (firstBadLink.length() != 0) {
+          throw new IOException("Bad connect ack with firstBadLink " +
+                                firstBadLink);
+        }
+      }
+      result = true;     // success
+      blockStream = dfsClient.new MultiDataOutputStream(tmpOut);
+      blockReplyStream = dfsClient.new MultiDataInputStream(replyIn);
+      this.s = sockets;
+
+    } catch (IOException ie) {
+
+      DFSClient.LOG.info("Exception in createBlockOutputStream " +
+          nodes[curNode].getName() + " " + " for file " + src + ie);
+
+      dfsClient.incWriteExpCntToStats();
+      
+      // find the datanode that matches
+      if (firstBadLink.length() != 0) {
+        for (int i = 0; i < nodes.length; i++) {
+          if (nodes[i].getName().equals(firstBadLink)) {
+            errorIndex = i;
+            break;
+          }
+        }
+      } else {
+        // if we are doing parallel writes, then record the datanode that is bad
+        errorIndex = curNode;
+      }
+      hasError = true;
+      setLastException(ie);
+      blockReplyStream = null;
+      result = false;
+    } finally {
+      if (!result) {
+        for (int i = 0; i < sockets.length; i++) {
+          IOUtils.closeSocket(sockets[i]);
+        }
+        this.s = null;
+      }
+    }
+    return result;
+  }
+
+  private LocatedBlock locateFollowingBlock(long start,
+                                            DatanodeInfo[] excludedNodes
+                                            ) throws IOException {
+    int retries = dfsClient.conf.getInt(
+        "dfs.client.block.write.locateFollowingBlock.retries", 5);
+    
+    long sleeptime = 400;
+    while (true) {
+      long localstart = System.currentTimeMillis();
+      while (true) {
+        try {
+          VersionedLocatedBlock loc = null;
+          if (dfsClient.namenodeProtocolProxy != null
+              && dfsClient.namenodeProtocolProxy.isMethodSupported(
+                  "addBlockAndFetchMetaInfo", String.class, String.class,
+                  DatanodeInfo[].class, DatanodeInfo[].class, long.class,
+                  Block.class)) {
+           loc = dfsClient.namenode.addBlockAndFetchMetaInfo(src, 
+               dfsClient.clientName, excludedNodes, favoredNodes,
+               this.lastBlkOffset, getLastBlock());
+          } else if (dfsClient.namenodeProtocolProxy != null
+              && dfsClient.namenodeProtocolProxy.isMethodSupported(
+                  "addBlockAndFetchMetaInfo", String.class, String.class,
+                  DatanodeInfo[].class, DatanodeInfo[].class, long.class)) {
+            loc = dfsClient.namenode.addBlockAndFetchMetaInfo(src,
+                dfsClient.clientName, excludedNodes, favoredNodes, this.lastBlkOffset);
+          } else if (dfsClient.namenodeProtocolProxy != null
+              && dfsClient.namenodeProtocolProxy.isMethodSupported(
+                  "addBlockAndFetchMetaInfo", String.class, String.class,
+                  DatanodeInfo[].class, long.class)) {
+            loc = dfsClient.namenode.addBlockAndFetchMetaInfo(src,
+                dfsClient.clientName, excludedNodes, this.lastBlkOffset);
+          } else if (dfsClient.namenodeProtocolProxy != null
+              && dfsClient.namenodeProtocolProxy.isMethodSupported(
+                  "addBlockAndFetchMetaInfo", String.class, String.class,
+                  DatanodeInfo[].class)) {
+            loc = dfsClient.namenode.addBlockAndFetchMetaInfo(src,
+                dfsClient.clientName, excludedNodes);
+          } else if (dfsClient.namenodeProtocolProxy != null
+              && dfsClient.namenodeProtocolProxy.isMethodSupported(
+                  "addBlockAndFetchVersion", String.class, String.class,
+                  DatanodeInfo[].class)) {
+            loc = dfsClient.namenode.addBlockAndFetchVersion(src,
+                dfsClient.clientName, excludedNodes);
+          } else if (dfsClient.namenodeProtocolProxy != null
+              && dfsClient.namenodeProtocolProxy.isMethodSupported("addBlock",
+                  String.class, String.class, DatanodeInfo[].class)) {
+            return dfsClient.namenode.addBlock(src, dfsClient.clientName,
+                excludedNodes);
+          } else {
+            return dfsClient.namenode.addBlock(src, dfsClient.clientName);
+          }
+          dfsClient.updateDataTransferProtocolVersionIfNeeded(
+              loc.getDataProtocolVersion());
+          if (loc instanceof LocatedBlockWithMetaInfo) {
+            LocatedBlockWithMetaInfo metaLoc = (LocatedBlockWithMetaInfo)loc;
+            this.namespaceId = metaLoc.getNamespaceID();
+            dfsClient.getNewNameNodeIfNeeded(metaLoc.getMethodFingerPrint());
+          }
+          return loc;
+        } catch (RemoteException e) {
+          IOException ue =
+            e.unwrapRemoteException(FileNotFoundException.class,
+                                    AccessControlException.class,
+                                    NSQuotaExceededException.class,
+                                    DSQuotaExceededException.class);
+          if (ue != e) {
+            throw ue; // no need to retry these exceptions
+          }
+
+          if (NotReplicatedYetException.class.getName().
+              equals(e.getClassName())) {
+
+              if (retries == 0) {
+                throw e;
+              } else {
+                --retries;
+                DFSClient.LOG.info(StringUtils.stringifyException(e));
+                if (System.currentTimeMillis() - localstart > 5000) {
+                  DFSClient.LOG.info("Waiting for replication for "
+                      + (System.currentTimeMillis() - localstart) / 1000
+                      + " seconds");
+                }
+                try {
+                  DFSClient.LOG.warn("NotReplicatedYetException sleeping " + src
+                      + " retries left " + retries);
+                  Thread.sleep(sleeptime);
+                  sleeptime *= 2;
+                } catch (InterruptedException ie) {
+                }
+              }
+          } else {
+            throw e;
+          }
+        }
+      }
+    }
+  }
+
+  @Override
+  protected void incMetrics(int len){
+    dfsClient.metrics.incWriteOps();
+  	dfsClient.metrics.incWriteSize(len);
+  }
+  // @see FSOutputSummer#writeChunk()
+  @Override
+  protected synchronized void writeChunk(byte[] b, int offset, int len, byte[] checksum)
+                                                        throws IOException {
+    dfsClient.checkOpen();
+    isClosed();
+
+
+    int cklen = checksum.length;
+    int bytesPerChecksum = this.checksum.getBytesPerChecksum();
+    if (len > bytesPerChecksum) {
+      throw new IOException("writeChunk() buffer size is " + len +
+                            " is larger than supported  bytesPerChecksum " +
+                            bytesPerChecksum);
+    }
+    if (checksum.length != this.checksum.getChecksumSize()) {
+      throw new IOException("writeChunk() checksum size is supposed to be " +
+                            this.checksum.getChecksumSize() +
+                            " but found to be " + checksum.length);
+    }
+
+    synchronized (dataQueue) {
+
+      // If queue is full, then wait till we can create  enough space
+      while (!closed && dataQueue.size() + ackQueue.size()  > maxPackets) {
+        try {
+          dataQueue.wait(packetTimeout);
+          checkIfLastPacketTimeout();
+        } catch (InterruptedException  e) {
+        }
+      }
+      isClosed();
+      
+      if (currentPacket == null) {
+        currentPacket = new Packet(packetSize, chunksPerPacket, bytesCurBlock);
+        if (DFSClient.LOG.isDebugEnabled()) {
+          DFSClient.LOG.debug("DFSClient writeChunk allocating new packet seqno=" +
+                    currentPacket.seqno +
+                    ", src=" + src +
+                    ", packetSize=" + packetSize +
+                    ", chunksPerPacket=" + chunksPerPacket +
+                    ", bytesCurBlock=" + bytesCurBlock +
+                    ", forceSync=" + forceSync +
+                    ", doParallelWrites=" + doParallelWrites +
+                    ", len=" + len +
+                    ", blocksize=" + blockSize);
+        }
+      }
+
+      currentPacket.writeChecksum(checksum, 0, cklen);
+      currentPacket.writeData(b, offset, len);
+      currentPacket.numChunks++;
+      bytesCurBlock += len;
+
+      // If packet is full, enqueue it for transmission
+      if (currentPacket.numChunks == currentPacket.maxChunks ||
+          bytesCurBlock == blockSize) {
+        if (DFSClient.LOG.isDebugEnabled()) {
+          DFSClient.LOG.debug("DFSClient writeChunk packet full seqno=" +
+                    currentPacket.seqno +
+                    ", src=" + src +
+                    ", bytesCurBlock=" + bytesCurBlock +
+                    ", blockSize=" + blockSize +
+                    ", appendChunk=" + appendChunk);
+        }
+        //
+        // if we allocated a new packet because we encountered a block
+        // boundary, reset bytesCurBlock.
+        //
+        if (bytesCurBlock == blockSize) {
+          currentPacket.lastPacketInBlock = true;
+          bytesCurBlock = 0;
+          lastFlushOffset = 0;
+        }
+        enqueueCurrentPacket();
+
+        // If this was the first write after reopening a file, then the above
+        // write filled up any partial chunk. Tell the summer to generate full
+        // crc chunks from now on.
+        if (appendChunk) {
+          appendChunk = false;
+          resetChecksumChunk(bytesPerChecksum);
+        }
+        int psize = Math.min((int)(blockSize-bytesCurBlock), 
+            dfsClient.writePacketSize);
+        computePacketChunkSize(psize, bytesPerChecksum);
+      }
+    }
+
+    //LOG.debug("DFSClient writeChunk done length " + len +
+    //          " checksum length " + cklen);
+  }
+
+  private synchronized void enqueueCurrentPacket() {
+    synchronized (dataQueue) {
+      if (currentPacket == null) return;
+      dataQueue.addLast(currentPacket);
+      dataQueue.notifyAll();
+      lastQueuedSeqno = currentPacket.seqno;
+      currentPacket = null;
+    }
+  }
+
+  /**
+   * All data is written out to datanodes. It is not guaranteed
+   * that data has been flushed to persistent store on the
+   * datanode. Block allocations are persisted on namenode.
+   */
+  public void sync() throws IOException {
+  	long start = System.currentTimeMillis();
+    try {
+      long toWaitFor;
+      synchronized (this) {
+        /* Record current blockOffset. This might be changed inside
+         * flushBuffer() where a partial checksum chunk might be flushed.
+         * After the flush, reset the bytesCurBlock back to its previous value,
+         * any partial checksum chunk will be sent now and in next packet.
+         */
+        long saveOffset = bytesCurBlock;
+        Packet oldCurrentPacket = currentPacket;
+
+        // flush checksum buffer, but keep checksum buffer intact
+        flushBuffer(true);
+        // bytesCurBlock potentially incremented if there was buffered data
+
+        if (DFSClient.LOG.isDebugEnabled()) {
+          DFSClient.LOG.debug("DFSClient flush() : saveOffset " + saveOffset +
+                    " bytesCurBlock " + bytesCurBlock +
+                    " lastFlushOffset " + lastFlushOffset);
+        }
+
+        // Flush only if we haven't already flushed till this offset.
+        if (lastFlushOffset != bytesCurBlock) {
+          assert bytesCurBlock > lastFlushOffset;
+          // record the valid offset of this flush
+          lastFlushOffset = bytesCurBlock;
+          enqueueCurrentPacket();
+        } else {
+          // just discard the current packet since it is already been sent.
+          if (oldCurrentPacket == null && currentPacket != null) {
+            // If we didn't previously have a packet queued, and now we do,
+            // but we don't plan on sending it, then we should not
+            // skip a sequence number for it!
+            currentSeqno--;
+          }
+          currentPacket = null;
+        }
+        // Restore state of stream. Record the last flush offset
+        // of the last full chunk that was flushed.
+        //
+        bytesCurBlock = saveOffset;
+        toWaitFor = lastQueuedSeqno;
+      }
+      waitForAckedSeqno(toWaitFor);
+
+      // If any new blocks were allocated since the last flush,
+      // then persist block locations on namenode.
+      //
+      boolean willPersist;
+      synchronized (this) {
+        willPersist = persistBlocks;
+        persistBlocks = false;
+      }
+      if (willPersist) {
+        dfsClient.namenode.fsync(src, dfsClient.clientName);
+      }
+      long timeval = System.currentTimeMillis() - start;
+      dfsClient.metrics.incSyncTime(timeval);
+    } catch (IOException e) {
+        lastException = new IOException("IOException flush:", e);
+        closed = true;
+        closeThreads();
+        throw e;
+    }
+  }
+  
+  private Block getLastBlock() {
+    return this.block;
+  }
+
+  /**
+   * Returns the number of replicas of current block. This can be different
+   * from the designated replication factor of the file because the NameNode
+   * does not replicate the block to which a client is currently writing to.
+   * The client continues to write to a block even if a few datanodes in the
+   * write pipeline have failed. If the current block is full and the next
+   * block is not yet allocated, then this API will return 0 because there are
+   * no replicas in the pipeline.
+   */
+  public int getNumCurrentReplicas() throws IOException {
+    synchronized(dataQueue) {
+      if (nodes == null) {
+        return blockReplication;
+      }
+      return nodes.length;
+    }
+  }
+
+  /**
+   * Waits till all existing data is flushed and confirmations
+   * received from datanodes.
+   */
+  private void flushInternal() throws IOException {
+    isClosed();
+    dfsClient.checkOpen();
+
+    long toWaitFor;
+    synchronized (this) {
+      enqueueCurrentPacket();
+      toWaitFor = lastQueuedSeqno;
+    }
+
+    waitForAckedSeqno(toWaitFor);
+  }
+
+  private void waitForAckedSeqno(long seqnumToWaitFor) throws IOException {
+    boolean interrupted = false;
+
+    synchronized (ackQueue) {
+      while (!closed) {
+        isClosed();
+        if (lastAckedSeqno >= seqnumToWaitFor) {
+          break;
+        }
+        try {
+          ackQueue.wait();
+        } catch (InterruptedException ie) {
+          interrupted = true;
+        }
+      }
+    }
+
+    if (interrupted) {
+      Thread.currentThread().interrupt();
+    }
+    isClosed();
+  }
+
+  /**
+   * Closes this output stream and releases any system
+   * resources associated with this stream.
+   */
+  @Override
+  public void close() throws IOException {
+    try {
+      if (closed) {
+        IOException e = lastException;
+        if (e == null)
+          return;
+        else
+          throw e;
+      }
+
+      try {
+        closeInternal();
+
+        if (s != null) {
+          for (int i = 0; i < s.length; i++) {
+            s[i].close();
+          }
+          s = null;
+        }
+      } catch (IOException e) {
+        lastException = e;
+        throw e;
+      }
+    } finally {
+      // We always try to remove the connection from the lease to
+      // avoid memory leak. In case of failed close(), it is possible
+      // that later users' retry of close() could succeed but fail on
+      // lease expiration. Since clients don't possibly write more data
+      // after calling close(), this case doesn't change any guarantee
+      // of data itself.
+      dfsClient.leasechecker.remove(src);
+    }
+  }
+
+  /**
+   * Harsh abort method that should only be used from tests - this
+   * is in order to prevent pipeline recovery when eg a DN shuts down.
+   */
+  void abortForTests() throws IOException {
+    if (streamer != null) {
+      streamer.close();
+    }
+    if (response != null) {
+      response.close();
+    }
+    closed = true;
+  }
+
+  /**
+   * Aborts this output stream and releases any system
+   * resources associated with this stream.
+   */
+  synchronized void abort() throws IOException {
+    if (closed) {
+      return;
+    }
+    setLastException(new IOException("Lease timeout of " +
+                                     (dfsClient.hdfsTimeout/1000) + " seconds expired."));
+    closeThreads();
+  }
+
+
+  // shutdown datastreamer and responseprocessor threads.
+  private void closeThreads() throws IOException {
+    try {
+      if (streamer != null) {
+        streamer.close();
+        streamer.join();
+      }
+
+      // shutdown response after streamer has exited.
+      if (response != null) {
+        response.close();
+        response.join();
+        response = null;
+      }
+    } catch (InterruptedException e) {
+      throw new InterruptedIOException("Failed to shutdown response thread");
+    }
+  }
+
+  /**
+   * Closes this output stream and releases any system
+   * resources associated with this stream.
+   */
+  private synchronized void closeInternal() throws IOException {
+    dfsClient.checkOpen();
+    isClosed();
+
+    try {
+        flushBuffer();       // flush from all upper layers
+
+        // Mark that this packet is the last packet in block.
+        // If there are no outstanding packets and the last packet
+        // was not the last one in the current block, then create a
+        // packet with empty payload.
+        synchronized (dataQueue) {
+          if (currentPacket == null && bytesCurBlock != 0) {
+            currentPacket = new Packet(packetSize, chunksPerPacket,
+			bytesCurBlock);
+          }
+          if (currentPacket != null) {
+            currentPacket.lastPacketInBlock = true;
+          }
+        }
+      flushInternal();             // flush all data to Datanodes
+      isClosed(); // check to see if flushInternal had any exceptions
+      closed = true; // allow closeThreads() to showdown threads
+
+      closeThreads();
+
+      synchronized (dataQueue) {
+        if (blockStream != null) {
+          blockStream.writeInt(0); // indicate end-of-block to datanode
+          blockStream.close();
+          blockReplyStream.close();
+        }
+        if (s != null) {
+          for (int i = 0; i < s.length; i++) {
+            s[i].close();
+          }
+          s = null;
+        }
+      }
+
+      streamer = null;
+      blockStream = null;
+      blockReplyStream = null;
+
+      dfsClient.closeFile(src, lastBlkOffset, getLastBlock());
+    } finally {
+      closed = true;
+    }
+  }
+
+  void setArtificialSlowdown(long period) {
+    artificialSlowdown = period;
+  }
+
+  synchronized void setChunksPerPacket(int value) {
+    chunksPerPacket = Math.min(chunksPerPacket, value);
+    packetSize = DataNode.PKT_HEADER_LEN + DFSClient.SIZE_OF_INTEGER +
+						 (checksum.getBytesPerChecksum() +
+							checksum.getChecksumSize()) * chunksPerPacket;
+  }
+
+  synchronized void setTestFilename(String newname) {
+    src = newname;
+  }
+
+  /**
+   * Returns the size of a file as it was when this stream was opened
+   */
+  long getInitialLen() {
+    return initialFileSize;
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/DFSUtil.java b/src/hdfs/org/apache/hadoop/hdfs/DFSUtil.java
index b22829df..511fdb67 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/DFSUtil.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/DFSUtil.java
@@ -18,12 +18,20 @@
 
 package org.apache.hadoop.hdfs;
 
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Comparator;
@@ -55,8 +63,14 @@ public class DFSUtil {
     new Comparator<DatanodeInfo>() {
     @Override
     public int compare(DatanodeInfo a, DatanodeInfo b) {
-      return a.isDecommissioned() == b.isDecommissioned() ? 0 :
-        a.isDecommissioned() ? 1 : -1;
+      if (a.isDecommissioned() != b.isDecommissioned()) {
+        return a.isDecommissioned() ? 1 : -1;
+      } else if (a.isSuspectFail() != b.isSuspectFail()) {
+        return a.isSuspectFail() ? 1 : -1;
+      } else {
+        return 0;
+      }
+      
     }
   };
   
@@ -641,34 +655,75 @@ public static String getNameServiceIdFromAddress(Configuration conf,
    * return server http address from the configuration
    * @param conf
    * @param namenode - namenode address
+   * @param isAvatar - whether it's avatar config
    * @return server http
    */
   public static String getInfoServer(
-      InetSocketAddress namenode, Configuration conf) {
+      InetSocketAddress namenode, Configuration conf, boolean isAvatar) {
     String httpAddressDefault = 
         NetUtils.getServerAddress(conf, "dfs.info.bindAddress", 
                                   "dfs.info.port", "dfs.http.address"); 
     String httpAddress = null;
     if(namenode != null) {
-      // if non-default namenode, try reverse look up 
-      // the nameServiceID if it is available
-      String nameServiceId = DFSUtil.getNameServiceIdFromAddress(
-          conf, namenode,
-          FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY);
+      if (!isAvatar) {
+        // if non-default namenode, try reverse look up 
+        // the nameServiceID if it is available
+        String nameServiceId = DFSUtil.getNameServiceIdFromAddress(
+            conf, namenode,
+            FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY);
 
-      if (nameServiceId != null) {
-        httpAddress = conf.get(DFSUtil.getNameServiceIdKey(
-            FSConstants.DFS_NAMENODE_HTTP_ADDRESS_KEY, nameServiceId));
+        if (nameServiceId != null) {
+          httpAddress = conf.get(DFSUtil.getNameServiceIdKey(
+              FSConstants.DFS_NAMENODE_HTTP_ADDRESS_KEY, nameServiceId));
+        }
+      } else {
+        // federated, avatar addresses
+        String suffix = "0";
+        String nameServiceId = DFSUtil.getNameServiceIdFromAddress(
+            conf, namenode,
+            FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY + "0");
+        if (nameServiceId == null) {
+          nameServiceId = DFSUtil.getNameServiceIdFromAddress(
+              conf, namenode,
+              FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY + "1");
+          suffix = "1";
+        }
+        if (nameServiceId != null) {
+          httpAddress = conf.get(DFSUtil.getNameServiceIdKey(
+              FSConstants.DFS_NAMENODE_HTTP_ADDRESS_KEY + suffix, nameServiceId));
+        }
+        
+        // federated, avatar addresses - ok
+        if (httpAddress != null) {
+          return httpAddress;
+        }
+        
+        // non-federated, avatar adresses
+        httpAddress = getNonFederatedAvatarInfoServer(namenode, "0", conf);
+        if (httpAddress != null) {
+          return httpAddress;
+        }
+        httpAddress = getNonFederatedAvatarInfoServer(namenode, "1", conf);     
       }
     }
-    // else - Use non-federation style configuration
+
+    // else - Use non-federation, non-avatar configuration
     if (httpAddress == null) {
-      httpAddress = conf.get("dfs.http.address", httpAddressDefault);
+      httpAddress = conf.get(FSConstants.DFS_NAMENODE_HTTP_ADDRESS_KEY, httpAddressDefault);
     }
-
     return httpAddress;
   }
   
+  private static String getNonFederatedAvatarInfoServer(
+      InetSocketAddress namenode, String suffix, Configuration conf) {
+    String rpcAddress = conf.get("fs.default.name" + suffix);
+    if (rpcAddress != null && !rpcAddress.isEmpty()
+        && NetUtils.createSocketAddr(rpcAddress).equals(namenode)) {
+      return conf.get(FSConstants.DFS_NAMENODE_HTTP_ADDRESS_KEY + suffix);
+    }
+    return null;
+  }
+  
   /**
    * Given the InetSocketAddress for any configured communication with a 
    * namenode, this method determines whether it is the configured
@@ -754,4 +809,65 @@ public static DistributedFileSystem convertToDFS(FileSystem fs) {
     else
       return null;
   }
+  
+  
+  /*
+   * Connect to the some url to get the html content 
+   */
+  public static String getHTMLContent(URI uri) throws IOException {
+    InputStream stream = null;
+    URL path = uri.toURL();
+    URLConnection connection = path.openConnection();
+    stream = connection.getInputStream();
+    BufferedReader input = new BufferedReader(
+        new InputStreamReader(stream));
+    StringBuilder sb = new StringBuilder();
+    String line = null;
+    try {
+      while (true) {
+        line = input.readLine();
+        if (line == null) {
+          break;
+        }
+        sb.append(line + "\n");
+      }
+      return sb.toString();
+    } finally {
+      input.close();
+    }
+  }
+  
+  /**
+   * Given the start time in nano seconds, return the elapsed time in
+   * microseconds.
+   */
+  public static long getElapsedTimeMicroSeconds(long start) {
+    return (System.nanoTime() - start) / 1000;
+  }
+  
+  public static String getStackTrace() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("------------------------------------\n");
+    sb.append("Current stack trace:\n\n");
+    StackTraceElement[] trace = Thread.currentThread().getStackTrace();    
+    for(StackTraceElement se : trace) {
+      sb.append(se + "\n");
+    }
+    return sb.toString();   
+  }
+  
+  public static String getAllStackTraces() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("------------------------------------\n");
+    sb.append("All stack traces:\n\n");
+    Map<Thread, StackTraceElement[]> traces = Thread.getAllStackTraces();    
+    for(Entry<Thread, StackTraceElement[]> e : traces.entrySet()) {
+      sb.append("------------------------------------\n");
+      sb.append(e.getKey() + "\n\n");
+      for(StackTraceElement se : e.getValue()) {
+        sb.append(se + "\n");
+      }
+    }
+    return sb.toString();   
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java b/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java
index 84b84866..f1ecd05a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java
@@ -27,14 +27,13 @@
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.Block;
-import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
 import org.apache.hadoop.hdfs.protocol.FSConstants.UpgradeAction;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.util.PathValidator;
 import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.security.AccessControlException;
@@ -242,8 +241,10 @@ public FSDataOutputStream create(Path f, FsPermission permission,
     int bufferSize, short replication, long blockSize,
     Progressable progress) throws IOException {
       return create(f, permission, overwrite, bufferSize,
-                      replication, blockSize,
-                      getConf().getInt("io.bytes.per.checksum", 512), progress);
+        replication,
+        blockSize,
+        getConf().getInt("io.bytes.per.checksum",
+            FSConstants.DEFAULT_BYTES_PER_CHECKSUM), progress);
 
   }
 
@@ -360,10 +361,19 @@ public void concat(Path trg, Path [] psrcs) throws IOException {
   /** 
    * See {@link ClientProtocol#hardLink(String, String)}. 
    */ 
+  @Override
   public boolean hardLink(Path src, Path dst) throws IOException {  
     return dfs.hardLink(getPathName(src), getPathName(dst));  
   }
-  
+
+  /**
+   * See {@link ClientProtocol#getHardLinkedFiles(String)}.
+   */
+  @Override
+  public String[] getHardLinkedFiles(Path src) throws IOException {
+    return dfs.getHardLinkedFiles(getPathName(src));
+  }
+
   /**
    * Rename files/dirs
    */
@@ -476,7 +486,9 @@ public OpenFileInfo[] iterativeGetOpenFiles(
   public void close() throws IOException {
     try {
       super.processDeleteOnExit();
-      dfs.close();
+      if (dfs != null) {
+        dfs.close();
+      }
     } finally {
       super.close();
     }
@@ -605,6 +617,13 @@ public void saveNamespace(boolean force, boolean uncompressed)
   public void refreshNodes() throws IOException {
     dfs.refreshNodes();
   }
+  
+  /**
+   * Rolls edit log at the namenode manually.
+   */
+  public void rollEditLog() throws IOException {
+    dfs.rollEditLog();
+  }
 
   /**
    * Finalize previously upgraded files system state.
diff --git a/src/hdfs/org/apache/hadoop/hdfs/FileStatusExtended.java b/src/hdfs/org/apache/hadoop/hdfs/FileStatusExtended.java
index 21f876bb..ea2c5123 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/FileStatusExtended.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/FileStatusExtended.java
@@ -12,16 +12,20 @@
 public class FileStatusExtended extends FileStatus implements Writable {
   private Block[] blocks;
   private String leaseHolder;
+  // HardLink id of -1 denotes the file is not hardlinked.
+  private long hardlinkId;
   
   public FileStatusExtended() {}
 
-  public FileStatusExtended(FileStatus stat, Block[] blocks, String leaseHolder) {
+  public FileStatusExtended(FileStatus stat, Block[] blocks,
+      String leaseHolder, long hardlinkId) {
     super(stat.getLen(), stat.isDir(), stat.getReplication(),
         stat.getBlockSize(), stat.getModificationTime(), stat.getAccessTime(),
         stat.getPermission(), stat.getOwner(), stat.getGroup(), 
         stat.getPath());
     this.blocks = blocks;
     this.leaseHolder = (leaseHolder == null) ? "" : leaseHolder;
+    this.hardlinkId = hardlinkId;
   }
   
   public Block[] getBlocks() {
@@ -40,6 +44,7 @@ public void write(DataOutput out) throws IOException {
       blocks[i].write(out);
     }
     out.writeUTF(leaseHolder);
+    out.writeLong(hardlinkId);
   }
 
   public void readFields(DataInput in) throws IOException {
@@ -51,21 +56,60 @@ public void readFields(DataInput in) throws IOException {
       blocks[i].readFields(in);
     }
     leaseHolder = in.readUTF();
+    hardlinkId = in.readLong();
   }
 
   @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;
-    if (!super.equals(obj))
-      return false;
     if (getClass() != obj.getClass())
       return false;
     FileStatusExtended other = (FileStatusExtended) obj;
-    if (!Arrays.equals(blocks, other.blocks))
+    if (!leaseHolder.equals(other.leaseHolder)
+        || hardlinkId != other.hardlinkId)
+      return false;
+    boolean closedFile = leaseHolder.isEmpty();
+    if (!super.compareFull(obj, closedFile)) {
+      return false;
+    }
+    if (!blocksEquals(blocks, other.blocks, closedFile))
       return false;
-    if (!leaseHolder.equals(other.leaseHolder))
+    return true;
+  }
+  
+  /**
+   * Comapre two arrays of blocks. If the file is open, do not compare 
+   * sizes of the blocks.
+   */
+  private boolean blocksEquals(Block[] a1, Block[] a2, boolean closedFile) {
+    if (a1 == a2)
+      return true;
+    if (a1 == null || a2 == null || a2.length != a1.length)
       return false;
+
+    for (int i = 0; i < a1.length; i++) {
+      Block b1 = a1[i];
+      Block b2 = a2[i];
+
+      if (b1 == b2)
+        continue;
+      if (b1 == null || b2 == null)
+        return false;
+
+      // compare ids and gen stamps
+      if (!(b1.getBlockId() == b2.getBlockId() && b1.getGenerationStamp() == b2
+          .getGenerationStamp()))
+        return false;
+
+      // for open files check len-2 blocks only
+      if (!closedFile && i >= a1.length - 2)
+        continue;
+
+      // check block size
+      if (b1.getNumBytes() != b2.getNumBytes())
+        return false;
+    }
     return true;
   }
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/metrics/DFSClientMetrics.java b/src/hdfs/org/apache/hadoop/hdfs/metrics/DFSClientMetrics.java
index aa3dd6f5..9379afa6 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/metrics/DFSClientMetrics.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/metrics/DFSClientMetrics.java
@@ -1,5 +1,7 @@
 package org.apache.hadoop.hdfs.metrics;
 
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.metrics.MetricsContext;
@@ -55,18 +57,20 @@ public class DFSClientMetrics implements Updater {
 
 
 
-	private long numLsCalls = 0;
+	private AtomicLong numLsCalls = new AtomicLong(0);
 	private static Log log = LogFactory.getLog(DFSClientMetrics.class);
 	final MetricsRecord metricsRecord;
+	private boolean enabled = false;
 
 	// create a singleton DFSClientMetrics 
 	private static DFSClientMetrics metrics;
 
-	public DFSClientMetrics() {
+	public DFSClientMetrics(boolean enabled) {
 		// Create a record for FSNamesystem metrics
 		MetricsContext metricsContext = MetricsUtil.getContext("hdfsclient");
 		metricsRecord = MetricsUtil.createRecord(metricsContext, "DFSClient");
 		metricsContext.registerUpdater(this);
+		this.enabled = enabled;
 	
 	}
 
@@ -75,67 +79,98 @@ public Object clone() throws CloneNotSupportedException{
 		throw new CloneNotSupportedException();
 	}
 
-	public synchronized void incLsCalls() {
-		numLsCalls++;
+	public void incLsCalls() {
+	  if (enabled) {
+	    numLsCalls.incrementAndGet();
+	  }
 	}
-	
-	public synchronized void incReadsFromLocalFile() {
-		readsFromLocalFile.inc();
+
+	public void incReadsFromLocalFile() {
+	  if (enabled) {
+	    readsFromLocalFile.inc();
+	  }
 	}
 
-	public synchronized void incPreadTime(long value) {
-		preadLatency.inc(value);
+	public void incPreadTime(long value) {
+    if (enabled) {
+      preadLatency.inc(value);
+    }
 	}
 
-	public synchronized void incPreadSize(long value) {
-		preadSize.inc(value);
+	public void incPreadSize(long value) {
+	   if (enabled) {
+	     preadSize.inc(value);
+	   }
 	}
 
-	public synchronized void incPreadOps(){
-		preadOps.inc();
+	public void incPreadOps(){
+	   if (enabled) {
+	     preadOps.inc();
+	   }
 	}
-	
-	public synchronized void incReadTime(long value) {
-		readLatency.inc(value);
+
+	public void incReadTime(long value) {
+	  if (enabled) {
+	    readLatency.inc(value);
+	  }
 	}
 
-	public synchronized void incReadSize(long value) {
-		readSize.inc(value);
+	public void incReadSize(long value) {
+	  if (enabled) {
+	    readSize.inc(value);
+	  }
 	}
-	
-	public synchronized void incReadOps(){
-		readOps.inc();
+
+	public void incReadOps(){
+	  if (enabled) {
+	    readOps.inc();
+	  }
 	}
 
-	public synchronized void incSyncTime(long value) {
-		syncLatency.inc(value);
+	public void incSyncTime(long value) {
+	  if (enabled) {
+	    syncLatency.inc(value);
+	  }
 	}
-	
-	public synchronized void incWriteSize(long value){
-		writeSize.inc(value);
-		
+
+	public void incWriteSize(long value){
+    if (enabled) {
+      writeSize.inc(value);
+    }
 	}
 
-	public synchronized void incWriteOps(){
-		writeOps.inc();
+	public void incWriteOps(){
+	  if (enabled) {
+	    writeOps.inc();
+	  }
 	}
-	
-	public synchronized void incNumCreateFileOps(){
-		numCreateFileOps.inc();
+
+	public void incNumCreateFileOps(){
+	  if (enabled) {
+	    numCreateFileOps.inc();
+	  }
 	}
 
-	public synchronized void incNumCreateDirOps(){
-		numCreateDirOps.inc();
+	public void incNumCreateDirOps(){
+	  if (enabled) {
+	    numCreateDirOps.inc();
+	  }
 	}
-	
-	private synchronized long getAndResetLsCalls() {
-		long ret = numLsCalls;
-		numLsCalls = 0;
-		return ret;
+
+	private long getAndResetLsCalls() {
+	  if (enabled) {
+	    return numLsCalls.getAndSet(0);
+	  } else {
+	    return 0;
+	  }
 	}
 
+	public void enable(boolean enabled) {
+    this.enabled = enabled;
+  }
+
 
-	/**
+  /**
 	 * Since this object is a registered updater, this method will be called
 	 * periodically, e.g. every 5 seconds.
 	 */
diff --git a/src/hdfs/org/apache/hadoop/hdfs/metrics/LookasideMetrics.java b/src/hdfs/org/apache/hadoop/hdfs/metrics/LookasideMetrics.java
index ac7a7abf..3c1a2f79 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/metrics/LookasideMetrics.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/metrics/LookasideMetrics.java
@@ -61,6 +61,17 @@ public LocalMetrics(LocalMetrics old) {
       this.numGetAttempts = old.numGetAttempts; old.numGetAttempts = 0;
       this.numGetHits = old.numGetHits; old.numGetHits = 0;
     }
+    
+    public void reset() {
+      this.numAdd = 0;
+      this.numAddNew = 0;
+      this.numAddExisting = 0;
+      this.numRename = 0;
+      this.numRemove = 0;
+      this.numEvict = 0;
+      this.numGetAttempts = 0;
+      this.numGetHits = 0;
+    }
   }
 
   private long numLsCalls = 0;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/Block.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/Block.java
index 9f57f0d1..43d81202 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/Block.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/Block.java
@@ -44,19 +44,50 @@ public class Block implements Writable, Comparable<Block> {
   public static final long GRANDFATHER_GENERATION_STAMP = 0;
 
   /**
-   * name should be obtained by calling File.getName()
-   *  - only the last component
+   * Determine whether the data file is for a block of non-inline checksum
+   * The file name is of this format:
+   * blk_<blk_id>
+   * @param name
+   * @return
    */
-  public static boolean isBlockFilename(String name) {
-    if ( name.startsWith( BLOCK_FILE_PREFIX ) && 
-        name.indexOf( '.' ) < 0 ) {
+  public static boolean isSeparateChecksumBlockFilename(String name) {
+    if (isBlockFileName(name) && name.indexOf('.') < 0
+        && name.indexOf('_', BLOCK_FILE_PREFIX.length()) < 0) {
       return true;
     } 
     return false;
   }
 
+
+  /**
+   * Determine whether the file name is for a inline checksum block.
+   * Inline checksum blocks are of this format:
+   * blk_(blockId)_(generation_id)_(version)_(checksum_type)_(bytes_per_checksum)
+   * @param fileName
+   * @return
+   */
+  public static boolean isInlineChecksumBlockFilename(String fileName) {
+    if (!isBlockFileName(fileName)) {
+      return false;
+    }
+    int index_sep = fileName.indexOf('_', Block.BLOCK_FILE_PREFIX.length());
+    return index_sep > 0 && fileName.indexOf('.', index_sep) < 0;
+  }
+  
+  /**
+   * Determine if the file name is a valid block/checksum file name.
+   */
+  private static boolean isBlockFileName(String fileName) {
+    return fileName.startsWith(BLOCK_FILE_PREFIX);
+  }
+  
   public static long filename2id(String name) {
-    return Long.parseLong(name.substring(BLOCK_FILE_PREFIX.length()));
+    int endIndex = - 1;
+    if ((endIndex = name.indexOf('_', BLOCK_FILE_PREFIX.length())) < 0) {
+      return Long.parseLong(name.substring(BLOCK_FILE_PREFIX.length()));
+    } else {
+      return Long.parseLong(name.substring(BLOCK_FILE_PREFIX.length(), endIndex));
+    }
   }
 
   private long blockId;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/BlockChecksumHeader.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/BlockChecksumHeader.java
new file mode 100644
index 00000000..66827fd5
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/BlockChecksumHeader.java
@@ -0,0 +1,74 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.protocol;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+/**
+ * The header for the OP_BLOCK_CHECKSUM datanode operation.
+ */
+public class BlockChecksumHeader extends DataTransferHeader {
+
+  private int namespaceId;
+  private long blockId;
+  private long genStamp;
+  
+  public BlockChecksumHeader(final VersionAndOpcode versionAndOpcode) {
+    super(versionAndOpcode);
+  }
+  
+  public BlockChecksumHeader(final int dataTransferVersion,
+      final int namespaceId, final long blockId, final long genStamp) {
+    super(dataTransferVersion, DataTransferProtocol.OP_BLOCK_CHECKSUM);
+    set(namespaceId, blockId, genStamp);
+  }
+
+  public void set(int namespaceId, long blockId, long genStamp) {
+    this.namespaceId = namespaceId;
+    this.blockId = blockId;
+    this.genStamp = genStamp;
+  }
+
+  public int getNamespaceId() {
+    return namespaceId;
+  }
+
+  public long getBlockId() {
+    return blockId;
+  }
+
+  public long getGenStamp() {
+    return genStamp;
+  }
+
+  public void write(DataOutput out) throws IOException {
+    if (getDataTransferVersion() >= DataTransferProtocol.FEDERATION_VERSION) {
+      out.writeInt(namespaceId);
+    }
+    out.writeLong(blockId);
+    out.writeLong(genStamp);
+  }
+
+  public void readFields(DataInput in) throws IOException {
+    namespaceId = in.readInt();
+    blockId = in.readLong();
+    genStamp = in.readLong();
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientDatanodeProtocol.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientDatanodeProtocol.java
index 298cd85a..c9d7f65d 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientDatanodeProtocol.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientDatanodeProtocol.java
@@ -157,4 +157,19 @@ public void copyBlock(int srcNamespaceId, Block srcblock,
    * @throws IOException
    */
   public void refreshNamenodes() throws IOException;
+  
+  /**
+   * Informs the datanode it should stop serving the given namespace.
+   * @param nameserviceId the id of the namespace the datanode should stop
+   * serving
+   * @throws IOEXception
+   */
+  public void removeNamespace(String nameserviceId) throws IOException;
+
+  /** Reads in data dirs from a textfile containing these directories
+   * datanode will refresh the configuration file with the new list 
+   * of directories 
+   * @throws IOException
+   */
+  public void refreshDataDirs(String confVolumes) throws IOException; 
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientProtocol.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
index 49ad4249..b4ba2e56 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
@@ -525,7 +525,20 @@ public boolean complete(String src, String clientName, long fileLen,
    *                                any quota restriction 
    */
   public boolean hardLink(String src, String dst) throws IOException;
-  
+
+  /**
+   * Computes the list of files hardlinked to the given file
+   *
+   * @param src
+   *          the file to look for
+   * @return a list of files that are hardlinked to the given file, return an
+   *         empty list if no files are found or the file has a reference count
+   *         of 1
+   * @throws IOException
+   *           if the given name is invalid
+   */
+  public String[] getHardLinkedFiles(String src) throws IOException;
+
   /**
    * Rename an item in the file system namespace.
    * 
@@ -776,6 +789,12 @@ public DatanodeInfo[] getDatanodeReport(FSConstants.DatanodeReportType type)
    */
   public void saveNamespace() throws IOException;
   
+  /**
+   * Roll edit log manually.
+   * @throws IOException if the roll failed.
+   */
+  public void rollEditLogAdmin() throws IOException;
+  
   /**
    * Save namespace image.
    * 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/CopyBlockHeader.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/CopyBlockHeader.java
new file mode 100644
index 00000000..06f30259
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/CopyBlockHeader.java
@@ -0,0 +1,74 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.protocol;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+/**
+ * The header for the OP_COPY_BLOCK datanode operation.
+ */
+public class CopyBlockHeader extends DataTransferHeader {
+
+  private int namespaceId;
+  private long blockId;
+  private long genStamp;
+  
+  public CopyBlockHeader(final VersionAndOpcode versionAndOpcode) {
+    super(versionAndOpcode);
+  }
+  
+  public CopyBlockHeader(final int dataTransferVersion,
+      final int namespaceId, final long blockId, final long genStamp) {
+    super(dataTransferVersion, DataTransferProtocol.OP_COPY_BLOCK);
+    set(namespaceId, blockId, genStamp);
+  }
+
+  public void set(int namespaceId, long blockId, long genStamp) {
+    this.namespaceId = namespaceId;
+    this.blockId = blockId;
+    this.genStamp = genStamp;
+  }
+
+  public int getNamespaceId() {
+    return namespaceId;
+  }
+
+  public long getBlockId() {
+    return blockId;
+  }
+
+  public long getGenStamp() {
+    return genStamp;
+  }
+
+  public void write(DataOutput out) throws IOException {
+    if (getDataTransferVersion() >= DataTransferProtocol.FEDERATION_VERSION) {
+      out.writeInt(namespaceId);
+    }
+    out.writeLong(blockId);
+    out.writeLong(genStamp);
+  }
+
+  public void readFields(DataInput in) throws IOException {
+    namespaceId = in.readInt();
+    blockId = in.readLong();
+    genStamp = in.readLong();
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferHeader.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferHeader.java
index 0bc3a1d9..70b70692 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferHeader.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferHeader.java
@@ -19,6 +19,9 @@
 
 import java.io.*;
 
+/**
+ * The base class for datanode protocol headers.
+ */
 public class DataTransferHeader {
   private VersionAndOpcode versionAndOp;
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeID.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeID.java
index c05daf5d..530cdba7 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeID.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeID.java
@@ -173,8 +173,8 @@ public int compareTo(DatanodeID that) {
   /////////////////////////////////////////////////
   /** {@inheritDoc} */
   public void write(DataOutput out) throws IOException {
-    UTF8.writeString(out, name);
-    UTF8.writeString(out, storageID);
+    UTF8.writeStringOpt(out, name);
+    UTF8.writeStringOpt(out, storageID);
     out.writeShort(infoPort);
   }
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
index bb1e13a0..0c8d7637 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
@@ -45,6 +45,7 @@ public class DatanodeInfo extends DatanodeID implements Node {
   protected long lastUpdate;
   protected int xceiverCount;
   protected String location = NetworkTopology.DEFAULT_RACK;
+  private static volatile boolean suspectNodes = true;
 
   /** HostName as suplied by the datanode during registration as its 
    * name. Namenode uses datanode IP address as the name.
@@ -69,6 +70,8 @@ public String toString() {
   }
   
   protected AdminStates adminState;
+  protected boolean suspectFail = false;
+  
 
 
   public DatanodeInfo() {
@@ -87,6 +90,7 @@ public DatanodeInfo(DatanodeInfo from) {
     this.location = from.getNetworkLocation();
     this.adminState = from.adminState;
     this.hostName = from.hostName;
+    this.suspectFail = from.suspectFail;
   }
 
   public DatanodeInfo(DatanodeID nodeID) {
@@ -106,6 +110,14 @@ protected DatanodeInfo(DatanodeID nodeID, String location, String hostName) {
     this.hostName = hostName;
   }
   
+  public boolean isSuspectFail() {
+    return suspectFail;
+  }
+
+  public void setSuspectFail(boolean suspectFail) {
+    this.suspectFail = suspectFail;
+  }
+
   /** The raw capacity. */
   public long getCapacity() { return capacity; }
   
@@ -350,8 +362,8 @@ public void write(DataOutput out) throws IOException {
     out.writeLong(remaining);
     out.writeLong(lastUpdate);
     out.writeInt(xceiverCount);
-    Text.writeString(out, location);
-    Text.writeString(out, hostName == null? "": hostName);
+    Text.writeStringOpt(out, location);
+    Text.writeStringOpt(out, hostName == null? "": hostName);
     WritableUtils.writeEnum(out, getAdminState());
   }
 
@@ -367,8 +379,20 @@ public void readFields(DataInput in) throws IOException {
     this.remaining = in.readLong();
     this.lastUpdate = in.readLong();
     this.xceiverCount = in.readInt();
-    this.location = Text.readString(in);
-    this.hostName = Text.readString(in);
+    this.location = Text.readStringOpt(in);
+    this.hostName = Text.readStringOpt(in);
     setAdminState(WritableUtils.readEnum(in, AdminStates.class));
   }
+
+  public static boolean shouldSuspectNodes() {
+    return suspectNodes;
+  }
+
+  public static void enableSuspectNodes() {
+    DatanodeInfo.suspectNodes = true;
+  }
+  
+  public static void disableSuspectNodes() {
+    DatanodeInfo.suspectNodes = false;
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/FSConstants.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/FSConstants.java
index 7b25e8fb..759993c7 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/FSConstants.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/FSConstants.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hdfs.protocol;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.DataChecksum;
 
 /************************************
  * Some handy constants
@@ -65,6 +66,9 @@ public enum SafeModeAction{ SAFEMODE_LEAVE, SAFEMODE_ENTER, SAFEMODE_GET; }
 
   // type of the datanode report
   public static enum DatanodeReportType {ALL, LIVE, DEAD }
+  
+  public static int CHECKSUM_TYPE = DataChecksum.CHECKSUM_CRC32;
+  public static int DEFAULT_BYTES_PER_CHECKSUM = 512;
 
   /**
    * Distributed upgrade actions:
@@ -90,9 +94,12 @@ public static enum UpgradeAction {
   // Version is reflected in the data storage file.
   // Versions are negative.
   // Decrement LAYOUT_VERSION to define a new version.
-  public static final int LAYOUT_VERSION = -37;
+  public static final int LAYOUT_VERSION = -41;
   // Current version: 
-  // -37: persist last transaction id in FSImage.
+  // -40: All the INodeFiles will have a INode type (1 byte) and 
+  // only the hardlink files will persist an additional hardlink ID (1 vLong)
+  // right after the the Inode type.
+  // -41: support inline checksum.
   public static final int FEDERATION_VERSION = -35;
   
   public static final String DFS_SOFT_LEASE_KEY = "dfs.softlease.period";
@@ -106,6 +113,8 @@ public static enum UpgradeAction {
   public static final String DFS_FEDERATION_NAMESERVICES = "dfs.federation.nameservices";
   public static final String DFS_FEDERATION_NAMESERVICE_ID = "dfs.federation.nameservice.id";
   
+  public static final String DFS_DATANODE_IPC_ADDRESS_KEY = "dfs.datanode.ipc.address";
+  
   public static final String  DFS_NAMENODE_RPC_ADDRESS_KEY = "dfs.namenode.rpc-address";
   public static final String  DFS_NAMENODE_HTTP_ADDRESS_KEY = "dfs.http.address";
   public static final String  DFS_NAMENODE_SECONDARY_HTTP_ADDRESS_KEY = "dfs.secondary.http.address";
@@ -115,7 +124,12 @@ public static enum UpgradeAction {
   public static final String DFS_NAMENODE_EDITS_DIR_KEY = "dfs.name.edits.dir";
   public static final String DFS_NAMENODE_CHECKPOINT_DIR_KEY = "fs.checkpoint.dir";
   public static final String DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY = "fs.checkpoint.edits.dir";
+  
+  public static String DFS_NAMENODE_NUM_CHECKPOINTS_RETAINED_KEY = "dfs.num.checkpoints.retained";
 
   public static final long MIN_INTERVAL_CHECK_DIR_MSEC = 300 * 1000;
 
+  public static String FS_NAMENODE_ALIASES = "fs.default.name.aliases";
+  public static String DFS_NAMENODE_DN_ALIASES = "dfs.namenode.dn-address.aliases";
+  public static String DFS_HTTP_ALIASES = "dfs.http.address.aliases";
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
index 2de8e0e6..cb56a855 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
@@ -228,8 +228,8 @@ public void write(DataOutput out) throws IOException {
     out.writeLong(modification_time);
     out.writeLong(access_time);
     permission.write(out);
-    Text.writeString(out, owner);
-    Text.writeString(out, group);
+    Text.writeStringOpt(out, owner);
+    Text.writeStringOpt(out, group);
   }
 
   public void readFields(DataInput in) throws IOException {
@@ -247,7 +247,7 @@ public void readFields(DataInput in) throws IOException {
     modification_time = in.readLong();
     access_time = in.readLong();
     permission.readFields(in);
-    owner = Text.readString(in);
-    group = Text.readString(in);
+    owner = Text.readStringOpt(in);
+    group = Text.readStringOpt(in);
   }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/LayoutVersion.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/LayoutVersion.java
index 931dcb5c..9490ff1a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/LayoutVersion.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/LayoutVersion.java
@@ -76,7 +76,12 @@ public static enum Feature {
     RESERVED_REL23(-34, -30, "Reserved for release 0.23"),
     FEDERATION(-35, "Support for namenode federation"),
     LEASE_REASSIGNMENT(-36, "Support for persisting lease holder reassignment"),
-    STORED_TXIDS(-37, "Transaction IDs are stored in edits log and image files");
+    STORED_TXIDS(-37, "Transaction IDs are stored in edits log and image files"),
+    TXID_BASED_LAYOUT(-38, "File names in NN Storage are based on transaction IDs"), 
+    EDITLOG_OP_OPTIMIZATION(-39,
+        "Use LongWritable and ShortWritable directly instead of ArrayWritable of UTF8"),
+    HARDLINK(-40, "HardLink inforamation is stored in edits log and image files"),
+    SUPPORT_INLINE_CHECKSUM(-41, "Support inline checksum");
     
     final int lv;
     final int ancestorLV;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadBlockAccelaratorHeader.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadBlockAccelaratorHeader.java
new file mode 100644
index 00000000..f690ca76
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadBlockAccelaratorHeader.java
@@ -0,0 +1,103 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.protocol;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.hadoop.io.Text;
+
+/**
+ * The header for the OP_READ_BLOCK_ACCELARATOR datanode operation.
+ */
+public class ReadBlockAccelaratorHeader extends DataTransferHeader {
+
+  private int namespaceId;
+  private long blockId;
+  private long genStamp;
+  private long startOffset;
+  private long len;
+  private String clientName;
+  
+  public ReadBlockAccelaratorHeader(final VersionAndOpcode versionAndOp) {
+    super(versionAndOp);
+  }
+  
+  public ReadBlockAccelaratorHeader(final int dataTransferVersion,
+      final int namespaceId, final long blockId, final long genStamp,
+      final long startOffset, final long len, final String clientName) {
+    super(dataTransferVersion, DataTransferProtocol.OP_READ_BLOCK_ACCELERATOR);
+    set(namespaceId, blockId, genStamp, startOffset, len, clientName);
+  }
+  
+  public void set(final int namespaceId, final long blockId, final long genStamp,
+      final long startOffset, final long len, final String clientName) {
+    this.namespaceId = namespaceId;
+    this.blockId = blockId;
+    this.genStamp = genStamp;
+    this.startOffset = startOffset;
+    this.len = len;
+    this.clientName = clientName;
+  }
+
+  public int getNamespaceId() {
+    return namespaceId;
+  }
+
+  public long getBlockId() {
+    return blockId;
+  }
+
+  public long getGenStamp() {
+    return genStamp;
+  }
+
+  public long getStartOffset() {
+    return startOffset;
+  }
+
+  public long getLen() {
+    return len;
+  }
+
+  public String getClientName() {
+    return clientName;
+  }
+  
+  public void write(DataOutput out) throws IOException {
+    if (getDataTransferVersion() >= DataTransferProtocol.FEDERATION_VERSION) {
+      out.writeInt(namespaceId);
+    }
+    out.writeLong(blockId);
+    out.writeLong(genStamp);
+    out.writeLong(startOffset);
+    out.writeLong(len);
+    Text.writeString(out, clientName);
+  }
+
+  public void readFields(DataInput in) throws IOException {
+    namespaceId = in.readInt();
+    blockId = in.readLong();
+    genStamp = in.readLong();
+    startOffset = in.readLong();
+    len = in.readLong();
+    clientName = Text.readString(in);
+  }
+  
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadBlockHeader.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadBlockHeader.java
index a179cc9a..abcc99f1 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadBlockHeader.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadBlockHeader.java
@@ -22,8 +22,7 @@
 import org.apache.hadoop.io.*;
 
 /**
- * Read and write header for OP_READ_BLOCK
- * 
+ * The header for the OP_READ_BLOCK datanode operation.
  */
 public class ReadBlockHeader extends DataTransferHeader implements Writable {
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadMetadataHeader.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadMetadataHeader.java
new file mode 100644
index 00000000..5981c81e
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/ReadMetadataHeader.java
@@ -0,0 +1,74 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.protocol;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+/**
+ * The header for the OP_READ_METADATA datanode operation.
+ */
+public class ReadMetadataHeader extends DataTransferHeader {
+
+  private int namespaceId;
+  private long blockId;
+  private long genStamp;
+
+  public ReadMetadataHeader(final VersionAndOpcode versionAndOpcode) {
+    super(versionAndOpcode);
+  }
+  
+  public ReadMetadataHeader(final int dataTransferVersion,
+      final int namespaceId, final long blockId, final long genStamp) {
+    super(dataTransferVersion, DataTransferProtocol.OP_READ_METADATA);
+    set(namespaceId, blockId, genStamp);
+  }
+  
+  public void set(int namespaceId, long blockId, long genStamp) {
+    this.namespaceId = namespaceId;
+    this.blockId = blockId;
+    this.genStamp = genStamp;
+  }
+  
+  public int getNamespaceId() {
+    return namespaceId;
+  }
+
+  public long getBlockId() {
+    return blockId;
+  }
+
+  public long getGenStamp() {
+    return genStamp;
+  }
+  
+  public void write(DataOutput out) throws IOException {
+    if (getDataTransferVersion() >= DataTransferProtocol.FEDERATION_VERSION) {
+      out.writeInt(namespaceId);
+    }
+    out.writeLong(blockId);
+    out.writeLong(genStamp);
+  }
+
+  public void readFields(DataInput in) throws IOException {
+    namespaceId = in.readInt();
+    blockId = in.readLong();
+    genStamp = in.readLong();
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/ReplaceBlockHeader.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/ReplaceBlockHeader.java
new file mode 100644
index 00000000..d031a2f7
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/ReplaceBlockHeader.java
@@ -0,0 +1,95 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.protocol;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.hadoop.io.Text;
+
+/**
+ * The header for the OP_REPLACE_BLOCK datanode operation.
+ */
+public class ReplaceBlockHeader extends DataTransferHeader {
+  
+  private int namespaceId;
+  private long blockId;
+  private long genStamp;
+  private String sourceID;
+  private DatanodeInfo proxySource;
+  
+  public ReplaceBlockHeader(VersionAndOpcode versionAndOpcode) {
+    super(versionAndOpcode);
+  }
+  
+  public ReplaceBlockHeader(final int dataTransferVersion,
+      final int namespaceId, final long blockId, final long genStamp,
+      final String sourceID, final DatanodeInfo proxySource) {
+    super(dataTransferVersion, DataTransferProtocol.OP_REPLACE_BLOCK);
+    set(namespaceId, blockId, genStamp, sourceID, proxySource);
+  }
+  
+  public void set(int namespaceId, long blockId, long genStamp,
+      String sourceID, DatanodeInfo proxySource) {
+    this.namespaceId = namespaceId;
+    this.blockId = blockId;
+    this.genStamp = genStamp;
+    this.sourceID = sourceID;
+    this.proxySource = proxySource;
+  }
+  
+  public int getNamespaceId() {
+    return namespaceId;
+  }
+
+  public long getBlockId() {
+    return blockId;
+  }
+
+  public long getGenStamp() {
+    return genStamp;
+  }
+  
+  public String getSourceID() {
+    return sourceID;
+  }
+  
+  public DatanodeInfo getProxySource() {
+    return proxySource;
+  }
+  
+  public void write(DataOutput out) throws IOException {
+    if (getDataTransferVersion() >= DataTransferProtocol.FEDERATION_VERSION) {
+      out.writeInt(namespaceId);
+    }
+    out.writeLong(blockId);
+    out.writeLong(genStamp);
+    Text.writeString(out, sourceID);
+    proxySource.write(out);
+  }
+
+  public void readFields(DataInput in) throws IOException {
+    namespaceId = in.readInt();
+    blockId = in.readLong();
+    genStamp = in.readLong();
+    sourceID = Text.readString(in);
+    proxySource = new DatanodeInfo();
+    proxySource.readFields(in);
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/protocol/WriteBlockHeader.java b/src/hdfs/org/apache/hadoop/hdfs/protocol/WriteBlockHeader.java
index 49ed154b..84d25dbd 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/protocol/WriteBlockHeader.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/protocol/WriteBlockHeader.java
@@ -23,8 +23,7 @@
 import org.apache.hadoop.util.DataChecksum;
 
 /**
- * Read and write header for OP_WRITE_BLOCK
- * 
+ * The header for the OP_WRITE_BLOCK datanode operation.
  */
 public class WriteBlockHeader extends DataTransferHeader implements Writable {
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java b/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
index 7eeb47f5..1313705d 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
@@ -59,8 +59,10 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FilterFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
 import org.apache.hadoop.hdfs.protocol.Block;
@@ -70,14 +72,15 @@
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.protocol.ReplaceBlockHeader;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.Util;
 import org.apache.hadoop.hdfs.server.namenode.BlockPlacementPolicy;
 import org.apache.hadoop.hdfs.server.namenode.BlockPlacementPolicyDefault;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
-import org.apache.hadoop.hdfs.server.namenode.UnsupportedActionException;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
 import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations.BlockWithLocations;
+import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
@@ -192,7 +195,7 @@
  */
 
 public class Balancer implements Tool {
-  private static final Log LOG =
+  protected static final Log LOG =
       LogFactory.getLog(Balancer.class.getName());
   final private static long MAX_BLOCKS_SIZE_TO_FETCH = 2*1024*1024*1024L; //2GB
 
@@ -202,13 +205,13 @@ public class Balancer implements Tool {
   public final static int MAX_NUM_CONCURRENT_MOVES = 5;
   public static int maxConcurrentMoves = MAX_NUM_CONCURRENT_MOVES;
   private static long maxIterationTime = 20*60*1000L; //20 mins
-  private Configuration conf;
+  protected Configuration conf;
   private static double threshold = 10D;
   
   private InetSocketAddress namenodeAddress;
-  private NamenodeProtocol namenode;
-  private ClientProtocol client;
-  private FileSystem fs;
+  protected NamenodeProtocol namenode;
+  protected ClientProtocol client;
+  protected FileSystem fs;
   private OutputStream out = null;
 
   private final static Random rnd = new Random();
@@ -244,6 +247,8 @@ public class Balancer implements Tool {
   final static private int DISPATCHER_THREAD_POOL_SIZE = 200;
   private ExecutorService dispatcherExecutor = null;
 
+  protected boolean shuttingDown = false;
+
   /* This class keeps track of a scheduled block move */
   private class PendingBlockMove {
     private BalancerBlock block;
@@ -342,7 +347,8 @@ private void dispatch() {
             sock.getInputStream(), FSConstants.BUFFER_SIZE));
         receiveResponse(in);
         bytesMoved.inc(block.getNumBytes());
-        LOG.info( "Moving block " + block.getBlock().getBlockId() +
+        LOG.info("Moving block " + block.getBlock().getBlockId() + " of size "
+            + block.getNumBytes() +
               " from "+ source.getName() + " to " +
               target.getName() + " through " +
               proxySource.getName() +
@@ -378,13 +384,13 @@ private void dispatch() {
 
     /* Send a block replace request to the output stream*/
     private void sendRequest(DataOutputStream out) throws IOException {
-      out.writeShort(DataTransferProtocol.DATA_TRANSFER_VERSION);
-      out.writeByte(DataTransferProtocol.OP_REPLACE_BLOCK);
-      out.writeInt(namespaceId);
-      out.writeLong(block.getBlock().getBlockId());
-      out.writeLong(block.getBlock().getGenerationStamp());
-      Text.writeString(out, source.getStorageID());
-      proxySource.write(out);
+      /* Write the header */
+      ReplaceBlockHeader replaceBlockHeader = new ReplaceBlockHeader(
+          DataTransferProtocol.DATA_TRANSFER_VERSION, namespaceId,
+          block.getBlock().getBlockId(), block.getBlock().getGenerationStamp(),
+          source.getStorageID(), proxySource.getDatanode());
+      replaceBlockHeader.writeVersionAndOpCode(out);
+      replaceBlockHeader.write(out);
       out.flush();
     }
 
@@ -814,28 +820,32 @@ private void dispatchBlocks(long startTime) {
     }
   }
 
-  /* Check that this Balancer is compatible with the Block Placement Policy
+  /*
+   * Check that this Balancer is compatible with the Block Placement Policy
    * used by the Namenode.
-   */
-  private void checkReplicationPolicyCompatibility(Configuration conf) throws UnsupportedActionException {
-    if (!(BlockPlacementPolicy.getInstance(conf, null, null, null, null, null) instanceof 
-        BlockPlacementPolicyDefault)) {
-      throw new UnsupportedActionException("Balancer without BlockPlacementPolicyDefault");
+   *
+   * In case it is not compatible, throw IllegalArgumentException
+   *
+   * */
+  private void checkReplicationPolicyCompatibility(Configuration conf) {
+    if (!(BlockPlacementPolicy.getInstance(conf, null, null, null, null, null)
+        instanceof BlockPlacementPolicyDefault)) {
+      throw new IllegalArgumentException("Configuration lacks BlockPlacementPolicyDefault");
     }
   }
-  
+
   /** Default constructor */
-  Balancer() throws UnsupportedActionException {
+  Balancer() {
   }
 
   /** Construct a balancer from the given configuration */
-  Balancer(Configuration conf) throws UnsupportedActionException {
+  Balancer(Configuration conf) {
     setConf(conf);
     checkReplicationPolicyCompatibility(conf);
   }
 
   /** Construct a balancer from the given configuration and threshold */
-  Balancer(Configuration conf, double threshold) throws UnsupportedActionException {
+  Balancer(Configuration conf, double threshold) {
     setConf(conf);
     checkReplicationPolicyCompatibility(conf);
     Balancer.threshold = threshold;
@@ -876,6 +886,15 @@ private double checkThreshold(int value) {
     return threshold;
   }
 
+  protected void initNameNodes() throws IOException {
+    this.namenode = createNamenode(namenodeAddress, conf);
+    this.client = DFSClient.createNamenode(namenodeAddress, conf);
+  }
+
+  protected void initFS() throws IOException {
+    this.fs = FileSystem.get(NameNode.getUri(namenodeAddress), conf);
+  }
+
   /* Initialize balancer. It sets the value of the threshold, and
    * builds the communication proxies to
    * namenode as a client and a secondary namenode and retry proxies
@@ -883,9 +902,8 @@ private double checkThreshold(int value) {
    */
   private void init(InetSocketAddress namenodeAddress) throws IOException {
     this.namenodeAddress = namenodeAddress;
-    this.namenode = createNamenode(namenodeAddress, conf);
-    this.client = DFSClient.createNamenode(namenodeAddress, conf);
-    this.fs = FileSystem.get(NameNode.getUri(namenodeAddress), conf);
+    initFS();
+    initNameNodes();
     this.moverExecutor = Executors.newFixedThreadPool(moveThreads);
     int dispatchThreads = (int)Math.max(1, moveThreads/maxConcurrentMoves);
     this.dispatcherExecutor = Executors.newFixedThreadPool(dispatchThreads);
@@ -903,7 +921,7 @@ private void init(InetSocketAddress namenodeAddress) throws IOException {
 
   /* Build a NamenodeProtocol connection to the namenode and
    * set up the retry policy */
-  private static NamenodeProtocol createNamenode(InetSocketAddress nameNodeAddr, Configuration conf)
+  protected static NamenodeProtocol createNamenode(InetSocketAddress nameNodeAddr, Configuration conf)
     throws IOException {
     RetryPolicy timeoutPolicy = RetryPolicies.exponentialBackoffRetry(
         5, 200, TimeUnit.MILLISECONDS);
@@ -1489,14 +1507,15 @@ private Options setupOptions() {
   }
   
   // Exit status
-  final public static int SUCCESS = 1;
-  final public static int IN_PROGRESS = 0;
+  final public static int SUCCESS = 0;
+  final public static int IN_PROGRESS = 1;
   final public static int ALREADY_RUNNING = -1;
   final public static int NO_MOVE_BLOCK = -2;
   final public static int NO_MOVE_PROGRESS = -3;
   final public static int IO_EXCEPTION = -4;
   final public static int ILLEGAL_ARGS = -5;
   final public static int INTERRUPTED = -6;
+  final public static int NOT_ALL_BALANCED = -7;
   
   public int run(String[] args) throws Exception {
     final long startTime = Util.now();
@@ -1549,6 +1568,15 @@ private void parse(String[] args) {
     }
   }
 
+  private static Balancer getBalancerInstance(Configuration conf)
+      throws IOException {
+    Class<?> clazz = conf.getClass("dfs.balancer.impl", Balancer.class);
+    if (!Balancer.class.isAssignableFrom(clazz)) {
+      throw new IOException("Invalid class for balancer : " + clazz);
+    }
+    return (Balancer) ReflectionUtils.newInstance(clazz, conf);
+  }
+
   
   /**
    * Balance all namenodes.
@@ -1565,15 +1593,17 @@ static int run(List<InetSocketAddress> namenodes,
     
     final List<Balancer> balancers 
         = new ArrayList<Balancer>(namenodes.size());
+    boolean failNN = false;
     try {
       for(InetSocketAddress isa : namenodes) {
         try{
-          Balancer b = new Balancer(conf);
+          Balancer b = Balancer.getBalancerInstance(conf);
           b.init(isa);
           balancers.add(b);
         } catch (IOException e) {
           e.printStackTrace();
           LOG.error("Cannot connect to namenode: " + isa);
+          failNN = true;
         }
       }
     
@@ -1606,6 +1636,10 @@ static int run(List<InetSocketAddress> namenodes,
         b.close();
       }
     }
+    if (failNN) {
+      LOG.warn("Could not initialize all balancers");
+      return NOT_ALL_BALANCED;
+    }
     return SUCCESS;
   }
 
@@ -1714,6 +1748,7 @@ public int run(int iterations, Formatter formatter){
   
   /** Close the connection. */
   void close() {
+    shuttingDown = true;
     // shutdown thread pools
     dispatcherExecutor.shutdownNow();
     moverExecutor.shutdownNow();
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/common/Storage.java b/src/hdfs/org/apache/hadoop/hdfs/server/common/Storage.java
index 342bb7c4..3dd7a0e4 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/common/Storage.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/common/Storage.java
@@ -64,7 +64,7 @@ public abstract class Storage extends StorageInfo {
   // Constants
   
   // last layout version that did not suppot upgrades
-  protected static final int LAST_PRE_UPGRADE_LAYOUT_VERSION = -3;
+  public static final int LAST_PRE_UPGRADE_LAYOUT_VERSION = -3;
   
   // this corresponds to Hadoop-0.14.
   public static final int LAST_UPGRADABLE_LAYOUT_VERSION = -7;
@@ -339,7 +339,22 @@ public void clearDirectory() throws IOException {
       if (!curDir.mkdirs())
         throw new IOException("Cannot create current directory " + curDir);
     }
-    
+
+    public boolean isEmpty() throws IOException {
+      File rootDir = this.getRootDir();
+      if (!rootDir.exists()) {
+        throw new IOException("Directory " + rootDir + " does not exist!");
+      }
+      String contents[] = rootDir.list();
+      if (contents == null) {
+        throw new IOException("Unable to list files in " + rootDir);
+      }
+      if (contents.length == 1 && this.useLock) { // Ignore lock file
+        return contents[0].equals(STORAGE_FILE_LOCK);
+      }
+      return contents.length == 0;
+    }
+
     public File getRootDir() {
       return root;
     }
@@ -654,7 +669,7 @@ private void checkConversionNeeded(StorageDirectory sd) throws IOException {
    * 
    * @param oldVersion
    */
-  protected static void checkVersionUpgradable(int oldVersion) 
+  public static void checkVersionUpgradable(int oldVersion) 
                                      throws IOException {
     if (oldVersion > LAST_UPGRADABLE_LAYOUT_VERSION) {
       String msg = "*********** Upgrade is not supported from this older" +
@@ -733,7 +748,7 @@ public static void rename(File from, File to) throws IOException {
                             + from.getCanonicalPath() + " to " + to.getCanonicalPath());
   }
 
-  protected static void deleteDir(File dir) throws IOException {
+  public static void deleteDir(File dir) throws IOException {
     if (!FileUtil.fullyDelete(dir))
       throw new IOException("Failed to delete " + dir.getCanonicalPath());
   }
@@ -868,4 +883,13 @@ protected void writeCorruptedData(RandomAccessFile file) throws IOException {
     file.writeBytes(messageForPreUpgradeVersion);
     file.getFD().sync();
   }  
+  
+  public Iterable<StorageDirectory> dirIterable(final StorageDirType dirType) {
+    return new Iterable<StorageDirectory>() {
+      @Override
+      public Iterator<StorageDirectory> iterator() {
+        return dirIterator(dirType);
+      }
+    };
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/common/StorageInfo.java b/src/hdfs/org/apache/hadoop/hdfs/server/common/StorageInfo.java
index 8f768b50..57b2266d 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/common/StorageInfo.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/common/StorageInfo.java
@@ -51,4 +51,8 @@ public void   setStorageInfo(StorageInfo from) {
     namespaceID = from.namespaceID;
     cTime = from.cTime;
   }
+  
+  public String toColonSeparatedString() {
+    return layoutVersion + ":" + namespaceID + ":" + cTime;
+  }
 }
\ No newline at end of file
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockInlineChecksumReader.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockInlineChecksumReader.java
new file mode 100644
index 00000000..c6de06dd
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockInlineChecksumReader.java
@@ -0,0 +1,351 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.hadoop.fs.ChecksumException;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.server.datanode.BlockSender.InputStreamFactory;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.util.ChecksumUtil;
+import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.StringUtils;
+/**
+ * The class to read from inline checksum block file and stream it to
+ * output packet buffer. The expected block file name is:
+ * blk_(blockId)_(generation_id)
+ * 
+ * The file format is following:
+ * +---------------------------+
+ * |     Checksum Header       |
+ * +---------------------------+
+ * |                           |
+ * |    Data for Chunk 1       |
+ * |        ......             |
+ * |                           |
+ * +---------------------------+
+ * |   Checksum for Chunk 1    |
+ * +---------------------------+
+ * |                           |
+ * |    Data for Chunk 2       |
+ * |         ......            |
+ * |                           |
+ * +---------------------------+
+ * |   Checksum for Chunk 2    |
+ * +---------------------------+
+ * |                           |
+ * |    Data for Chunk 3       |
+ * |            .              |
+ * |            .              |
+ * |            .              |
+ * |                           |
+ * +---------------------------+
+ * |    Data for Last Chunk    |
+ * |     (Can be Partial)      |
+ * +---------------------------+
+ * |  Checksum for Last Chunk  |
+ * +---------------------------+
+ * 
+ * After the file header, chunks are saved. For every chunk, first data
+ * are saved, and then checksums.
+ * 
+ */
+public class BlockInlineChecksumReader extends DatanodeBlockReader {
+  private InputStreamFactory streamFactory;
+  private InputStream blockIn; // data stream
+  long blockInPosition = -1;
+  MemoizedBlock memoizedBlock;
+  private int initChecksumType;
+  private int initBytesPerChecksum;
+
+  BlockInlineChecksumReader(int namespaceId, Block block,
+      FSDatasetInterface data, boolean ignoreChecksum, boolean verifyChecksum,
+      boolean corruptChecksumOk, InputStreamFactory streamFactory, int checksumType, int bytesPerChecksum) {
+    super(namespaceId, block, data, ignoreChecksum, verifyChecksum,
+        corruptChecksumOk);
+    this.streamFactory = streamFactory;
+    this.initChecksumType = checksumType;
+    this.initBytesPerChecksum = bytesPerChecksum;
+  }
+
+  @Override
+  public DataChecksum getChecksumToSend(long blockLength) throws IOException {
+    if (checksum == null) {
+      assert initChecksumType != DataChecksum.CHECKSUM_UNKNOWN;
+      checksum = DataChecksum.newDataChecksum(initChecksumType,
+          initBytesPerChecksum);
+      super.getChecksumInfo(blockLength);
+    }
+    assert checksum != null;
+    if (ignoreChecksum) {
+      return DataChecksum.newDataChecksum(DataChecksum.CHECKSUM_NULL,
+          checksum.getBytesPerChecksum());
+    } else {
+      return checksum;
+    }
+  }
+
+  /**
+   * get file length for the block size.
+   * 
+   * @param blockSize
+   * @param bytesPerChecksum
+   * @param checksumSize
+   * @return
+   */
+  public static long getFileLengthFromBlockSize(long blockSize,
+      int bytesPerChecksum, int checksumSize) {
+    long numChunks; 
+    if (blockSize % bytesPerChecksum == 0) {    
+      numChunks = blockSize / bytesPerChecksum; 
+    } else {    
+      numChunks = blockSize / bytesPerChecksum + 1; 
+    }   
+    return blockSize + numChunks * checksumSize 
+        + BlockInlineChecksumReader.getHeaderSize();  
+  } 
+
+  /**
+   * Translate from block offset to position in file.
+   * 
+   * @param offsetInBlock
+   * @param bytesPerChecksum
+   * @param checksumSize
+   * @return
+   */
+  public static long getPosFromBlockOffset(long offsetInBlock, int bytesPerChecksum,
+      int checksumSize) {
+    // We only support to read full chunks, so offsetInBlock must be the boundary
+    // of the chunks.
+    assert offsetInBlock % bytesPerChecksum == 0;
+    // The position in the file will be the same as the file size for the block
+    // size.
+    return getFileLengthFromBlockSize(offsetInBlock, bytesPerChecksum, checksumSize);
+  }
+
+  public void initializeStream(long offset, long blockLength)
+      throws IOException {
+    // seek to the right offsets
+    long offsetInFile = BlockInlineChecksumReader
+        .getPosFromBlockOffset(offset, bytesPerChecksum, checksumSize);
+    // Seek to to start of the chunk. The new position will be the same 
+    // as the file size if block size is current offset.
+    blockIn = streamFactory.createStream(offsetInFile);
+    memoizedBlock = new MemoizedBlock(blockIn, blockLength, streamFactory,
+        block);
+  }
+
+  @Override
+  public boolean prepareTransferTo() throws IOException {
+    return false;
+  }
+
+  @Override
+  public void sendChunks(OutputStream out, byte[] buf, long startOffset,
+      int startChecksumOff, int numChunks, int len) throws IOException {
+    long offset = startOffset;
+    long endOffset = startOffset + len;
+    int checksumOff = startChecksumOff;
+    int checksumLen =  ignoreChecksum ? 0 : (numChunks * checksumSize);
+    int dataOff = checksumOff + checksumLen;
+    int remain = len;
+
+    for (int i = 0; i < numChunks; i++) {
+      assert remain > 0;
+
+      int lenToRead = (remain > bytesPerChecksum) ? bytesPerChecksum : remain;
+
+      IOUtils.readFully(blockIn, buf, dataOff, lenToRead);
+      if (!ignoreChecksum) {
+        IOUtils.readFully(blockIn, buf, checksumOff, checksumSize);
+      } else {
+        IOUtils.skipFully(blockIn, checksumSize);
+      }
+
+      if (verifyChecksum && !corruptChecksumOk) {
+        checksum.reset();
+        checksum.update(buf, dataOff, lenToRead);
+        if (!checksum.compare(buf, checksumOff)) {
+          throw new ChecksumException("Checksum failed at "
+              + (offset + len - remain), len);
+        }
+      }
+
+      dataOff += lenToRead;
+      checksumOff += checksumSize;
+      remain -= lenToRead;
+    }
+    
+    // only recompute checksum if we can't trust the meta data due to
+    // concurrent writes
+    if ((checksumSize != 0 && endOffset % bytesPerChecksum != 0)
+        && memoizedBlock.hasBlockChanged(endOffset)) {
+      ChecksumUtil.updateChunkChecksum(buf, startChecksumOff, startChecksumOff
+          + checksumLen, len, checksum);
+    }
+
+    try {
+      out.write(buf, 0, dataOff);
+    } catch (IOException e) {
+      throw BlockSender.ioeToSocketException(e);
+    }
+  }
+
+  @Override
+  public void close() throws IOException {
+    IOException ioe = null;
+
+    // close data file
+    if (blockIn != null) {
+      try {
+        blockIn.close();
+      } catch (IOException e) {
+        ioe = e;
+      }
+      blockIn = null;
+    }
+    // throw IOException if there is any
+    if (ioe != null) {
+      throw ioe;
+    }
+  }
+
+  /**
+   * helper class used to track if a block's meta data is verifiable or not
+   */
+  class MemoizedBlock {
+    // block data stream
+    private InputStream inputStream;
+    // visible block length
+    private long blockLength;
+    private final Block block;
+    private final InputStreamFactory isf;
+
+    private boolean riInitialized = false;
+    private ReplicaToRead ri;
+
+    private MemoizedBlock(InputStream inputStream, long blockLength,
+        InputStreamFactory isf, Block block) throws IOException {
+      this.inputStream = inputStream;
+      this.blockLength = blockLength;
+      this.isf = isf;
+      this.block = block;
+    }
+
+    // logic: if we are starting or ending on a partial chunk and the block
+    // has more data than we were told at construction, the block has 'changed'
+    // in a way that we care about (ie, we can't trust crc data)
+    boolean hasBlockChanged(long endOffset) throws IOException {
+      if (!riInitialized) {
+        FSDatasetInterface ds = null;
+        if (isf instanceof BlockInputStreamFactory) {
+          ds = ((BlockInputStreamFactory) isf).getDataset();
+          ri = ds.getReplicaToRead(namespaceId, block);
+          riInitialized = true;
+        }
+      }
+      
+      if (ri != null && ri.getBytesWritten() > blockLength) {
+        return true;
+      }
+      
+      // check if we are using transferTo since we tell if the file has changed
+      // (blockInPosition >= 0 => we are using transferTo and File Channels
+      long currentLength = ((FileInputStream) inputStream).getChannel().size();
+
+      return currentLength != BlockInlineChecksumReader
+          .getFileLengthFromBlockSize(blockLength, bytesPerChecksum,
+              checksumSize);
+    }
+  }
+
+  static public long getBlockSizeFromFileLength(long fileSize, int checksumType,
+      int bytesPerChecksum) {
+    assert checksumType != DataChecksum.CHECKSUM_UNKNOWN;
+
+    long headerSize = BlockInlineChecksumReader.getHeaderSize();
+    if (fileSize <= headerSize) {
+      return 0;
+    }
+    long checksumSize = DataChecksum.getChecksumSizeByType(checksumType);
+    long numChunks = (fileSize - headerSize - 1)
+        / (bytesPerChecksum + checksumSize) + 1;
+    if (fileSize <= headerSize + checksumSize * numChunks + bytesPerChecksum
+        * (numChunks - 1)) {
+      DataNode.LOG.warn("Block File has wrong size: size " + fileSize
+          + " checksumType: " + checksumType + " bytesPerChecksum"
+          + bytesPerChecksum);
+    }
+    return fileSize - headerSize - checksumSize * numChunks;
+  }
+
+  static class GenStampAndChecksum {
+    public GenStampAndChecksum(long generationStamp, int checksumType,
+            int bytesPerChecksum) {
+      super();
+      this.generationStamp = generationStamp;
+      this.checksumType = checksumType;
+      this.bytesPerChecksum = bytesPerChecksum;
+    }
+    long generationStamp;
+    int checksumType;
+    int bytesPerChecksum;
+  }
+
+  /** Return the generation stamp from the name of the block file.
+   */
+  static GenStampAndChecksum getGenStampAndChecksumFromInlineChecksumFile(
+      String fileName) throws IOException {
+    String[] vals = StringUtils.split(fileName, '_');
+    if (vals.length != 6) {
+      // blk, blkid, genstamp, version, checksumtype, byte per checksum
+      throw new IOException("unidentified block name format: " + fileName);
+    }
+    if (Integer.parseInt(vals[3]) != FSDataset.FORMAT_VERSION_INLINECHECKSUM) {
+      // We only support one version of meta version now.
+      throw new IOException("Unsupported format version for file "
+          + fileName);
+
+    }
+    return new GenStampAndChecksum(Long.parseLong(vals[2]),
+            Integer.parseInt(vals[4]), Integer.parseInt(vals[5]));
+  }
+  /** Return the generation stamp from the name of the block file.
+   */
+  static long getGenerationStampFromInlineChecksumFile(String blockName)
+      throws IOException {
+    String[] vals = StringUtils.split(blockName, '_');
+    if (vals.length != 6) {
+      // blk, blkid, genstamp, version, checksumtype, byte per checksum
+      throw new IOException("unidentified block name format: " + blockName);
+    }
+    return Long.parseLong(vals[2]);
+  }
+  
+  /**
+   * Returns the size of the header for data file
+   */
+  public static int getHeaderSize() {
+    return 0;
+  }
+
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockInlineChecksumWriter.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockInlineChecksumWriter.java
new file mode 100644
index 00000000..fd9619f3
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockInlineChecksumWriter.java
@@ -0,0 +1,372 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.nio.channels.ClosedChannelException;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
+
+import org.apache.hadoop.fs.FSInputChecker;
+import org.apache.hadoop.fs.FSOutputSummer;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.util.DataChecksum;
+
+/** 
+ * The class to write into local inline checksum block file.
+ * The expected block file name is:   
+ *   blk_(blockId)_(generation_id)_(checksum_type)_(bytes_per_checksum)    
+ *  
+ * The file format is following:    
+ * +---------------------------+    
+ * |     Checksum Header       |    
+ * +---------------------------+    
+ * |                           |    
+ * |    Data for Chunk 1       |    
+ * |        ......             |    
+ * |                           |    
+ * +---------------------------+    
+ * |   Checksum for Chunk 1    |    
+ * +---------------------------+    
+ * |                           |    
+ * |    Data for Chunk 2       |    
+ * |         ......            |    
+ * |                           |    
+ * +---------------------------+    
+ * |   Checksum for Chunk 2    |    
+ * +---------------------------+    
+ * |                           |    
+ * |    Data for Chunk 3       |    
+ * |            .              |    
+ * |            .              |    
+ * |            .              |    
+ * |                           |    
+ * +---------------------------+    
+ * |    Data for Last Chunk    |    
+ * |     (Can be Partial)      |    
+ * +---------------------------+    
+ * |    Checksum for Chunk 3   |    
+ * +---------------------------+  
+ *  
+ */
+public class BlockInlineChecksumWriter extends DatanodeBlockWriter {  
+  private File blockFile;
+
+  protected OutputStream dataOut = null; // to block file at local disk
+  private Checksum partialCrc = null;
+  private int checksumType = DataChecksum.CHECKSUM_UNKNOWN;
+
+  public BlockInlineChecksumWriter(File blockFile, int checksumType, int bytesPerChecksum) {
+    this.blockFile = blockFile;
+    this.bytesPerChecksum = bytesPerChecksum;
+    this.checksumType = checksumType;
+  }
+
+  public void initializeStreams(int bytesPerChecksum, int checksumSize,
+      Block block, String inAddr, int namespaceId, DataNode datanode)
+      throws FileNotFoundException, IOException {
+    if (this.dataOut == null) {
+      this.dataOut = new FileOutputStream(
+          new RandomAccessFile(blockFile, "rw").getFD());
+    }
+
+    setParameters(bytesPerChecksum, checksumSize, block, inAddr, namespaceId,
+        datanode);
+  }
+
+  @Override
+  public void writeHeader(DataChecksum checksum) throws IOException {
+    // In current version, no header is written.
+  }
+
+  @Override
+  public void writePacket(byte pktBuf[], int len, int startDataOff, int startChecksumOff,
+      int numChunks) throws IOException {
+    int dataOff = startDataOff;
+    int checksumOff = startChecksumOff;
+    
+    if (partialCrc != null) {
+      // If this is a partial chunk, then verify that this is the only
+      // chunk in the packet. Calculate new crc for this chunk.
+      if (len > bytesPerChecksum) {
+        throw new IOException("Got wrong length during writeBlock(" + block
+            + ") from " + inAddr + " "
+            + "A packet can have only one partial chunk." + " len = " + len
+            + " bytesPerChecksum " + bytesPerChecksum);
+      }
+      dataOut.write(pktBuf, dataOff, len);
+      partialCrc.update(pktBuf, dataOff, len);
+      byte[] buf = FSOutputSummer.convertToByteStream(partialCrc, checksumSize);
+      dataOut.write(buf);
+      LOG.debug("Writing out partial crc for data len " + len);
+      partialCrc = null;
+    } else {
+      int remain = len;
+      for (int i = 0; i < numChunks; i++) {
+        assert remain > 0;
+
+        int lenToWrite = (remain > bytesPerChecksum) ? bytesPerChecksum
+            : remain;
+
+        // finally write to the disk :
+        dataOut.write(pktBuf, dataOff, lenToWrite);
+
+
+        dataOut.write(pktBuf, checksumOff, checksumSize);
+        dataOff += lenToWrite;
+        remain -= lenToWrite;
+        checksumOff += checksumSize;
+      }
+    }
+  }
+
+  /**
+   * Retrieves the offset in the block to which the the next write will write
+   * data to.
+   */
+  public long getChannelPosition() throws IOException {
+    return ((FileOutputStream) dataOut).getChannel().position();
+  }
+  
+  @Override
+  public void setPosAndRecomputeChecksumIfNeeded(long offsetInBlock, DataChecksum checksum) throws IOException {
+    long expectedFileLength = BlockInlineChecksumReader.getFileLengthFromBlockSize(
+        offsetInBlock, bytesPerChecksum, checksumSize);
+
+    if (getChannelPosition() == expectedFileLength) {
+      if (offsetInBlock % bytesPerChecksum != 0) {
+        // Previous packet is a partial chunk.
+        // If the position is the expected file length, we assume
+        // everything is fine and we just set to the correct position.
+        setChannelPosition(expectedFileLength - checksumSize);
+      }
+      return;
+    }
+    
+    if (dataOut != null) {
+      dataOut.flush();
+    }
+
+    long positionToSeekTo = expectedFileLength;
+    // If this is a partial chunk, then read in pre-existing checksum
+    if (offsetInBlock % bytesPerChecksum != 0) {
+      // Previous packet is a partial chunk.
+      positionToSeekTo -= checksumSize;
+      LOG.info("setBlockPosition trying to set position to " + offsetInBlock
+          + " for block " + block
+          + " which is not a multiple of bytesPerChecksum " + bytesPerChecksum);
+      computePartialChunkCrc(offsetInBlock, bytesPerChecksum, checksum);
+    }
+
+    // set the position of the block file
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Changing block file offset of block " + block + " from "
+          + getChannelPosition() + " to " + positionToSeekTo);
+    }
+
+    setChannelPosition(positionToSeekTo);
+  }
+
+  /**
+   * Sets the offset in the block to which the the next write will write data
+   * to.
+   */
+  public void setChannelPosition(long dataOffset)
+      throws IOException {
+    if (((FileOutputStream) dataOut).getChannel().size() < dataOffset) {
+      String msg = "Trying to change block file offset of block " + block
+          + "file " + ((blockFile != null) ? blockFile.getPath() : "unknown")
+          + " to " + dataOffset + " but actual size of file is "
+          + ((FileOutputStream) dataOut).getChannel().size();
+      throw new IOException(msg);
+    }
+    if (dataOffset > ((FileOutputStream) dataOut).getChannel().size()) {
+      throw new IOException("Set position over the end of the data file.");
+    }
+    ((FileOutputStream) dataOut).getChannel().position(dataOffset);
+  }
+
+  /**
+   * reads in the partial crc chunk and computes checksum of pre-existing data
+   * in partial chunk.
+   */
+  private void computePartialChunkCrc(long blkoff, int bytesPerChecksum,
+      DataChecksum checksum) throws IOException {
+
+    // find offset of the beginning of partial chunk.
+    //
+    int sizePartialChunk = (int) (blkoff % bytesPerChecksum);
+    int checksumSize = checksum.getChecksumSize();
+    long fileOff = BlockInlineChecksumReader.getPosFromBlockOffset(blkoff
+        - sizePartialChunk, bytesPerChecksum, checksumSize);
+    LOG.info("computePartialChunkCrc sizePartialChunk " + sizePartialChunk
+        + " block " + block + " offset in block " + blkoff);
+
+    // create an input stream from the block file
+    // and read in partial crc chunk into temporary buffer
+    //
+    byte[] buf = new byte[sizePartialChunk];
+    byte[] crcbuf = new byte[checksumSize];
+    FileInputStream dataIn = null;
+    
+    try {
+      RandomAccessFile blockInFile = new RandomAccessFile(blockFile, "r");
+      dataIn = new FileInputStream(blockInFile.getFD());
+
+      if (fileOff > 0) {
+        blockInFile.seek(fileOff);
+      }
+      IOUtils.readFully(dataIn, buf, 0, sizePartialChunk);
+
+      // open meta file and read in crc value computer earlier
+      IOUtils.readFully(dataIn, crcbuf, 0, crcbuf.length);
+    } finally {
+      if (dataIn != null) {
+        dataIn.close();
+      }
+    }
+
+    // compute crc of partial chunk from data read in the block file.
+    partialCrc = new CRC32();
+    partialCrc.update(buf, 0, sizePartialChunk);
+    LOG.info("Read in partial CRC chunk from disk for block " + block);
+
+    // paranoia! verify that the pre-computed crc matches what we
+    // recalculated just now
+    if (partialCrc.getValue() != FSInputChecker.checksum2long(crcbuf)) {
+      String msg = "Partial CRC " + partialCrc.getValue()
+          + " does not match value computed the "
+          + " last time file was closed "
+          + FSInputChecker.checksum2long(crcbuf);
+      throw new IOException(msg);
+    }
+  }
+
+  /**
+   * Flush the data and checksum data out to the stream. Please call sync to
+   * make sure to write the data in to disk
+   * 
+   * @throws IOException
+   */
+  @Override
+  public void flush(boolean forceSync) throws IOException {
+    if (dataOut != null) {
+      dataOut.flush();
+      if (forceSync && (dataOut instanceof FileOutputStream)) {
+        ((FileOutputStream) dataOut).getChannel().force(true);
+      }
+    }
+  }
+
+  public void truncateBlock(long newBlockLen)
+      throws IOException {
+    if (newBlockLen == 0) {
+      // Special case for truncating to 0 length, since there's no previous
+      // chunk.
+      RandomAccessFile blockRAF = new RandomAccessFile(blockFile, "rw");
+      try {
+        // truncate blockFile
+        blockRAF.setLength(BlockInlineChecksumReader.getHeaderSize());
+      } finally {
+        blockRAF.close();
+      }
+      return;
+    }
+
+    DataChecksum dcs = DataChecksum.newDataChecksum(this.checksumType, this.bytesPerChecksum);
+    this.checksumSize = dcs.getChecksumSize();
+
+    long newBlockFileSize = BlockInlineChecksumReader
+        .getFileLengthFromBlockSize(newBlockLen, bytesPerChecksum, checksumSize);
+
+    int lastchunksize = (int) (newBlockLen % bytesPerChecksum);
+
+    RandomAccessFile blockRAF = new RandomAccessFile(blockFile, "rw");
+    try {
+      // truncate blockFile
+      blockRAF.setLength(newBlockFileSize);
+
+      if (lastchunksize != 0) {
+        // Calculate last partial checksum.
+        long lastchunkoffset = BlockInlineChecksumReader.getPosFromBlockOffset(
+            newBlockLen - lastchunksize, bytesPerChecksum, checksumSize);
+
+        byte[] b = new byte[Math.max(lastchunksize, checksumSize)];
+
+        // read last chunk
+        blockRAF.seek(lastchunkoffset);
+        blockRAF.readFully(b, 0, lastchunksize);
+
+        // compute checksum
+        dcs.update(b, 0, lastchunksize);
+        dcs.writeValue(b, 0, false);
+
+        blockRAF.seek(newBlockFileSize - checksumSize);
+        blockRAF.write(b, 0, checksumSize);
+      }
+    } finally {
+      blockRAF.close();
+    }
+  }
+
+  @Override
+  public void close() throws IOException {
+    IOException ioe = null;
+    // close block file
+    try {
+      try {
+        flush(datanode.syncOnClose);
+      } finally {
+        if (dataOut != null) {
+          dataOut.close();
+          dataOut = null;
+        }
+      }
+    } catch (IOException e) {
+      ioe = e;
+    }
+
+    // disk check
+    // We don't check disk for ClosedChannelException as close() can be
+    // called twice and it is possible that out.close() throws.
+    // No need to check or recheck disk then.
+    //
+    if (ioe != null) {
+      if (!(ioe instanceof ClosedChannelException)) {
+        datanode.checkDiskError(ioe);
+      }
+      throw ioe;
+    }
+  }
+  
+  static public String getInlineChecksumFileName(Block block, int checksumType,
+      int bytesPerChecksum) {
+    assert checksumType != DataChecksum.CHECKSUM_UNKNOWN;
+    return block.getBlockName() + "_" + block.getGenerationStamp() + "_"
+        + FSDataset.FORMAT_VERSION_INLINECHECKSUM + "_" + checksumType + "_"
+        + bytesPerChecksum;
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java
index db7458d3..d44e74a4 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java
@@ -34,10 +34,13 @@
  * BlockMetadataHeader manages metadata for data blocks on Datanodes.
  * This is not related to the Block related functionality in Namenode.
  * The biggest part of data block metadata is CRC for the block.
+ * 
+ * metafile is only used for non-inline checksum blocks, so this class
+ * should never be used if operating inline checksum.
  */
 public class BlockMetadataHeader {
 
-  static final short METADATA_VERSION = FSDataset.METADATA_VERSION;
+  static final short METADATA_VERSION = FSDataset.FORMAT_VERSION_NON_INLINECHECKSUM;
   
   /**
    * Header includes everything except the checksum(s) themselves.
@@ -141,11 +144,12 @@ static void writeHeader(DataOutputStream out, DataChecksum checksum)
                          throws IOException {
     writeHeader(out, new BlockMetadataHeader(METADATA_VERSION, checksum));
   }
-
+  
+  
   /**
    * Returns the size of the header
    */
-  static int getHeaderSize() {
+  public static int getHeaderSize() {
     return Short.SIZE/Byte.SIZE + DataChecksum.getChecksumHeaderSize();
   }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
index ea700514..6989e8a3 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
@@ -61,9 +61,6 @@ class BlockReceiver implements java.io.Closeable, FSConstants {
   protected boolean finalized;
   private DataInputStream in = null; // from where data are read
   private DataChecksum checksum; // from where chunks of a block can be read
-  private OutputStream out = null; // to block file at local disk
-  private OutputStream cout = null; // output stream for cehcksum file
-  private DataOutputStream checksumOut = null; // to crc file at local disk
   private int bytesPerChecksum;
   private int checksumSize;
   private ByteBuffer buf; // contains one full packet.
@@ -76,15 +73,15 @@ class BlockReceiver implements java.io.Closeable, FSConstants {
   private DataOutputStream mirrorOut;
   private Daemon responder = null;
   private DataTransferThrottler throttler;
-  private FSDataset.BlockWriteStreams streams;
   private ReplicaBeingWritten replicaBeingWritten;
   private boolean isRecovery = false;
   private String clientName;
   DatanodeInfo srcDataNode = null;
-  private Checksum partialCrc = null;
   private DataNode datanode = null;
   volatile private boolean mirrorError;
   private int namespaceId;
+  private DatanodeBlockWriter blockWriter;
+  
 
   BlockReceiver(int namespaceId, Block block, DataInputStream in, String inAddr,
                 String myAddr, boolean isRecovery, String clientName, 
@@ -106,16 +103,14 @@ class BlockReceiver implements java.io.Closeable, FSConstants {
       //
       // Open local disk out
       //
-      streams = datanode.data.writeToBlock(namespaceId, this.block, isRecovery,
-                              clientName == null || clientName.length() == 0);
+      blockWriter = datanode.data.writeToBlock(namespaceId, this.block,
+          isRecovery, clientName == null || clientName.length() == 0,
+          checksum.getChecksumType(), checksum.getBytesPerChecksum());
       replicaBeingWritten = datanode.data.getReplicaBeingWritten(namespaceId, this.block);
       this.finalized = false;
-      if (streams != null) {
-        this.out = streams.dataOut;
-        this.cout = streams.checksumOut;
-        this.checksumOut = new DataOutputStream(new BufferedOutputStream(
-                                                  streams.checksumOut, 
-                                                  SMALL_BUFFER_SIZE));
+      if (blockWriter != null) {
+        blockWriter.initializeStreams(bytesPerChecksum, checksumSize, block,
+            inAddr, namespaceId, datanode);
         // If this block is for appends, then remove it from periodic
         // validation.
         if (datanode.blockScanner != null && isRecovery) {
@@ -146,45 +141,8 @@ class BlockReceiver implements java.io.Closeable, FSConstants {
    * close files.
    */
   public void close() throws IOException {
-
-    IOException ioe = null;
-    // close checksum file
-    try {
-      if (checksumOut != null) {
-        checksumOut.flush();
-        if (datanode.syncOnClose && (cout instanceof FileOutputStream)) {
-          ((FileOutputStream)cout).getChannel().force(true);
-        }
-        checksumOut.close();
-        checksumOut = null;
-      }
-    } catch(IOException e) {
-      ioe = e;
-    }
-    // close block file
-    try {
-      if (out != null) {
-        out.flush();
-        if (datanode.syncOnClose && (out instanceof FileOutputStream)) {
-          ((FileOutputStream)out).getChannel().force(true);
-        }
-        out.close();
-        out = null;
-      }
-    } catch (IOException e) {
-      ioe = e;
-    }
-    
-    // disk check
-    // We don't check disk for ClosedChannelException as close() can be
-    // called twice and it is possible that out.close() throws.
-    // No need to check or recheck disk then.
-    //
-    if (ioe != null) {
-      if (!(ioe instanceof ClosedChannelException)) {
-        datanode.checkDiskError(ioe);
-      }
-      throw ioe;
+    if (blockWriter != null) {
+      blockWriter.close();
     }
   }
 
@@ -194,18 +152,7 @@ public void close() throws IOException {
    * @throws IOException
    */
   void flush(boolean forceSync) throws IOException {
-    if (checksumOut != null) {
-      checksumOut.flush();
-      if (forceSync && (cout instanceof FileOutputStream)) {
-  ((FileOutputStream)cout).getChannel().force(true);
-       }
-    }
-    if (out != null) {
-      out.flush();
-      if (forceSync && (out instanceof FileOutputStream)) {
-        ((FileOutputStream)out).getChannel().force(true);
-       }
-    }
+    blockWriter.flush(forceSync);
   }
 
   /**
@@ -486,9 +433,11 @@ private int receivePacket() throws IOException {
       setBlockPosition(offsetInBlock);  // adjust file position
       
       offsetInBlock += len;
+      this.replicaBeingWritten.setBytesReceived(offsetInBlock);
 
-      int checksumLen = ((len + bytesPerChecksum - 1)/bytesPerChecksum)*
-                                                            checksumSize;
+      int numChunks = ((len + bytesPerChecksum - 1)/bytesPerChecksum);
+
+      int checksumLen = numChunks * checksumSize;
 
       if ( buf.remaining() != (checksumLen + len)) {
         throw new IOException("Data remaining in packet does not match " +
@@ -514,33 +463,16 @@ private int receivePacket() throws IOException {
       try {
         if (!finalized) {
           long writeStartTime = System.currentTimeMillis();
-          //finally write to the disk :
-          out.write(pktBuf, dataOff, len);
-
-          // If this is a partial chunk, then verify that this is the only
-          // chunk in the packet. Calculate new crc for this chunk.
-          if (partialCrc != null) {
-            if (len > bytesPerChecksum) {
-              throw new IOException("Got wrong length during writeBlock(" + 
-                                    block + ") from " + inAddr + " " +
-                                    "A packet can have only one partial chunk."+
-                                    " len = " + len + 
-                                    " bytesPerChecksum " + bytesPerChecksum);
-            }
-            partialCrc.update(pktBuf, dataOff, len);
-            byte[] buf = FSOutputSummer.convertToByteStream(partialCrc, checksumSize);
-            checksumOut.write(buf);
-            LOG.debug("Writing out partial crc for data len " + len);
-            partialCrc = null;
-          } else {
-            checksumOut.write(pktBuf, checksumOff, checksumLen);
-          }
+          
+          blockWriter.writePacket(pktBuf, len, dataOff,
+              checksumOff, numChunks);
+          
           datanode.myMetrics.bytesWritten.inc(len);
 
           /// flush entire packet before sending ack
           flush(forceSync);
-
           this.replicaBeingWritten.setBytesOnDisk(offsetInBlock);
+
           // Record time taken to write packet
           long writePacketDuration = System.currentTimeMillis() - writeStartTime;
           datanode.myMetrics.writePacketLatency.inc(writePacketDuration);
@@ -596,7 +528,7 @@ long receiveBlock(
     try {
       // write data chunk header
       if (!finalized) {
-        BlockMetadataHeader.writeHeader(checksumOut, checksum);
+        blockWriter.writeHeader(checksum);
       }
       if (clientName.length() > 0) {
         responder = new Daemon(datanode.threadGroup, 
@@ -695,91 +627,10 @@ private void setBlockPosition(long offsetInBlock) throws IOException {
       }
       return;
     }
-
-    if (datanode.data.getChannelPosition(namespaceId, block, streams) == offsetInBlock) {
-      return;                   // nothing to do 
-    }
-    long offsetInChecksum = BlockMetadataHeader.getHeaderSize() +
-                            offsetInBlock / bytesPerChecksum * checksumSize;
-    if (out != null) {
-     out.flush();
-    }
-    if (checksumOut != null) {
-      checksumOut.flush();
-    }
-
-    // If this is a partial chunk, then read in pre-existing checksum
-    if (offsetInBlock % bytesPerChecksum != 0) {
-      LOG.info("setBlockPosition trying to set position to " +
-               offsetInBlock +
-               " for block " + block +
-               " which is not a multiple of bytesPerChecksum " +
-               bytesPerChecksum);
-      computePartialChunkCrc(offsetInBlock, offsetInChecksum, bytesPerChecksum);
-    }
-
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("Changing block file offset of block " + block + " from " + 
-        datanode.data.getChannelPosition(namespaceId, block, streams) +
-             " to " + offsetInBlock +
-             " meta file offset to " + offsetInChecksum);
-    }
-
-    // set the position of the block file
-    datanode.data.setChannelPosition(namespaceId, block, streams, offsetInBlock, offsetInChecksum);
+    blockWriter.setPosAndRecomputeChecksumIfNeeded(offsetInBlock, checksum);
   }
 
-  /**
-   * reads in the partial crc chunk and computes checksum
-   * of pre-existing data in partial chunk.
-   */
-  private void computePartialChunkCrc(long blkoff, long ckoff, 
-                                      int bytesPerChecksum) throws IOException {
-
-    // find offset of the beginning of partial chunk.
-    //
-    int sizePartialChunk = (int) (blkoff % bytesPerChecksum);
-    int checksumSize = checksum.getChecksumSize();
-    blkoff = blkoff - sizePartialChunk;
-    LOG.info("computePartialChunkCrc sizePartialChunk " + 
-              sizePartialChunk +
-              " block " + block +
-              " offset in block " + blkoff +
-              " offset in metafile " + ckoff);
-
-    // create an input stream from the block file
-    // and read in partial crc chunk into temporary buffer
-    //
-    byte[] buf = new byte[sizePartialChunk];
-    byte[] crcbuf = new byte[checksumSize];
-    FSDataset.BlockInputStreams instr = null;
-    try { 
-      instr = datanode.data.getTmpInputStreams(namespaceId, block, blkoff, ckoff);
-      IOUtils.readFully(instr.dataIn, buf, 0, sizePartialChunk);
-
-      // open meta file and read in crc value computer earlier
-      IOUtils.readFully(instr.checksumIn, crcbuf, 0, crcbuf.length);
-    } finally {
-      IOUtils.closeStream(instr);
-    }
-
-    // compute crc of partial chunk from data read in the block file.
-    partialCrc = new CRC32();
-    partialCrc.update(buf, 0, sizePartialChunk);
-    LOG.info("Read in partial CRC chunk from disk for block " + block);
 
-    // paranoia! verify that the pre-computed crc matches what we
-    // recalculated just now
-    if (partialCrc.getValue() != FSInputChecker.checksum2long(crcbuf)) {
-      String msg = "Partial CRC " + partialCrc.getValue() +
-                   " does not match value computed the " +
-                   " last time file was closed " +
-                   FSInputChecker.checksum2long(crcbuf);
-      throw new IOException(msg);
-    }
-    //LOG.debug("Partial CRC matches 0x" + 
-    //            Long.toHexString(partialCrc.getValue()));
-  }
   
   
   /**
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
index 08dc3415..da71ee65 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
@@ -34,6 +34,7 @@
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.server.datanode.DatanodeBlockReader.BlockInputStreamFactory;
 import org.apache.hadoop.hdfs.util.DataTransferThrottler;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.net.SocketOutputStream;
@@ -41,6 +42,7 @@
 import org.apache.hadoop.util.DataChecksum;
 import org.apache.hadoop.util.Progressable;
 import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.hdfs.server.datanode.BlockWithChecksumFileReader.InputStreamWithChecksumFactory;
 
 /**
  * Reads a block from the disk and sends it to a recipient.
@@ -49,28 +51,21 @@ public class BlockSender implements java.io.Closeable, FSConstants {
   public static final Log LOG = DataNode.LOG;
   static final Log ClientTraceLog = DataNode.ClientTraceLog;
   
-  private int namespaceId;
-  private Block block; // the block to read from
-  private InputStream blockIn; // data stream
-  private long blockInPosition = -1; // updated while using transferTo().
-  private DataInputStream checksumIn; // checksum datastream
   private DataChecksum checksum; // checksum stream
   private long offset; // starting position to read
   private long endOffset; // ending position
   private long blockLength;
   private int bytesPerChecksum; // chunk size
   private int checksumSize; // checksum size
-  private boolean corruptChecksumOk; // if need to verify checksum
   private boolean chunkOffsetOK; // if need to send chunk offset
   private long seqno; // sequence number of packet
-  private boolean ignoreChecksum = false;
 
   private boolean transferToAllowed = true;
   private boolean blockReadFully; //set when the whole block is read
   private boolean verifyChecksum; //if true, check is verified while reading
   private DataTransferThrottler throttler;
   private String clientTraceFmt; // format of client trace log message
-  private MemoizedBlock memoizedBlock;
+  private DatanodeBlockReader blockReader;
 
   /**
    * Minimum buffer used while sending data to clients. Used only if
@@ -94,85 +89,79 @@ public class BlockSender implements java.io.Closeable, FSConstants {
     
     long blockLength = datanode.data.getVisibleLength(namespaceId, block);
     boolean transferToAllowed = datanode.transferToAllowed;
-    this.ignoreChecksum = ignoreChecksum;
     
-    InputStreamFactory streamFactory = new BlockInputStreamFactory(namespaceId, block, datanode.data);
-    DataInputStream metadataIn = null;
-    if (!ignoreChecksum) {
-      try {
-        metadataIn = new DataInputStream(new BufferedInputStream(
-            datanode.data.getMetaDataInputStream(namespaceId, block),
-            BUFFER_SIZE));
-      } catch (IOException e) {
-        if (!corruptChecksumOk
-            || datanode.data.metaFileExists(namespaceId, block)) {
-          throw e;
-        }
-        metadataIn = null;
-      }
-    }
+    DatanodeBlockReader.BlockInputStreamFactory streamFactory =
+        new DatanodeBlockReader.BlockInputStreamFactory(
+          namespaceId, block, datanode.data, ignoreChecksum, verifyChecksum,
+          corruptChecksumOk);
+    blockReader = streamFactory.getBlockReader();
+
     initialize(namespaceId, block, blockLength, startOffset, length,
         corruptChecksumOk, chunkOffsetOK, verifyChecksum, transferToAllowed,
-        metadataIn, streamFactory, clientTraceFmt);
+         streamFactory, clientTraceFmt);
+  }
+
+  /**
+   * This consturcotr is only for backward compatibility and will be removed
+   * after new data nodes are rolled out everywhere.
+   * 
+   */
+  public BlockSender(int namespaceId, Block block, long blockLength,
+      long startOffset, long length, boolean corruptChecksumOk,
+      boolean chunkOffsetOK, boolean verifyChecksum, boolean transferToAllowed,
+      final DataInputStream metadataIn,
+      final InputStreamFactory streamFactory)
+      throws IOException {
+    this(namespaceId, block, blockLength, startOffset, length,
+        corruptChecksumOk, chunkOffsetOK, verifyChecksum, transferToAllowed,
+        new BlockWithChecksumFileReader.InputStreamWithChecksumFactory() {
+          @Override
+          public InputStream createStream(long offset) throws IOException {
+            // we are passing 0 as the offset above,
+            // so we can safely ignore
+            // the offset passed
+            return streamFactory.createStream(offset);
+          }
+
+          @Override
+          public DataInputStream getChecksumStream() throws IOException {
+            return metadataIn;
+          }
+        });
   }
   
   public BlockSender(int namespaceId, Block block, long blockLength, long startOffset, long length,
               boolean corruptChecksumOk, boolean chunkOffsetOK,
               boolean verifyChecksum, boolean transferToAllowed,
-              DataInputStream metadataIn, InputStreamFactory streamFactory
+              BlockWithChecksumFileReader.InputStreamWithChecksumFactory streamFactory
               ) throws IOException {
+    blockReader = new BlockWithChecksumFileReader(
+        namespaceId, block, null, false, verifyChecksum,
+        corruptChecksumOk, streamFactory);
+
     initialize(namespaceId, block, blockLength, startOffset, length,
          corruptChecksumOk, chunkOffsetOK, verifyChecksum, transferToAllowed,
-         metadataIn, streamFactory, null);
+         streamFactory, null);
   }
 
   private void initialize(int namespaceId, Block block, long blockLength,
       long startOffset, long length, boolean corruptChecksumOk,
       boolean chunkOffsetOK, boolean verifyChecksum, boolean transferToAllowed,
-      DataInputStream metadataIn, InputStreamFactory streamFactory,
-      String clientTraceFmt) throws IOException {
+      BlockWithChecksumFileReader.InputStreamWithChecksumFactory streamFactory, String clientTraceFmt)
+      throws IOException {
     try {
-      this.namespaceId = namespaceId;
-      this.block = block;
       this.chunkOffsetOK = chunkOffsetOK;
-      this.corruptChecksumOk = corruptChecksumOk;
       this.verifyChecksum = verifyChecksum;
       this.blockLength = blockLength;
       this.transferToAllowed = transferToAllowed;
       this.clientTraceFmt = clientTraceFmt;
 
-      if ( !corruptChecksumOk || metadataIn != null) {
-        this.checksumIn = metadataIn;
-
-        // read and handle the common header here. For now just a version
-       BlockMetadataHeader header = BlockMetadataHeader.readHeader(checksumIn);
-       short version = header.getVersion();
-
-        if (version != FSDataset.METADATA_VERSION) {
-          LOG.warn("Wrong version (" + version + ") for metadata file for "
-              + block + " ignoring ...");
-        }
-        checksum = header.getChecksum();
-      } else {
-        if (!ignoreChecksum) {
-          LOG.warn("Could not find metadata file for " + block);
-        }
-        // This only decides the buffer size. Use BUFFER_SIZE?
-        checksum = DataChecksum.newDataChecksum(DataChecksum.CHECKSUM_NULL,
-            16 * 1024);
-      }
-
-      /* If bytesPerChecksum is very large, then the metadata file
-       * is mostly corrupted. For now just truncate bytesPerchecksum to
-       * blockLength.
-       */        
-      bytesPerChecksum = checksum.getBytesPerChecksum();
-      if (bytesPerChecksum > 10*1024*1024 && bytesPerChecksum > blockLength){
-        checksum = DataChecksum.newDataChecksum(checksum.getChecksumType(),
-                                   Math.max((int)blockLength, 10*1024*1024));
-        bytesPerChecksum = checksum.getBytesPerChecksum();        
-      }
-      checksumSize = checksum.getChecksumSize();
+      
+      checksum = blockReader.getChecksumToSend(blockLength);
+      
+      bytesPerChecksum = blockReader.getBytesPerChecksum();
+      checksumSize = blockReader.getChecksumSize();
+      
 
       if (length < 0) {
         length = blockLength;
@@ -200,22 +189,11 @@ private void initialize(int namespaceId, Block block, long blockLength,
         }
       }
 
-      // seek to the right offsets
-      if (offset > 0) {
-        long checksumSkip = (offset / bytesPerChecksum) * checksumSize;
-        // note blockInStream is  seeked when created below
-        if (checksumSkip > 0) {
-          // Should we use seek() for checksum file as well?
-          IOUtils.skipFully(checksumIn, checksumSkip);
-        }
-      }
       seqno = 0;
       
-      blockIn = streamFactory.createStream(offset);
-      memoizedBlock = new MemoizedBlock(blockIn, blockLength, streamFactory, block);
+      blockReader.initializeStream(offset, blockLength);
     } catch (IOException ioe) {
       IOUtils.closeStream(this);
-      IOUtils.closeStream(blockIn);
       throw ioe;
     }
   }
@@ -224,28 +202,8 @@ private void initialize(int namespaceId, Block block, long blockLength,
    * close opened files.
    */
   public void close() throws IOException {
-    IOException ioe = null;
-    // close checksum file
-    if(checksumIn!=null) {
-      try {
-        checksumIn.close();
-      } catch (IOException e) {
-        ioe = e;
-      }
-      checksumIn = null;
-    }
-    // close data file
-    if(blockIn!=null) {
-      try {
-        blockIn.close();
-      } catch (IOException e) {
-        ioe = e;
-      }
-      blockIn = null;
-    }
-    // throw IOException if there is any
-    if(ioe!= null) {
-      throw ioe;
+    if (blockReader != null) {
+      blockReader.close();
     }
   }
 
@@ -255,7 +213,7 @@ public void close() throws IOException {
    * was a socket error rather than often more serious exceptions like 
    * disk errors.
    */
-  private static IOException ioeToSocketException(IOException ioe) {
+  static IOException ioeToSocketException(IOException ioe) {
     if (ioe.getClass().equals(IOException.class)) {
       // "se" could be a new class in stead of SocketException.
       IOException se = new SocketException("Original Exception : " + ioe);
@@ -309,107 +267,15 @@ private int sendChunks(ByteBuffer pkt, int maxChunks, OutputStream out)
     pkt.putInt(len);
     
     int checksumOff = pkt.position();
-    int checksumLen = numChunks * checksumSize;
     byte[] buf = pkt.array();
     
-    if (checksumSize > 0 && checksumIn != null) {
-      try {
-        checksumIn.readFully(buf, checksumOff, checksumLen);
-      } catch (IOException e) {
-        LOG.warn(" Could not read or failed to veirfy checksum for data" +
-                 " at offset " + offset + " for block " + block + " got : "
-                 + StringUtils.stringifyException(e));
-        IOUtils.closeStream(checksumIn);
-        checksumIn = null;
-        if (corruptChecksumOk) {
-          if (checksumOff < checksumLen) {
-            // Just fill the array with zeros.
-            Arrays.fill(buf, checksumOff, checksumLen, (byte) 0);
-          }
-        } else {
-          throw e;
-        }
-      }
-    }
-    
-    int dataOff = checksumOff + checksumLen;
+    blockReader.sendChunks(out, buf, offset, checksumOff,
+        numChunks, len);
     
-    if (blockInPosition < 0) {
-      //normal transfer
-      IOUtils.readFully(blockIn, buf, dataOff, len);
-
-      if (verifyChecksum) {
-        int dOff = dataOff;
-        int cOff = checksumOff;
-        int dLeft = len;
-
-        for (int i=0; i<numChunks; i++) {
-          checksum.reset();
-          int dLen = Math.min(dLeft, bytesPerChecksum);
-          checksum.update(buf, dOff, dLen);
-          if (!checksum.compare(buf, cOff)) {
-            throw new ChecksumException("Checksum failed at " + 
-                                        (offset + len - dLeft), len);
-          }
-          dLeft -= dLen;
-          dOff += dLen;
-          cOff += checksumSize;
-        }
-      }
-      
-      // only recompute checksum if we can't trust the meta data due to 
-      // concurrent writes
-      if (memoizedBlock.hasBlockChanged(len)) {
-        ChecksumUtil.updateChunkChecksum(
-          buf, checksumOff, dataOff, len, checksum
-        );
-      }
-      
-      try {
-        out.write(buf, 0, dataOff + len);
-      } catch (IOException e) {
-        throw ioeToSocketException(e);
-      }
-    } else {
-      try {
-        //use transferTo(). Checks on out and blockIn are already done. 
-        SocketOutputStream sockOut = (SocketOutputStream) out;
-        FileChannel fileChannel = ((FileInputStream) blockIn).getChannel();
-
-        if (memoizedBlock.hasBlockChanged(len)) {
-          fileChannel.position(blockInPosition);
-          IOUtils.readFileChannelFully(
-            fileChannel,
-            buf,
-            dataOff,
-            len
-          );
-          
-          ChecksumUtil.updateChunkChecksum(
-            buf, checksumOff, dataOff, len, checksum
-          );          
-          sockOut.write(buf, 0, dataOff + len);
-        } else {
-          //first write the packet
-          sockOut.write(buf, 0, dataOff);
-          // no need to flush. since we know out is not a buffered stream.
-          sockOut.transferToFully(fileChannel, blockInPosition, len);
-        }
-
-        blockInPosition += len;
-
-      } catch (IOException e) {
-      /* exception while writing to the client (well, with transferTo(),
-       * it could also be while reading from the local file).
-       */
-        throw ioeToSocketException(e);
-      }
-    }
-
     if (throttler != null) { // rebalancing so throttle
       throttler.throttle(packetLen);
     }
-
+    
     return len;
   }
 
@@ -473,12 +339,7 @@ public long sendBlock(DataOutputStream out, OutputStream baseStream,
       
       if (transferToAllowed && !verifyChecksum && 
           baseStream instanceof SocketOutputStream && 
-          blockIn instanceof FileInputStream) {
-        
-        FileChannel fileChannel = ((FileInputStream)blockIn).getChannel();
-        
-        // blockInPosition also indicates sendChunks() uses transferTo.
-        blockInPosition = fileChannel.position();
+          blockReader.prepareTransferTo()) {
         streamForSendChunks = baseStream;
         
         // assure a mininum buffer size.
@@ -536,78 +397,8 @@ public long sendBlock(DataOutputStream out, OutputStream baseStream,
   boolean isBlockReadFully() {
     return blockReadFully;
   }
-  
+
   public static interface InputStreamFactory {
     public InputStream createStream(long offset) throws IOException; 
   }
-  
-  private static class BlockInputStreamFactory implements InputStreamFactory {
-    private final int namespaceId;
-    private final Block block;
-    private final FSDatasetInterface data;
-
-    private BlockInputStreamFactory(int namespaceId, Block block, FSDatasetInterface data) {
-      this.namespaceId = namespaceId;
-      this.block = block;
-      this.data = data;
-    }
-
-    @Override
-    public InputStream createStream(long offset) throws IOException {
-      return data.getBlockInputStream(namespaceId, block, offset);
-    }
-    
-    public FSDatasetInterface getDataset() {
-      return this.data;
-    }
-  }
-
-  /**
-   * helper class used to track if a block's meta data is verifiable or not
-   */
-  private class MemoizedBlock {
-    // block data stream 
-    private InputStream inputStream;
-    //  visible block length
-    private long blockLength;
-    private final Block block;
-    private final InputStreamFactory isf;
-
-    private MemoizedBlock(
-      InputStream inputStream,
-      long blockLength,
-      InputStreamFactory isf,
-      Block block) {
-      this.inputStream = inputStream;
-      this.blockLength = blockLength;
-      this.isf = isf;
-      this.block = block;
-    }
-
-    // logic: if we are starting or ending on a partial chunk and the block
-    // has more data than we were told at construction, the block has 'changed'
-    // in a way that we care about (ie, we can't trust crc data) 
-    boolean hasBlockChanged(long dataLen) throws IOException {
-      // check if we are using transferTo since we tell if the file has changed
-      // (blockInPosition >= 0 => we are using transferTo and File Channels
-      if (BlockSender.this.blockInPosition >= 0) {
-        long currentLength = ((FileInputStream) inputStream).getChannel().size();
-        
-        return (blockInPosition % bytesPerChecksum != 0 || 
-            dataLen % bytesPerChecksum != 0) &&
-          currentLength > blockLength;
-
-      } else {
-        FSDatasetInterface ds = null;
-        if (isf instanceof BlockInputStreamFactory) {
-          ds = ((BlockInputStreamFactory)isf).getDataset();
-        }
-          
-        // offset is the offset into the block
-        return (BlockSender.this.offset % bytesPerChecksum != 0 || 
-            dataLen % bytesPerChecksum != 0) &&
-            ds != null && ds.getFinalizedBlockLength(namespaceId, block) > blockLength;
-      }
-    }
-  }
-}
+}
\ No newline at end of file
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockWithChecksumFileReader.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockWithChecksumFileReader.java
new file mode 100644
index 00000000..e322d6f9
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockWithChecksumFileReader.java
@@ -0,0 +1,449 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.FileChannel;
+import java.util.Arrays;
+
+import org.apache.hadoop.fs.ChecksumException;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.server.datanode.BlockSender.InputStreamFactory;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.net.SocketOutputStream;
+import org.apache.hadoop.util.ChecksumUtil;
+import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.StringUtils;
+
+/**
+ * Read from blocks with separate checksum files.
+ * Block file name:
+ * blk_(blockId)
+ * 
+ * Checksum file name:
+ * blk_(blockId)_(generation_stamp).meta
+ * 
+ * The on disk file format is:
+ * Data file keeps just data in the block:
+ * 
+ *  +---------------+
+ *  |               |
+ *  |     Data      |
+ *  |      .        |
+ *  |      .        |
+ *  |      .        |
+ *  |      .        |
+ *  |      .        |
+ *  |      .        |
+ *  |               |
+ *  +---------------+
+ *  
+ *  Checksum file:
+ *  +----------------------+
+ *  |   Checksum Header    |
+ *  +----------------------+
+ *  | Checksum for Chunk 1 |
+ *  +----------------------+
+ *  | Checksum for Chunk 2 |
+ *  +----------------------+
+ *  |          .           |
+ *  |          .           |
+ *  |          .           |
+ *  +----------------------+
+ *  |  Checksum for last   |
+ *  |   Chunk (Partial)    |
+ *  +----------------------+
+ * 
+ */
+public class BlockWithChecksumFileReader extends DatanodeBlockReader {
+  private InputStreamWithChecksumFactory streamFactory;
+  private DataInputStream checksumIn; // checksum datastream
+  private InputStream blockIn; // data stream
+  long blockInPosition = -1;
+  MemoizedBlock memoizedBlock;
+
+  BlockWithChecksumFileReader(int namespaceId, Block block,
+      FSDatasetInterface data, boolean ignoreChecksum, boolean verifyChecksum,
+      boolean corruptChecksumOk, InputStreamWithChecksumFactory streamFactory) throws IOException {
+    super(namespaceId, block, data, ignoreChecksum, verifyChecksum,
+        corruptChecksumOk);
+    this.streamFactory = streamFactory;
+    this.checksumIn = streamFactory.getChecksumStream();
+    this.block = block;
+  }
+  
+  private void initializeNullChecksum() {
+    checksumIn = null;
+    // This only decides the buffer size. Use BUFFER_SIZE?
+    checksum = DataChecksum.newDataChecksum(DataChecksum.CHECKSUM_NULL,
+        16 * 1024);
+  }
+
+  public DataChecksum getChecksumToSend(long blockLength) throws IOException {
+    if (!corruptChecksumOk || checksumIn != null) {
+
+      // read and handle the common header here. For now just a version
+      try {
+      BlockMetadataHeader header = BlockMetadataHeader.readHeader(checksumIn);
+      short version = header.getVersion();
+
+      if (version != FSDataset.FORMAT_VERSION_NON_INLINECHECKSUM) {
+        LOG.warn("Wrong version (" + version + ") for metadata file for "
+            + block + " ignoring ...");
+      }
+      checksum = header.getChecksum();
+      } catch (IOException ioe) {
+        if (blockLength == 0) {
+          initializeNullChecksum();
+        } else {
+          throw ioe;
+        }
+      }
+    } else {
+      LOG.warn("Could not find metadata file for " + block);
+      initializeNullChecksum();
+    }
+    super.getChecksumInfo(blockLength);
+    return checksum;
+
+  }
+
+  public void initializeStream(long offset, long blockLength)
+      throws IOException {
+    // seek to the right offsets
+    if (offset > 0) {
+      long checksumSkip = (offset / bytesPerChecksum) * checksumSize;
+      // note blockInStream is seeked when created below
+      if (checksumSkip > 0) {
+        // Should we use seek() for checksum file as well?
+        IOUtils.skipFully(checksumIn, checksumSkip);
+      }
+    }
+
+    blockIn = streamFactory.createStream(offset);
+    memoizedBlock = new MemoizedBlock(blockIn, blockLength, streamFactory,
+        block);
+  }
+
+  public boolean prepareTransferTo() throws IOException {
+    if (blockIn instanceof FileInputStream) {
+      FileChannel fileChannel = ((FileInputStream) blockIn).getChannel();
+
+      // blockInPosition also indicates sendChunks() uses transferTo.
+      blockInPosition = fileChannel.position();
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public void sendChunks(OutputStream out, byte[] buf, long offset,
+      int checksumOff, int numChunks, int len) throws IOException {
+    int checksumLen = numChunks * checksumSize;
+
+    if (checksumSize > 0 && checksumIn != null) {
+      try {
+        checksumIn.readFully(buf, checksumOff, checksumLen);
+      } catch (IOException e) {
+        LOG.warn(" Could not read or failed to veirfy checksum for data"
+            + " at offset " + offset + " for block " + block + " got : "
+            + StringUtils.stringifyException(e));
+        IOUtils.closeStream(checksumIn);
+        checksumIn = null;
+        if (corruptChecksumOk) {
+          if (checksumOff < checksumLen) {
+            // Just fill the array with zeros.
+            Arrays.fill(buf, checksumOff, checksumLen, (byte) 0);
+          }
+        } else {
+          throw e;
+        }
+      }
+    }
+
+    int dataOff = checksumOff + checksumLen;
+    
+    if (blockInPosition < 0) {
+      // normal transfer
+      IOUtils.readFully(blockIn, buf, dataOff, len);
+
+      if (verifyChecksum) {
+        int dOff = dataOff;
+        int cOff = checksumOff;
+        int dLeft = len;
+
+        for (int i = 0; i < numChunks; i++) {
+          checksum.reset();
+          int dLen = Math.min(dLeft, bytesPerChecksum);
+          checksum.update(buf, dOff, dLen);
+          if (!checksum.compare(buf, cOff)) {
+            throw new ChecksumException("Checksum failed at "
+                + (offset + len - dLeft), len);
+          }
+          dLeft -= dLen;
+          dOff += dLen;
+          cOff += checksumSize;
+        }
+      }
+
+      // only recompute checksum if we can't trust the meta data due to
+      // concurrent writes
+      if (memoizedBlock.hasBlockChanged(len, offset)) {
+        ChecksumUtil.updateChunkChecksum(buf, checksumOff, dataOff, len,
+            checksum);
+      }
+
+      try {
+        out.write(buf, 0, dataOff + len);
+      } catch (IOException e) {
+        throw BlockSender.ioeToSocketException(e);
+      }
+    } else {
+      try {
+        // use transferTo(). Checks on out and blockIn are already done.
+        SocketOutputStream sockOut = (SocketOutputStream) out;
+        FileChannel fileChannel = ((FileInputStream) blockIn).getChannel();
+
+        if (memoizedBlock.hasBlockChanged(len, offset)) {
+          fileChannel.position(blockInPosition);
+          IOUtils.readFileChannelFully(fileChannel, buf, dataOff, len);
+
+          ChecksumUtil.updateChunkChecksum(buf, checksumOff, dataOff, len,
+              checksum);
+          sockOut.write(buf, 0, dataOff + len);
+        } else {
+          // first write the packet
+          sockOut.write(buf, 0, dataOff);
+          // no need to flush. since we know out is not a buffered stream.
+          sockOut.transferToFully(fileChannel, blockInPosition, len);
+        }
+
+        blockInPosition += len;
+
+      } catch (IOException e) {
+        /*
+         * exception while writing to the client (well, with transferTo(), it
+         * could also be while reading from the local file).
+         */
+        throw BlockSender.ioeToSocketException(e);
+      }
+    }
+
+  }
+
+  public void close() throws IOException {
+    IOException ioe = null;
+
+    // close checksum file
+    if (checksumIn != null) {
+      try {
+        checksumIn.close();
+      } catch (IOException e) {
+        ioe = e;
+      }
+      checksumIn = null;
+    }
+    // close data file
+    if (blockIn != null) {
+      try {
+        blockIn.close();
+      } catch (IOException e) {
+        ioe = e;
+      }
+      blockIn = null;
+    }
+    // throw IOException if there is any
+    if (ioe != null) {
+      throw ioe;
+    }
+  }
+
+  /**
+   * helper class used to track if a block's meta data is verifiable or not
+   */
+  class MemoizedBlock {
+    // block data stream
+    private InputStream inputStream;
+    // visible block length
+    private long blockLength;
+    private final Block block;
+    private final InputStreamWithChecksumFactory isf;
+
+    private MemoizedBlock(InputStream inputStream, long blockLength,
+        InputStreamWithChecksumFactory isf, Block block) {
+      this.inputStream = inputStream;
+      this.blockLength = blockLength;
+      this.isf = isf;
+      this.block = block;
+    }
+
+    // logic: if we are starting or ending on a partial chunk and the block
+    // has more data than we were told at construction, the block has 'changed'
+    // in a way that we care about (ie, we can't trust crc data)
+    boolean hasBlockChanged(long dataLen, long offset) throws IOException {
+      // check if we are using transferTo since we tell if the file has changed
+      // (blockInPosition >= 0 => we are using transferTo and File Channels
+      if (blockInPosition >= 0) {
+        long currentLength = ((FileInputStream) inputStream).getChannel()
+            .size();
+
+        return (blockInPosition % bytesPerChecksum != 0 || dataLen
+            % bytesPerChecksum != 0)
+            && currentLength > blockLength;
+
+      } else {
+        FSDatasetInterface ds = null;
+        if (isf instanceof DatanodeBlockReader.BlockInputStreamFactory) {
+          ds = ((DatanodeBlockReader.BlockInputStreamFactory) isf).getDataset();
+        }
+
+        // offset is the offset into the block
+        return (offset % bytesPerChecksum != 0 || dataLen % bytesPerChecksum != 0)
+            && ds != null
+            && ds.getOnDiskLength(namespaceId, block) > blockLength;
+      }
+    }
+  }
+  
+  public static interface InputStreamWithChecksumFactory extends
+      BlockSender.InputStreamFactory {
+    public DataInputStream getChecksumStream() throws IOException; 
+  }
+
+  /** Find the metadata file for the specified block file.
+   * Return the generation stamp from the name of the metafile.
+   */
+  static long getGenerationStampFromSeperateChecksumFile(String[] listdir, String blockName) {
+    for (int j = 0; j < listdir.length; j++) {
+      String path = listdir[j];
+      if (!path.startsWith(blockName)) {
+        continue;
+      }
+      String[] vals = StringUtils.split(path, '_');
+      if (vals.length != 3) {     // blk, blkid, genstamp.meta
+        continue;
+      }
+      String[] str = StringUtils.split(vals[2], '.');
+      if (str.length != 2) {
+        continue;
+      }
+      return Long.parseLong(str[0]);
+    }
+    DataNode.LOG.warn("Block " + blockName +
+                      " does not have a metafile!");
+    return Block.GRANDFATHER_GENERATION_STAMP;
+  }
+  
+
+  /**
+   * Find generation stamp from block file and meta file.
+   * @param blockFile
+   * @param metaFile
+   * @return
+   * @throws IOException
+   */
+  static long parseGenerationStampInMetaFile(File blockFile, File metaFile
+      ) throws IOException {
+    String metaname = metaFile.getName();
+    String gs = metaname.substring(blockFile.getName().length() + 1,
+        metaname.length() - FSDataset.METADATA_EXTENSION.length());
+    try {
+      return Long.parseLong(gs);
+    } catch(NumberFormatException nfe) {
+      throw (IOException)new IOException("blockFile=" + blockFile
+          + ", metaFile=" + metaFile).initCause(nfe);
+    }
+  }
+
+  /**
+   * This class provides the input stream and length of the metadata
+   * of a block
+   *
+   */
+  static class MetaDataInputStream extends FilterInputStream {
+    MetaDataInputStream(InputStream stream, long len) {
+      super(stream);
+      length = len;
+    }
+    private long length;
+    
+    public long getLength() {
+      return length;
+    }
+  }
+  
+  static protected File getMetaFile(FSDatasetInterface dataset, int namespaceId,
+      Block b) throws IOException {
+    return BlockWithChecksumFileWriter.getMetaFile(dataset.getBlockFile(namespaceId, b), b);
+  }
+  
+  /**
+   * Does the meta file exist for this block?
+   * @param namespaceId - parent namespace id
+   * @param b - the block
+   * @return true of the metafile for specified block exits
+   * @throws IOException
+   */
+  static public boolean metaFileExists(FSDatasetInterface dataset, int namespaceId, Block b) throws IOException {
+    return getMetaFile(dataset, namespaceId, b).exists();
+  }
+
+  /**
+   * Returns metaData of block b as an input stream (and its length)
+   * @param namespaceId - parent namespace id
+   * @param b - the block
+   * @return the metadata input stream; 
+   * @throws IOException
+   */
+  static public MetaDataInputStream getMetaDataInputStream(
+      FSDatasetInterface dataset, int namespace, Block b) throws IOException {
+    File checksumFile = getMetaFile(dataset, namespace, b);
+    return new MetaDataInputStream(new FileInputStream(checksumFile),
+                                                    checksumFile.length());
+  }
+  
+  static byte[] getMetaData(FSDatasetInterface dataset, int namespaceId,
+      Block block) throws IOException {
+    MetaDataInputStream checksumIn = null;
+    try {
+      checksumIn = getMetaDataInputStream(dataset, namespaceId, block);
+
+      long fileSize = checksumIn.getLength();
+
+      if (fileSize >= 1L << 31 || fileSize <= 0) {
+        throw new IOException("Unexpected size for checksumFile of block"
+            + block);
+      }
+
+      byte[] buf = new byte[(int) fileSize];
+      IOUtils.readFully(checksumIn, buf, 0, buf.length);
+      return buf;
+    } finally {
+      IOUtils.closeStream(checksumIn);
+    }
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockWithChecksumFileWriter.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockWithChecksumFileWriter.java
new file mode 100644
index 00000000..3491234f
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockWithChecksumFileWriter.java
@@ -0,0 +1,459 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.BufferedOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.nio.channels.ClosedChannelException;
+import java.util.Arrays;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
+
+import org.apache.hadoop.fs.FSInputChecker;
+import org.apache.hadoop.fs.FSOutputSummer;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.PureJavaCrc32;
+
+/** 
+ * Write data into block file and checksum into a separate checksum files.   
+ * 
+ * The on disk file format is:  
+ * Data file:   
+ *  
+ *  +---------------+   
+ *  |               |   
+ *  |     Data      |   
+ *  |      .        |   
+ *  |      .        |   
+ *  |      .        |   
+ *  |      .        |   
+ *  |      .        |   
+ *  |      .        |   
+ *  |               |   
+ *  +---------------+   
+ *      
+ *  Checksum file:  
+ *  +----------------------+   
+ *  |   Checksum Header    |   
+ *  +----------------------+    
+ *  | Checksum for Chunk 1 |    
+ *  +----------------------+    
+ *  | Checksum for Chunk 2 |    
+ *  +----------------------+    
+ *  |          .           |    
+ *  |          .           |    
+ *  |          .           |    
+ *  +----------------------+    
+ *  |  Checksum for last   |    
+ *  |   Chunk (Partial)    |    
+ *  +----------------------+    
+ *  
+ */
+public class BlockWithChecksumFileWriter extends DatanodeBlockWriter {
+  File blockFile, metafile;
+
+  protected OutputStream dataOut = null; // to block file at local disk
+  protected DataOutputStream checksumOut = null; // to crc file at local disk
+  protected OutputStream cout = null; // output stream for checksum file
+  protected Checksum partialCrc = null;
+
+  public BlockWithChecksumFileWriter(File blockFile, File metafile) {
+    this.blockFile = blockFile;
+    this.metafile = metafile;
+  }
+
+  public void initializeStreams(int bytesPerChecksum, int checksumSize,
+      Block block, String inAddr, int namespaceId, DataNode datanode)
+      throws FileNotFoundException, IOException {
+    if (this.dataOut == null) {
+      this.dataOut = new FileOutputStream(
+          new RandomAccessFile(blockFile, "rw").getFD());
+    }
+    if (this.cout == null) {
+      this.cout = new FileOutputStream(
+          new RandomAccessFile(metafile, "rw").getFD());
+    }
+    checksumOut = new DataOutputStream(new BufferedOutputStream(cout,
+        FSConstants.SMALL_BUFFER_SIZE));
+
+    setParameters(bytesPerChecksum, checksumSize, block, inAddr, namespaceId,
+        datanode);
+  }
+
+  @Override
+  public void writeHeader(DataChecksum checksum) throws IOException {
+    BlockMetadataHeader.writeHeader(checksumOut, checksum);
+  }
+
+  @Override
+  public void writePacket(byte pktBuf[], int len, int dataOff, int checksumOff,
+      int numChunks) throws IOException {
+    // finally write to the disk :
+    dataOut.write(pktBuf, dataOff, len);
+
+    // If this is a partial chunk, then verify that this is the only
+    // chunk in the packet. Calculate new crc for this chunk.
+    if (partialCrc != null) {
+      if (len > bytesPerChecksum) {
+        throw new IOException("Got wrong length during writeBlock(" + block
+            + ") from " + inAddr + " "
+            + "A packet can have only one partial chunk." + " len = " + len
+            + " bytesPerChecksum " + bytesPerChecksum);
+      }
+      partialCrc.update(pktBuf, dataOff, len);
+      byte[] buf = FSOutputSummer.convertToByteStream(partialCrc, checksumSize);
+      checksumOut.write(buf);
+      LOG.debug("Writing out partial crc for data len " + len);
+      partialCrc = null;
+    } else {
+      checksumOut.write(pktBuf, checksumOff, numChunks * checksumSize);
+    }
+  }
+
+  /**
+   * Retrieves the offset in the block to which the the next write will write
+   * data to.
+   */
+  public long getChannelPosition() throws IOException {
+    FileOutputStream file = (FileOutputStream) dataOut;
+    return file.getChannel().position();
+  }
+
+  @Override
+  public void setPosAndRecomputeChecksumIfNeeded(long offsetInBlock, DataChecksum checksum) throws IOException {
+    if (getChannelPosition() == offsetInBlock) {
+      return; // nothing to do
+    }
+    long offsetInChecksum = BlockMetadataHeader.getHeaderSize() + offsetInBlock
+        / bytesPerChecksum * checksumSize;
+
+    if (dataOut != null) {
+      dataOut.flush();
+    }
+    if (checksumOut != null) {
+      checksumOut.flush();
+    }
+
+    // If this is a partial chunk, then read in pre-existing checksum
+    if (offsetInBlock % bytesPerChecksum != 0) {
+      LOG.info("setBlockPosition trying to set position to " + offsetInBlock
+          + " for block " + block
+          + " which is not a multiple of bytesPerChecksum " + bytesPerChecksum);
+      computePartialChunkCrc(offsetInBlock, offsetInChecksum, bytesPerChecksum, checksum);
+    }
+
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Changing block file offset of block " + block + " from "
+          + getChannelPosition() + " to " + offsetInBlock
+          + " meta file offset to " + offsetInChecksum);
+    }
+
+    // set the position of the block file
+    setChannelPosition(offsetInBlock, offsetInChecksum);
+  }
+
+  /**
+   * Sets the offset in the block to which the the next write will write data
+   * to.
+   */
+  public void setChannelPosition(long dataOffset, long ckOffset)
+      throws IOException {
+    FileOutputStream file = (FileOutputStream) dataOut;
+    if (file.getChannel().size() < dataOffset) {
+      String fileName;
+      if (datanode.data instanceof FSDataset) {
+        FSDataset fsDataset = (FSDataset) datanode.data;
+        fileName = fsDataset.getDatanodeBlockInfo(namespaceId, block)
+            .getTmpFile(namespaceId, block).toString();
+      } else {
+        fileName = "unknown";
+      }
+      String msg = "Trying to change block file offset of block " + block
+          + " file " + fileName + " to " + dataOffset
+          + " but actual size of file is " + file.getChannel().size();
+      throw new IOException(msg);
+    }
+    if (dataOffset > file.getChannel().size()) {
+      throw new IOException("Set position over the end of the data file.");
+    }
+    file.getChannel().position(dataOffset);
+    file = (FileOutputStream) cout;
+    if (ckOffset > file.getChannel().size()) {
+      throw new IOException("Set position over the end of the checksum file.");
+    }
+    file.getChannel().position(ckOffset);
+  }
+
+  /**
+   * reads in the partial crc chunk and computes checksum of pre-existing data
+   * in partial chunk.
+   */
+  private void computePartialChunkCrc(long blkoff, long ckoff,
+      int bytesPerChecksum, DataChecksum checksum) throws IOException {
+
+    // find offset of the beginning of partial chunk.
+    //
+    int sizePartialChunk = (int) (blkoff % bytesPerChecksum);
+    int checksumSize = checksum.getChecksumSize();
+    blkoff = blkoff - sizePartialChunk;
+    LOG.info("computePartialChunkCrc sizePartialChunk " + sizePartialChunk
+        + " block " + block + " offset in block " + blkoff
+        + " offset in metafile " + ckoff);
+
+    // create an input stream from the block file
+    // and read in partial crc chunk into temporary buffer
+    //
+    byte[] buf = new byte[sizePartialChunk];
+    byte[] crcbuf = new byte[checksumSize];
+    FileInputStream dataIn = null, metaIn = null;
+    
+    try {
+
+      DatanodeBlockInfo info = datanode.data.getDatanodeBlockInfo(namespaceId,
+          block);
+      if (info == null) {
+        throw new IOException("Block " + block
+            + " does not exist in volumeMap.");
+      }
+      File blockFile = info.getDataFileToRead();
+      if (blockFile == null) {
+        blockFile = info.getTmpFile(namespaceId, block);
+      }
+      RandomAccessFile blockInFile = new RandomAccessFile(blockFile, "r");
+      if (blkoff > 0) {
+        blockInFile.seek(blkoff);
+      }
+      File metaFile = getMetaFile(blockFile, block);
+      RandomAccessFile metaInFile = new RandomAccessFile(metaFile, "r");
+      if (ckoff > 0) {
+        metaInFile.seek(ckoff);
+      }
+      dataIn = new FileInputStream(blockInFile.getFD());
+      metaIn = new FileInputStream(metaInFile.getFD());
+
+      IOUtils.readFully(dataIn, buf, 0, sizePartialChunk);
+
+      // open meta file and read in crc value computer earlier
+      IOUtils.readFully(metaIn, crcbuf, 0, crcbuf.length);
+    } finally {
+      if (dataIn != null) {
+        dataIn.close();
+      }
+      if (metaIn != null) {
+        metaIn.close();
+      }
+    }
+
+    // compute crc of partial chunk from data read in the block file.
+    partialCrc = new PureJavaCrc32();
+    partialCrc.update(buf, 0, sizePartialChunk);
+    LOG.info("Read in partial CRC chunk from disk for block " + block);
+
+    // paranoia! verify that the pre-computed crc matches what we
+    // recalculated just now
+    if (partialCrc.getValue() != FSInputChecker.checksum2long(crcbuf)) {
+      String msg = "Partial CRC " + partialCrc.getValue()
+          + " does not match value computed the "
+          + " last time file was closed "
+          + FSInputChecker.checksum2long(crcbuf);
+      throw new IOException(msg);
+    }
+    // LOG.debug("Partial CRC matches 0x" +
+    // Long.toHexString(partialCrc.getValue()));
+  }
+
+  /**
+   * Flush the data and checksum data out to the stream. Please call sync to
+   * make sure to write the data in to disk
+   * 
+   * @throws IOException
+   */
+  @Override
+  public void flush(boolean forceSync) throws IOException {
+    if (checksumOut != null) {
+      checksumOut.flush();
+      if (forceSync && (cout instanceof FileOutputStream)) {
+        ((FileOutputStream) cout).getChannel().force(true);
+      }
+    }
+    if (dataOut != null) {
+      dataOut.flush();
+      if (forceSync && (dataOut instanceof FileOutputStream)) {
+        ((FileOutputStream) dataOut).getChannel().force(true);
+      }
+    }
+  }
+
+  public void truncateBlock(long oldBlockFileLen, long newlen)
+      throws IOException {
+    if (newlen == 0) {
+      // Special case for truncating to 0 length, since there's no previous
+      // chunk.
+      RandomAccessFile blockRAF = new RandomAccessFile(blockFile, "rw");
+      try {
+        // truncate blockFile
+        blockRAF.setLength(newlen);
+      } finally {
+        blockRAF.close();
+      }
+      // update metaFile
+      RandomAccessFile metaRAF = new RandomAccessFile(metafile, "rw");
+      try {
+        metaRAF.setLength(BlockMetadataHeader.getHeaderSize());
+      } finally {
+        metaRAF.close();
+      }
+      return;
+    }
+    DataChecksum dcs = BlockMetadataHeader.readHeader(metafile).getChecksum();
+    int checksumsize = dcs.getChecksumSize();
+    int bpc = dcs.getBytesPerChecksum();
+    long newChunkCount = (newlen - 1) / bpc + 1;
+    long newmetalen = BlockMetadataHeader.getHeaderSize() + newChunkCount
+        * checksumsize;
+    long lastchunkoffset = (newChunkCount - 1) * bpc;
+    int lastchunksize = (int) (newlen - lastchunkoffset);
+    byte[] b = new byte[Math.max(lastchunksize, checksumsize)];
+
+    RandomAccessFile blockRAF = new RandomAccessFile(blockFile, "rw");
+    try {
+      // truncate blockFile
+      blockRAF.setLength(newlen);
+
+      // read last chunk
+      blockRAF.seek(lastchunkoffset);
+      blockRAF.readFully(b, 0, lastchunksize);
+    } finally {
+      blockRAF.close();
+    }
+
+    // compute checksum
+    dcs.update(b, 0, lastchunksize);
+    dcs.writeValue(b, 0, false);
+
+    // update metaFile
+    RandomAccessFile metaRAF = new RandomAccessFile(metafile, "rw");
+    try {
+      metaRAF.setLength(newmetalen);
+      metaRAF.seek(newmetalen - checksumsize);
+      metaRAF.write(b, 0, checksumsize);
+    } finally {
+      metaRAF.close();
+    }
+  }
+
+  @Override
+  public void close() throws IOException {
+    IOException ioe = null;
+
+    // close checksum file
+    try {
+      if (checksumOut != null) {
+        try {
+          checksumOut.flush();
+          if (datanode.syncOnClose && (cout instanceof FileOutputStream)) {
+            ((FileOutputStream) cout).getChannel().force(true);
+          }
+        } finally {
+          checksumOut.close();          
+          checksumOut = null;
+        }
+      }
+    } catch (IOException e) {
+      ioe = e;
+    }
+    // close block file
+    try {
+      if (dataOut != null) {
+        try {
+          dataOut.flush();
+          if (datanode.syncOnClose && (dataOut instanceof FileOutputStream)) {
+            ((FileOutputStream) dataOut).getChannel().force(true);
+          }
+        } finally {
+          dataOut.close();
+          dataOut = null;
+        }
+      }
+    } catch (IOException e) {
+      ioe = e;
+    }
+
+    // disk check
+    // We don't check disk for ClosedChannelException as close() can be
+    // called twice and it is possible that out.close() throws.
+    // No need to check or recheck disk then.
+    //
+    if (ioe != null) {
+      if (!(ioe instanceof ClosedChannelException)) {
+        datanode.checkDiskError(ioe);
+      }
+      throw ioe;
+    }
+  }
+
+  static String getMetaFileName(String blockFileName, long genStamp) {
+    return blockFileName + "_" + genStamp + FSDataset.METADATA_EXTENSION;
+  }
+
+  public static File getMetaFile(File f , Block b) {
+    return new File(getMetaFileName(f.getAbsolutePath(),
+                                    b.getGenerationStamp())); 
+  }
+
+  /** Find the corresponding meta data file from a given block file */
+  public static File findMetaFile(final File blockFile) throws IOException {
+    return findMetaFile(blockFile, false);
+  }
+
+  static File findMetaFile(final File blockFile, boolean missingOk)
+    throws IOException {
+    final String prefix = blockFile.getName() + "_";
+    final File parent = blockFile.getParentFile();
+    File[] matches = parent.listFiles(new FilenameFilter() {
+      public boolean accept(File dir, String name) {
+        return dir.equals(parent)
+            && name.startsWith(prefix) && name.endsWith(FSDataset.METADATA_EXTENSION);
+      }
+    });
+
+    if (matches == null || matches.length == 0) {
+      if (missingOk) {
+        return null;
+      } else {
+        throw new IOException("Meta file not found, blockFile=" + blockFile);
+      }
+    }
+    else if (matches.length > 1) {
+      throw new IOException("Found more than one meta files: "
+          + Arrays.asList(matches));
+    }
+    return matches[0];
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
index 95b9bad0..c8045428 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
@@ -390,6 +390,10 @@ private synchronized void updateScanStatusInternal(
   }
   
   private void handleScanFailure(Block block) {
+    reportBadBlocks(block, namespaceId, datanode);
+  }
+
+  static void reportBadBlocks(Block block, int namespaceId, DataNode datanode) {
     
     LOG.info("Reporting bad block " + block + " to namenode.");
     
@@ -405,7 +409,8 @@ private void handleScanFailure(Block block) {
                " Exception : " + StringUtils.stringifyException(e));
     }
   }
-    
+
+  
   static private class LogEntry {
     long blockId = -1;
     long verificationTime = -1;
@@ -590,7 +595,7 @@ private boolean assignInitialVerificationTimes() {
     try {
       for (LogFileHandler.Reader reader : logReader) {
       // update verification times from the verificationLog.
-        while (logReader != null && reader.hasNext()) {
+        while (reader != null && reader.hasNext()) {
           if (!datanode.shouldRun
               || datanode.blockScanner.blockScannerThread.isInterrupted()) {
             return false;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index 0c0d0e72..652c558b 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -97,6 +97,7 @@
 import org.apache.hadoop.hdfs.server.namenode.FileChecksumServlets;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.hadoop.hdfs.server.namenode.StreamFile;
+import org.apache.hadoop.hdfs.server.protocol.BlockAlreadyCommittedException;
 import org.apache.hadoop.hdfs.server.protocol.BlockCommand;
 import org.apache.hadoop.hdfs.server.protocol.BlockMetaDataInfo;
 import org.apache.hadoop.hdfs.server.protocol.BlockRecoveryInfo;
@@ -133,8 +134,10 @@
 import org.apache.hadoop.util.PulseChecker;
 import org.apache.hadoop.util.PulseCheckable;
 import org.apache.hadoop.util.VersionInfo;
+import org.apache.hadoop.util.DataDirFileReader;
 import org.mortbay.util.ajax.JSON;
 
+
 /**********************************************************
  * DataNode is a class (and program) that stores a set of
  * blocks for a DFS deployment.  A single deployment can
@@ -190,6 +193,24 @@ public class DataNode extends ReconfigurableBase
   public static final Log ClientTraceLog =
     LogFactory.getLog(DataNode.class.getName() + ".clienttrace");
 
+  private static Random cachedSecureRandom; 
+  
+  // get an instance of a SecureRandom for creating storageid
+  public synchronized static Random getSecureRandom() {
+    if (cachedSecureRandom != null)
+      return cachedSecureRandom;
+    try {
+      return SecureRandom.getInstance("SHA1PRNG");
+    } catch (NoSuchAlgorithmException e) {
+      return R;
+    }
+  }
+  
+  // used for testing to speed-up startup
+  public synchronized static void setSecureRandom(Random rand) {
+    cachedSecureRandom = rand;
+  }
+  
   /**
    * Use {@link NetUtils#createSocketAddr(String)} instead.
    */
@@ -239,6 +260,7 @@ public static InetSocketAddress createSocketAddr(String target
   int writePacketSize = 0;
   boolean syncOnClose;
   boolean supportAppends;
+  public boolean useInlineChecksum;
   long heartbeatExpireInterval;
   // heartbeatExpireInterval is how long namenode waits for datanode to report
   
@@ -281,6 +303,7 @@ static long now() {
           AbstractList<File> dataDirs) throws IOException {
    super(conf);
    supportAppends = conf.getBoolean("dfs.support.append", false);
+   useInlineChecksum = conf.getBoolean("dfs.use.inline.checksum", true);
    // TODO(pritam): Integrate this into a threadpool for all operations of the
    // datanode.
    blockCopyExecutor = Executors.newCachedThreadPool();
@@ -507,7 +530,7 @@ private void startInfoServer(Configuration conf) throws IOException {
   private void initIpcServer(Configuration conf) throws IOException {
     //init ipc server
     InetSocketAddress ipcAddr = NetUtils.createSocketAddr(
-        conf.get("dfs.datanode.ipc.address"));
+        conf.get(DFS_DATANODE_IPC_ADDRESS_KEY));
     ipcServer = RPC.getServer(this, ipcAddr.getHostName(), ipcAddr.getPort(), 
         conf.getInt("dfs.datanode.handler.count", 3), false, conf);
     ipcServer.start();
@@ -641,13 +664,7 @@ public static String createNewStorageId(int port) {
       LOG.warn("Could not find ip address of \"default\" inteface.");
     }
 
-    int rand = 0;
-    try {
-      rand = SecureRandom.getInstance("SHA1PRNG").nextInt(Integer.MAX_VALUE);
-    } catch (NoSuchAlgorithmException e) {
-      LOG.warn("Could not use SecureRandom");
-      rand = R.nextInt(Integer.MAX_VALUE);
-    }
+    int rand = getSecureRandom().nextInt(Integer.MAX_VALUE);
     return "DS-" + rand + "-"+ ip + "-" + port + "-" + 
                       System.currentTimeMillis();
   }
@@ -835,8 +852,11 @@ private void refreshVolumes(String confVolumes) throws Exception {
     conf.set("dfs.data.dir", oldVolumes);
     
     ArrayList<File> newDirs = getDataDirsFromURIs(dataDirs);
+    //This is used to pass a list of directories for the datanode to decommission.
     ArrayList<File> decomDirs = new ArrayList<File>();
-  
+    //Used to store storage directories that are no longer needed.
+    ArrayList<StorageDirectory> decomStorage = new ArrayList<StorageDirectory>();
+    
     for (Iterator<StorageDirectory> storageIter = this.storage.dirIterator();
         storageIter.hasNext();) {
       StorageDirectory dir = storageIter.next();
@@ -848,36 +868,53 @@ private void refreshVolumes(String confVolumes) throws Exception {
         continue;
       }
   
-      if (newDirs.contains(dir.getRoot())){
+      if (newDirs.contains(dir.getRoot().getAbsoluteFile())){
         // remove the dir already in-service in newDirs list
-        LOG.info("This conf dir has already been in service " + dir.getRoot());
-        newDirs.remove(dir.getRoot());
+        LOG.info("This conf dir has already been in service " + dir.getRoot().getAbsoluteFile());
+        newDirs.remove(dir.getRoot().getAbsoluteFile());
       } else {
+        LOG.info("This dir should not be in service and is not in the config. Removing: " + 
+          dir.getRoot());
         // add the dirs not described in conf files to decomDirs
-        LOG.warn("The configuration does not contain serving dir " +
-          dir.getRoot() + ", but we cannot remove it from serving volumes in current version." );
-        decomDirs.add(dir.getRoot());
+        decomDirs.add(dir.getRoot().getAbsoluteFile());
+        storageIter.remove();
+        decomStorage.add(dir);
       }
     }
-  
     if (newDirs.isEmpty()){
-      LOG.info("All the configured dir is in service, and do not need refreshment.");
-      return;
+      LOG.info("All the configured dirs are already in service");
+    } else {
+      for (int namespaceId: namespaceManager.getAllNamespaces()) {
+        // Load new volumes via DataStorage
+        NamespaceInfo nsInfo = getNSNamenode(namespaceId).versionRequest();
+        String nameserviceId = this.namespaceManager.get(namespaceId).getNameserviceId();
+        Collection<StorageDirectory> newStorageDirectories =
+          storage.recoverTransitionAdditionalRead(nsInfo, newDirs, getStartupOption(conf));
+        storage.recoverTransitionRead(this, namespaceId, nsInfo, newDirs, 
+          getStartupOption(conf), nameserviceId);
+       
+        // add new volumes in FSDataSet
+        ((FSDataset)data).addVolumes(conf, namespaceId, 
+          storage.getNameSpaceDataDir(namespaceId), newStorageDirectories);
+      }
     }
-
-    for (int namespaceId: namespaceManager.getAllNamespaces()) {
-      // Load new volumes via DataStorage
-      NamespaceInfo nsInfo = getNSNamenode(namespaceId).versionRequest();
-      String nameserviceId = this.namespaceManager.get(namespaceId).getNameserviceId();
-      Collection<StorageDirectory> newStorageDirectories =
-        storage.recoverTransitionAdditionalRead(nsInfo, newDirs, getStartupOption(conf));
-      storage.recoverTransitionRead(this, namespaceId, nsInfo, newDirs, 
-        getStartupOption(conf), nameserviceId);
-      
-      // add new volumes in FSDataSet
-      ((FSDataset)data).addVolumes(conf, namespaceId, 
-        storage.getNameSpaceDataDir(namespaceId), newStorageDirectories);
+    if (!decomDirs.isEmpty()) {
+      LOG.info("Removing decommissioned directories from FSDataset");
+      try {
+        ((FSDataset)data).removeVolumes(conf, decomDirs);
+      } catch (DiskErrorException de) {
+        handleDiskError(de.getMessage());
+      }
+      for (StorageDirectory sDir : decomStorage) {
+        try {
+          LOG.info("Unlocking Storage Directory: " + sDir.getRoot());
+          sDir.unlock();
+        } catch (IOException e) {
+          LOG.error("Unable to unlock Storage Directory: " + sDir.getRoot());
+        }
+      }
     }
+    LOG.info("Finished refreshing volumes");  
   }
     
   /** Number of concurrent xceivers per node. */
@@ -1691,7 +1728,16 @@ public LocatedBlock syncBlock(
       List<DatanodeID> successList = new ArrayList<DatanodeID>();
 
       throwIfAfterTime(deadline);
-      long generationstamp = nsNamenode.nextGenerationStamp(block, closeFile);
+      long generationstamp = -1;
+      try {
+        generationstamp = nsNamenode.nextGenerationStamp(block, closeFile);
+      } catch (RemoteException e) {
+        if (e.unwrapRemoteException() instanceof BlockAlreadyCommittedException) {
+          throw new BlockAlreadyCommittedException(e);
+        } else {
+          throw e;
+        }
+      }
       Block newblock = new Block(block.getBlockId(), block.getNumBytes(), generationstamp);
 
       for(BlockRecord r : syncList) {
@@ -1810,6 +1856,15 @@ synchronized NamespaceService get(int namespaceId) {
       return nsMapping.get(namespaceId);
     }
     
+    synchronized NamespaceService get(String nameserviceId) {
+      for (NamespaceService namespaceService : nsMapping.values()) {
+        if (namespaceService.getNameserviceId().equals(nameserviceId)) {
+          return namespaceService;
+        }
+      }
+      return null;
+    }
+    
     synchronized NamespaceService get(InetSocketAddress nameNodeAddr) {
       return nameNodeThreads.get(nameNodeAddr);
     }
@@ -1887,16 +1942,19 @@ void refreshNamenodes(List<InetSocketAddress> nameNodeAddrs, Configuration conf)
             remove(nsos);
           }
         }
+        for (NamespaceService nsos : toStop) {
+          nsos.stop();
+        }
+        for (NamespaceService nsos : toStop) {
+          nsos.join();
+        }
+        startAll();
       }
-      for (NamespaceService nsos : toStop) {
-        nsos.stop();
-      }
-      startAll();
     }
   }
   
   /* ********************************************************************
-  Protocol when a client reads data from Datanode (Cur Ver: 9):
+  Protocol when a client reads data from Datanode (Cur Ver: 23):
   
   Client's Request :
   =================
@@ -1907,9 +1965,11 @@ Protocol when a client reads data from Datanode (Cur Ver: 9):
      +----------------------------------------------+
      
      Processed in readBlock() :
-     +-------------------------------------------------------------------------+
-     | 8 byte Block ID | 8 byte genstamp | 8 byte start offset | 8 byte length |
-     +-------------------------------------------------------------------------+
+     +------------------------------------------------------------------+
+     | 4 byte NS ID |     8 byte Block ID     |     8 byte genstamp     |
+     +------------------------------------------------------------------+
+     |   8 byte start offset     |        8 byte length       |
+     +--------------------------------------------------------+
      |   vInt length   |  <DFSClient id> |
      +-----------------------------------+
      
@@ -1939,6 +1999,15 @@ In readBlock() :
       | Sequence of data PACKETs ....      |
       +------------------------------------+
 
+    If it is used for sending data from data nodes to clients, two extra
+    fields are sent in the end:
+
+      +--------------------------+
+      | Boolean isBlockFinalized |
+      +--------------------------+-------------------------------+
+      |                 8 byte Block length                      |
+      +----------------------------------------------------------+
+
     A "PACKET" is defined further below.
 
     The client reads data until it receives a packet with
@@ -2224,12 +2293,41 @@ public static DataNode instantiateDataNode(String args[],
           " anymore. RackID resolution is handled by the NameNode.");
       System.exit(-1);
     }
-    String[] dataDirs = conf.getStrings("dfs.data.dir");
-    dnThreadName = "DataNode: [" +
+    String[] dataDirs = getListOfDataDirs(conf);
+        dnThreadName = "DataNode: [" +
                         StringUtils.arrayToString(dataDirs) + "]";
     return makeInstance(dataDirs, conf);
   }
 
+  /** Returns a list of data directories from the file provided by the
+   * dfs.datadir.confpath. If it cannot get the list of data directories
+   * then the method will return the default dataDirs from dfs.data.dir.
+   */
+  public static String[] getListOfDataDirs(Configuration conf) {
+    String[] configFilePath = conf.getStrings("dfs.datadir.confpath");
+    String[] dataDirs = null;
+    if(configFilePath != null && (configFilePath.length != 0)) {
+      try {
+        DataDirFileReader reader = new DataDirFileReader(configFilePath[0]);
+        dataDirs = reader.getArrayOfCurrentDataDirectories();
+        if(dataDirs == null) {
+          LOG.warn("File is empty, using dfs.data.dir directories");
+        }
+      } catch (Exception e) {
+        LOG.warn("Could not read file, using directories from dfs.data.dir" +
+                                                         " Exception: ", e);
+      }
+    } else {
+      LOG.warn("No dfs.datadir.confpath not defined, now using default " +
+                                                              "directories");
+    }
+    if(dataDirs == null) {
+      dataDirs = conf.getStrings("dfs.data.dir");
+    }
+    return dataDirs;
+
+  }
+
   /** Instantiate & Start a single datanode daemon and wait for it to finish.
    *  If this thread is specifically interrupted, it will stop waiting.
    */
@@ -2551,15 +2649,20 @@ public BlockPathInfo getBlockPathInfo(Block block) throws IOException {
   }
   
   @Override
-  public BlockPathInfo getBlockPathInfo(int namespaceId, Block block) throws IOException {
-    File datafile = data.getBlockFile(namespaceId, block);
-    File metafile = FSDataset.getMetaFile(datafile, block);
-    BlockPathInfo info = new BlockPathInfo(block, datafile.getAbsolutePath(), 
-                                           metafile.getAbsolutePath());
+  public BlockPathInfo getBlockPathInfo(int namespaceId, Block block)
+      throws IOException {
+    ReplicaToRead replica = data.getReplicaToRead(namespaceId, block);
+    String metafilePath = "";
+    if (!replica.isInlineChecksum()) {
+      metafilePath = BlockWithChecksumFileWriter.getMetaFile(
+          replica.getDataFileToRead(), block).getAbsolutePath();
+    }
+    BlockPathInfo info = new BlockPathInfo(block, replica.getDataFileToRead()
+        .getAbsolutePath(), metafilePath);
     if (LOG.isDebugEnabled()) {
       LOG.debug("getBlockPathInfo successful block=" + block +
-                " blockfile " + datafile.getAbsolutePath() +
-                " metafile " + metafile.getAbsolutePath());
+                " blockfile " + replica.getDataFileToRead().getAbsolutePath() +
+                " metafile " + metafilePath);
     }
     return info;
   }
@@ -3146,6 +3249,21 @@ public void refreshNamenodes() throws IOException {
     refreshNamenodes(conf);
   }
   
+  public void refreshDataDirs(String confVolumes) throws IOException {
+    try{
+      //Refresh the volumes using default configuration path
+      if (confVolumes.equals("--defaultPath")) {
+        Configuration conf = getConf();
+        confVolumes = conf.get("dfs.datadir.confpath");
+      }
+      DataDirFileReader reader = new DataDirFileReader(confVolumes);
+      this.refreshVolumes(reader.getNewDirectories()); 
+    } catch (Exception e) {
+      LOG.error("Cannot refresh the data dirs of the node Exception: " + e);      
+      return;
+    }
+  }
+
   /**
    * {@inheritDoc}
    */
@@ -3289,4 +3407,16 @@ public void sendBlocksBeingWrittenReport(DatanodeProtocol node,
       node.blocksBeingWrittenReport(nsRegistration, bbwReport);
     }
   }
+
+  @Override
+  public void removeNamespace(String nameserviceId) throws IOException {
+    NamespaceService ns = namespaceManager.get(nameserviceId);
+    if (ns != null) {
+      namespaceManager.remove(ns);
+      ns.stop();
+    } else {
+      throw new IOException("Service with id " + nameserviceId +
+          " does not exist");
+    }
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataStorage.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
index 3abfb47a..80215be0 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
@@ -146,6 +146,12 @@ ArrayList<StorageDirectory> analyzeStorageDirs(NamespaceInfo nsInfo,
             continue;
           case NOT_FORMATTED: // format
             LOG.info("Storage directory " + dataDir + " is not formatted.");
+            if (!sd.isEmpty()) {
+              LOG.error("Storage directory " + dataDir
+                + " is not empty, and will not be formatted! Exiting.");
+              throw new IOException(
+                "Storage directory " + dataDir + " is not empty!");
+            }
             LOG.info("Formatting ...");
             format(sd, nsInfo);
             break;
@@ -197,8 +203,12 @@ synchronized void recoverTransitionRead(DataNode datanode,
       return;
     }
 
-    assert FSConstants.LAYOUT_VERSION == nsInfo.getLayoutVersion() :
-      "Data-node and name-node layout versions must be the same.";
+    if (FSConstants.LAYOUT_VERSION != nsInfo.getLayoutVersion()) {
+      throw new IOException(
+          "Data-node and name-node layout versions must be the same. Namenode LV: "
+              + nsInfo.getLayoutVersion() + ", current LV: "
+              + FSConstants.LAYOUT_VERSION);
+    }
     
     // 1. For each data directory calculate its state and 
     // check whether all is consistent before transitioning.
@@ -1028,7 +1038,7 @@ private static String convertMetatadataFileName(String oldFileName) {
     Matcher matcher = PRE_GENSTAMP_META_FILE_PATTERN.matcher(oldFileName);
     if (matcher.matches()) {
       //return the current metadata file name
-      return FSDataset.getMetaFileName(matcher.group(1),
+      return BlockWithChecksumFileWriter.getMetaFileName(matcher.group(1),
                                        Block.GRANDFATHER_GENERATION_STAMP);
     }
     return oldFileName;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
index d7abce2a..640b1c20 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
@@ -22,17 +22,24 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.nio.channels.FileChannel;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
+import java.security.MessageDigest;
 
 import org.apache.commons.logging.Log;
 import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.BlockChecksumHeader;
+import org.apache.hadoop.hdfs.protocol.CopyBlockHeader;
+import org.apache.hadoop.hdfs.protocol.ReadMetadataHeader;
+import org.apache.hadoop.hdfs.protocol.ReplaceBlockHeader;
 import org.apache.hadoop.hdfs.protocol.VersionAndOpcode;
 import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
@@ -40,7 +47,6 @@
 import org.apache.hadoop.hdfs.protocol.ReadBlockHeader;
 import org.apache.hadoop.hdfs.protocol.WriteBlockHeader;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
-import org.apache.hadoop.hdfs.server.datanode.FSDatasetInterface.MetaDataInputStream;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.io.Text;
@@ -94,7 +100,14 @@ private void getAddresses() {
    */
   private void updateCurrentThreadName(String status) {
     StringBuilder sb = new StringBuilder();
-    sb.append("DataXceiver for client ").append(remoteAddress);
+    sb.append("DataXceiver for client ");
+    InetAddress ia;
+    if (s != null && (ia = s.getInetAddress()) != null) {
+      sb.append(ia.toString());
+    } else {
+      sb.append("unknown");
+    }
+      
     if (status != null) {
       sb.append(" [").append(status).append("]");
     }
@@ -105,10 +118,6 @@ private void updateCurrentThreadName(String status) {
    * Read/write data from/to the DataXceiveServer.
    */
   public void run() {
-    if (remoteAddress == null) {
-      getAddresses();
-    }
-    
     DataInputStream in=null; 
     byte op = -1;
     try {
@@ -143,7 +152,7 @@ public void run() {
           datanode.myMetrics.readsFromRemoteClient.inc();
         break;
       case DataTransferProtocol.OP_READ_BLOCK_ACCELERATOR:
-        readBlockAccelerator( in );
+        readBlockAccelerator(in, versionAndOpcode);
         datanode.myMetrics.readBlockOp.inc(DataNode.now() - startTime);
         if (local)
           datanode.myMetrics.readsFromLocalClient.inc();
@@ -159,20 +168,20 @@ public void run() {
           datanode.myMetrics.writesFromRemoteClient.inc();
         break;
       case DataTransferProtocol.OP_READ_METADATA:
-        readMetadata( in );
+        readMetadata(in, versionAndOpcode);
         datanode.myMetrics.readMetadataOp.inc(DataNode.now() - startTime);
         break;
       case DataTransferProtocol.OP_REPLACE_BLOCK: // for balancing purpose; send to a destination
-        replaceBlock(in);
+        replaceBlock(in, versionAndOpcode);
         datanode.myMetrics.replaceBlockOp.inc(DataNode.now() - startTime);
         break;
       case DataTransferProtocol.OP_COPY_BLOCK:
             // for balancing purpose; send to a proxy source
-        copyBlock(in);
+        copyBlock(in, versionAndOpcode);
         datanode.myMetrics.copyBlockOp.inc(DataNode.now() - startTime);
         break;
       case DataTransferProtocol.OP_BLOCK_CHECKSUM: //get the checksum of a block
-        getBlockChecksum(in);
+        getBlockChecksum(in, versionAndOpcode);
         datanode.myMetrics.blockChecksumOp.inc(DataNode.now() - startTime);
         break;
       default:
@@ -228,13 +237,20 @@ private void readBlock(DataInputStream in,
                  new BufferedOutputStream(baseStream, SMALL_BUFFER_SIZE));
     
     BlockSender blockSender = null;
-    final String clientTraceFmt =
-      clientName.length() > 0 && ClientTraceLog.isInfoEnabled()
-        ? String.format(DN_CLIENTTRACE_FORMAT, localAddress, remoteAddress,
-            "%d", "HDFS_READ", clientName, "%d", 
-            datanode.getDNRegistrationForNS(namespaceId).getStorageID(), block, "%d")
-        : datanode.getDNRegistrationForNS(namespaceId) + " Served block " + block + " to " +
-            s.getInetAddress();
+    String clientTraceFmt = null;
+    if (ClientTraceLog.isInfoEnabled()) {    
+      if (remoteAddress == null) {
+        getAddresses();
+      }
+      clientTraceFmt = clientName.length() > 0 ? String.format(
+          DN_CLIENTTRACE_FORMAT, localAddress, remoteAddress, "%d",
+          "HDFS_READ", clientName, "%d",
+          datanode.getDNRegistrationForNS(namespaceId).getStorageID(), block,
+          "%d")
+          :
+          datanode.getDNRegistrationForNS(namespaceId)
+          + " Served block " + block + " to " + s.getInetAddress();
+    }
     updateCurrentThreadName("sending block " + block);
         
     try {
@@ -313,8 +329,10 @@ private void readBlock(DataInputStream in,
   private void writeBlock(DataInputStream in,
       VersionAndOpcode versionAndOpcode) throws IOException {
     DatanodeInfo srcDataNode = null;
-    LOG.debug("writeBlock receive buf size " + s.getReceiveBufferSize() +
-              " tcp no delay " + s.getTcpNoDelay());
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("writeBlock receive buf size " + s.getReceiveBufferSize() +
+                " tcp no delay " + s.getTcpNoDelay());
+    }
     //
     // Read in the header
     //
@@ -326,9 +344,14 @@ private void writeBlock(DataInputStream in,
     int namespaceid = headerToReceive.getNamespaceId();
     Block block = new Block(headerToReceive.getBlockId(), 
         dataXceiverServer.estimateBlockSize, headerToReceive.getGenStamp());
-    LOG.info("Receiving block " + block + 
-             " src: " + remoteAddress +
-             " dest: " + localAddress);
+    if (LOG.isInfoEnabled()) {
+      if (remoteAddress == null) {
+        getAddresses();
+      }
+      LOG.info("Receiving block " + block + 
+               " src: " + remoteAddress +
+               " dest: " + localAddress);
+    }
     int pipelineSize = headerToReceive.getPipelineDepth(); // num of datanodes in entire pipeline
     boolean isRecovery = headerToReceive.isRecoveryFlag(); // is this part of recovery?
     String client = headerToReceive.getClientName(); // working on behalf of this client
@@ -491,28 +514,30 @@ private void writeBlock(DataInputStream in,
    * Reads the metadata and sends the data in one 'DATA_CHUNK'.
    * @param in
    */
-  void readMetadata(DataInputStream in) throws IOException {
-    final int namespaceId = in.readInt();
-    Block block = new Block( in.readLong(), 0 , in.readLong());
-    MetaDataInputStream checksumIn = null;
+  void readMetadata(DataInputStream in, VersionAndOpcode versionAndOpcode)
+      throws IOException {
+    ReadMetadataHeader readMetadataHeader = 
+        new ReadMetadataHeader(versionAndOpcode);
+    readMetadataHeader.readFields(in);
+    final int namespaceId = readMetadataHeader.getNamespaceId();
+    Block block = new Block(readMetadataHeader.getBlockId(), 0,
+        readMetadataHeader.getGenStamp());
+    
+    ReplicaToRead rtr;
+    if ((rtr = datanode.data.getReplicaToRead(namespaceId, block)) == null
+        || rtr.isInlineChecksum()) {
+      throw new IOException(
+          "Read metadata from inline checksum file is not supported");
+    }
     DataOutputStream out = null;
-    updateCurrentThreadName("reading metadata for block " + block);
     try {
-      checksumIn = datanode.data.getMetaDataInputStream(namespaceId, block);
-      
-      long fileSize = checksumIn.getLength();
-
-      if (fileSize >= 1L<<31 || fileSize <= 0) {
-          throw new IOException("Unexpected size for checksumFile of block" +
-                  block);
-      }
-
-      byte [] buf = new byte[(int)fileSize];
-      IOUtils.readFully(checksumIn, buf, 0, buf.length);
+      updateCurrentThreadName("reading metadata for block " + block);
       
       out = new DataOutputStream(
                 NetUtils.getOutputStream(s, datanode.socketWriteTimeout));
       
+      byte[] buf = BlockWithChecksumFileReader.getMetaData(datanode.data,
+          namespaceId, block);
       out.writeByte(DataTransferProtocol.OP_STATUS_SUCCESS);
       out.writeInt(buf.length);
       out.write(buf);
@@ -521,7 +546,6 @@ void readMetadata(DataInputStream in) throws IOException {
       out.writeInt(0);
     } finally {
       IOUtils.closeStream(out);
-      IOUtils.closeStream(checksumIn);
     }
   }
   
@@ -529,26 +553,89 @@ void readMetadata(DataInputStream in) throws IOException {
    * Get block checksum (MD5 of CRC32).
    * @param in
    */
-  void getBlockChecksum(DataInputStream in) throws IOException {
-    final int namespaceId = in.readInt();
-    final Block block = new Block(in.readLong(), 0 , in.readLong());
+  void getBlockChecksum(DataInputStream in,
+      VersionAndOpcode versionAndOpcode) throws IOException {
+    // header
+    BlockChecksumHeader blockChecksumHeader =
+        new BlockChecksumHeader(versionAndOpcode);
+    blockChecksumHeader.readFields(in);
+    final int namespaceId = blockChecksumHeader.getNamespaceId();
+    final Block block = new Block(blockChecksumHeader.getBlockId(), 0,
+            blockChecksumHeader.getGenStamp());
 
     DataOutputStream out = null;
-    final MetaDataInputStream metadataIn = datanode.data.getMetaDataInputStream(namespaceId, block);
-    final DataInputStream checksumIn = new DataInputStream(new BufferedInputStream(
-        metadataIn, BUFFER_SIZE));
+    InputStream rawStreamIn = null;
+    DataInputStream streamIn = null;
+
+    ReplicaToRead ri = datanode.data.getReplicaToRead(namespaceId, block);
+    if (ri == null) {
+      throw new IOException("Unknown block");
+    }
 
     updateCurrentThreadName("getting checksum for block " + block);
     try {
-      //read metadata file
-      final BlockMetadataHeader header = BlockMetadataHeader.readHeader(checksumIn);
-      final DataChecksum checksum = header.getChecksum(); 
-      final int bytesPerCRC = checksum.getBytesPerChecksum();
-      final long crcPerBlock = (metadataIn.getLength()
-          - BlockMetadataHeader.getHeaderSize())/checksum.getChecksumSize();
-      
-      //compute block checksum
-      final MD5Hash md5 = MD5Hash.digest(checksumIn);
+      int bytesPerCRC;
+      int checksumSize;
+
+      long crcPerBlock;
+      MD5Hash md5;
+      if (!ri.isInlineChecksum()) {
+        rawStreamIn = BlockWithChecksumFileReader.getMetaDataInputStream(
+            datanode.data, namespaceId, block);
+        streamIn = new DataInputStream(new BufferedInputStream(rawStreamIn,
+            BUFFER_SIZE));
+
+        final BlockMetadataHeader header = BlockMetadataHeader
+            .readHeader(streamIn);
+        final DataChecksum checksum = header.getChecksum();
+        bytesPerCRC = checksum.getBytesPerChecksum();
+        checksumSize = checksum.getChecksumSize();
+        crcPerBlock = (((BlockWithChecksumFileReader.MetaDataInputStream) rawStreamIn)
+            .getLength() - BlockMetadataHeader.getHeaderSize()) / checksumSize;
+
+       //compute block checksum
+       md5 = MD5Hash.digest(streamIn);
+      } else {
+        bytesPerCRC = ri.getBytesPerChecksum();
+        checksumSize = DataChecksum.getChecksumSizeByType(ri.getChecksumType());
+        rawStreamIn = datanode.data.getBlockInputStream(namespaceId, block, 0);
+        streamIn = new DataInputStream(new BufferedInputStream(rawStreamIn,
+            BUFFER_SIZE));
+
+        long lengthLeft = ((FileInputStream) rawStreamIn).getChannel().size()
+            - BlockInlineChecksumReader.getHeaderSize();
+        if (lengthLeft == 0) {
+          crcPerBlock = 0;
+          md5 = MD5Hash.digest(new byte[0]);
+        } else {
+          crcPerBlock = (lengthLeft - 1) / (checksumSize + bytesPerCRC) + 1;
+          MessageDigest digester = MD5Hash.getDigester();
+          byte[] buffer = new byte[checksumSize];
+          while (lengthLeft > 0) {
+            if (lengthLeft >= bytesPerCRC + checksumSize) {
+              streamIn.skip(bytesPerCRC);
+              IOUtils.readFully(streamIn, buffer, 0, buffer.length);
+              lengthLeft -= bytesPerCRC
+                  + checksumSize;
+            } else if (lengthLeft > checksumSize) {
+              streamIn.skip(lengthLeft - checksumSize);
+              IOUtils.readFully(streamIn, buffer, 0, buffer.length);
+              lengthLeft = 0;
+            } else {
+              out = new DataOutputStream(
+                  NetUtils.getOutputStream(s, datanode.socketWriteTimeout));
+              out.writeShort(DataTransferProtocol.OP_STATUS_ERROR);
+              out.flush();
+              // report to name node the corruption.
+              DataBlockScanner.reportBadBlocks(block, namespaceId, datanode);
+              throw new IOException("File for namespace " + namespaceId
+                  + " block " + block + " seems to be corrupted");
+            }
+            digester.update(buffer);
+          }
+          md5 = new MD5Hash(digester.digest(), checksumSize * crcPerBlock);
+        }
+      }
 
       if (LOG.isDebugEnabled()) {
         LOG.debug("block=" + block + ", bytesPerCRC=" + bytesPerCRC
@@ -565,8 +652,12 @@ void getBlockChecksum(DataInputStream in) throws IOException {
       out.flush();
     } finally {
       IOUtils.closeStream(out);
-      IOUtils.closeStream(checksumIn);
-      IOUtils.closeStream(metadataIn);
+      if (streamIn != null) {
+        IOUtils.closeStream(streamIn);
+      }
+      if (rawStreamIn != null) {
+        IOUtils.closeStream(rawStreamIn);
+      }
     }
   }
 
@@ -576,12 +667,17 @@ void getBlockChecksum(DataInputStream in) throws IOException {
    * @param in The stream to read from
    * @throws IOException
    */
-  private void copyBlock(DataInputStream in) throws IOException {
+  private void copyBlock(DataInputStream in,
+      VersionAndOpcode versionAndOpcode) throws IOException {
+    
     // Read in the header
+    CopyBlockHeader copyBlockHeader = new CopyBlockHeader(versionAndOpcode);
+    copyBlockHeader.readFields(in);
     long startTime = System.currentTimeMillis();
-    int namespaceId = in.readInt();
-    long blockId = in.readLong(); // read block id
-    Block block = new Block(blockId, 0, in.readLong());
+    int namespaceId = copyBlockHeader.getNamespaceId();
+    long blockId = copyBlockHeader.getBlockId();
+    long genStamp = copyBlockHeader.getGenStamp();
+    Block block = new Block(blockId, 0, genStamp);
 
     if (!dataXceiverServer.balanceThrottler.acquire()) { // not able to start
       LOG.info("Not able to copy block " + blockId + " to " 
@@ -642,16 +738,21 @@ private void copyBlock(DataInputStream in) throws IOException {
    * @param in The stream to read from
    * @throws IOException
    */
-  private void replaceBlock(DataInputStream in) throws IOException {
+  private void replaceBlock(DataInputStream in,
+      VersionAndOpcode versionAndOpcode) throws IOException {
     long startTime = System.currentTimeMillis();
+    ReplaceBlockHeader replaceBlockHeader = 
+        new ReplaceBlockHeader(versionAndOpcode);
+    
     /* read header */
-    int namespaceId = in.readInt();
-    long blockId = in.readLong();
+    replaceBlockHeader.readFields(in);
+    int namespaceId = replaceBlockHeader.getNamespaceId();
+    long blockId = replaceBlockHeader.getBlockId();
+    long genStamp = replaceBlockHeader.getGenStamp();
     Block block = new Block(blockId, dataXceiverServer.estimateBlockSize,
-        in.readLong()); // block id & generation stamp
-    String sourceID = Text.readString(in); // read del hint
-    DatanodeInfo proxySource = new DatanodeInfo(); // read proxy source
-    proxySource.readFields(in);
+        genStamp);
+    String sourceID = replaceBlockHeader.getSourceID();
+    DatanodeInfo proxySource = replaceBlockHeader.getProxySource();
 
     if (!dataXceiverServer.balanceThrottler.acquire()) { // not able to start
       LOG.warn("Not able to receive block " + blockId + " from " 
@@ -684,11 +785,11 @@ private void replaceBlock(DataInputStream in) throws IOException {
                      new BufferedOutputStream(baseStream, SMALL_BUFFER_SIZE));
 
       /* send request to the proxy */
-      proxyOut.writeShort(DataTransferProtocol.DATA_TRANSFER_VERSION); // transfer version
-      proxyOut.writeByte(DataTransferProtocol.OP_COPY_BLOCK); // op code
-      proxyOut.writeInt(namespaceId);
-      proxyOut.writeLong(block.getBlockId()); // block id
-      proxyOut.writeLong(block.getGenerationStamp()); // block id
+      CopyBlockHeader copyBlockHeader = new CopyBlockHeader(
+          DataTransferProtocol.DATA_TRANSFER_VERSION, namespaceId,
+          block.getBlockId(), block.getGenerationStamp());
+      copyBlockHeader.writeVersionAndOpCode(proxyOut);
+      copyBlockHeader.write(proxyOut);
       proxyOut.flush();
 
       // receive the response from the proxy
@@ -782,7 +883,8 @@ private void sendResponse(Socket s, short opStatus, long timeout)
    *         with bytesPerChecksum
    * @throws IOException
    */
-  private void readBlockAccelerator(DataInputStream in) throws IOException {
+  private void readBlockAccelerator(DataInputStream in, 
+      VersionAndOpcode versionAndOpcode) throws IOException {
     //
     // Read in the header
     //
@@ -799,8 +901,14 @@ private void readBlockAccelerator(DataInputStream in) throws IOException {
 
     long startTime = System.currentTimeMillis();
     Block block = new Block( blockId, 0 , generationStamp);
+    // TODO: support inline checksum
+    ReplicaToRead ri = datanode.data.getReplicaToRead(namespaceId, block);
+    if (ri != null && ri.isInlineChecksum()) {
+      throw new IOException(
+          "Block read accelerator is not supported for inline checksum");
+    }
     File dataFile = datanode.data.getBlockFile(namespaceId, block);
-    File checksumFile = FSDataset.getMetaFile(dataFile, block);
+    File checksumFile = BlockWithChecksumFileWriter.getMetaFile(dataFile, block);
     FileInputStream datain = new FileInputStream(dataFile);
     FileInputStream metain = new FileInputStream(checksumFile);
     FileChannel dch = datain.getChannel();
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java
index 0aab545f..7b45ff81 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java
@@ -31,6 +31,8 @@
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.server.balancer.Balancer;
 import org.apache.hadoop.hdfs.util.DataTransferThrottler;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.util.Daemon;
 import org.apache.hadoop.util.StringUtils;
 
@@ -133,14 +135,14 @@ public void run() {
         
         new Daemon(datanode.threadGroup, 
             new DataXceiver(s, datanode, this)).start();
+        InjectionHandler.processEvent(
+            InjectionEvent.AVATARXEIVER_RUNTIME_FAILURE);
       } catch (SocketTimeoutException ignored) {
         // wake up to see if should continue to run
       } catch (IOException ie) {
-        LOG.warn(datanode.getDatanodeInfo() + ":DataXceiveServer: " 
-                                + StringUtils.stringifyException(ie));
+        LOG.warn(datanode.getDatanodeInfo() + ":DataXceiveServer IO error", ie);
       } catch (Throwable te) {
-        LOG.error(datanode.getDatanodeInfo() + ":DataXceiveServer: Exiting due to:" 
-                                 + StringUtils.stringifyException(te));
+        LOG.error(datanode.getDatanodeInfo() + ":DataXceiveServer exiting", te); 
         datanode.shouldRun = false;
       }
     }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockInfo.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockInfo.java
index d858ae8f..6ad590ac 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockInfo.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockInfo.java
@@ -32,41 +32,66 @@
  * This class is used by the datanode to maintain the map from a block 
  * to its metadata.
  */
-public class DatanodeBlockInfo {
+public class DatanodeBlockInfo implements ReplicaToRead {
   public static long UNFINALIZED = -1;
 
+  protected File file;         // block file
   private FSVolume volume;       // volume where the block belongs
-  private File     file;         // block file
+  private boolean inlineChecksum; // whether the file uses inline checksum.
+  private int checksumType;
+  private int bytesPerChecksum;
   private boolean detached;      // copy-on-write done for block
   private long finalizedSize;             // finalized size of the block
+  private boolean visible;
   
 
-  DatanodeBlockInfo(FSVolume vol, File file, long finalizedSize) {
+  DatanodeBlockInfo(FSVolume vol, File file, long finalizedSize,
+      boolean visible, boolean inlineChecksum, int checksumType,
+      int bytesPerChecksum) {
     this.volume = vol;
     this.file = file;
     this.finalizedSize = finalizedSize;
     detached = false;
-  }
-  
-  DatanodeBlockInfo(FSVolume vol) {
-    this.volume = vol;
-    this.file = null;
-    this.finalizedSize = UNFINALIZED;
-    detached = false;
+    this.visible = visible;
+    this.inlineChecksum = inlineChecksum;
+    this.checksumType = checksumType;
+    this.bytesPerChecksum = bytesPerChecksum;
   }
 
-  FSVolume getVolume() {
+  public FSVolume getVolume() {
     return volume;
   }
 
-  File getFile() {
-    return file;
+  @Override
+  public File getDataFileToRead() {
+    if (!visible) {
+      return null;
+    } else {
+      return file;
+    }
+  }
+
+  public int getChecksumType() {
+    return checksumType;
   }
+
+  public int getBytesPerChecksum() {
+    return bytesPerChecksum;
+  }
+
+  public void setFile(File file) {
+    this.file = file;    
+  }
+
   
   public boolean isFinalized() {
     return finalizedSize != UNFINALIZED;
   }
 
+  public boolean isInlineChecksum() {
+    return inlineChecksum;
+  }
+
   public long getFinalizedSize() throws IOException {
     if (finalizedSize == UNFINALIZED) {
       throw new IOException("Try to get finalized size for unfinalized block");
@@ -84,7 +109,13 @@ public void syncInMemorySize() throws IOException {
     if (finalizedSize == UNFINALIZED) {
       throw new IOException("Block is not finalized");
     }
-    this.finalizedSize = file.length();
+    if (!inlineChecksum) {
+      this.finalizedSize = file.length();
+    } else {
+      this.finalizedSize = BlockInlineChecksumReader
+          .getBlockSizeFromFileLength(file.length(), checksumType,
+              bytesPerChecksum);
+    }
   }
 
   public void verifyFinalizedSize() throws IOException {
@@ -98,10 +129,19 @@ public void verifyFinalizedSize() throws IOException {
       return;
     }
     long onDiskSize = this.file.length();
-    if (onDiskSize != this.finalizedSize) {
-      throw new IOException("finalized size of file " + this.file
+    if (!inlineChecksum) {
+      if (onDiskSize != this.finalizedSize) {
+        throw new IOException("finalized size of file " + this.file
           + " doesn't match size on disk. On disk size: " + onDiskSize
           + " size in memory: " + this.finalizedSize);
+      }
+    } else {
+      if (BlockInlineChecksumReader.getBlockSizeFromFileLength(
+          onDiskSize, checksumType, bytesPerChecksum) != this.finalizedSize) {
+        throw new IOException("finalized size of file " + this.file
+          + " doesn't match block size on disk. On disk size: " + onDiskSize
+          + " size in memory: " + this.finalizedSize);
+      }      
     }
   }
   
@@ -158,17 +198,23 @@ boolean detachBlock(int namespaceId, Block block, int numLinks) throws IOExcepti
     if (file == null || volume == null) {
       throw new IOException("detachBlock:Block not found. " + block);
     }
-    File meta = FSDataset.getMetaFile(file, block);
-    if (meta == null) {
-      throw new IOException("Meta file not found for block " + block);
+
+    File meta = null;
+    if (!inlineChecksum) {
+      meta = BlockWithChecksumFileWriter.getMetaFile(file, block);
+      if (meta == null) {
+        throw new IOException("Meta file not found for block " + block);
+      }
     }
 
     if (HardLink.getLinkCount(file) > numLinks) {
       DataNode.LOG.info("CopyOnWrite for block " + block);
       detachFile(namespaceId, file, block);
     }
-    if (HardLink.getLinkCount(meta) > numLinks) {
-      detachFile(namespaceId, meta, block);
+    if (!inlineChecksum) {
+      if (HardLink.getLinkCount(meta) > numLinks) {
+        detachFile(namespaceId, meta, block);
+      }
     }
     setDetached();
     return true;
@@ -178,4 +224,19 @@ public String toString() {
     return getClass().getSimpleName() + "(volume=" + volume
         + ", file=" + file + ", detached=" + detached + ")";
   }
+
+  @Override
+  public long getBytesVisible() throws IOException {
+    return getFinalizedSize();
+  }
+
+  @Override
+  public long getBytesWritten() throws IOException {
+    return getFinalizedSize();
+  }
+
+  public File getTmpFile(int namespaceId, Block b) throws IOException {
+    return getVolume().getTmpFile(namespaceId, b);
+  }
+  
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockReader.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockReader.java
new file mode 100644
index 00000000..130c6f6a
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockReader.java
@@ -0,0 +1,238 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.server.datanode.BlockSender.InputStreamFactory;
+import org.apache.hadoop.util.DataChecksum;
+
+/**
+ * Base class for reading data for blocks from local disks and
+ * fill in packet buffer.
+ * 
+ * @author sdong
+ *
+ */
+abstract class DatanodeBlockReader implements java.io.Closeable {
+  static final Log LOG = DataNode.LOG;
+  static final Log ClientTraceLog = DataNode.ClientTraceLog;
+
+  protected int namespaceId;
+  protected Block block;
+  protected FSDatasetInterface data;
+
+  protected boolean ignoreChecksum;
+  protected boolean verifyChecksum; // if true, check is verified while reading
+  protected boolean corruptChecksumOk; // if need to verify checksum
+
+  protected DataChecksum checksum; // checksum stream
+  protected int bytesPerChecksum; // chunk size
+  protected int checksumSize; // checksum size
+
+  DatanodeBlockReader(int namespaceId, Block block, FSDatasetInterface data,
+      boolean ignoreChecksum, boolean verifyChecksum, boolean corruptChecksumOk) {
+    this.namespaceId = namespaceId;
+    this.block = block;
+    this.data = data;
+    this.ignoreChecksum = ignoreChecksum;
+    this.verifyChecksum = verifyChecksum;
+    this.corruptChecksumOk = corruptChecksumOk;
+  }
+  /**   
+   * Read metadata (file header) from disk and generate checksum    
+   * metadata of the block. 
+   *    
+   * @param blockLength 
+   * @return    
+   * @throws IOException    
+   */
+  public abstract DataChecksum getChecksumToSend(long blockLength) throws IOException;
+
+  /** 
+   * Initialize input file stream(s) of local files for the block.  
+   *    
+   * @param offset  
+   * @param blockLength 
+   * @throws IOException    
+   */
+  public abstract void initializeStream(long offset, long blockLength)
+      throws IOException;
+
+  /**
+   * Pre-processing to determine whether it is possible to directly stream
+   * data from data blocks to output stream. It should only worked for
+   * the separate checksum file case. For other cases, a false should be
+   * directly returned.
+   * @return
+   * @throws IOException
+   */
+  public abstract boolean prepareTransferTo() throws IOException;
+
+  /**
+   * From current location, stream from current position to output stream
+   * or packet buffer, based on the case.
+   * 
+   * The expected format for the output packet buffer:
+   * 
+   * checksumOff-->+---------------------+
+   *               |Checksum for Chunk 1 |
+   *               +---------------------+
+   *               |Checksum for Chunk 2 |
+   *               +---------------------+
+   *               |         .           |
+   *               |         .           |
+   *               |         .           |
+   *               +---------------------+
+   *               |Checksum for Chunk N |
+   *               +---------------------+
+   *               |                     |
+   *               |                     |
+   *               |                     |
+   *               |        Data         |
+   *               |                     |
+   *               |                     |
+   *               |                     |
+   *               +---------------------+
+   * 
+   * @param out          output stream to clients, only used in direct
+   *                     transfer mode. In that case, buf is not used.
+   * @param buf          packet buffer for the data
+   * @param offset       starting block offset.
+   * @param checksumOff  starting checksum offset.
+   * @param numChunks    how many chunks to read
+   * @param len          how many bytes to read
+   * @throws IOException
+   */
+  public abstract void sendChunks(OutputStream out, byte[] buf, long offset,
+      int checksumOff, int numChunks, int len) throws IOException;
+
+  /**   
+   * @return number of bytes per data chunk for checksum    
+   */
+  int getBytesPerChecksum() {
+    return bytesPerChecksum;
+  }
+
+  /**
+   * @return number of bytes per checksum for a data chunk
+   */
+  int getChecksumSize() {
+    return checksumSize;
+  }
+
+  /**
+   * Populate bytes per checksum and checksum size information from
+   * local checksum object.
+   * 
+   * @param blockLength
+   */
+  protected void getChecksumInfo(long blockLength) {
+    /*
+     * If bytesPerChecksum is very large, then the metadata file is mostly
+     * corrupted. For now just truncate bytesPerchecksum to blockLength.
+     */
+    bytesPerChecksum = checksum.getBytesPerChecksum();
+    if (bytesPerChecksum > 10 * 1024 * 1024 && bytesPerChecksum > blockLength) {
+      checksum = DataChecksum.newDataChecksum(checksum.getChecksumType(),
+          Math.max((int) blockLength, 10 * 1024 * 1024));
+      bytesPerChecksum = checksum.getBytesPerChecksum();
+    }
+    checksumSize = checksum.getChecksumSize();
+  }
+
+  static class BlockInputStreamFactory implements
+      BlockWithChecksumFileReader.InputStreamWithChecksumFactory {
+    private final int namespaceId;
+    private final Block block;
+    private final FSDatasetInterface data;
+    private final boolean ignoreChecksum;
+    private final boolean verifyChecksum;
+    private final boolean corruptChecksumOk;
+    protected DataInputStream metadataIn = null;
+
+    BlockInputStreamFactory(int namespaceId, Block block,
+        FSDatasetInterface data, boolean ignoreChecksum,
+        boolean verifyChecksum, boolean corruptChecksumOk) {
+      this.namespaceId = namespaceId;
+      this.block = block;
+      this.data = data;
+      this.ignoreChecksum = ignoreChecksum;
+      this.verifyChecksum = verifyChecksum;
+      this.corruptChecksumOk = corruptChecksumOk;
+    }
+
+    @Override
+    public InputStream createStream(long offset) throws IOException {
+      return data.getBlockInputStream(namespaceId, block, offset);
+    }
+
+    @Override
+    public DataInputStream getChecksumStream() throws IOException {
+      ReplicaToRead info = data.getReplicaToRead(namespaceId, block);
+      if (info == null || info.isInlineChecksum()) {
+        throw new IOException(
+            "Getting checksum stream for inline checksum stream is not supported");
+      }
+      if (metadataIn != null) {
+        return metadataIn;
+      }
+      if (!ignoreChecksum) {
+        try {
+          metadataIn = new DataInputStream(new BufferedInputStream(
+              BlockWithChecksumFileReader.getMetaDataInputStream(data, namespaceId, block), FSConstants.BUFFER_SIZE));
+        } catch (IOException e) {
+          if (!corruptChecksumOk
+              || BlockWithChecksumFileReader.metaFileExists(data, namespaceId,
+                  block)) {
+            throw e;
+          }
+          metadataIn = null;
+        }
+      }
+      return metadataIn;
+    }
+    
+    public DatanodeBlockReader getBlockReader() throws IOException {
+      ReplicaToRead info = data.getReplicaToRead(namespaceId, block);
+      if (info.isInlineChecksum()) {
+        int checksumType = info.getChecksumType();
+        int bytesPerChecksum = info.getBytesPerChecksum();
+        return new BlockInlineChecksumReader(this.namespaceId, this.block,
+            this.data, this.ignoreChecksum, this.verifyChecksum,
+            this.corruptChecksumOk, this, checksumType, bytesPerChecksum);
+
+      } else {
+        return new BlockWithChecksumFileReader(this.namespaceId,
+            this.block, this.data, this.ignoreChecksum, this.verifyChecksum,
+            this.corruptChecksumOk, this);
+      }
+    }
+    
+    public FSDatasetInterface getDataset() {
+      return this.data;
+    }
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockWriter.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockWriter.java
new file mode 100644
index 00000000..64ca4c9b
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockWriter.java
@@ -0,0 +1,88 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.util.DataChecksum;
+
+/**
+ * Base class for block writing in data node. It reads input packet
+ * buffer and write data and checksum to local files.
+ *
+ */
+abstract class DatanodeBlockWriter implements java.io.Closeable {
+  static final Log LOG = DataNode.LOG;
+  static final Log ClientTraceLog = DataNode.ClientTraceLog;
+
+  protected int bytesPerChecksum;
+  protected int checksumSize;
+  protected Block block; // the block to receive
+  protected String inAddr;
+  protected int namespaceId;
+  protected DataNode datanode = null;
+
+  public abstract void initializeStreams(int bytesPerChecksum,
+      int checksumSize, Block block, String inAddr, int namespaceId,
+      DataNode datanode) throws FileNotFoundException, IOException;
+  
+  protected void setParameters(int bytesPerChecksum, int checksumSize,
+      Block block, String inAddr, int namespaceId, DataNode datanode) {
+    this.bytesPerChecksum = bytesPerChecksum;
+    this.checksumSize = checksumSize;
+    this.block = block;
+    this.inAddr = inAddr;
+    this.namespaceId = namespaceId;
+    this.datanode = datanode;
+  }
+
+  /**
+   * Write out checksum header
+   * 
+   * @param checksum
+   * @throws IOException
+   */
+  public abstract void writeHeader(DataChecksum checksum) throws IOException;
+
+  /**
+   * Write the data in the packet buffer to local disk.
+   * 
+   * Input format:
+   * Both of data and checksum are in pktBuf.
+   * data has len bytes and are from dataOff.
+   * checksums are from checksumOff, followed by checksums of chunks. 
+   * 
+   * @param pktBuf        packet buffer
+   * @param len           length of data in the buffer
+   * @param dataOff       starting data offset in pktBuf
+   * @param checksumOff   starting checksum offset in pktBuf
+   * @param numChunks     number of chunks expected in the pktBuf
+   * @throws IOException
+   */
+  public abstract void writePacket(byte pktBuf[], int len, int dataOff,
+      int checksumOff, int numChunks) throws IOException;
+
+  public abstract void setPosAndRecomputeChecksumIfNeeded(long offsetInBlock,
+      DataChecksum checksum) throws IOException;
+
+  public abstract void flush(boolean forceSync) throws IOException;
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
index 76af63d9..20b6ada5 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
@@ -55,6 +55,7 @@
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumReader.GenStampAndChecksum;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.FSDataset.ActiveFile;
 import org.apache.hadoop.hdfs.server.datanode.metrics.FSDatasetMBean;
@@ -70,6 +71,7 @@
 import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 import org.apache.hadoop.util.DiskChecker.DiskOutOfSpaceException;
 
+
 /**************************************************
  * FSDataset manages a set of data blocks.  Each block
  * has a unique name and an extent on disk.
@@ -85,6 +87,26 @@ static String[] getFileNames(File[] files) {
     return fileNames;
   }
 
+  static Block getBlockFromNames(File blockFiles[], String[] blockFilesNames, int index)
+      throws IOException {
+    if (Block.isSeparateChecksumBlockFilename(blockFilesNames[index])) {
+      long genStamp = BlockWithChecksumFileReader
+          .getGenerationStampFromSeperateChecksumFile(blockFilesNames,
+              blockFilesNames[index]);
+      return new Block(blockFiles[index], blockFiles[index].length(),
+          genStamp);
+    } else if (Block.isInlineChecksumBlockFilename(blockFilesNames[index])) {
+      // TODO: We might want to optimize it.
+      GenStampAndChecksum sac = BlockInlineChecksumReader
+          .getGenStampAndChecksumFromInlineChecksumFile(blockFilesNames[index]);
+      long blockLengh = BlockInlineChecksumReader.getBlockSizeFromFileLength(
+          blockFiles[index].length(), sac.checksumType, sac.bytesPerChecksum);
+
+      return new Block(blockFiles[index], blockLengh, sac.generationStamp);
+    }
+    return null;
+  }
+
   /**
    * A NamespaceSlice represents a portion of a namespace stored on a volume.  
    * Taken together, all BNamespaceSlices sharing a namespaceID across a 
@@ -169,7 +191,7 @@ class NamespaceSlice {
       this.dfsUsage = volume.dfsUsage.addNamespace(namespaceId, nsDir, conf);
     }
     
-    void getBlockInfo(LightWeightHashSet<Block> blocks){
+    void getBlockInfo(LightWeightHashSet<Block> blocks) throws IOException{
       dataDir.getBlockInfo(blocks);
     }
     
@@ -210,7 +232,7 @@ private void recoverDetachedBlocks(File dataDir, File dir)
       }
     }
     
-    void getBlocksBeingWrittenInfo(LightWeightHashSet<Block> blockSet) { 
+    void getBlocksBeingWrittenInfo(LightWeightHashSet<Block> blockSet) throws IOException { 
       if (rbwDir == null) {
         return;
       }
@@ -222,18 +244,14 @@ void getBlocksBeingWrittenInfo(LightWeightHashSet<Block> blockSet) {
       String[] blockFileNames = getFileNames(blockFiles);  
       for (int i = 0; i < blockFiles.length; i++) {
         if (!blockFiles[i].isDirectory()) {
-        // get each block in the rbwDir direcotry
-          if (Block.isBlockFilename(blockFileNames[i])) {
-            long genStamp = FSDataset.getGenerationStampFromFile(
-                blockFileNames, blockFileNames[i]);
-            Block block = 
-              new Block(blockFiles[i], blockFiles[i].length(), genStamp);
-            
+        // get each block in the rbwDir directory
+          Block block = FSDataset.getBlockFromNames(blockFiles, blockFileNames, i);
+          if (block != null) {
             // add this block to block set
             blockSet.add(block);
             if (DataNode.LOG.isDebugEnabled()) {
               DataNode.LOG.debug("recoverBlocksBeingWritten for block " + block);
-            }
+            }            
           }
         }
       }
@@ -254,9 +272,23 @@ private void recoverBlocksBeingWritten(File bbw) throws IOException {
         File f = b.pathfile;  // full path name of block file
         lock.writeLock().lock();
         try {
-          volumeMap.add(namespaceId, b.block, new DatanodeBlockInfo(volume, f,
-              DatanodeBlockInfo.UNFINALIZED));
-          volumeMap.addOngoingCreates(namespaceId, b.block, ActiveFile.createStartupRecoveryFile(f));
+          boolean isInlineChecksum = Block.isInlineChecksumBlockFilename(f
+              .getName());
+          int checksumType = DataChecksum.CHECKSUM_UNKNOWN;
+          int bytesPerChecksum = -1;
+          if (isInlineChecksum) {
+            GenStampAndChecksum sac = BlockInlineChecksumReader
+                .getGenStampAndChecksumFromInlineChecksumFile(f.getName());
+            checksumType = sac.checksumType;
+            bytesPerChecksum = sac.bytesPerChecksum;
+          }
+          DatanodeBlockInfo binfo = new DatanodeBlockInfo(volume, f,
+              DatanodeBlockInfo.UNFINALIZED, true, isInlineChecksum,
+              checksumType, bytesPerChecksum);
+
+          volumeMap.add(namespaceId, b.block, binfo);
+          volumeMap.addOngoingCreates(namespaceId, b.block, new ActiveFile(
+              binfo, true, ActiveFile.UNKNOWN_SIZE));
         } finally {
           lock.writeLock().unlock();
         }
@@ -309,12 +341,21 @@ File getTmpFile(Block b) throws IOException {
      * Temporary files. They get moved to the finalized block directory when
      * the block is finalized.
      */
-    File createTmpFile(Block b, boolean replicationRequest) throws IOException {
+    File createTmpFile(Block b, boolean replicationRequest,
+        boolean inlineChecksum, int checksumType, int bytesPerChecksum)
+        throws IOException {
       File f= null;
+      String fileName;
+      if (inlineChecksum) {
+        fileName = BlockInlineChecksumWriter.getInlineChecksumFileName(b,
+            checksumType, bytesPerChecksum);
+      } else {
+        fileName = b.getBlockName();
+      }
       if (!replicationRequest) {
-        f = new File(rbwDir, b.getBlockName());
+        f = new File(rbwDir, fileName);
       } else {
-        f = new File(tmpDir, b.getBlockName());
+        f = new File(tmpDir, fileName);
       }
       return FSDataset.createTmpFile(b, f);
     }
@@ -329,10 +370,18 @@ File createRbwFile(Block b) throws IOException {
       return FSDataset.createTmpFile(b, f);
     }
 
-    File addBlock(Block b, File f) throws IOException {
-      File blockFile = dataDir.addBlock(namespaceId, b, f);
-      File metaFile = getMetaFile(blockFile , b);
-      dfsUsage.incDfsUsed(b.getNumBytes()+metaFile.length());
+    File addBlock(Block b, File f, boolean inlineChecksum, int checksumType,
+        int bytesPerChecksum) throws IOException {
+      File blockFile = dataDir.addBlock(namespaceId, b, f, inlineChecksum,
+          checksumType, bytesPerChecksum);
+      long spaceAdded;
+      if (!inlineChecksum) {
+        File metaFile = BlockWithChecksumFileWriter.getMetaFile(blockFile , b);
+        spaceAdded = b.getNumBytes() + metaFile.length();
+      } else {
+        spaceAdded = blockFile.length();
+      }
+      dfsUsage.incDfsUsed(spaceAdded);
       return blockFile;
     }
       
@@ -356,29 +405,6 @@ public void shutdown() {
     }
   }
 
-  /** Find the metadata file for the specified block file.
-   * Return the generation stamp from the name of the metafile.
-   */
-  static long getGenerationStampFromFile(String[] listdir, String blockName) {
-    for (int j = 0; j < listdir.length; j++) {
-      String path = listdir[j];
-      if (!path.startsWith(blockName)) {
-        continue;
-      }
-      String[] vals = StringUtils.split(path, '_');
-      if (vals.length != 3) {     // blk, blkid, genstamp.meta
-        continue;
-      }
-      String[] str = StringUtils.split(vals[2], '.');
-      if (str.length != 2) {
-        continue;
-      }
-      return Long.parseLong(str[0]);
-    }
-    DataNode.LOG.warn("Block " + blockName +
-                      " does not have a metafile!");
-    return Block.GRANDFATHER_GENERATION_STAMP;
-  }
   /**
    * A data structure than encapsulates a Block along with the full pathname
    * of the block file
@@ -444,13 +470,28 @@ public FSDir(int namespaceId, File dir, FSVolume volume) throws IOException {
             asyncDiskService.deleteAsyncFile(volume, file);   
           } else if (file.isDirectory()) {
             numChildren++;
-          } else if (Block.isBlockFilename(fileName)) {
+          } else if (Block.isSeparateChecksumBlockFilename(fileName)) {
             numBlocks++;
             if (volume != null) {   
               long blkSize = file.length();
-              long genStamp = FSDataset.getGenerationStampFromFile(filesNames, fileName);    
-                volumeMap.add(namespaceId, new Block(file, blkSize, genStamp),     
-                  new DatanodeBlockInfo(volume, file, blkSize));   
+              long genStamp = BlockWithChecksumFileReader
+                  .getGenerationStampFromSeperateChecksumFile(filesNames,
+                      fileName);
+              volumeMap.add(namespaceId, new Block(file, blkSize, genStamp),
+                  new DatanodeBlockInfo(volume, file, blkSize, true, false,
+                      DataChecksum.CHECKSUM_UNKNOWN, -1));
+            }
+          } else if (Block.isInlineChecksumBlockFilename(fileName)) {
+            numBlocks++;
+            if (volume != null) {
+              GenStampAndChecksum sac = BlockInlineChecksumReader
+                      .getGenStampAndChecksumFromInlineChecksumFile(fileName);
+              long blkSize = BlockInlineChecksumReader
+                  .getBlockSizeFromFileLength(file.length(), sac.checksumType,
+                      sac.bytesPerChecksum);
+              volumeMap.add(namespaceId, new Block(file, blkSize,
+                  sac.generationStamp), new DatanodeBlockInfo(volume, file,
+                  blkSize, true, true, sac.checksumType, sac.bytesPerChecksum));
             }
           }
         }
@@ -469,26 +510,44 @@ public FSDir(int namespaceId, File dir, FSVolume volume) throws IOException {
       }
     }
         
-    public File addBlock(int namespaceId, Block b, File src) throws IOException {
+    public File addBlock(int namespaceId, Block b, File src,
+        boolean inlineChecksum, int checksumType, int bytesPerChecksum)
+        throws IOException {
       //First try without creating subdirectories
-      File file = addBlock(namespaceId, b, src, false, false);          
-      return (file != null) ? file : addBlock(namespaceId, b, src, true, true);
+      File file = addBlock(namespaceId, b, src, false, false, inlineChecksum,
+          checksumType, bytesPerChecksum);
+      return (file != null) ? file : addBlock(namespaceId, b, src, true, true,
+          inlineChecksum, checksumType, bytesPerChecksum);
     }
 
-    private File addBlock(int namespaceId, Block b, File src, boolean createOk, 
-                          boolean resetIdx) throws IOException {
+    private File addBlock(int namespaceId, Block b, File src, boolean createOk,
+        boolean resetIdx, boolean inlineChecksum, int checksumType,
+        int bytesPerChecksum) throws IOException {
       if (numBlocks < maxBlocksPerDir) {
-        File dest = new File(dir, b.getBlockName());
-        File metaData = getMetaFile( src, b );
-        File newmeta = getMetaFile(dest, b);
-        if ( ! metaData.renameTo( newmeta ) ||
-            ! src.renameTo( dest ) ) {
+        File dest;
+        if (!inlineChecksum) {
+          dest = new File(dir, b.getBlockName());
+          File metaData = BlockWithChecksumFileWriter.getMetaFile( src, b );
+          File newmeta = BlockWithChecksumFileWriter.getMetaFile(dest, b);
+          if ( ! metaData.renameTo( newmeta )) {
+            throw new IOException("could not move file "
+                + metaData.getAbsolutePath() + " to "
+                + newmeta.getAbsolutePath());
+          }
+          if (DataNode.LOG.isDebugEnabled()) {
+            DataNode.LOG.debug("addBlock: Moved " + metaData + " to " + newmeta);
+          }
+        } else {
+          dest = new File(dir,
+              BlockInlineChecksumWriter.getInlineChecksumFileName(b,
+                  checksumType, bytesPerChecksum));
+        }
+        if (! src.renameTo( dest ) ) {
           throw new IOException( "could not move files for " + b +
                                  " from tmp to " + 
                                  dest.getAbsolutePath() );
         }
         if (DataNode.LOG.isDebugEnabled()) {
-          DataNode.LOG.debug("addBlock: Moved " + metaData + " to " + newmeta);
           DataNode.LOG.debug("addBlock: Moved " + src + " to " + dest);
         }
 
@@ -506,7 +565,8 @@ private File addBlock(int namespaceId, Block b, File src, boolean createOk,
         //Check if any child-tree has room for a block.
         for (int i=0; i < children.length; i++) {
           int idx = (lastChildIdx + i)%children.length;
-          File file = children[idx].addBlock(namespaceId, b, src, false, resetIdx);
+          File file = children[idx].addBlock(namespaceId, b, src, false,
+              resetIdx, inlineChecksum, checksumType, bytesPerChecksum);
           if (file != null) {
             lastChildIdx = idx;
             return file; 
@@ -531,14 +591,16 @@ private File addBlock(int namespaceId, Block b, File src, boolean createOk,
             
       //now pick a child randomly for creating a new set of subdirs.
       lastChildIdx = random.nextInt(children.length);
-      return children[ lastChildIdx ].addBlock(namespaceId, b, src, true, false); 
+      return children[lastChildIdx].addBlock(namespaceId, b, src, true, false,
+          inlineChecksum, checksumType, bytesPerChecksum);
     }
-
+    
     /**
      * Populate the given blockSet with any child blocks
      * found at this node.
+     * @throws IOException 
      */
-    public void getBlockInfo(LightWeightHashSet<Block> blockSet) {
+    public void getBlockInfo(LightWeightHashSet<Block> blockSet) throws IOException {
       FSDir[] children = this.getChildren();
       if (children != null) {
         for (int i = 0; i < children.length; i++) {
@@ -550,10 +612,9 @@ public void getBlockInfo(LightWeightHashSet<Block> blockSet) {
       String[] blockFilesNames = getFileNames(blockFiles);
       
       for (int i = 0; i < blockFiles.length; i++) {
-        if (Block.isBlockFilename(blockFilesNames[i])) {
-          long genStamp = FSDataset.getGenerationStampFromFile(blockFilesNames,
-              blockFilesNames[i]);
-          blockSet.add(new Block(blockFiles[i], blockFiles[i].length(), genStamp));
+        Block block = getBlockFromNames(blockFiles, blockFilesNames, i);
+        if (block != null) {
+          blockSet.add(block);
         }
       }
     }
@@ -562,8 +623,9 @@ public void getBlockInfo(LightWeightHashSet<Block> blockSet) {
      * Populate the given blockSet with any child blocks
      * found at this node. With each block, return the full path
      * of the block file.
+     * @throws IOException 
      */
-    void getBlockAndFileInfo(LightWeightHashSet<BlockAndFile> blockSet) {
+    void getBlockAndFileInfo(LightWeightHashSet<BlockAndFile> blockSet) throws IOException {
       FSDir[] children = this.getChildren();
       if (children != null) {
         for (int i = 0; i < children.length; i++) {
@@ -574,10 +636,8 @@ void getBlockAndFileInfo(LightWeightHashSet<BlockAndFile> blockSet) {
       File blockFiles[] = dir.listFiles();
       String[] blockFilesNames = getFileNames(blockFiles);      
       for (int i = 0; i < blockFiles.length; i++) {
-        if (Block.isBlockFilename(blockFilesNames[i])) {
-          long genStamp = FSDataset.getGenerationStampFromFile(blockFilesNames,
-              blockFilesNames[i]);
-          Block block = new Block(blockFiles[i], blockFiles[i].length(), genStamp);
+        Block block = getBlockFromNames(blockFiles, blockFilesNames, i);
+        if (block != null) {
           blockSet.add(new BlockAndFile(blockFiles[i].getAbsoluteFile(), block));
         }
       }
@@ -801,9 +861,10 @@ String getFileSystem() throws IOException {
       return usage.getFilesystem();
     }
      
-    File addBlock(int namespaceId, Block b, File f) throws IOException {
+    File addBlock(int namespaceId, Block b, File f, boolean inlineChecksum,
+        int checksumType, int bytesPerChecksum) throws IOException {
       NamespaceSlice ns = getNamespaceSlice(namespaceId);
-      return ns.addBlock(b, f);
+      return ns.addBlock(b, f, inlineChecksum, checksumType, bytesPerChecksum);
     }
       
     void checkDirs() throws DiskErrorException {
@@ -830,9 +891,12 @@ File getTmpFile(int namespaceId, Block b) throws IOException {
      * Temporary files. They get moved to the finalized block directory when
      * the block is finalized.
      */
-    File createTmpFile(int namespaceId, Block b, boolean replicationRequest) throws IOException {
+    File createTmpFile(int namespaceId, Block b, boolean replicationRequest,
+        boolean inlineChecksum, int checksumType, int bytesPerChecksum)
+        throws IOException {
       NamespaceSlice ns = getNamespaceSlice(namespaceId);
-      return ns.createTmpFile(b, replicationRequest);
+      return ns.createTmpFile(b, replicationRequest, inlineChecksum,
+          checksumType, bytesPerChecksum);
     }
     
     /**
@@ -851,7 +915,8 @@ public void addNamespace(int namespaceId, String nsDir, Configuration conf, bool
       namespaceMap.addNamespace(namespaceId, ns);
     }
     
-    void getBlocksBeingWrittenInfo(int namespaceId, LightWeightHashSet<Block> blockSet) {
+    void getBlocksBeingWrittenInfo(int namespaceId,
+        LightWeightHashSet<Block> blockSet) throws IOException {
       NamespaceSlice ns = getNamespaceSlice(namespaceId);
       if (ns == null) {
         return;
@@ -1156,6 +1221,24 @@ private List<FSVolume> checkDirs() {
       return removed_vols;
     }
     
+    private List<FSVolume> removeBVolumes(List<File> directories) {
+      ArrayList<FSVolume> removed_vols = new ArrayList<FSVolume>();
+      if (directories != null && directories.size() > 0) {
+        FSVolume[] fsVolumes = this.getVolumes();
+        for(int idx = 0; idx < fsVolumes.length; idx++) {
+          FSVolume fsv = fsVolumes[idx];
+          if(directories.contains(fsv.getDir())) {
+            removed_vols.add(fsv);
+          }
+        }
+        volumeList.removeVolumes(removed_vols);
+        DataNode.LOG.info("Completed FSVolumeSet.removeVolumes. Removed="
+            + removed_vols.size() + "volumes. List of current volumes: "
+            + toString());
+      }
+      return removed_vols;
+    }
+    
     private void addNamespace(int namespaceId, String nsDir, Configuration conf)
         throws IOException {
       FSVolume[] volumes = this.getVolumes();
@@ -1234,14 +1317,20 @@ public LightWeightHashSet<Block> call() throws Exception {
 
   //Find better place?
   public static final String METADATA_EXTENSION = ".meta";
-  public static final short METADATA_VERSION = 1;
+  public static final short FORMAT_VERSION_NON_INLINECHECKSUM = 1;
+  public static final short FORMAT_VERSION_INLINECHECKSUM = 2;
   public static final String DELETE_FILE_EXT = "toDelete.";
 
-  static class ActiveFile implements ReplicaBeingWritten, Cloneable {
-    final File file;
+  static class ActiveFile implements ReplicaToRead, ReplicaBeingWritten,
+      Cloneable {
+    static final long UNKNOWN_SIZE = -1;
+    
+    DatanodeBlockInfo datanodeBlockInfo;
     final List<Thread> threads = new ArrayList<Thread>(2);
+    private volatile long bytesReceived;
     private volatile long bytesAcked;
     private volatile long bytesOnDisk;
+
     /**
      * Set to true if this file was recovered during datanode startup.
      * This may indicate that the file has been truncated (eg during
@@ -1249,8 +1338,9 @@ static class ActiveFile implements ReplicaBeingWritten, Cloneable {
      */
     final boolean wasRecoveredOnStartup;
 
-    ActiveFile(File f, List<Thread> list) {
-      this(f, false);
+    ActiveFile(DatanodeBlockInfo datanodeBlockInfo, List<Thread> list,
+        long expectedSize) throws IOException {
+      this(datanodeBlockInfo, false, expectedSize);
       if (list != null) {
         threads.addAll(list);
       }
@@ -1261,18 +1351,34 @@ static class ActiveFile implements ReplicaBeingWritten, Cloneable {
      * Create an ActiveFile from a file on disk during DataNode startup.
      * This factory method is just to make it clear when the purpose
      * of this constructor is.
+     * @throws IOException 
      */
-    public static ActiveFile createStartupRecoveryFile(File f) {
-      return new ActiveFile(f, true);
-    }
+    private ActiveFile(DatanodeBlockInfo datanodeBlockInfo, boolean recovery,
+                       long expectedSize)
+        throws IOException {
+      this.datanodeBlockInfo = datanodeBlockInfo;
+      long sizeFromDisk;
 
-    private ActiveFile(File f, boolean recovery) {
-      file = f;
-      bytesAcked = bytesOnDisk = f.length();
+      if (!isInlineChecksum()) {
+        sizeFromDisk = getDataFile().length();
+      } else {
+        GenStampAndChecksum sac = BlockInlineChecksumReader
+            .getGenStampAndChecksumFromInlineChecksumFile(getDataFile()
+                .getName());
+        sizeFromDisk = BlockInlineChecksumReader.getBlockSizeFromFileLength(
+            getDataFile().length(), sac.checksumType, sac.bytesPerChecksum);
+      }
+      if (expectedSize != UNKNOWN_SIZE && sizeFromDisk != expectedSize) {
+        throw new IOException("File " + getDataFile()
+            + " on disk size " + sizeFromDisk + " doesn't match expected size "
+            + expectedSize);
+      }
+      bytesReceived = bytesAcked = bytesOnDisk = sizeFromDisk;
       wasRecoveredOnStartup = recovery;
     }
 
-    public long getBytesAcked() {
+    @Override
+    public long getBytesVisible() {
       return bytesAcked;
     }
 
@@ -1280,66 +1386,58 @@ public void setBytesAcked(long value) {
       bytesAcked = value;
     }
 
-    public long getBytesOnDisk() {
+    @Override
+    public long getBytesWritten() {
       return bytesOnDisk;
     }
 
     public void setBytesOnDisk(long value) {
       bytesOnDisk = value;
     }
+    
+    public long getBytesReceived() {
+      return bytesReceived;
+    }
+
+    public void setBytesReceived(long length) {
+      bytesReceived = length;
+    }
+
+    @Override
+    public File getDataFileToRead() {
+      return datanodeBlockInfo.getDataFileToRead();
+    }
 
+    public File getDataFile() {
+      return datanodeBlockInfo.file;
+    }
+    
     public String toString() {
-      return getClass().getSimpleName() + "(file=" + file
+      return getClass().getSimpleName() + "(file=" + getDataFile()
           + ", threads=" + threads + ")";
     }
     
     public ActiveFile getClone() throws CloneNotSupportedException {
       return (ActiveFile) super.clone();
     }
-  }
-  
-  static String getMetaFileName(String blockFileName, long genStamp) {
-    return blockFileName + "_" + genStamp + METADATA_EXTENSION;
-  }
-
-  static File getMetaFile(File f , Block b) {
-    return new File(getMetaFileName(f.getAbsolutePath(),
-                                    b.getGenerationStamp())); 
-  }
-  protected File getMetaFile(int namespaceId, Block b) throws IOException {
-    return getMetaFile(getBlockFile(namespaceId, b), b);
-  }
-
-  /** Find the corresponding meta data file from a given block file */
-  public static File findMetaFile(final File blockFile) throws IOException {
-    return findMetaFile(blockFile, false);
-  }
 
-  private static File findMetaFile(final File blockFile, boolean missingOk)
-    throws IOException {
-    final String prefix = blockFile.getName() + "_";
-    final File parent = blockFile.getParentFile();
-    File[] matches = parent.listFiles(new FilenameFilter() {
-      public boolean accept(File dir, String name) {
-        return dir.equals(parent)
-            && name.startsWith(prefix) && name.endsWith(METADATA_EXTENSION);
-      }
-    });
+    @Override
+    public boolean isInlineChecksum() {
+      return datanodeBlockInfo.isInlineChecksum();
+    }
 
-    if (matches == null || matches.length == 0) {
-      if (missingOk) {
-        return null;
-      } else {
-        throw new IOException("Meta file not found, blockFile=" + blockFile);
-      }
+    @Override
+    public int getChecksumType() {
+      return datanodeBlockInfo.getChecksumType();
     }
-    else if (matches.length > 1) {
-      throw new IOException("Found more than one meta files: "
-          + Arrays.asList(matches));
+
+    @Override
+    public int getBytesPerChecksum() {
+      return datanodeBlockInfo.getBytesPerChecksum();
     }
-    return matches[0];
   }
   
+  
   /**
    * Check if a file is scheduled for deletion
    * name should be obtained by File.getName()
@@ -1347,45 +1445,7 @@ else if (matches.length > 1) {
   static boolean isPendingDeleteFilename(String name) {
     return name.startsWith(DELETE_FILE_EXT);
   }
-
-  /** Find the corresponding meta data file from a given block file */
-  static long parseGenerationStamp(File blockFile, File metaFile
-      ) throws IOException {
-    String metaname = metaFile.getName();
-    String gs = metaname.substring(blockFile.getName().length() + 1,
-        metaname.length() - METADATA_EXTENSION.length());
-    try {
-      return Long.parseLong(gs);
-    } catch(NumberFormatException nfe) {
-      throw (IOException)new IOException("blockFile=" + blockFile
-          + ", metaFile=" + metaFile).initCause(nfe);
-    }
-  }
-
-  /** Return the block file for the given ID */ 
-  public File findBlockFile(int namespaceId, long blockId) {
-    lock.readLock().lock();
-    try {
-      final Block eb = new Block(blockId);
-      File blockfile = null;
-      ActiveFile activefile = volumeMap.getOngoingCreates(namespaceId, eb);
-      if (activefile != null) {
-        blockfile = activefile.file;
-      }
-      if (blockfile == null) {
-        blockfile = getFile(namespaceId, eb);
-      }
-      if (blockfile == null) {
-        if (DataNode.LOG.isDebugEnabled()) {
-          DataNode.LOG.debug("volumeMap=" + volumeMap);
-        }
-      }
-      return blockfile;
-    } finally {
-      lock.readLock().unlock();
-    }
-  }
-
+  
   public Block getStoredBlock(int namespaceId, long blkid) throws IOException {
     return getStoredBlock(namespaceId, blkid, false);
   }
@@ -1394,43 +1454,42 @@ public Block getStoredBlock(int namespaceId, long blkid,
       boolean useOnDiskLength) throws IOException {
     lock.readLock().lock();
     try {
-      File blockfile = findBlockFile(namespaceId, blkid);
-      if (blockfile == null) {
+      ReplicaToRead replica = getReplicaToRead(namespaceId, new Block(
+          blkid));
+      if (replica == null) {
         return null;
       }
-      File metafile = findMetaFile(blockfile, true);
-      if (metafile == null) {
+      File blockfile = replica.getDataFileToRead();
+      if (blockfile == null) {
         return null;
       }
+      
+      File metafile = null;
+      if (!replica.isInlineChecksum()) {
+        metafile = BlockWithChecksumFileWriter.findMetaFile(blockfile, true);
+        if (metafile == null) {
+          return null;
+        }
+      }
       Block block = new Block(blkid);
       if (useOnDiskLength) {
         block.setNumBytes(getOnDiskLength(namespaceId, block));
       } else {
         block.setNumBytes(getVisibleLength(namespaceId, block));
       }
-      block.setGenerationStamp(parseGenerationStamp(blockfile, metafile));
+      if (replica.isInlineChecksum()) {
+        block.setGenerationStamp(BlockInlineChecksumReader
+            .getGenerationStampFromInlineChecksumFile(blockfile.getName()));
+      } else {
+        block.setGenerationStamp(BlockWithChecksumFileReader
+            .parseGenerationStampInMetaFile(blockfile, metafile));
+      }
       return block;
     } finally {
       lock.readLock().unlock();
     }
   }
 
-  public boolean metaFileExists(int namespaceId, Block b) throws IOException {
-    return getMetaFile(namespaceId, b).exists();
-  }
-  
-  public long getMetaDataLength(int namespaceId, Block b) throws IOException {
-    File checksumFile = getMetaFile(namespaceId, b);
-    return checksumFile.length();
-  }
-
-  public MetaDataInputStream getMetaDataInputStream(int namespace, Block b)
-      throws IOException {
-    File checksumFile = getMetaFile(namespace, b);
-    return new MetaDataInputStream(new FileInputStream(checksumFile),
-                                                    checksumFile.length());
-  }
-
   FSVolumeSet volumes;
   private DataNode datanode;
   private Configuration conf;
@@ -1469,10 +1528,10 @@ public void initialize(DataStorage storage) throws IOException{
       // The number of volumes required for operation is the total number 
       // of volumes configured minus the number of failed volumes we can
       // tolerate.
-      final int volFailuresTolerated =
-        conf.getInt("dfs.datanode.failed.volumes.tolerated", 0);
-      String[] dataDirs = conf.getStrings("dfs.data.dir");
+      String[] dataDirs = DataNode.getListOfDataDirs(conf);
       int volsConfigured = (dataDirs == null) ? 0 : dataDirs.length;
+      final int volFailuresTolerated =
+        conf.getInt("dfs.datanode.failed.volumes.tolerated", volsConfigured-1);
       this.validVolsRequired = volsConfigured - volFailuresTolerated;
       if (validVolsRequired < 1 || validVolsRequired > storage.getNumStorageDirs()) {
         throw new DiskErrorException("Too many failed volumes - "
@@ -1618,24 +1677,20 @@ public long getFinalizedBlockLength(int namespaceId, Block b) throws IOException
 
   @Override
   public long getOnDiskLength(int namespaceId, Block b) throws IOException {
-    ActiveFile activeFile = volumeMap.getOngoingCreates(namespaceId, b);
-
-    if (activeFile != null) {
-      return activeFile.getBytesOnDisk();
-    } else {
-      return getFinalizedBlockLength(namespaceId, b);
+    ReplicaToRead rtr = this.getReplicaToRead(namespaceId, b);
+    if (rtr == null) {
+      throw new IOException("Can't find block " + b + " in volumeMap");
     }
+    return rtr.getBytesWritten();
   }
 
   @Override
   public long getVisibleLength(int namespaceId, Block b) throws IOException {
-    ActiveFile activeFile = volumeMap.getOngoingCreates(namespaceId, b);
-
-    if (activeFile != null) {
-      return activeFile.getBytesAcked();
-    } else {
-      return getFinalizedBlockLength(namespaceId, b);
+    ReplicaToRead rtr = this.getReplicaToRead(namespaceId, b);
+    if (rtr == null) {
+      throw new IOException("Can't find block " + b + " in volumeMap");
     }
+    return rtr.getBytesVisible();
   }
 
   @Override
@@ -1664,7 +1719,7 @@ public File getBlockFile(int namespaceId, Block b) throws IOException {
     }
     return f;
   }
-  
+
   public InputStream getBlockInputStream(int namespaceId, Block b) throws IOException {
     return new FileInputStream(getBlockFile(namespaceId, b));
   }
@@ -1678,44 +1733,6 @@ public InputStream getBlockInputStream(int namespaceId, Block b, long seekOffset
     return new FileInputStream(blockInFile.getFD());
   }
 
-  /**
-   * Returns handles to the block file and its metadata file
-   */
-  public BlockInputStreams getTmpInputStreams(int namespaceId, Block b, 
-                          long blkOffset, long ckoff) throws IOException {
-    lock.readLock().lock();
-    try {
-      DatanodeBlockInfo info = volumeMap.get(namespaceId, b);
-      if (info == null) {
-        throw new IOException("Block " + b + " does not exist in volumeMap.");
-      }
-      FSVolume v = info.getVolume();
-      File blockFile = info.getFile();
-      if (blockFile == null) {
-        blockFile = v.getTmpFile(namespaceId, b);
-      }
-      RandomAccessFile blockInFile = new RandomAccessFile(blockFile, "r");
-      if (blkOffset > 0) {
-        blockInFile.seek(blkOffset);
-      }
-      File metaFile = getMetaFile(blockFile, b);
-      RandomAccessFile metaInFile = new RandomAccessFile(metaFile, "r");
-      if (ckoff > 0) {
-        metaInFile.seek(ckoff);
-      }
-      return new BlockInputStreams(new FileInputStream(blockInFile.getFD()),
-          new FileInputStream(metaInFile.getFD()));
-    } finally {
-      lock.readLock().unlock();
-    }
-  }
-
-  private BlockWriteStreams createBlockWriteStreams( File f , File metafile) throws IOException {
-      return new BlockWriteStreams(new FileOutputStream(new RandomAccessFile( f , "rw" ).getFD()),
-          new FileOutputStream( new RandomAccessFile( metafile , "rw" ).getFD() ));
-
-  }
-
   /**
    * Make a copy of the block if this block is linked to an existing
    * snapshot. This ensures that modifying this block does not modify
@@ -1825,6 +1842,13 @@ private ArrayList<Thread> getActiveThreads(int namespaceId, Block block) {
     return null;
   }
   
+  private void setDataFileForBlock(int namespaceId, Block block, File newDataFile) {
+    DatanodeBlockInfo info = volumeMap.get(namespaceId, block);
+    if (info != null) {
+      info.setFile(newDataFile);
+    }
+  }
+  
   /**
    * Try to update an old block to a new block.
    * If there are ongoing create threads running for the old block,
@@ -1842,19 +1866,24 @@ private List<Thread> tryUpdateBlock(int namespaceId,
         return activeThreads;
       }
 
-      if (volumeMap.get(namespaceId, oldblock) == null) {
+      DatanodeBlockInfo binfo = volumeMap.get(namespaceId, oldblock);
+      if (binfo == null) {
         throw new IOException("Block " + oldblock
             + " doesn't exist or has been recovered to a new generation ");
       }
 
-      //No ongoing create threads is alive.  Update block.
-      File blockFile = findBlockFile(namespaceId, oldblock.getBlockId());
-      if (blockFile == null) {
-        throw new IOException("Block " + oldblock + " does not exist.");
-      }
+      File blockFile = binfo.file;
   
-      File oldMetaFile = findMetaFile(blockFile);
-      long oldgs = parseGenerationStamp(blockFile, oldMetaFile);
+      long oldgs;
+      File oldMetaFile = null;
+      if (binfo.isInlineChecksum()) {
+        oldgs = BlockInlineChecksumReader
+            .getGenerationStampFromInlineChecksumFile(blockFile.getName());
+      } else {
+        oldMetaFile = BlockWithChecksumFileWriter.findMetaFile(blockFile);
+        oldgs = BlockWithChecksumFileReader.parseGenerationStampInMetaFile(
+            blockFile, oldMetaFile);
+      }
       
     // First validate the update
 
@@ -1884,32 +1913,60 @@ private List<Thread> tryUpdateBlock(int namespaceId,
       }
 
       // Now perform the update
-
-      // rename meta file to a tmp file
-      File tmpMetaFile = new File(oldMetaFile.getParent(),
-          oldMetaFile.getName() + "_tmp" + newblock.getGenerationStamp());
-      if (!oldMetaFile.renameTo(tmpMetaFile)) {
-        throw new IOException("Cannot rename block meta file to " + tmpMetaFile);
+      File tmpMetaFile = null;
+      if (!binfo.isInlineChecksum()) {
+        // rename meta file to a tmp file
+        tmpMetaFile = new File(oldMetaFile.getParent(),
+            oldMetaFile.getName() + "_tmp" + newblock.getGenerationStamp());
+        if (!oldMetaFile.renameTo(tmpMetaFile)) {
+          throw new IOException("Cannot rename block meta file to " + tmpMetaFile);
+        }
       }
 
-      long oldFileLength = blockFile.length();
-      if (newblock.getNumBytes() < oldFileLength) {
-        truncateBlock(blockFile, tmpMetaFile, oldFileLength,
-            newblock.getNumBytes());
-      ActiveFile file = volumeMap.getOngoingCreates(namespaceId, oldblock);
+      long oldBlockLength;
+      if (!binfo.isInlineChecksum()) {
+        oldBlockLength = blockFile.length();
+      } else {
+        oldBlockLength = BlockInlineChecksumReader.getBlockSizeFromFileLength(
+            blockFile.length(), binfo.getChecksumType(),
+            binfo.getBytesPerChecksum());
+      }
+      ActiveFile file = null;
+      if (newblock.getNumBytes() < oldBlockLength) {
+        if (!binfo.isInlineChecksum()) {
+          new BlockWithChecksumFileWriter(blockFile, tmpMetaFile)
+              .truncateBlock(oldBlockLength, newblock.getNumBytes());
+        } else {
+          new BlockInlineChecksumWriter(blockFile, binfo.getChecksumType(),
+              binfo.getBytesPerChecksum())
+              .truncateBlock(newblock.getNumBytes());
+        }
+      file = volumeMap.getOngoingCreates(namespaceId, oldblock);
       if (file != null) {
         file.setBytesAcked(newblock.getNumBytes());
         file.setBytesOnDisk(newblock.getNumBytes());
+        file.setBytesReceived(newblock.getNumBytes());
       } else {
         // This should never happen unless called from unit tests.
-        this.getDatanodeBlockInfo(namespaceId, oldblock).syncInMemorySize();
+        binfo.syncInMemorySize();
       }
       }
   
-      //rename the tmp file to the new meta file (with new generation stamp)
-      File newMetaFile = getMetaFile(blockFile, newblock);
-      if (!tmpMetaFile.renameTo(newMetaFile)) {
-        throw new IOException("Cannot rename tmp meta file to " + newMetaFile);
+      String newDataFileName;
+      if (!binfo.isInlineChecksum()) {
+        //rename the tmp file to the new meta file (with new generation stamp)
+        File newMetaFile = BlockWithChecksumFileWriter.getMetaFile(blockFile, newblock);
+        if (!tmpMetaFile.renameTo(newMetaFile)) {
+          throw new IOException("Cannot rename tmp meta file to " + newMetaFile);
+        }
+      } else {
+        newDataFileName = BlockInlineChecksumWriter.getInlineChecksumFileName(
+            newblock, binfo.getChecksumType(), binfo.getBytesPerChecksum());
+        File newDataFile = new File(blockFile.getParent(), newDataFileName);
+        if (!blockFile.renameTo(newDataFile)) {
+          throw new IOException("Cannot rename data file to " + newDataFileName);
+        }
+        setDataFileForBlock(namespaceId, oldblock, newDataFile);
       }
   
       if(volumeMap.getOngoingCreates(namespaceId, oldblock) != null){
@@ -1927,71 +1984,6 @@ private List<Thread> tryUpdateBlock(int namespaceId,
     }
   }
 
-  static void truncateBlock(File blockFile, File metaFile,
-      long oldBlockFileLen, long newlen) throws IOException {
-    if (newlen == oldBlockFileLen) {
-      return;
-    }
-    if (newlen > oldBlockFileLen) {
-      throw new IOException("Cannot truncate block to from oldlen (="
-          + oldBlockFileLen + ") to newlen (=" + newlen + ")");
-    }
-
-    if (newlen == 0) {
-      // Special case for truncating to 0 length, since there's no previous
-      // chunk.
-      RandomAccessFile blockRAF = new RandomAccessFile(blockFile, "rw");
-      try {
-        //truncate blockFile
-        blockRAF.setLength(newlen);
-      } finally {
-        blockRAF.close();
-      }
-      //update metaFile
-      RandomAccessFile metaRAF = new RandomAccessFile(metaFile, "rw");
-      try {
-        metaRAF.setLength(BlockMetadataHeader.getHeaderSize());
-      } finally {
-        metaRAF.close();
-      }
-      return;
-    }
-    DataChecksum dcs = BlockMetadataHeader.readHeader(metaFile).getChecksum();
-    int checksumsize = dcs.getChecksumSize();
-    int bpc = dcs.getBytesPerChecksum();
-    long newChunkCount = (newlen - 1)/bpc + 1;
-    long newmetalen = BlockMetadataHeader.getHeaderSize() + newChunkCount*checksumsize;
-    long lastchunkoffset = (newChunkCount - 1)*bpc;
-    int lastchunksize = (int)(newlen - lastchunkoffset);
-    byte[] b = new byte[Math.max(lastchunksize, checksumsize)];
-
-    RandomAccessFile blockRAF = new RandomAccessFile(blockFile, "rw");
-    try {
-      //truncate blockFile
-      blockRAF.setLength(newlen);
-
-      //read last chunk
-      blockRAF.seek(lastchunkoffset);
-      blockRAF.readFully(b, 0, lastchunksize);
-    } finally {
-      blockRAF.close();
-    }
-
-    //compute checksum
-    dcs.update(b, 0, lastchunksize);
-    dcs.writeValue(b, 0, false);
-
-    //update metaFile
-    RandomAccessFile metaRAF = new RandomAccessFile(metaFile, "rw");
-    try {
-      metaRAF.setLength(newmetalen);
-      metaRAF.seek(newmetalen - checksumsize);
-      metaRAF.write(b, 0, checksumsize);
-    } finally {
-      metaRAF.close();
-    }
-  }
-
   private final static String DISK_ERROR = "Possible disk error on file creation: ";
   /** Get the cause of an I/O exception if caused by a possible disk error
    * @param ioe an I/O exception
@@ -2015,8 +2007,9 @@ static IOException getCauseIfDiskError(IOException ioe) {
    * If replicationRequest is true, then this operation is part of a block
    * replication request.
    */
-  public BlockWriteStreams writeToBlock(int namespaceId, Block b, boolean isRecovery,
-                           boolean replicationRequest) throws IOException {
+  public DatanodeBlockWriter writeToBlock(int namespaceId, Block b,
+      boolean isRecovery, boolean replicationRequest, int checksumType, int bytesPerChecksum)
+      throws IOException {
     //
     // Make sure the block isn't a valid one - we're still creating it!
     //
@@ -2038,15 +2031,20 @@ public BlockWriteStreams writeToBlock(int namespaceId, Block b, boolean isRecove
     //
     File f = null;
     List<Thread> threads = null;
+    long expectedFileSize = ActiveFile.UNKNOWN_SIZE;
+    boolean inlineChecksum = datanode.useInlineChecksum;
     lock.writeLock().lock();
     try {
+
       //
       // Is it already in the create process?
       //
       ActiveFile activeFile = volumeMap.getOngoingCreates(namespaceId, b);
       if (activeFile != null) {
-        f = activeFile.file;
+        f = activeFile.getDataFile();
         threads = activeFile.threads;
+        expectedFileSize = activeFile.getBytesWritten();
+        inlineChecksum = activeFile.isInlineChecksum();
 
         if (!isRecovery) {
           throw new BlockAlreadyExistsException("Block " + b +
@@ -2062,28 +2060,38 @@ public BlockWriteStreams writeToBlock(int namespaceId, Block b, boolean isRecove
       if (!isRecovery) {
         v = volumes.getNextVolume(blockSize);
         // create temporary file to hold block in the designated volume
-        f = createTmpFile(namespaceId, v, b, replicationRequest);
+        f = createTmpFile(namespaceId, v, b, replicationRequest,
+            inlineChecksum, checksumType, bytesPerChecksum);
       } else if (f != null) {
         DataNode.LOG.info("Reopen already-open Block for append " + b);
         // create or reuse temporary file to hold block in the designated volume
-        v = volumeMap.get(namespaceId, b).getVolume();
+        DatanodeBlockInfo binfo = volumeMap.get(namespaceId, b);
+        inlineChecksum = binfo.isInlineChecksum();
+        v = binfo.getVolume();
         volumeMap.add(namespaceId, b, new DatanodeBlockInfo(v, f,
-            DatanodeBlockInfo.UNFINALIZED));
+            DatanodeBlockInfo.UNFINALIZED, true, inlineChecksum, checksumType,
+            bytesPerChecksum));
       } else {
         // reopening block for appending to it.
         DataNode.LOG.info("Reopen Block for append " + b);
-        v = volumeMap.get(namespaceId, b).getVolume();
-        f = createTmpFile(namespaceId, v, b, replicationRequest);
+        DatanodeBlockInfo binfo = volumeMap.get(namespaceId, b);
+        inlineChecksum = binfo.isInlineChecksum();
+        v = binfo.getVolume();
+        f = createTmpFile(namespaceId, v, b, replicationRequest,
+            inlineChecksum, checksumType, bytesPerChecksum);
         File blkfile = getBlockFile(namespaceId, b);
-        File oldmeta = getMetaFile(namespaceId, b);
-        File newmeta = getMetaFile(f, b);
-
-        // rename meta file to tmp directory
-        DataNode.LOG.debug("Renaming " + oldmeta + " to " + newmeta);
-        if (!oldmeta.renameTo(newmeta)) {
-          throw new IOException("Block " + b + " reopen failed. " +
-                                " Unable to move meta file  " + oldmeta +
-                                " to tmp dir " + newmeta);
+
+        if (!inlineChecksum) {
+          File oldmeta = BlockWithChecksumFileReader.getMetaFile(this, namespaceId, b);
+          File newmeta = BlockWithChecksumFileWriter.getMetaFile(f, b);
+
+          // rename meta file to tmp directory
+          DataNode.LOG.debug("Renaming " + oldmeta + " to " + newmeta);
+          if (!oldmeta.renameTo(newmeta)) {
+            throw new IOException("Block " + b + " reopen failed. "
+                + " Unable to move meta file  " + oldmeta + " to tmp dir "
+                + newmeta);
+          }
         }
 
         // rename block file to tmp directory
@@ -2109,12 +2117,17 @@ public BlockWriteStreams writeToBlock(int namespaceId, Block b, boolean isRecove
       // If this is a replication request, then this is not a permanent
       // block yet, it could get removed if the datanode restarts. If this
       // is a write or append request, then it is a valid block.
+      DatanodeBlockInfo binfo;
       if (replicationRequest) {
-        volumeMap.add(namespaceId, b, new DatanodeBlockInfo(v));
+        binfo = new DatanodeBlockInfo(v, f, DatanodeBlockInfo.UNFINALIZED,
+            false, inlineChecksum, checksumType, bytesPerChecksum);
       } else {
-        volumeMap.add(namespaceId, b, new DatanodeBlockInfo(v, f, -1));
+        binfo = new DatanodeBlockInfo(v, f, DatanodeBlockInfo.UNFINALIZED,
+            true, inlineChecksum, checksumType, bytesPerChecksum);
       }
-      volumeMap.addOngoingCreates(namespaceId, b, new ActiveFile(f, threads));
+      volumeMap.add(namespaceId, b, binfo); 
+      volumeMap.addOngoingCreates(namespaceId, b, new ActiveFile(binfo,
+          threads, expectedFileSize));
       
     } finally {
       lock.writeLock().unlock();
@@ -2135,60 +2148,34 @@ public BlockWriteStreams writeToBlock(int namespaceId, Block b, boolean isRecove
     // REMIND - mjc - make this a filter stream that enforces a max
     // block size, so clients can't go crazy
     //
-    File metafile = getMetaFile(f, b);
-    DataNode.LOG.debug("writeTo blockfile is " + f + " of size " + f.length());
-    DataNode.LOG.debug("writeTo metafile is " + metafile + " of size " + metafile.length());
-    return createBlockWriteStreams( f , metafile);
-  }
-
-  /**
-   * Retrieves the offset in the block to which the
-   * the next write will write data to.
-   */
-  public long getChannelPosition(int namespaceId, Block b, BlockWriteStreams streams) 
-                                 throws IOException {
-    FileOutputStream file = (FileOutputStream) streams.dataOut;
-    return file.getChannel().position();
-  }
-
-  /**
-   * Sets the offset in the block to which the
-   * the next write will write data to.
-   */
-  public void setChannelPosition(int namespaceId, Block b, BlockWriteStreams streams, 
-                                 long dataOffset, long ckOffset) 
-                                 throws IOException {
-    FileOutputStream file = (FileOutputStream) streams.dataOut;
-    if (file.getChannel().size() < dataOffset) {
-      String  msg = "Trying to change block file offset of block " + b +
-                    " file " + volumeMap.get(namespaceId, b).getVolume().getTmpFile(namespaceId, b) +
-                    " to " + dataOffset +
-                    " but actual size of file is " +
-                    file.getChannel().size();
-      throw new IOException(msg);
+    if (DataNode.LOG.isDebugEnabled()) {
+      DataNode.LOG.debug("writeTo blockfile is " + f + " of size " + f.length());
     }
-    if (dataOffset > file.getChannel().size()) {
-      throw new IOException("Set position over the end of the data file.");
-    }
-    file.getChannel().position(dataOffset);
-    file = (FileOutputStream) streams.checksumOut;
-    if (ckOffset > file.getChannel().size()) {
-      throw new IOException("Set position over the end of the checksum file.");
+    if (inlineChecksum) {
+      return new BlockInlineChecksumWriter(f, checksumType, bytesPerChecksum);
+    } else {
+      File metafile = BlockWithChecksumFileWriter.getMetaFile(f, b);
+      if (DataNode.LOG.isDebugEnabled()) {
+        DataNode.LOG.debug("writeTo metafile is " + metafile + " of size "
+            + metafile.length());
+      }
+      return new BlockWithChecksumFileWriter(f, metafile);
     }
-    file.getChannel().position(ckOffset);
   }
-
+  
   File createTmpFile(int namespaceId, FSVolume vol, Block blk,
-                        boolean replicationRequest) throws IOException {
+      boolean replicationRequest, boolean inlineChecksum, int checksumType,
+      int bytePerChecksum) throws IOException {
     lock.writeLock().lock();
     try {
-      if ( vol == null ) {
-        vol = volumeMap.get(namespaceId, blk).getVolume();
         if ( vol == null ) {
-          throw new IOException("Could not find volume for block " + blk);
+          vol = volumeMap.get(namespaceId, blk).getVolume();
+          if ( vol == null ) {
+            throw new IOException("Could not find volume for block " + blk);
+          }
         }
-      }
-      return vol.createTmpFile(namespaceId, blk, replicationRequest);
+      return vol.createTmpFile(namespaceId, blk, replicationRequest,
+          inlineChecksum, checksumType, bytePerChecksum);
     } finally {
       lock.writeLock().unlock();
     }
@@ -2221,7 +2208,7 @@ public void finalizeBlockIfNeeded(int namespaceId, Block b) throws IOException {
   public void finalizeBlockInternal(int namespaceId, Block b, boolean reFinalizeOk)
     throws IOException {
     lock.writeLock().lock();
-    DatanodeBlockInfo replicaInfo = volumeMap.get(namespaceId, b);
+    DatanodeBlockInfo binfo = volumeMap.get(namespaceId, b);
     try {
       ActiveFile activeFile = volumeMap.getOngoingCreates(namespaceId, b);
       if (activeFile == null) {
@@ -2231,20 +2218,23 @@ public void finalizeBlockInternal(int namespaceId, Block b, boolean reFinalizeOk
           throw new IOException("Block " + b + " is already finalized.");
         }
       }
-      File f = activeFile.file;
+      File f = activeFile.getDataFile();
       if (f == null || !f.exists()) {
         throw new IOException("No temporary file " + f + " for block " + b);
       }
-      FSVolume v = replicaInfo.getVolume();
+      FSVolume v = binfo.getVolume();
       if (v == null) {
         throw new IOException("No volume for temporary file " + f + 
                               " for block " + b);
       }
           
       File dest = null;
-      dest = v.addBlock(namespaceId, b, f);
+      dest = v.addBlock(namespaceId, b, f, activeFile.isInlineChecksum(),
+          binfo.getChecksumType(), binfo.getBytesPerChecksum());
       volumeMap.add(namespaceId, b,
-          new DatanodeBlockInfo(v, dest, activeFile.getBytesOnDisk()));
+          new DatanodeBlockInfo(v, dest, activeFile.getBytesWritten(), true,
+              activeFile.isInlineChecksum(), binfo.getChecksumType(), binfo
+                  .getBytesPerChecksum()));
       volumeMap.removeOngoingCreates(namespaceId, b);
     } finally {
       lock.writeLock().unlock();
@@ -2270,7 +2260,7 @@ private boolean isBlockFinalizedInternal(int namespaceId, Block b,
     ActiveFile activeFile = volumeMap.getOngoingCreates(namespaceId, b);
     if (activeFile != null) {
       if (validate) {
-        File f = activeFile.file;
+        File f = activeFile.getDataFile();
         if (f == null || !f.exists()) {
           // we should never get into this position.
           DataNode.LOG.warn("No temporary file " + f + " for block " + b);
@@ -2316,7 +2306,12 @@ public void unfinalizeBlock(int namespaceId, Block b) throws IOException {
       volumeMap.remove(namespaceId, b);
       
       // delete the on-disk temp file
-      if (delBlockFromDisk(activefile.file, getMetaFile(activefile.file, b), b)) {
+      File metaFile = null;
+      if (!activefile.isInlineChecksum()) {
+        metaFile = BlockWithChecksumFileWriter.getMetaFile(
+            activefile.getDataFileToRead(), b);
+      }
+      if (delBlockFromDisk(activefile.getDataFileToRead(), metaFile, b)) {
         DataNode.LOG.warn("Block " + b + " unfinalized and removed. " );
       }
     } finally {
@@ -2415,15 +2410,18 @@ File validateBlockFile(int namespaceId, Block b) throws IOException {
   File getValidateBlockFile(int namespaceId, Block b, boolean checkSize)
       throws IOException {
     //Should we check for metadata file too?
-    DatanodeBlockInfo blockInfo = getDatanodeBlockInfo(namespaceId, b);
+    DatanodeBlockInfo blockInfo = this.getDatanodeBlockInfo(namespaceId, b);
     File f = null;
     if (blockInfo != null) {
       if (checkSize) {
         blockInfo.verifyFinalizedSize();
       }
-      f = blockInfo.getFile();
-      if(f.exists())
+      f = blockInfo.file;
+      assert f != null;
+
+      if(f.exists()) {
         return f;
+      }
    
       // if file is not null, but doesn't exist - possibly disk failed
       datanode.checkDiskError();
@@ -2448,12 +2446,12 @@ public void validateBlockMetadata(int namespaceId, Block b) throws IOException {
     if (info == null) {
       throw new IOException("Block " + b + " does not exist in volumeMap.");
     }
-    FSVolume v = info.getVolume();
-    File tmp = v.getTmpFile(namespaceId, b);
-    File f = info.getFile();
-    long fileSize;
+
+    File f = info.getDataFileToRead();
+    // Try to find out block size
+    long localBlockSize;
     if (f == null) {
-      f = tmp;
+      f = info.getTmpFile(namespaceId, b);
       if (f == null) {
         throw new IOException("Block " + b + " does not exist on disk.");
       }
@@ -2462,67 +2460,94 @@ public void validateBlockMetadata(int namespaceId, Block b) throws IOException {
                               " block file " + f +
                               " does not exist on disk.");
       }
-      fileSize = f.length();
+      if (info.isInlineChecksum()) {
+        // TODO: do we want to do it?
+        localBlockSize = BlockInlineChecksumReader.getBlockSizeFromFileLength(
+            f.length(), info.getChecksumType(), info.getBytesPerChecksum());
+      } else {
+        localBlockSize = f.length();
+      }
     } else {
       if (info.isFinalized()) {
         info.verifyFinalizedSize();
-        fileSize = info.getFinalizedSize();
+        localBlockSize = info.getFinalizedSize();
       } else {
-        fileSize = f.length();
+        if (info.isInlineChecksum()) {
+          // TODO: do we want to do it?
+          localBlockSize = BlockInlineChecksumReader
+              .getBlockSizeFromFileLength(f.length(), info.getChecksumType(),
+                  info.getBytesPerChecksum());
+        } else {
+          localBlockSize = f.length();
+        }
       }
     }
-    if (b.getNumBytes() > fileSize) {
+
+    if (b.getNumBytes() > localBlockSize) {
       throw new IOException("Block " + b + 
                             " length is " + b.getNumBytes()  +
                             " does not match block file length " +
                             f.length());
     }
-    File meta = getMetaFile(f, b);
-    if (meta == null) {
-      throw new IOException("Block " + b + 
-                            " metafile does not exist.");
-    }
-    if (!meta.exists()) {
-      throw new IOException("Block " + b + 
-                            " metafile " + meta +
-                            " does not exist on disk.");
-    }
-    long metaFileSize = meta.length();
-    if (metaFileSize == 0 && fileSize > 0) {
-      throw new IOException("Block " + b + " metafile " + meta + " is empty.");
+    long stamp;
+    DataChecksum dcs;
+    if (!info.isInlineChecksum()) {
+      File meta = BlockWithChecksumFileWriter.getMetaFile(f, b);
+      if (meta == null) {
+        throw new IOException("Block " + b + 
+                              " metafile does not exist.");
+      }
+      if (!meta.exists()) {
+        throw new IOException("Block " + b + 
+                              " metafile " + meta +
+                              " does not exist on disk.");
+      }
+      long metaFileSize = meta.length();
+      if (metaFileSize == 0 && localBlockSize > 0) {
+        throw new IOException("Block " + b + " metafile " + meta + " is empty.");
+      }
+      stamp = BlockWithChecksumFileReader.parseGenerationStampInMetaFile(f,
+          meta);
+      if (metaFileSize == 0) {
+        // no need to check metadata size for 0 size file
+        return;
+      }
+      dcs = BlockMetadataHeader.readHeader(meta).getChecksum();
+      // verify that checksum file has an integral number of checkum values.
+      int checksumsize = dcs.getChecksumSize();
+      long actual = metaFileSize - BlockMetadataHeader.getHeaderSize();
+      long numChunksInMeta = actual/checksumsize;
+      if (actual % checksumsize != 0) {
+        throw new IOException("Block " + b +
+                              " has a checksum file of size " + metaFileSize +
+                              " but it does not align with checksum size of " +
+                              checksumsize);
+      }
+      int bpc = dcs.getBytesPerChecksum();
+      long minDataSize = (numChunksInMeta - 1) * bpc;
+      long maxDataSize = numChunksInMeta * bpc;
+      if (localBlockSize > maxDataSize || localBlockSize <= minDataSize) {
+        throw new IOException("Block " + b +
+                              " is of size " + f.length() +
+                              " but has " + (numChunksInMeta + 1) +
+                              " checksums and each checksum size is " +
+                              checksumsize + " bytes.");
+      }
+    } else {
+      stamp = BlockInlineChecksumReader
+          .getGenerationStampFromInlineChecksumFile(f.getName());
+      if (localBlockSize == 0) {
+        // no need to check metadata size for 0 size file
+        return;
+      }
+      // TODO: What verification we can do here?
     }
-    long stamp = parseGenerationStamp(f, meta);
     if (stamp != b.getGenerationStamp()) {
       throw new IOException("Block " + b + 
                             " genstamp is " + b.getGenerationStamp()  +
                             " does not match meta file stamp " +
                             stamp);
     }
-    if (metaFileSize == 0) {
-      // no need to check metadata size for 0 size file
-      return;
-    }
-    // verify that checksum file has an integral number of checkum values.
-    DataChecksum dcs = BlockMetadataHeader.readHeader(meta).getChecksum();
-    int checksumsize = dcs.getChecksumSize();
-    long actual = metaFileSize - BlockMetadataHeader.getHeaderSize();
-    long numChunksInMeta = actual/checksumsize;
-    if (actual % checksumsize != 0) {
-      throw new IOException("Block " + b +
-                            " has a checksum file of size " + metaFileSize +
-                            " but it does not align with checksum size of " +
-                            checksumsize);
-    }
-    int bpc = dcs.getBytesPerChecksum();
-    long minDataSize = (numChunksInMeta - 1) * bpc;
-    long maxDataSize = numChunksInMeta * bpc;
-    if (fileSize > maxDataSize || fileSize <= minDataSize) {
-      throw new IOException("Block " + b +
-                            " is of size " + f.length() +
-                            " but has " + (numChunksInMeta + 1) +
-                            " checksums and each checksum size is " +
-                            checksumsize + " bytes.");
-    }
     // We could crc-check the entire block here, but it will be a costly 
     // operation. Instead we rely on the above check (file length mismatch)
     // to detect corrupt blocks.
@@ -2538,6 +2563,7 @@ public void invalidate(int namespaceId, Block invalidBlks[]) throws IOException
     for (int i = 0; i < invalidBlks.length; i++) {
       File f = null;
       FSVolume v;
+      boolean inlineChecksum;
       lock.writeLock().lock();
       try {
         DatanodeBlockInfo dinfo = volumeMap.get(namespaceId, invalidBlks[i]);
@@ -2552,7 +2578,8 @@ public void invalidate(int namespaceId, Block invalidBlks[]) throws IOException
                            ". BlockInfo not found in volumeMap.");
           continue;
         }
-        f = dinfo.getFile();
+        inlineChecksum = dinfo.isInlineChecksum();
+        f = dinfo.getDataFileToRead();
         v = dinfo.getVolume();
         if (f == null) {
           DataNode.LOG.warn("Unexpected error trying to delete block "
@@ -2584,18 +2611,24 @@ public void invalidate(int namespaceId, Block invalidBlks[]) throws IOException
       } finally {
         lock.writeLock().unlock();
       }
-      File metaFile = getMetaFile( f, invalidBlks[i]);
 
       //rename the files to be deleted
       //for safety we add prefix instead of suffix,
       //so the valid block files still start with "blk_"
       File blockFileRenamed = new File(f.getParent()
 		  + File.separator + DELETE_FILE_EXT + f.getName());
-      File metaFileRenamed = new File(metaFile.getParent()
+      
+      File metaFile = null;
+      File metaFileRenamed = null;
+
+      if (!inlineChecksum) {
+        metaFile = BlockWithChecksumFileWriter.getMetaFile( f, invalidBlks[i]);
+        metaFileRenamed = new File(metaFile.getParent()
 		  + File.separator + DELETE_FILE_EXT + metaFile.getName());
+      }
 
       if((!f.renameTo(blockFileRenamed)) ||
-		  (!metaFile.renameTo(metaFileRenamed))) {
+		  (!inlineChecksum && !metaFile.renameTo(metaFileRenamed))) {
 	  DataNode.LOG.warn("Unexpected error trying to delete block "
                   + invalidBlks[i] +
                   ". Cannot rename files for deletion.");
@@ -2622,18 +2655,39 @@ public File getFile(int namespaceId, Block b) {
     try {
       DatanodeBlockInfo info = volumeMap.get(namespaceId, b);
       if (info != null) {
-        return info.getFile();
+        return info.getDataFileToRead();
       }
       return null;
     } finally {
       lock.readLock().unlock();
     }
   }
-
+  
+  @Override
   public DatanodeBlockInfo getDatanodeBlockInfo(int namespaceId, Block b) {
     return volumeMap.get(namespaceId, b);
   }
 
+  @Override
+  public ReplicaToRead getReplicaToRead(int namespaceId, Block block) {
+    lock.readLock().lock();
+    try {
+      ActiveFile activefile = volumeMap.getOngoingCreates(namespaceId, block);
+      if (activefile != null) {
+        return activefile;
+      }
+      DatanodeBlockInfo info = volumeMap.get(namespaceId, block);
+      if (info == null) {
+        if (DataNode.LOG.isDebugEnabled()) {
+          DataNode.LOG.debug("volumeMap=" + volumeMap);
+        }
+      }
+      return info;
+    } finally {
+      lock.readLock().unlock();
+    }
+  }
+
   /**
    * check if a data directory is healthy
    * if some volumes failed - make sure to remove all the blocks that belong
@@ -2677,7 +2731,43 @@ public void checkDataDir() throws DiskErrorException {
     throw  new DiskErrorException("DataNode failed volumes:" + sb);
   
   }
-  
+ 
+  /**
+   * remove directories that are given from the list of volumes to use.
+   * This function also makes sure to remove all the blocks that belong to
+   * these volumes.
+   */
+  public void removeVolumes(Configuration conf, List<File> directories) 
+      throws Exception {
+    if (directories == null || directories.isEmpty()) {
+      DataNode.LOG.warn("There were no directories to remove. Exiting ");
+      return;
+    }
+    List<FSVolume> volArray = null;
+    lock.readLock().lock();
+    try {
+      volArray = volumes.removeBVolumes(directories);
+    } finally {
+      lock.readLock().unlock();
+    }
+    // remove related blocks
+    long mlsec = System.currentTimeMillis();
+    lock.writeLock().lock();
+    try {
+      volumeMap.removeUnhealthyVolumes(volArray);
+    } finally {
+      lock.writeLock().unlock();
+    }
+    mlsec = System.currentTimeMillis() - mlsec;
+    DataNode.LOG.warn(">>>>>>>>>Removing these blocks took " + mlsec + 
+             " millisecs in refresh<<<<<<<<<<<<<<< ");
+    StringBuilder sb = new StringBuilder();
+    for(FSVolume fv : volArray) {
+      sb.append(fv.toString() + ";");
+    }
+    throw new DiskErrorException("These volumes were removed: " + sb);
+  }  
+ 
   public void addVolumes(Configuration conf, int namespaceId, String nsDir,
       Collection<StorageDirectory> dirs) throws Exception {
     if (dirs == null || dirs.isEmpty()) {
@@ -2914,30 +3004,6 @@ public void copyFile(File src, File dst, boolean hardlink) throws IOException {
     }
   }
 
-  /**
-   * Adds a file to the ongoingCreates datastructure to indicate we are creating
-   * a file.
-   * 
-   * @param dstNamespaceId
-   *          namespace id for dstBlock
-   * @param dstBlock
-   *          the block that we are going to create
-   * @param dstVol
-   *          the volume on which the file is to be created.
-   * @return the temporary file for the block
-   * @throws IOException
-   */
-  private File addToOngoingCreates(int dstNamespaceId, Block dstBlock,
-      FSVolume dstVol) throws IOException {
-    List<Thread> threads = null;
-    // We do not want to create a BBW, hence treat this as a replication
-    // request.
-    File dstBlockFile = createTmpFile(dstNamespaceId, dstVol, dstBlock, true);
-    volumeMap.addOngoingCreates(dstNamespaceId, dstBlock,
-        new ActiveFile(dstBlockFile, threads));
-    return dstBlockFile;
-  }
-
   /**
    * Find a volume on the datanode for the destination block to be placed on.
    * It tries to place the destination block on the same volume as the source
@@ -3021,6 +3087,8 @@ private boolean copyBlockLocalAdd(String srcFileSystem, File srcBlockFile,
         throw new IOException("Block " + srcBlock.getBlockName()
             + " is not valid or does not have a valid block file");
       }
+      boolean inlineChecksum = Block.isInlineChecksumBlockFilename(srcBlockFile
+          .getName());
 
       FSVolume dstVol = null;
       if (shouldHardLinkBlockCopy) {
@@ -3035,9 +3103,27 @@ private boolean copyBlockLocalAdd(String srcFileSystem, File srcBlockFile,
         hardlink = false;
       }
 
-      dstBlockFile = addToOngoingCreates(dstNamespaceId, dstBlock, dstVol);
-      volumeMap.add(dstNamespaceId, dstBlock, new DatanodeBlockInfo(dstVol,
-          dstBlockFile, DatanodeBlockInfo.UNFINALIZED));
+      int checksumType = DataChecksum.CHECKSUM_UNKNOWN;
+      int bytesPerChecksum = -1;
+      if (inlineChecksum) {
+        GenStampAndChecksum sac = BlockInlineChecksumReader
+            .getGenStampAndChecksumFromInlineChecksumFile(srcBlockFile
+                .getName());
+        checksumType = sac.checksumType;
+        bytesPerChecksum = sac.bytesPerChecksum;
+      }
+
+      List<Thread> threads = null;
+      // We do not want to create a BBW, hence treat this as a replication
+      // request.
+      dstBlockFile = createTmpFile(dstNamespaceId, dstVol, dstBlock, true,
+          inlineChecksum, checksumType, bytesPerChecksum);
+      DatanodeBlockInfo binfo = new DatanodeBlockInfo(dstVol, dstBlockFile,
+          DatanodeBlockInfo.UNFINALIZED, true, inlineChecksum, checksumType,
+          bytesPerChecksum);
+      volumeMap.add(dstNamespaceId, dstBlock, binfo);
+      volumeMap.addOngoingCreates(dstNamespaceId, dstBlock, new ActiveFile(
+          binfo, threads, ActiveFile.UNKNOWN_SIZE));      
     } finally {
       lock.writeLock().unlock();
     }
@@ -3063,18 +3149,31 @@ private boolean copyBlockLocalAdd(String srcFileSystem, File srcBlockFile,
   private void copyBlockLocalFinalize(int dstNamespaceId,
       Block dstBlock, File dstBlockFile)
     throws IOException {
-    long blkSize = dstBlockFile.length();
+    boolean inlineChecksum = Block.isInlineChecksumBlockFilename(dstBlockFile
+        .getName());
+    long blkSize = 0;
+    long fileSize = dstBlockFile.length();
     lock.writeLock().lock();
     try {
       DatanodeBlockInfo info = volumeMap.get(dstNamespaceId, dstBlock);
       if (info == null) {
         throw new IOException("Could not find information for " + dstBlock);
       }
+      if (inlineChecksum) {
+        blkSize = BlockInlineChecksumReader.getBlockSizeFromFileLength(fileSize,
+            info.getChecksumType(), info.getBytesPerChecksum());
+      } else {
+        blkSize = fileSize;
+      }
+
       FSVolume dstVol = info.getVolume();
       // Finalize block on disk.
-      File dest = dstVol.addBlock(dstNamespaceId, dstBlock, dstBlockFile);
-      volumeMap.add(dstNamespaceId, dstBlock, new DatanodeBlockInfo(dstVol,
-          dest, blkSize));
+      File dest = dstVol.addBlock(dstNamespaceId, dstBlock, dstBlockFile,
+          info.isInlineChecksum(), info.getChecksumType(),
+          info.getBytesPerChecksum());
+      volumeMap.add(dstNamespaceId, dstBlock,
+          new DatanodeBlockInfo(dstVol, dest, blkSize, true, inlineChecksum,
+              info.getChecksumType(), info.getBytesPerChecksum()));
       volumeMap.removeOngoingCreates(dstNamespaceId, dstBlock);
     } finally {
       lock.writeLock().unlock();
@@ -3091,14 +3190,18 @@ public void copyBlockLocal(String srcFileSystem, File srcBlockFile,
       boolean hardlink = copyBlockLocalAdd(srcFileSystem, srcBlockFile,
           srcNamespaceId, srcBlock, dstNamespaceId, dstBlock);
 
-      dstBlockFile = volumeMap.get(dstNamespaceId, dstBlock).getFile();
-      // Create metafile.
-      File metaFileSrc = getMetaFile(srcBlockFile, srcBlock);
-      File metaFileDst = getMetaFile(dstBlockFile, dstBlock);
+      DatanodeBlockInfo binfo = volumeMap.get(dstNamespaceId, dstBlock);
+      dstBlockFile = binfo.getDataFileToRead();
 
       // Copy files.
       copyFile(srcBlockFile, dstBlockFile, hardlink);
-      copyFile(metaFileSrc, metaFileDst, hardlink);
+
+      // Copy metafile.
+      if (!binfo.isInlineChecksum()) {
+        File metaFileSrc = BlockWithChecksumFileWriter.getMetaFile(srcBlockFile, srcBlock);
+        File metaFileDst = BlockWithChecksumFileWriter.getMetaFile(dstBlockFile, dstBlock);
+        copyFile(metaFileSrc, metaFileDst, hardlink);
+      }
 
       // Finalize block
       copyBlockLocalFinalize(dstNamespaceId, dstBlock, dstBlockFile);
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetAsyncDiskService.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetAsyncDiskService.java
index eb10ecf3..9319a44a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetAsyncDiskService.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetAsyncDiskService.java
@@ -211,8 +211,12 @@ public String toString() {
 
     @Override
     public void run() {
-      long dfsBytes = blockFile.length() + metaFile.length();
-      if ( !blockFile.delete() || ( !metaFile.delete() && metaFile.exists() ) ) {
+      long dfsBytes = blockFile.length();
+      if (metaFile != null) {
+        dfsBytes += metaFile.length();
+      }
+      if (!blockFile.delete()
+          || (metaFile != null && !metaFile.delete() && metaFile.exists())) {
         DataNode.LOG.warn("Unexpected error trying to delete block "
             + blockName + " at file " + blockFile + ". Ignored.");
       } else {
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java
index 7adca7c3..c598cfd5 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java
@@ -19,10 +19,8 @@
 
 
 import java.io.Closeable;
-import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.File;
 
 
@@ -44,53 +42,6 @@
  */
 public interface FSDatasetInterface extends FSDatasetMBean {
 
-  
-  /**
-   * Returns the length of the metadata file of the specified block
-   * @param namespaceId - parent namespace id
-   * @param b - the block for which the metadata length is desired
-   * @return the length of the metadata file for the specified block.
-   * @throws IOException
-   */
-  public long getMetaDataLength(int namespaceId, Block b) throws IOException;
-
-  /**
-   * This class provides the input stream and length of the metadata
-   * of a block
-   *
-   */
-  static class MetaDataInputStream extends FilterInputStream {
-    MetaDataInputStream(InputStream stream, long len) {
-      super(stream);
-      length = len;
-    }
-    private long length;
-    
-    public long getLength() {
-      return length;
-    }
-  }
-  
-  /**
-   * Returns metaData of block b as an input stream (and its length)
-   * @param namespaceId - parent namespace id
-   * @param b - the block
-   * @return the metadata input stream; 
-   * @throws IOException
-   */
-  public MetaDataInputStream getMetaDataInputStream(int namespaceId, Block b)
-        throws IOException;
-  
-  /**
-   * Does the meta file exist for this block?
-   * @param namespaceId - parent namespace id
-   * @param b - the block
-   * @return true of the metafile for specified block exits
-   * @throws IOException
-   */
-  public boolean metaFileExists(int namespaceId, Block b) throws IOException;
-
-
   /**
    * Returns the specified block's on-disk length (excluding metadata)
    * @param namespaceId - parent namespace id
@@ -157,57 +108,6 @@ public MetaDataInputStream getMetaDataInputStream(int namespaceId, Block b)
    */
   public InputStream getBlockInputStream(int namespaceId, Block b, long seekOffset)
             throws IOException;
-
-  /**
-   * Returns an input stream at specified offset of the specified block
-   * The block is still in the tmp directory and is not finalized
-   * 
-   * @param namespaceId - parent namespace id
-   * @param b
-   * @param blkoff
-   * @param ckoff
-   * @return an input stream to read the contents of the specified block,
-   *  starting at the offset
-   * @throws IOException
-   */
-  public BlockInputStreams getTmpInputStreams(int namespaceId, Block b, long blkoff, long ckoff)
-            throws IOException;
-
-     /**
-      * 
-      * This class contains the output streams for the data and checksum
-      * of a block
-      *
-      */
-     static class BlockWriteStreams {
-      OutputStream dataOut;
-      OutputStream checksumOut;
-      BlockWriteStreams(OutputStream dOut, OutputStream cOut) {
-        dataOut = dOut;
-        checksumOut = cOut;
-      }
-      
-    }
-
-  /**
-   * This class contains the input streams for the data and checksum
-   * of a block
-   */
-  static class BlockInputStreams implements Closeable {
-    final InputStream dataIn;
-    final InputStream checksumIn;
-
-    BlockInputStreams(InputStream dataIn, InputStream checksumIn) {
-      this.dataIn = dataIn;
-      this.checksumIn = checksumIn;
-    }
-
-    /** {@inheritDoc} */
-    public void close() {
-      IOUtils.closeStream(dataIn);
-      IOUtils.closeStream(checksumIn);
-    }
-  }
     
   /**
    * Creates the block and returns output streams to write data and CRC
@@ -220,8 +120,9 @@ public void close() {
    *  and CRC
    * @throws IOException
    */
-  public BlockWriteStreams writeToBlock(int namespaceId, Block b, boolean isRecovery, 
-                                        boolean isReplicationRequest) throws IOException;
+  public DatanodeBlockWriter writeToBlock(int namespaceId, Block b,
+      boolean isRecovery, boolean isReplicationRequest, int checksumType,
+      int bytePerChecksum) throws IOException;
 
   /**
    * Update the block to the new generation stamp and length.  
@@ -320,33 +221,6 @@ public BlockWriteStreams writeToBlock(int namespaceId, Block b, boolean isRecove
    */
   public void shutdown();
 
-  /**
-   * Returns the current offset in the data stream.
-   * 
-   * @param namespaceId - parent namespace id
-   * @param b
-   * @param stream The stream to the data file and checksum file
-   * @return the position of the file pointer in the data stream
-   * @throws IOException
-   */
-  public long getChannelPosition(int namespaceId, Block b, BlockWriteStreams stream) throws IOException;
-
-  /**
-   * Sets the file pointer of the data stream and checksum stream to
-   * the specified values.
-   * 
-   * @param namespaceId - parent namespace id
-   * @param b
-   * @param stream The stream for the data file and checksum file
-   * @param dataOffset The position to which the file pointre for the data stream
-   *        should be set
-   * @param ckOffset The position to which the file pointre for the checksum stream
-   *        should be set
-   * @throws IOException
-   */
-  public void setChannelPosition(int namespaceId, Block b, BlockWriteStreams stream, long dataOffset,
-                                 long ckOffset) throws IOException;
-
   /**
    * Validate that the contents in the Block matches
    * the file on disk. Returns true if everything is fine.
@@ -370,6 +244,24 @@ public void setChannelPosition(int namespaceId, Block b, BlockWriteStreams strea
    **/
   public File getBlockFile(int namespaceId, Block b) throws IOException;
 
+  /** 
+   * Get replica information for a given data block.  
+   * @param namespaceId - parent namespace id 
+   * @param b - block 
+   **/  
+  public DatanodeBlockInfo getDatanodeBlockInfo(int namespaceId, Block b) throws IOException;
+  
+  /**
+   * Return a replicaToRead object that can fetch file location and
+   * size information.
+   * @param namespaceId
+   * @param blockId
+   * @return
+   */
+  public ReplicaToRead getReplicaToRead(int namespaceId, Block block)
+      throws IOException;  
+
+
   /**
    * Copies over a block from a block file, note that the block file might be a
    * file on another Datanode sharing this machine.
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/NameSpaceSliceStorage.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/NameSpaceSliceStorage.java
index 600257c0..baaddbdc 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/NameSpaceSliceStorage.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/NameSpaceSliceStorage.java
@@ -113,6 +113,12 @@ void recoverTransitionRead(DataNode datanode, NamespaceInfo nsInfo,
           continue;
         case NOT_FORMATTED: // format
           LOG.info("Storage directory " + dataDir + " is not formatted.");
+          if (!sd.isEmpty()) {
+            LOG.error("Storage directory " + dataDir
+              + " is not empty, and will not be formatted! Exiting.");
+            throw new IOException(
+              "Storage directory " + dataDir + " is not empty!");
+          }
           LOG.info("Formatting ...");
           format(sd, nsInfo);
           break;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaBeingWritten.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaBeingWritten.java
index 512b06c6..bcca4a88 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaBeingWritten.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaBeingWritten.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hdfs.server.datanode;
 
 public interface ReplicaBeingWritten {
+  public void setBytesReceived(long length);
   public void setBytesOnDisk(long length);
   public void setBytesAcked(long length);
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaToRead.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaToRead.java
new file mode 100644
index 00000000..065ee65a
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaToRead.java
@@ -0,0 +1,56 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * The interface for a block replica to be read.
+ */
+public interface ReplicaToRead {
+  /**
+   * @return file path on the local disk to read. NULL if the block is not ready
+   *         to be read (for now it means it's a block still being transferring
+   *         from another data node or another block)
+   */
+  public File getDataFileToRead();
+
+  /**
+   * @return The length of the bytes available for clients to read. (data have
+   *         been saved in all replicas in the pipeline). For finalized blocks,
+   *         the value returned will be the same as file size on disk
+   *         (getLengthWritten).
+   * @throws IOException
+   */
+  public long getBytesVisible() throws IOException;
+
+  /**
+   * @return The length of the bytes flushed to local file of current machine.
+   *         For finalized blocks, it will be the same as bytes available to
+   *         read (getLengthVisible()).
+   * @throws IOException
+   */
+  public long getBytesWritten() throws IOException;
+
+  public boolean isInlineChecksum();
+  
+  public int getChecksumType();
+
+  public int getBytesPerChecksum();
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/VolumeMap.java b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/VolumeMap.java
index 52650297..410e6ecd 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/datanode/VolumeMap.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/datanode/VolumeMap.java
@@ -124,7 +124,7 @@ DatanodeBlockInfo add(int namespaceId, Block block,
     }
   }
 
-  DatanodeBlockInfo update(int namespaceId, Block oldB, Block newB) {
+  synchronized DatanodeBlockInfo update(int namespaceId, Block oldB, Block newB) {
     Map<Block, DatanodeBlockInfo> m = namespaceMap.get(namespaceId);
     if (m == null) {
       return null;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/hightidenode/FileFixer.java b/src/hdfs/org/apache/hadoop/hdfs/server/hightidenode/FileFixer.java
index f8a84ec5..38c21030 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/hightidenode/FileFixer.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/hightidenode/FileFixer.java
@@ -56,7 +56,7 @@
 import org.apache.hadoop.util.DataChecksum;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.DFSUtil;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/AccessTimeException.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/AccessTimeException.java
new file mode 100644
index 00000000..7df738cd
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/AccessTimeException.java
@@ -0,0 +1,32 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+
+/**
+ * This exception is thrown since accessTime is not allowed to change
+ * when dfs.access.time.touchable is set to false in the configuration file
+ */
+public class AccessTimeException extends IOException {
+
+  public AccessTimeException(String text){
+    super(text);
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyConfigurable.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyConfigurable.java
index b61fb834..865de6e2 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyConfigurable.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyConfigurable.java
@@ -143,7 +143,7 @@ public void initialize(Configuration conf, FSClusterStats stats,
     this.racks = new ArrayList<String>();
     this.hostsReader = hostsReader;
     this.dnsToSwitchMapping = dnsToSwitchMapping;
-    hostsUpdated();
+    hostsUpdated(true);
     if (r == null) {
       r = new Random();
     }
@@ -152,6 +152,10 @@ public void initialize(Configuration conf, FSClusterStats stats,
 
   /** {@inheritDoc} */
   public void hostsUpdated() {
+    hostsUpdated(false);
+  }
+
+  public void hostsUpdated(boolean startup) {
     List<String> hostsIn = new ArrayList<String>(hostsReader.getHosts());
     List<String> hostsRacks = dnsToSwitchMapping.resolve(hostsIn);
     HashMap<String,RackRingInfo> tempRacksMap =
@@ -160,8 +164,23 @@ public void hostsUpdated() {
 
     int index = hostsRacks.indexOf(NetworkTopology.DEFAULT_RACK);
     if (index != -1) {
-      throw new DefaultRackException("Could not resolve rack for : "
-          + hostsIn.get(index) + " probably due to a DNS issue");
+      if (!startup) {
+        throw new DefaultRackException("Could not resolve rack for : "
+            + hostsIn.get(index) + " probably due to a DNS issue");
+      } else {
+        // We do not want to abort startup, just remove the bad datanode.
+        for (int i = 0; i < hostsRacks.size(); i++) {
+          if (hostsRacks.get(i).equals(NetworkTopology.DEFAULT_RACK)) {
+            LOG.warn("Could not resolve rack for : "
+                + hostsIn.get(i) + " probably due to a DNS issue, removing"
+                + " the host since we are in startup");
+            hostsRacks.remove(i);
+            hostsReader.getHosts().remove(hostsIn.get(i));
+            hostsIn.remove(i);
+            i--;
+          }
+        }
+      }
     }
 
     for (int i=0; i<hostsIn.size(); i++) {
@@ -246,6 +265,41 @@ protected int randomIntInWindow(int begin, int windowSize, int n,
     return iterator;
   }
 
+  /**
+   * This method is currently used only for re-replication and should be used
+   * only for this. If this method is used for normal block placements that
+   * would completely break this placement policy.
+   */
+  @Override
+  public DatanodeDescriptor[] chooseTarget(FSInodeInfo srcInode,
+      int numOfReplicas,
+      DatanodeDescriptor writer, List<DatanodeDescriptor> chosenNodes,
+      List<Node> excludesNodes, long blocksize) {
+    if (numOfReplicas == 0 || clusterMap.getNumOfLeaves() == 0) {
+      return new DatanodeDescriptor[0];
+    }
+
+    int[] result = getActualReplicas(numOfReplicas, chosenNodes);
+    numOfReplicas = result[0];
+    int maxNodesPerRack = result[1];
+
+    HashMap<Node, Node> excludedNodes = new HashMap<Node, Node>();
+    List<DatanodeDescriptor> results = new ArrayList<DatanodeDescriptor>(
+        chosenNodes.size() + numOfReplicas);
+
+    updateExcludedAndChosen(null, excludedNodes, results, chosenNodes);
+
+    if (!clusterMap.contains(writer)) {
+      writer = null;
+    }
+
+    DatanodeDescriptor localNode = super.chooseTarget(numOfReplicas, writer,
+        excludedNodes, blocksize, maxNodesPerRack, results,
+        chosenNodes.isEmpty());
+
+    return this.finalizeTargets(results, chosenNodes, writer, localNode);
+  }
+
   /* choose <i>numOfReplicas</i> from all data nodes */
   @Override
   protected DatanodeDescriptor chooseTarget(int numOfReplicas,
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyDefault.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyDefault.java
index af3065b4..1b1a8956 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyDefault.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyDefault.java
@@ -99,7 +99,50 @@ public DatanodeDescriptor[] chooseTarget(FSInodeInfo srcInode,
                                     long blocksize) {
     return chooseTarget(numOfReplicas, writer, chosenNodes, null, blocksize);
   }
-    
+
+  final protected int[] getActualReplicas(int numOfReplicas,
+      List<DatanodeDescriptor> chosenNodes) {
+    int clusterSize = clusterMap.getNumOfLeaves();
+    int totalNumOfReplicas = chosenNodes.size() + numOfReplicas;
+    if (totalNumOfReplicas > clusterSize) {
+      numOfReplicas -= (totalNumOfReplicas - clusterSize);
+      totalNumOfReplicas = clusterSize;
+    }
+
+    int maxNodesPerRack = (totalNumOfReplicas - 1) / clusterMap.getNumOfRacks()
+        + 2;
+    return new int[] { numOfReplicas, maxNodesPerRack };
+  }
+
+  final protected void updateExcludedAndChosen(List<Node> exlcNodes,
+      HashMap<Node, Node> excludedNodes, List<DatanodeDescriptor> results,
+      List<DatanodeDescriptor> chosenNodes) {
+    if (exlcNodes != null) {
+      for (Node node : exlcNodes) {
+        excludedNodes.put(node, node);
+      }
+    }
+
+    for (DatanodeDescriptor node : chosenNodes) {
+      excludedNodes.put(node, node);
+      if ((!node.isDecommissionInProgress()) && (!node.isDecommissioned())) {
+        results.add(node);
+      }
+    }
+  }
+
+  final protected DatanodeDescriptor[] finalizeTargets(
+      List<DatanodeDescriptor> results, List<DatanodeDescriptor> chosenNodes,
+      DatanodeDescriptor writer, DatanodeDescriptor localNode) {
+    results.removeAll(chosenNodes);
+
+    // sorting nodes to form a pipeline
+    DatanodeDescriptor[] pipeline = results
+        .toArray(new DatanodeDescriptor[results.size()]);
+    clusterMap.getPipeline((writer == null) ? localNode : writer, pipeline);
+    return pipeline;
+  }
+
   /**
    * This is not part of the public API but is used by the unit tests.
    */
@@ -111,33 +154,17 @@ DatanodeDescriptor[] chooseTarget(int numOfReplicas,
     if (numOfReplicas == 0 || clusterMap.getNumOfLeaves()==0) {
       return new DatanodeDescriptor[0];
     }
+
+    int[] result = getActualReplicas(numOfReplicas, chosenNodes);
+    numOfReplicas = result[0];
+    int maxNodesPerRack = result[1];
       
     HashMap<Node, Node> excludedNodes = new HashMap<Node, Node>();
-    if (exlcNodes != null) {
-      for (Node node:exlcNodes) {
-        excludedNodes.put(node, node);
-      }
-    }
-     
-    int clusterSize = clusterMap.getNumOfLeaves();
-    int totalNumOfReplicas = chosenNodes.size()+numOfReplicas;
-    if (totalNumOfReplicas > clusterSize) {
-      numOfReplicas -= (totalNumOfReplicas-clusterSize);
-      totalNumOfReplicas = clusterSize;
-    }
-      
-    int maxNodesPerRack = 
-      (totalNumOfReplicas-1)/clusterMap.getNumOfRacks()+2;
-      
-    List<DatanodeDescriptor> results = 
-      new ArrayList<DatanodeDescriptor>(chosenNodes.size() + numOfReplicas);
-    for (DatanodeDescriptor node:chosenNodes) {
-      excludedNodes.put(node, node);
-      if ((!node.isDecommissionInProgress()) && (!node.isDecommissioned())) {
-        results.add(node);
-      }
-    }
-      
+    List<DatanodeDescriptor> results = new ArrayList<DatanodeDescriptor>(
+        chosenNodes.size() + numOfReplicas);
+
+    updateExcludedAndChosen(exlcNodes, excludedNodes, results, chosenNodes);
+
     if (!clusterMap.contains(writer)) {
       writer=null;
     }
@@ -145,14 +172,8 @@ DatanodeDescriptor[] chooseTarget(int numOfReplicas,
     DatanodeDescriptor localNode = chooseTarget(numOfReplicas, writer, 
                                                 excludedNodes, blocksize, maxNodesPerRack, results,
                                                 chosenNodes.isEmpty());
-      
-    results.removeAll(chosenNodes);
-      
-    // sorting nodes to form a pipeline
-    DatanodeDescriptor[] pipeline = results.toArray(
-        new DatanodeDescriptor[results.size()]);
-    clusterMap.getPipeline((writer == null) ? localNode : writer, pipeline);
-    return pipeline;
+
+    return this.finalizeTargets(results, chosenNodes, writer, localNode);
   }
     
   /**
@@ -484,6 +505,10 @@ protected boolean isGoodTarget(DatanodeDescriptor node,
       }
       return false;
     }
+    if (DatanodeInfo.shouldSuspectNodes() && node.isSuspectFail()) {
+      return false;
+    }
+    
     return true;
   }
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlocksMap.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlocksMap.java
index b00b9a4a..9c06c1f6 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlocksMap.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlocksMap.java
@@ -352,7 +352,7 @@ private static int computeCapacity() {
     return c;
   }
 
-  void close() {
+  public void close() {
     blocks = null;
   }
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CheckpointSignature.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CheckpointSignature.java
index 68c3517f..3d7cd9f1 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CheckpointSignature.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CheckpointSignature.java
@@ -22,40 +22,43 @@
 import java.io.IOException;
 
 import org.apache.hadoop.hdfs.server.common.StorageInfo;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.CheckpointStates;
 import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.io.WritableComparable;
 
+import com.google.common.collect.ComparisonChain;
+
 /**
  * A unique signature intended to identify checkpoint transactions.
  */
 public class CheckpointSignature extends StorageInfo 
                       implements WritableComparable<CheckpointSignature> {
   private static final String FIELD_SEPARATOR = ":";
-  long editsTime = -1L;
-  long checkpointTime = -1L;
   MD5Hash imageDigest = null;
-  CheckpointStates checkpointState = null;
+  long mostRecentCheckpointTxId;
+  long curSegmentTxId;
 
   CheckpointSignature() {}
 
-  CheckpointSignature(FSImage fsImage) {
-    super(fsImage);
-    editsTime = fsImage.getEditLog().getFsEditTime();
-    checkpointTime = fsImage.checkpointTime;
-    imageDigest = fsImage.getImageDigest();
-    checkpointState = fsImage.ckptState;
+  CheckpointSignature(FSImage fsImage) throws IOException {
+    super(fsImage.storage);
+    mostRecentCheckpointTxId = fsImage.storage.getMostRecentCheckpointTxId();
+    imageDigest = fsImage.getImageDigest(mostRecentCheckpointTxId);
+    curSegmentTxId = fsImage.getEditLog().getCurSegmentTxId();
   }
 
   CheckpointSignature(String str) {
     String[] fields = str.split(FIELD_SEPARATOR);
-    assert fields.length == 6 : "Must be 6 fields in CheckpointSignature";
+    assert fields.length == 6 : "Must be 7 fields in CheckpointSignature";
     layoutVersion = Integer.valueOf(fields[0]);
     namespaceID = Integer.valueOf(fields[1]);
     cTime = Long.valueOf(fields[2]);
-    editsTime = Long.valueOf(fields[3]);
-    checkpointTime = Long.valueOf(fields[4]);
-    imageDigest = new MD5Hash(fields[5]);
+    imageDigest = new MD5Hash(fields[3]);
+    mostRecentCheckpointTxId = Long.valueOf(fields[4]);
+    curSegmentTxId = Long.valueOf(fields[5]);
+  }
+  
+  public long getMostRecentCheckpointTxId() {
+    return mostRecentCheckpointTxId;
   }
 
   /**
@@ -70,10 +73,9 @@ public String toString() {
     return String.valueOf(layoutVersion) + FIELD_SEPARATOR
          + String.valueOf(namespaceID) + FIELD_SEPARATOR
          + String.valueOf(cTime) + FIELD_SEPARATOR
-         + String.valueOf(editsTime) + FIELD_SEPARATOR
-         + String.valueOf(checkpointTime) + FIELD_SEPARATOR
          + imageDigest.toString() + FIELD_SEPARATOR
-         + checkpointState.toString();
+         + String.valueOf(mostRecentCheckpointTxId) + FIELD_SEPARATOR 
+         + String.valueOf(curSegmentTxId);
   }
 
   void validateStorageInfo(StorageInfo si) throws IOException {
@@ -91,15 +93,17 @@ void validateStorageInfo(StorageInfo si) throws IOException {
   // Comparable interface
   //
   public int compareTo(CheckpointSignature o) {
-    return 
-      (layoutVersion < o.layoutVersion) ? -1 : 
-                  (layoutVersion > o.layoutVersion) ? 1 :
-      (namespaceID < o.namespaceID) ? -1 : (namespaceID > o.namespaceID) ? 1 :
-      (cTime < o.cTime) ? -1 : (cTime > o.cTime) ? 1 :
-      (editsTime < o.editsTime) ? -1 : (editsTime > o.editsTime) ? 1 :
-      (checkpointTime < o.checkpointTime) ? -1 : 
-                  (checkpointTime > o.checkpointTime) ? 1 : 
-                    imageDigest.compareTo(o.imageDigest);
+    
+    return ComparisonChain.start()  
+        .compare(layoutVersion, o.layoutVersion) 
+        .compare(namespaceID, o.namespaceID) 
+        .compare(cTime, o.cTime) 
+        .compare(curSegmentTxId, o.curSegmentTxId) 
+        .compare(imageDigest, o.imageDigest)
+        .result();
+    
+    // for now don't compare most recent checkpoint txid, 
+    // as it would be different when finalizing a previously failed checkpoint
   }
 
   public boolean equals(Object o) {
@@ -111,7 +115,7 @@ public boolean equals(Object o) {
 
   public int hashCode() {
     return layoutVersion ^ namespaceID ^
-            (int)(cTime ^ editsTime ^ checkpointTime) ^
+            (int)(cTime ^ mostRecentCheckpointTxId ^ curSegmentTxId) ^
             imageDigest.hashCode();
   }
 
@@ -122,20 +126,18 @@ public void write(DataOutput out) throws IOException {
     out.writeInt(getLayoutVersion());
     out.writeInt(getNamespaceID());
     out.writeLong(getCTime());
-    out.writeLong(editsTime);
-    out.writeLong(checkpointTime);
+    out.writeLong(mostRecentCheckpointTxId);
+    out.writeLong(curSegmentTxId);
     imageDigest.write(out);
-    out.writeInt(checkpointState.serialize());
   }
 
   public void readFields(DataInput in) throws IOException {
     layoutVersion = in.readInt();
     namespaceID = in.readInt();
     cTime = in.readLong();
-    editsTime = in.readLong();
-    checkpointTime = in.readLong();
+    mostRecentCheckpointTxId = in.readLong();
+    curSegmentTxId = in.readLong();
     imageDigest = new MD5Hash();
     imageDigest.readFields(in);
-    checkpointState = CheckpointStates.deserialize(in.readInt());
   }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java
index 121e8879..6c0ed41e 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java
@@ -18,8 +18,9 @@
 package org.apache.hadoop.hdfs.server.namenode;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -28,32 +29,36 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
-import javax.management.JMX;
-import javax.management.MBeanServerConnection;
 import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.DFSUtil;
-import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo.AdminStates;
+import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.UnixUserGroupInformation;
-import org.apache.hadoop.util.StringUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
 import org.apache.hadoop.hdfs.server.namenode.NameNodeMXBean;
 
 /**
  * This class generates the data that is needed to be displayed on cluster web 
- * console by connecting to each namenode through JMX.
+ * console by connecting to each namenode through http.
  */
 class ClusterJspHelper {
+  public final static String TOTAL_FILES_AND_DIRECTORIES = "TotalFilesAndDirectories";
+  public final static String TOTAL = "Total";
+  public final static String FREE = "Free";
+  public final static String NAMESPACE_USED = "NamespaceUsed";
+  public final static String NON_DFS_USEDSPACE = "NonDfsUsedSpace";
+  public final static String TOTAL_BLOCKS = "TotalBlocks";
+  public final static String NUMBER_MISSING_BLOCKS = "NumberOfMissingBlocks";
+  public final static String SAFE_MODE_TEXT = "SafeModeText";
+  public final static String LIVE_NODES = "LiveNodes";
+  public final static String DEAD_NODES = "DeadNodes";
+  public final static String DECOM_NODES = "DecomNodes";
+  public final static String NNSPECIFIC_KEYS = "NNSpecificKeys";
+  public final static String IS_PRIMARY = "IsPrimary";
   
   public static class NameNodeKey 
     implements Comparable<NameNodeKey> {
@@ -61,12 +66,19 @@ public static class NameNodeKey
     public static final int ACTIVE = 0;
     public static final int BOTH = 1;
     public static final int STANDBY = 2;
+    public static final String DELIMITER = "\n";
     
     String key;
     int type;
     
     public NameNodeKey(){ }
     
+    public NameNodeKey(String input) {
+      String[] splits = input.split(DELIMITER);
+      key = splits[0];
+      type = Integer.parseInt(splits[1]);
+    }
+    
     public NameNodeKey(String s, int t){
       key = s;
       type = t;
@@ -106,6 +118,10 @@ public void setType(int type) {
     public int hashCode() {
       return key.hashCode();
     }
+
+    public String toString() {
+      return this.key + DELIMITER + this.type;
+    }
   }
   
   final static public String WEB_UGI_PROPERTY_NAME = "dfs.web.ugi";
@@ -113,6 +129,9 @@ public int hashCode() {
   public static final String OVERALL_STATUS = "overall-status";
   public static final String DEAD = "Dead";
   public static Configuration conf = new Configuration();
+  private static final boolean isAvatar =
+      conf.get("fs.default.name0", "").length() > 0;
+
   public NameNode localnn;
   public static final UnixUserGroupInformation webUGI
   = UnixUserGroupInformation.createImmutable(
@@ -123,7 +142,8 @@ public ClusterJspHelper(NameNode nn) {
   }
   
   private NamenodeMXBeanHelper getNNHelper(InetSocketAddress isa) 
-      throws IOException, MalformedObjectNameException {
+      throws IOException, MalformedObjectNameException, 
+      URISyntaxException {
     if (localnn != null) {
       Configuration runningConf = localnn.getConf();
       InetSocketAddress nameNodeAddr = NameNode.getAddress(runningConf); 
@@ -133,6 +153,59 @@ private NamenodeMXBeanHelper getNNHelper(InetSocketAddress isa)
     }
     return new NamenodeMXBeanHelper(isa, conf);
   }
+  
+  public class NameNodeStatusFetcher extends Thread {
+    InetSocketAddress isa;
+    Exception e = null;
+    NamenodeStatus nn = null;
+    public NameNodeStatusFetcher(InetSocketAddress isa) {
+      this.isa = isa;
+    }
+    
+    public void run() {
+      NamenodeMXBeanHelper nnHelper = null;
+      LOG.info("connect to " + isa.toString());
+      long starttime = System.currentTimeMillis();
+      try {
+        nnHelper = getNNHelper(isa);
+        nn = nnHelper.getNamenodeStatus();
+      } catch ( Exception exception ) {
+        // track exceptions encountered when connecting to namenodes
+        this.e = exception;
+        LOG.error(isa.toString() + " has the exception:", e);
+        nn = new NamenodeStatus();
+      } finally {
+        LOG.info("Take time " + isa.toString() + " : " + 
+            (System.currentTimeMillis() - starttime));
+      }
+    }
+  }
+  
+  public class DecommissionStatusFetcher extends Thread {
+    InetSocketAddress isa;
+    Exception e = null;
+    Map<String, Map<String, String>> statusMap = null;
+    
+    public DecommissionStatusFetcher(InetSocketAddress isa,
+        Map<String, Map<String, String>> statusMap) {
+      this.isa = isa;
+      this.statusMap = statusMap;
+    }
+    
+    public void run() {
+      NamenodeMXBeanHelper nnHelper = null;
+      try {
+        nnHelper = getNNHelper(isa);
+        synchronized(statusMap) {
+          nnHelper.getDecomNodeInfoForReport(statusMap);
+        }
+      } catch (Exception exception) {
+        this.e = exception;
+        LOG.error(isa.toString() + " has the exception:", e);
+      }
+    }
+  }
+  
   /**
    * JSP helper function that generates cluster health report.  When 
    * encountering exception while getting Namenode status, the exception will 
@@ -141,11 +214,11 @@ private NamenodeMXBeanHelper getNNHelper(InetSocketAddress isa)
   ClusterStatus generateClusterHealthReport() {
     ClusterStatus cs = new ClusterStatus();
     List<InetSocketAddress> isas = null;
-    
-    //TODO how to do it in a more generic way
-    ArrayList<String> suffixes = new ArrayList<String>();
-    suffixes.add("0"); suffixes.add("1");
-    
+    ArrayList<String> suffixes = null;
+    if (isAvatar) {
+      suffixes = new ArrayList<String>();
+      suffixes.add("0"); suffixes.add("1");
+    }
     try {
       cs.nnAddrs = isas = DFSUtil.getClientRpcAddresses(conf, suffixes);
     } catch (Exception e) {
@@ -157,25 +230,21 @@ ClusterStatus generateClusterHealthReport() {
     
     sort(isas);
     
-    // Process each namenode and add it to ClusterStatus
-    for (InetSocketAddress isa : isas) {
-      NamenodeMXBeanHelper nnHelper = null;
-      NamenodeStatus nn = null;
-      LOG.info("connect to " + isa.toString());
+    // Process each namenode and add it to ClusterStatus in parallel
+    NameNodeStatusFetcher[] threads = new NameNodeStatusFetcher[isas.size()];
+    for (int i = 0; i < isas.size(); i++) {
+      threads[i] = new NameNodeStatusFetcher(isas.get(i));
+      threads[i].start();
+    }
+    for (NameNodeStatusFetcher thread : threads) {
       try {
-        nnHelper = getNNHelper(isa);
-        nn = nnHelper.getNamenodeStatus();
-      } catch ( Exception e ) {
-        // track exceptions encountered when connecting to namenodes
-        cs.addException(isa.toString(), e);
-        LOG.error(isa.toString() + " has the exception:", e);
-        nn = new NamenodeStatus();
-        continue;
-      } finally {
-        cs.addNamenodeStatus(nn);
-        if (nnHelper != null) {
-          nnHelper.cleanup();
+        thread.join();
+        if (thread.e != null) {
+          cs.addException(thread.isa.toString(), thread.e);
         }
+        cs.addNamenodeStatus(thread.nn);
+      } catch (InterruptedException ex) {
+        LOG.warn(ex);
       }
     }
     return cs;
@@ -197,12 +266,12 @@ public int compare(InetSocketAddress o1, InetSocketAddress o2) {
    */
   DecommissionStatus generateDecommissioningReport() {
     List<InetSocketAddress> isas = null;
-    try {
-      
-      //TODO how to do it in a more generic way
-      ArrayList<String> suffixes = new ArrayList<String>();
+    ArrayList<String> suffixes = null;
+    if (isAvatar) {
+      suffixes = new ArrayList<String>();
       suffixes.add("0"); suffixes.add("1");
-      
+    }
+    try {
       isas = DFSUtil.getClientRpcAddresses(conf, suffixes);
       sort(isas);
     } catch (Exception e) {
@@ -223,21 +292,21 @@ DecommissionStatus generateDecommissioningReport() {
       new HashMap<String, Exception>();
     
     List<String> unreportedNamenode = new ArrayList<String>();
-    for (InetSocketAddress isa : isas) {
-      NamenodeMXBeanHelper nnHelper = null;
+    DecommissionStatusFetcher[] threads = new DecommissionStatusFetcher[isas.size()];
+    for (int i = 0; i < isas.size(); i++) {
+      threads[i] = new DecommissionStatusFetcher(isas.get(i), statusMap);
+      threads[i].start();
+    }
+    for (DecommissionStatusFetcher thread : threads) {
       try {
-        nnHelper = getNNHelper(isa);
-        nnHelper.getDecomNodeInfoForReport(statusMap);
-      } catch (Exception e) {
-        // catch exceptions encountered while connecting to namenodes
-        decommissionExceptions.put(isa.toString(), e);
-        unreportedNamenode.add(isa.toString());
-        LOG.error(isa.toString() + " has the exception:", e);
-        continue;
-      } finally {
-        if (nnHelper != null) {
-          nnHelper.cleanup();
+        thread.join();
+        if (thread.e != null) {
+          // catch exceptions encountered while connecting to namenodes
+          decommissionExceptions.put(thread.isa.toString(), thread.e);
+          unreportedNamenode.add(thread.isa.toString());
         }
+      } catch (InterruptedException ex) {
+        LOG.warn(ex);
       }
     }
     updateUnknownStatus(statusMap, unreportedNamenode);
@@ -357,73 +426,159 @@ private int getDatanodeHttpPort(Configuration conf) {
     }
     return Integer.parseInt(address.split(":")[1]);
   }
+  
+  static class NameNodeMXBeanObject implements NameNodeMXBean {
+    private static final ObjectMapper mapper = new ObjectMapper();
+    Map<String, Object> values = null;
+    String httpAddress = null;
+    
+    NameNodeMXBeanObject(InetSocketAddress namenode, Configuration conf)
+      throws IOException, URISyntaxException {
+      httpAddress = DFSUtil.getInfoServer(namenode, conf, isAvatar);
+      InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(httpAddress);
+      String nameNodeMXBeanContent = DFSUtil.getHTMLContent(
+          new URI("http", null, infoSocAddr.getHostName(), 
+              infoSocAddr.getPort(), "/namenodeMXBean", null, null));
+      TypeReference<Map<String, Object>> type = 
+          new TypeReference<Map<String, Object>>() { };
+      values = mapper.readValue(nameNodeMXBeanContent, type);
+    }
+
+    public String getVersion() {
+      return null;
+    }
+    
+    public long getUsed() {
+      return -1L; 
+    }
+    
+    public long getFree() {
+      return Long.parseLong((String)values.get(FREE));
+    }
+    
+    public long getTotal() {
+      return Long.parseLong((String)values.get(TOTAL));
+    }
+    
+    public String getSafemode() {
+      return null;
+    }
+    
+    public boolean isUpgradeFinalized() {
+      return true; 
+    }
+    
+    public long getNonDfsUsedSpace() {
+      return Long.parseLong((String)values.get(NON_DFS_USEDSPACE));
+    }
+    
+    public float getPercentUsed(){
+      return -1.0f;
+    }
+    
+    public float getPercentRemaining() {
+      return -1.0f;
+    }
+    
+    public long getNamespaceUsed() {
+      return Long.parseLong((String)values.get(NAMESPACE_USED));
+    }
+    
+    public float getPercentNamespaceUsed() {
+      return -1.0f;
+    }
+      
+    public long getTotalBlocks() {
+      return Long.parseLong((String)values.get(TOTAL_BLOCKS));
+    }
+    
+    public long getTotalFilesAndDirectories() {
+      return Long.parseLong((String) values.get(TOTAL_FILES_AND_DIRECTORIES));
+    }
+    
+    public long getNumberOfMissingBlocks() {
+      return Long.parseLong((String)values.get(NUMBER_MISSING_BLOCKS));
+    }
+    
+    public int getThreads() {
+      return -1;
+    }
+
+    public String getLiveNodes() {
+      return (String)values.get(LIVE_NODES);
+    }
+    
+    public String getDeadNodes() {
+      return (String)values.get(DEAD_NODES);
+    }
+    
+    public String getDecomNodes() {
+      return (String)values.get(DECOM_NODES);
+    }
+    
+    public int getNamespaceId() {
+      return -1;
+    }
+    
+    public String getNameserviceId() {
+      return null;
+    }
+
+    public String getSafeModeText() {
+      return (String)values.get(SAFE_MODE_TEXT);
+    }
+    
+    public Map<NameNodeKey, String> getNNSpecificKeys() {
+      TypeReference<Map<String, String>> type = 
+          new TypeReference<Map<String, String>>() { };
+      Map<NameNodeKey, String> result = new HashMap<NameNodeKey, String>();
+      try {
+        Map<String, String> tmp = NamenodeMXBeanHelper.mapper.readValue(
+            (String)values.get(NNSPECIFIC_KEYS), type);
+        for (String key: tmp.keySet()) {
+          result.put(new NameNodeKey(key), tmp.get(key));
+        }
+        return result;
+      } catch (Exception e) {
+        LOG.error(e);
+        return null;
+      } 
+    }
+    
+    public boolean getIsPrimary() {
+      return Boolean.parseBoolean((String)values.get(IS_PRIMARY));
+    }
+  }
 
   /**
-   * Class for connecting to Namenode over JMX and get attributes
-   * exposed by the MXBean.
+   * Class for connecting to Namenode over http or local fsnamesystem 
    */
   static class NamenodeMXBeanHelper {
-    private static final ObjectMapper mapper = new ObjectMapper();
+    public static final ObjectMapper mapper = new ObjectMapper();
     private final InetSocketAddress rpcAddress;
     private final String address;
     private final Configuration conf;
-    private final JMXConnector connector;
     private final NameNodeMXBean mxbeanProxy;
     
-    public static int getJMXPort(
-        InetSocketAddress namenode, Configuration conf) {
-      int jmxPort = 
-          conf.getInt("dfs.namenode.jmxport", 8998); 
-      if(namenode != null) {
-        // if non-default namenode, try reverse look up 
-        // the nameServiceID if it is available
-        String nameServiceId = DFSUtil.getNameServiceIdFromAddress(
-            conf, namenode,
-            FSConstants.DFS_NAMENODE_RPC_ADDRESS_KEY);
-
-        if (nameServiceId != null) {
-          jmxPort = conf.getInt(DFSUtil.getNameServiceIdKey(
-              "dfs.namenode.jmxport", nameServiceId), jmxPort);
-        }
-      }
-      return jmxPort;
-    }
-    
     NamenodeMXBeanHelper(InetSocketAddress addr, Configuration conf) 
-        throws IOException, MalformedObjectNameException {
+        throws IOException, MalformedObjectNameException,
+        URISyntaxException{
       this(addr, conf, null);
     }
     
     NamenodeMXBeanHelper(InetSocketAddress addr, Configuration conf, 
-        NameNode localnn)
-        throws IOException, MalformedObjectNameException {
+        NameNode localnn) throws IOException, URISyntaxException {
       this.rpcAddress = addr;
       this.address = addr.toString();
       this.conf = conf;
-      int port = getJMXPort(addr, conf);
       if (localnn == null) {
-        JMXServiceURL jmxURL = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"
-            + addr.getHostName() + ":" + port + "/jmxrmi");
-        LOG.info("Create RMI connector and connect to the RMI connector server" + jmxURL);
-        connector = JMXConnectorFactory.connect(jmxURL);
-        mxbeanProxy = getNamenodeMxBean();
+        mxbeanProxy = new NameNodeMXBeanObject(addr, conf);
       } else {
         LOG.info("Call local namenode " + this.address + " directly");
-        connector = null;
         mxbeanProxy = localnn.getNamesystem();
       }
     }
     
-    private NameNodeMXBean getNamenodeMxBean()
-        throws IOException, MalformedObjectNameException {
-      // Get an MBeanServerConnection on the remote VM.
-      MBeanServerConnection remote = connector.getMBeanServerConnection();
-      ObjectName mxbeanName = new ObjectName(
-          "hadoop:service=NameNode,name=NameNodeInfo");
-
-      return JMX.newMXBeanProxy(remote, mxbeanName, NameNodeMXBean.class);
-    }
-    
     /** Get the map corresponding to the JSON string */
     private static Map<String, Map<String, Object>> getNodeMap(String json)
         throws IOException {
@@ -433,10 +588,10 @@ private static Map<String, Map<String, Object>> getNodeMap(String json)
     }
     
     /**
-     * Process JSON string returned from JMX connection to get the number of
+     * Process JSON string returned from connection to get the number of
      * live datanodes.
      * 
-     * @param json JSON output from JMX call that contains live node status.
+     * @param json JSON output that contains live node status.
      * @param nn namenode status to return information in
      */
     private static void getLiveNodeCount(String json, NamenodeStatus nn)
@@ -465,11 +620,10 @@ private static void getLiveNodeCount(String json, NamenodeStatus nn)
     }
   
     /**
-     * Count the number of dead datanode based on the JSON string returned from
-     * JMX call.
+     * Count the number of dead datanode based on the JSON string returned 
      * 
      * @param nn namenode
-     * @param json JSON string returned from JMX call
+     * @param json JSON string returned from http or local fsnamesystem
      */
     private static void getDeadNodeCount(String json, NamenodeStatus nn)
         throws IOException {
@@ -498,18 +652,21 @@ public NamenodeStatus getNamenodeStatus()
         throws IOException, MalformedObjectNameException {
       NamenodeStatus nn = new NamenodeStatus();
       nn.address = this.address;
-      nn.filesAndDirectories = mxbeanProxy.getTotalFiles();
+      nn.filesAndDirectories = mxbeanProxy.getTotalFilesAndDirectories();
       nn.capacity = mxbeanProxy.getTotal();
       nn.free = mxbeanProxy.getFree();
       nn.nsUsed = mxbeanProxy.getNamespaceUsed();
       nn.nonDfsUsed = mxbeanProxy.getNonDfsUsedSpace();
       nn.blocksCount = mxbeanProxy.getTotalBlocks();
       nn.missingBlocksCount = mxbeanProxy.getNumberOfMissingBlocks();
-      nn.httpAddress = DFSUtil.getInfoServer(rpcAddress, conf);
+      nn.httpAddress = DFSUtil.getInfoServer(rpcAddress, conf, isAvatar);
       nn.safeModeText = mxbeanProxy.getSafeModeText();
       getLiveNodeCount(mxbeanProxy.getLiveNodes(), nn);
       getDeadNodeCount(mxbeanProxy.getDeadNodes(), nn);
       nn.namenodeSpecificInfo = mxbeanProxy.getNNSpecificKeys();
+      if (nn.namenodeSpecificInfo == null) {
+        throw new IOException("Namenode SpecificInfo is null");
+      }
       nn.isPrimary = mxbeanProxy.getIsPrimary();
       return nn;
     }
@@ -517,7 +674,6 @@ public NamenodeStatus getNamenodeStatus()
     /**
      * Connect to namenode to get decommission node information.
      * @param statusMap data node status map
-     * @param connector JMXConnector
      */
     private void getDecomNodeInfoForReport(
         Map<String, Map<String, String>> statusMap) throws IOException,
@@ -528,8 +684,8 @@ private void getDecomNodeInfoForReport(
     }
   
     /**
-     * Process the JSON string returned from JMX call to get live datanode
-     * status. Store the information into datanode status map and
+     * Process the JSON string returned from http or local fsnamesystem to get
+     * live datanode status. Store the information into datanode status map and
      * Decommissionnode.
      * 
      * @param statusMap Map of datanode status. Key is datanode, value
@@ -568,9 +724,9 @@ private static void getLiveNodeStatus(
     }
   
     /**
-     * Process the JSON string returned from JMX connection to get the dead
-     * datanode information. Store the information into datanode status map and
-     * Decommissionnode.
+     * Process the JSON string returned from http or local fsnamesystem to get
+     * the dead datanode information. Store the information into datanode status
+     * map and Decommissionnode.
      * 
      * @param statusMap map with key being datanode, value being an
      *          inner map (key:namenode, value:decommisionning state).
@@ -611,13 +767,13 @@ private static void getDeadNodeStatus(
     }
   
     /**
-     * We process the JSON string returned from JMX connection to get the
-     * decommisioning datanode information.
+     * We process the JSON string returned from http or local fsnamesystem
+     * to get the decommisioning datanode information.
      * 
      * @param dataNodeStatusMap map with key being datanode, value being an
      *          inner map (key:namenode, value:decommisionning state).
      * @param address 
-     * @param json JSON string returned from JMX connection
+     * @param json JSON string returned 
      */
     private static void getDecommissionNodeStatus(
         Map<String, Map<String, String>> dataNodeStatusMap, String address,
@@ -640,18 +796,9 @@ private static void getDecommissionNodeStatus(
         dataNodeStatusMap.put(dn, nnStatus);
       }
     }
-  
-    
-    public void cleanup() {
-      if (connector != null) {
-        try {
-          connector.close();
-        } catch (Exception e) {
-          // log failure of close jmx connection
-          LOG.warn("Unable to close JMX connection. "
-              + StringUtils.stringifyException(e));
-        }
-      }
+
+    public boolean isAvatar() {
+      return isAvatar;
     }
   }
 
@@ -745,6 +892,10 @@ public void addNamenodeStatus(NamenodeStatus nn) {
     public void addException(String address, Exception e) {
       nnExceptions.put(address, e);
     }
+    
+    public boolean isAvatar() {
+      return isAvatar;
+    }
   }
   
   /**
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CorruptReplicasMap.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CorruptReplicasMap.java
index b1f4d8c7..4b22525a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CorruptReplicasMap.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CorruptReplicasMap.java
@@ -129,4 +129,8 @@ public int numCorruptReplicas(Block blk) {
   public int size() {
     return corruptReplicasMap.size();
   }
+  
+  public void clear() {
+    corruptReplicasMap = new HashMap<Block, Collection<DatanodeDescriptor>>();
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java
index 4380dbe1..de683105 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java
@@ -474,10 +474,11 @@ void reportDiff(BlocksMap blocksMap,
       }
       int index = storedBlock.findDatanode(this);
       if(index < 0) {// Known block, but not on the DN
-        // if the size differs from what is in the blockmap, then return
-        // the new block. addStoredBlock will then pick up the right size of this
-        // block and will update the block object in the BlocksMap
-        if (storedBlock.getNumBytes() != iblk.getNumBytes()) {
+        // if the size/GS differs from what is in the blockmap, then return
+        // the new block. addStoredBlock will then pick up the right size/GS of 
+        // this block and will update the block object in the BlocksMap
+        if (storedBlock.getNumBytes() != iblk.getNumBytes()
+            || storedBlock.getGenerationStamp() != iblk.getGenerationStamp()) {
           toAdd.add(new Block(iblk));
         } else {
           toAdd.add(storedBlock);
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java
index 3fe2efef..1a927185 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java
@@ -35,6 +35,7 @@
 import org.apache.hadoop.hdfs.protocol.ClientProtocol;
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics;
 import org.apache.hadoop.security.UnixUserGroupInformation;
 import org.apache.hadoop.security.UserGroupInformation;
 
@@ -44,6 +45,8 @@
 abstract class DfsServlet extends HttpServlet {
   /** For java.io.Serializable */
   private static final long serialVersionUID = 1L;
+  
+  private ClientProtocol nnProxy = null;
 
   static final Log LOG = LogFactory.getLog(DfsServlet.class.getCanonicalName());
 
@@ -62,8 +65,11 @@ protected UnixUserGroupInformation getUGI(HttpServletRequest request) {
   /**
    * Create a {@link NameNode} proxy from the current {@link ServletContext}. 
    */
-  protected ClientProtocol createNameNodeProxy(UnixUserGroupInformation ugi
+  protected synchronized ClientProtocol createNameNodeProxy(UnixUserGroupInformation ugi
       ) throws IOException {
+    if (nnProxy != null) {
+      return nnProxy;
+    }
     ServletContext context = getServletContext();
     InetSocketAddress nnAddr = (InetSocketAddress)context.getAttribute("name.node.address");
     if (nnAddr == null) {
@@ -73,7 +79,8 @@ protected ClientProtocol createNameNodeProxy(UnixUserGroupInformation ugi
         (Configuration)context.getAttribute("name.conf"));
     UnixUserGroupInformation.saveToConf(conf,
         UnixUserGroupInformation.UGI_PROPERTY_NAME, ugi);
-    return DFSClient.createNamenode(nnAddr, conf);
+    nnProxy = DFSClient.createNamenode(nnAddr, conf);
+    return nnProxy;
   }
 
   /** Create a URI for redirecting request to a datanode */
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogFileInputStream.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogFileInputStream.java
index ab1ccab3..93d8db87 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogFileInputStream.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogFileInputStream.java
@@ -29,13 +29,14 @@
 
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
 import org.apache.hadoop.io.IOUtils;
 
 /**
  * An implementation of the abstract class {@link EditLogInputStream}, which
  * reads edits from a local file.
  */
-class EditLogFileInputStream extends EditLogInputStream {
+public class EditLogFileInputStream extends EditLogInputStream {
   private File file;
   private final FileInputStream fStream;
   private final FileChannel fc;
@@ -55,7 +56,7 @@ class EditLogFileInputStream extends EditLogInputStream {
    * @throws IOException if an actual IO error occurs while reading the
    *         header
    */
-  EditLogFileInputStream(File name)
+  public EditLogFileInputStream(File name)
       throws LogHeaderCorruptException, IOException {
     this(name, HdfsConstants.INVALID_TXID, HdfsConstants.INVALID_TXID);
   }
@@ -202,7 +203,7 @@ static int readLogVersion(DataInputStream in) throws IOException,
    * or because the header data is invalid (eg claims to be
    * over a newer version than the running NameNode)
    */
-  static class LogHeaderCorruptException extends IOException {
+  public static class LogHeaderCorruptException extends IOException {
     private static final long serialVersionUID = 1L;
 
     private LogHeaderCorruptException(String msg) {
@@ -219,4 +220,9 @@ public long getPosition() throws IOException{
   public long getReadChecksum() {
     return reader.getChecksum();
   }
+
+  @Override
+  public JournalType getType() {
+    return JournalType.FILE;
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogFileOutputStream.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogFileOutputStream.java
index 585cc159..728941a2 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogFileOutputStream.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogFileOutputStream.java
@@ -39,7 +39,7 @@
  * An implementation of the abstract class {@link EditLogOutputStream}, which
  * stores edits in a local file.
  */
-class EditLogFileOutputStream extends EditLogOutputStream {
+public class EditLogFileOutputStream extends EditLogOutputStream {
   private static Log LOG = LogFactory.getLog(EditLogFileOutputStream.class);
 
   private File file;
@@ -65,7 +65,7 @@ class EditLogFileOutputStream extends EditLogOutputStream {
    *          Size of flush buffer
    * @throws IOException
    */
-  EditLogFileOutputStream(File name, NameNodeMetrics metrics) throws IOException {
+  public EditLogFileOutputStream(File name, NameNodeMetrics metrics) throws IOException {
     super();
     FSNamesystem.LOG.info("Edit Log preallocate size for " + name +   
                           " is " + FSEditLog.preallocateSize + " bytes " +    
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogInputStream.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogInputStream.java
index 1fc7240c..c0e55c2e 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogInputStream.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogInputStream.java
@@ -21,6 +21,8 @@
 import java.io.IOException;
 import java.util.zip.Checksum;
 
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
+
 /**
  * A generic abstract class to support reading edits log data from 
  * persistent storage.
@@ -28,7 +30,7 @@
  * It should stream bytes from the storage exactly as they were written
  * into the #{@link EditLogOutputStream}.
  */
- abstract class EditLogInputStream implements Closeable {
+public abstract class EditLogInputStream implements Closeable {
   /** 
    * @return the first transaction which will be found in this stream
    */
@@ -93,6 +95,8 @@ abstract class EditLogInputStream implements Closeable {
   /**
    * Get checksum for the most recently consumed operation
    */
-  public abstract long getReadChecksum(); 
+  public abstract long getReadChecksum();
+
+  public abstract JournalType getType();
 
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogOutputStream.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogOutputStream.java
index 52c7cdab..e9fdfe42 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogOutputStream.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/EditLogOutputStream.java
@@ -18,13 +18,15 @@
 package org.apache.hadoop.hdfs.server.namenode;
 
 import java.io.IOException;
+
+import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.metrics.util.MetricsTimeVaryingRate;
 
 /**
  * A generic abstract class to support journaling of edits logs into 
  * a persistent storage.
  */
- abstract class EditLogOutputStream {
+public abstract class EditLogOutputStream {
   // these are statistics counters
   private long numSync;        // number of sync(s) to disk
   private long totalTimeSync;  // total time to sync
@@ -78,12 +80,12 @@ abstract class EditLogOutputStream {
    */
   public void flush() throws IOException {
     numSync++;
-    long start = FSNamesystem.now();
+    long start = System.nanoTime();
     flushAndSync();
-    long end = FSNamesystem.now();
-    totalTimeSync += (end - start);
+    long time = DFSUtil.getElapsedTimeMicroSeconds(start);
+    totalTimeSync += time;
     if (sync != null) {
-      sync.inc(end - start);
+      sync.inc(time);
     }
   }
   
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
index bfd22a6a..5d2e483c 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hdfs.server.namenode;
 
 import java.io.*;
+import java.net.URI;
 import java.util.*;
 
 import org.apache.commons.lang.mutable.MutableInt;
@@ -26,6 +27,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.permission.*;
+import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.FileStatusExtended;
 import org.apache.hadoop.hdfs.protocol.DirectoryListing;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
@@ -42,6 +44,8 @@
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.TimeUnit;
 
+import junit.framework.Assert;
+
 /*************************************************
  * FSDirectory stores the filesystem directory state.
  * It handles writing/loading values to disk, and logging
@@ -49,21 +53,21 @@
  *
  * It keeps the filename->blockset mapping always-current
  * and logged to disk.
- * 
+ *
  *************************************************/
 public class FSDirectory implements FSConstants, Closeable {
 
   final INodeDirectoryWithQuota rootDir;
-  FSImage fsImage;  
+  FSImage fsImage;
   private boolean ready = false;
   private final int lsLimit;  // max list limit
-  
+
   static int BLOCK_DELETION_NO_LIMIT = 0;
 
   private static Random random = new Random(FSNamesystem.now());
 
   /**
-   * Caches frequently used file names used in {@link INode} to reuse 
+   * Caches frequently used file names used in {@link INode} to reuse
    * byte[] objects and reduce heap usage.
    */
   private final NameCache<ByteArray> nameCache;
@@ -72,7 +76,9 @@ public class FSDirectory implements FSConstants, Closeable {
   private ReentrantReadWriteLock bLock;
   private Condition cond;
   private boolean hasRwLock;
-  long totalFiles = 0;
+  
+  /** Keeps track of the lastest hard link ID;*/
+  private volatile long latestHardLinkID = 0;
 
   // utility methods to acquire and release read lock and write lock
   // if hasRwLock is false, then readLocks morph into writeLocks.
@@ -105,12 +111,11 @@ boolean hasWriteLock() {
   }
 
   /** Access an existing dfs name directory. */
-  FSDirectory(FSNamesystem ns, Configuration conf) throws IOException {
-    this(new FSImage(conf), ns, conf);
-    if (conf.getBoolean("dfs.name.dir.restore", false)) {
-      NameNode.LOG.info("set FSImage.restoreFailedStorage");
-      fsImage.setRestoreFailedStorage(true);
-    }
+  FSDirectory(FSNamesystem ns, Configuration conf, 
+      Collection<URI> dataDirs,
+      Collection<URI> editsDirs) throws IOException {
+    this(new FSImage(conf, dataDirs, editsDirs), ns, conf);
+    fsImage.setFSNamesystem(ns);
   }
 
   FSDirectory(FSImage fsImage, FSNamesystem ns, Configuration conf) {
@@ -132,40 +137,50 @@ boolean hasWriteLock() {
     initialize(conf);
   }
 
+  private long getAndIncrementLastHardLinkID() {
+    return this.latestHardLinkID++;
+  }
+  
+  /**
+   * Reset the lastHardLinkID if the hardLinkID is larger than the original lastHardLinkID.
+   * 
+   * This function is not thread safe.
+   * @param hardLinkID
+   */
+  void resetLastHardLinkIDIfLarge(long hardLinkID) {
+    if (this.latestHardLinkID < hardLinkID) {
+      this.latestHardLinkID = hardLinkID;
+    }
+  }
+  
   private FSNamesystem getFSNamesystem() {
     return fsImage.getFSNamesystem();
   }
-    
+
   private void initialize(Configuration conf) {
     this.bLock = new ReentrantReadWriteLock(); // non-fair
     this.cond = bLock.writeLock().newCondition();
     this.hasRwLock = getFSNamesystem().hasRwLock;
   }
 
-  void loadFSImage(Collection<File> dataDirs,
-                   Collection<File> editsDirs,
-                   StartupOption startOpt) throws IOException {
+  void loadFSImage(StartupOption startOpt, Configuration conf) 
+      throws IOException {
     // format before starting up if requested
     if (startOpt == StartupOption.FORMAT) {
-      fsImage.setStorageDirectories(dataDirs, editsDirs);
       fsImage.format();
       startOpt = StartupOption.REGULAR;
     }
     try {
-      boolean saveNamespace = 
-          fsImage.recoverTransitionRead(dataDirs, editsDirs, startOpt);
+      boolean saveNamespace =
+          fsImage.recoverTransitionRead(startOpt);
       if (saveNamespace) {
-        fsImage.saveNamespace(true);
+        fsImage.saveNamespace();
       }
-      FSEditLog editLog = fsImage.getEditLog();
-      assert editLog != null : "editLog must be initialized";
-      if (!editLog.isOpen())
-        editLog.open();
-      if (!saveNamespace) {
-        fsImage.rollEditLog();
+      if (conf.getBoolean("dfs.namenode.openlog", true)) {
+        fsImage.openEditLog();
       }
-      fsImage.setCheckpointDirectories(null, null);
-    } catch(IOException e) {
+    } catch (IOException e) {
+      NameNode.LOG.fatal("Exception when loading the image,", e);
       fsImage.close();
       throw e;
     }
@@ -204,7 +219,7 @@ void waitForReady() {
       }
     }
   }
-
+  
   /**
    * Add the given filename to the fs.
    */
@@ -218,7 +233,8 @@ INodeFileUnderConstruction addFile(String path,
                 String clientName,
                 String clientMachine,
                 DatanodeDescriptor clientNode,
-                long generationStamp)
+                long generationStamp,
+                long accessTime)
                 throws IOException {
     waitForReady();
 
@@ -231,15 +247,17 @@ INodeFileUnderConstruction addFile(String path,
         return null;
       }
     }
+    if (accessTime == -1){
+    	accessTime = modTime;
+    }
     INodeFileUnderConstruction newNode = new INodeFileUnderConstruction(
                                  permissions,replication,
-                                 preferredBlockSize, modTime, clientName, 
+                                 preferredBlockSize, modTime, accessTime, clientName, 
                                  clientMachine, clientNode);
     newNode.setLocalName(components[inodes.length-1]);
     writeLock();
     try {
       newNode = addChild(inodes, inodes.length-1, newNode, -1, false);
-      totalFiles++;
     } finally {
       writeUnlock();
     }
@@ -273,7 +291,6 @@ private INodeFileUnderConstruction unprotectedAddFile(String path,
         clientName, clientMachine, null);
     try {
       newNode = addNode(path, newNode, 0, false);
-      this.totalFiles++;
     } catch (IOException e) {
       return null;
     }
@@ -282,9 +299,9 @@ private INodeFileUnderConstruction unprotectedAddFile(String path,
 
   /**
    */
-  INode unprotectedAddFile( String path, 
+  INode unprotectedAddFile( String path,
                             PermissionStatus permissions,
-                            Block[] blocks, 
+                            Block[] blocks,
                             short replication,
                             long modificationTime,
                             long atime,
@@ -363,9 +380,9 @@ Block addBlock(String path, INode[] inodes, Block block) throws IOException {
       INodeFile fileNode = (INodeFile) inodes[inodes.length-1];
 
       // check quota limits and updated space consumed
-      updateCount(inodes, inodes.length-1, 0, 
+      updateCount(inodes, inodes.length-1, 0,
           fileNode.getPreferredBlockSize()*fileNode.getReplication(), true);
-      
+
       // associate the new list of blocks with this file
       BlockInfo blockInfo = getFSNamesystem().blocksMap.addINode(block, fileNode);
       fileNode.addBlock(blockInfo);
@@ -385,7 +402,7 @@ Block addBlock(String path, INode[] inodes, Block block) throws IOException {
   /**
    * Persist the block list for the inode.
    */
-  void persistBlocks(String path, INodeFileUnderConstruction file) 
+  void persistBlocks(String path, INodeFileUnderConstruction file)
                      throws IOException {
     waitForReady();
 
@@ -394,7 +411,7 @@ void persistBlocks(String path, INodeFileUnderConstruction file)
       fsImage.getEditLog().logOpenFile(path, file);
       if (NameNode.stateChangeLog.isDebugEnabled()) {
         NameNode.stateChangeLog.debug("DIR* FSDirectory.persistBlocks: "
-                                      +path+" with "+ file.getBlocks().length 
+                                      +path+" with "+ file.getBlocks().length
                                       +" blocks is persisted to the file system");
       }
     } finally {
@@ -415,7 +432,7 @@ void closeFile(String path, INodeFile file) throws IOException {
       fsImage.getEditLog().logCloseFile(path, file);
       if (NameNode.stateChangeLog.isDebugEnabled()) {
         NameNode.stateChangeLog.debug("DIR* FSDirectory.closeFile: "
-                                    +path+" with "+ file.getBlocks().length 
+                                    +path+" with "+ file.getBlocks().length
                                     +" blocks is persisted to the file system");
       }
     } finally {
@@ -426,7 +443,7 @@ void closeFile(String path, INodeFile file) throws IOException {
   /**
    * Remove the block from a file.
    */
-  boolean removeBlock(String path, INodeFileUnderConstruction fileNode, 
+  boolean removeBlock(String path, INodeFileUnderConstruction fileNode,
                       Block block) throws IOException {
     waitForReady();
 
@@ -451,55 +468,79 @@ boolean removeBlock(String path, INodeFileUnderConstruction fileNode,
     return true;
   }
 
-  /** 
-   * @see #unprotectedHardLinkTo(String, String, long)
+  /**
+   * Retrieves a the hardlink id for a given file.
+   *
+   * @param src
+   *          the file to lookup
+   * @return the hardlink id
+   * @throws IOException
+   *           if the specified file is not a valid hardlink file
    */
-  boolean hardLinkTo(String src, String srcLocalName, byte[] srcComponent,
-      INode[] srcInodes, String dst, INode[] dstInodes, byte[] dstComponent)
-      throws QuotaExceededException {
+  public long getHardLinkId(String src) throws IOException {
+    byte[][] components = INode.getPathComponents(src);
+    readLock();
+    try {
+      INodeFile node = this.getFileINode(components);
+      if ((!exists(node)) || (!(node instanceof INodeHardLinkFile))) {
+        throw new IOException(src + " is not a valid hardlink file");
+      }
+      return ((INodeHardLinkFile) node).getHardLinkID();
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * @see #unprotectedHardLinkTo(String, String)
+   */
+  boolean hardLinkTo(String src, String[] srcNames, byte[][] srcComponents, INode[] srcInodes,
+      String dst, String[] dstNames, byte[][] dstComponents, INode[] dstInodes)
+      throws QuotaExceededException, FileNotFoundException {
     if (NameNode.stateChangeLog.isDebugEnabled()) {
       NameNode.stateChangeLog.debug("DIR* FSDirectory.hardLinkTo: src: " + src
           + " dst: " + dst);
     }
     waitForReady();
-    if (!unprotectedHardLinkTo(src, srcLocalName, srcComponent, srcInodes, dst,
-        dstInodes, dstComponent)) {
+    long now = FSNamesystem.now();
+    if (!unprotectedHardLinkTo(src, srcNames, srcComponents, srcInodes, dst,
+        dstNames, dstComponents, dstInodes, now)) {
       return false;
     }
-    // TODO: add the logHardLink in the followup diffs
-    //fsImage.getEditLog().logHardLink(src, dst);
+    fsImage.getEditLog().logHardLink(src, dst, now);
     return true;
   }
-  
+
   /** hard link the dst path to the src path
-   * 
+   *
    * @param src source path
    * @param dst destination path
+   * @param timestamp The modification timestamp for the dst's parent directory
    * @return true if the hardLink succeeds; false otherwise
    * @throws QuotaExceededException if the operation violates any quota limit
+   * @throws FileNotFoundException
    */
-  boolean unprotectedHardLinkTo(String src, String dst) 
-  throws QuotaExceededException {
-    return unprotectedHardLinkTo(src, null, null, null, dst, null, null);
+  boolean unprotectedHardLinkTo(String src, String dst, long timestamp)
+  throws QuotaExceededException, FileNotFoundException {
+    return unprotectedHardLinkTo(src, null, null, null, dst, null, null, null, timestamp);
   }
 
-  private boolean unprotectedHardLinkTo(String src, String srcLocalName, byte[] srcComponent,
-      INode[] srcINodes, String dst, INode[] dstINodes, byte[] dstComponent)
-    throws QuotaExceededException {
+  private boolean unprotectedHardLinkTo(String src, String[] srcNames, byte[][] srcComponents,
+      INode[] srcINodes, String dst, String[] dstNames, byte[][] dstComponents,
+      INode[] dstINodes, long timestamp)
+    throws QuotaExceededException, FileNotFoundException {
     writeLock();
     try {
       // Get the src file inodes if necessary
       if (srcINodes == null) {
-        String[] srcNames = INode.getPathNames(src);
-        srcLocalName = srcNames[srcNames.length-1];
-        byte[][] srcComponents = INode.getPathComponents(srcNames);
-        srcComponent = srcComponents[srcComponents.length-1];
+        srcNames = INode.getPathNames(src);
+        srcComponents = INode.getPathComponents(srcNames);
         srcINodes = new INode[srcComponents.length];
         rootDir.getExistingPathINodes(srcComponents, srcINodes);
       }
+      INode srcINode = srcINodes[srcINodes.length - 1];
 
       // Check the validation of the src
-      INode srcINode = srcINodes[srcINodes.length - 1];
       if (srcINode == null) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedHardLinkTo: "
             + "failed to hardlink " + dst + " to " + src
@@ -512,7 +553,7 @@ private boolean unprotectedHardLinkTo(String src, String srcLocalName, byte[] sr
             + "failed to hardlink " + dst + " to " + src + " because source is a directory.");
         return false;
       }
-      
+
       INodeFile srcINodeFile = (INodeFile) srcINode;
       if (srcINodeFile.getBlocks() == null) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedHardLinkTo: "
@@ -520,24 +561,25 @@ private boolean unprotectedHardLinkTo(String src, String srcLocalName, byte[] sr
             + " because the source file is NULL blocks");
         return false;
       }
-      
+
       if (srcINodeFile.isUnderConstruction()) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedHardLinkTo: "
             + "failed to hardlink " + dst + " to " + src
             + " because the source file is still under construction.");
         return false;
       }
-      
+
       // Get the dst file inodes if necessary
       if (dstINodes == null) {
-        byte[][] dstComponents = INode.getPathComponents(dst);
-        dstComponent = dstComponents[dstComponents.length-1];
+        dstNames = INode.getPathNames(dst);
+        dstComponents = INode.getPathComponents(dst);
         dstINodes = new INode[dstComponents.length];
         rootDir.getExistingPathINodes(dstComponents, dstINodes);
       }
-      
+      byte[] dstComponent = dstComponents[dstComponents.length-1];
+      INode dstINode = dstINodes[dstINodes.length - 1];
+
       // Check the validation of the dst
-      INode dstINode= dstINodes[dstINodes.length - 1];
       if (dstINode != null) {
         // if the src and dst has already linked together, return true directly.
         if (dstINode instanceof INodeHardLinkFile &&
@@ -555,15 +597,20 @@ private boolean unprotectedHardLinkTo(String src, String srcLocalName, byte[] sr
         }
       }
 
+      // Create the intermediate directories if they don't exist.
       if (dstINodes[dstINodes.length - 2] == null) {
-        NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedHardLinkTo: "
-            + "failed to hardlink " + dst + " to " + src 
-            + " because destination's parent does not exist");
-        return false;
+        if (!mkdirs(dst, dstNames, dstComponents, dstINodes, dstINodes.length - 1,
+            new PermissionStatus(FSNamesystem.getCurrentUGI().getUserName(),
+                null, FsPermission.getDefault()),
+            true, FSNamesystem.now())) {
+          NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedHardLinkTo: "
+              + "failed to hardlink " + dst + " to " + src
+              + " because cannot create destination's parent dir" );
+          return false;
+        }
       }
-      
-      // TODO: Ensure the destination has quota for hard linked file
-      // verifyQuotaForHardLink(srcINodes, dstINodes);
+      // Ensure the destination has quota for hard linked file
+      int nonCommonAncestorPos = verifyQuotaForHardLink(srcINodes, dstINodes);
 
       INodeHardLinkFile srcLinkedFile = null;
       if (srcINodeFile instanceof INodeHardLinkFile) {
@@ -579,32 +626,34 @@ private boolean unprotectedHardLinkTo(String src, String srcLocalName, byte[] sr
         // The source file is a regular file
         try {
           // Convert the source file from INodeFile to INodeHardLinkFile
-          srcLinkedFile = new INodeHardLinkFile(srcINodeFile);
-          srcLinkedFile.incReferenceCnt();
+          srcLinkedFile = new INodeHardLinkFile(srcINodeFile, this.getAndIncrementLastHardLinkID());
         } catch (IOException e) {
           NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedHardLinkTo: "
               + "failed to hardlink " + dst + " to " + src
               + " because source is empty.");
           return false;
         }
-        
+
         try {
           // Replace the new INodeHardLinkFile in its parent directory
           ((INodeDirectory)srcINodes[srcINodes.length - 2]).replaceChild(srcLinkedFile);
         } catch (IllegalArgumentException e) {
           NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedHardLinkTo: "
-              + " failed to hardlink " + dst + " to " + src 
+              + " failed to hardlink " + dst + " to " + src
               + " because no such src file is found in its parent direcoty.");
           return false;
         }
+        
+        // Increment the reference cnt for the src file
+        srcLinkedFile.incReferenceCnt();
       }
-      
-      // Create the destination INodeHardLinkFile 
+
+      // Create the destination INodeHardLinkFile
       INodeHardLinkFile dstLinkedFile = new INodeHardLinkFile(srcLinkedFile);
       dstLinkedFile.setLocalName(dstComponent);
-      
+
       // Add the dstLinkedFile to the destination directory
-      dstLinkedFile = addChildNoQuotaCheck(dstINodes, dstINodes.length - 1,
+      dstLinkedFile = addChildNoQuotaCheck(dstINodes, nonCommonAncestorPos, dstINodes.length - 1,
           dstLinkedFile, -1, false);
       if (dstLinkedFile == null) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedHardLinkTo: "
@@ -613,12 +662,14 @@ private boolean unprotectedHardLinkTo(String src, String srcLocalName, byte[] sr
         return false;
       }
       
-      // Increase the reference cnt and update the src and dst INodes
+      // Increase the reference cnt for the dst 
       dstLinkedFile.incReferenceCnt();
       dstINodes[dstINodes.length - 1] = dstLinkedFile;
       srcINodes[srcINodes.length - 1] = srcLinkedFile;
-      assert(dstLinkedFile.getReferenceCnt() == srcLinkedFile.getReferenceCnt());
+      dstINodes[dstINodes.length -2].setModificationTime(timestamp);
       
+      assert(dstLinkedFile.getReferenceCnt() == srcLinkedFile.getReferenceCnt());
+
       if (NameNode.stateChangeLog.isDebugEnabled()) {
         NameNode.stateChangeLog.debug("DIR* FSDirectory.unprotectedHardLinkTo: "
             + "succeeded to hardlink " + dst + " to " + src
@@ -629,7 +680,7 @@ private boolean unprotectedHardLinkTo(String src, String srcLocalName, byte[] sr
       writeUnlock();
     }
   }
-  
+
   /**
    * @see #unprotectedRenameTo(String, String, long)
    */
@@ -650,13 +701,13 @@ boolean renameTo(String src, String srcLocalName, byte[] srcComponent,
   }
 
   /** Change a path name
-   * 
+   *
    * @param src source path
    * @param dst destination path
    * @return true if rename succeeds; false otherwise
    * @throws QuotaExceededException if the operation violates any quota limit
    */
-  boolean unprotectedRenameTo(String src, String dst, long timestamp) 
+  boolean unprotectedRenameTo(String src, String dst, long timestamp)
   throws QuotaExceededException {
     return unprotectedRenameTo(src, null, null, null, dst, null, null, timestamp);
   }
@@ -681,7 +732,7 @@ private boolean unprotectedRenameTo(String src, String srcLocalName, byte[] srcC
             + "failed to rename " + src + " to " + dst
             + " because source does not exist");
         return false;
-      } 
+      }
       if (srcInodes.length == 1) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedRenameTo: "
             +"failed to rename "+src+" to "+dst+ " because source is the root");
@@ -701,13 +752,13 @@ private boolean unprotectedRenameTo(String src, String srcLocalName, byte[] srcC
         dstInodes[dstInodes.length-1] = ((INodeDirectory)dstNode).
                                getChildINode(dstComponent);
       }
-      
+
       // check the validity of the destination
       if (dst.equals(src)) {
         return true;
       }
       // dst cannot be directory or a file under src
-      if (dst.startsWith(src) && 
+      if (dst.startsWith(src) &&
           dst.charAt(src.length()) == Path.SEPARATOR_CHAR) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedRenameTo: "
             + "failed to rename " + src + " to " + dst
@@ -717,20 +768,20 @@ private boolean unprotectedRenameTo(String src, String srcLocalName, byte[] srcC
 
       if (dstInodes[dstInodes.length-1] != null) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedRenameTo: "
-                                     +"failed to rename "+src+" to "+dst+ 
+                                     +"failed to rename "+src+" to "+dst+
                                      " because destination exists");
         return false;
       }
       if (dstInodes[dstInodes.length-2] == null) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.unprotectedRenameTo: "
-            +"failed to rename "+src+" to "+dst+ 
+            +"failed to rename "+src+" to "+dst+
             " because destination's parent does not exist");
         return false;
       }
-      
+
       // Ensure dst has quota to accommodate rename
-      verifyQuotaForRename(srcInodes,dstInodes);
-      
+      verifyQuotaForRename(srcInodes, dstInodes);
+
       INode dstChild = null;
       INode srcChild = null;
       String srcChildName = null;
@@ -745,9 +796,9 @@ private boolean unprotectedRenameTo(String src, String srcLocalName, byte[] srcC
       }
         srcChildName = srcChild.getLocalName();
         srcChild.setLocalName(dstComponent);
-        
+
         // add src to the destination
-        dstChild = addChildNoQuotaCheck(dstInodes, dstInodes.length - 1,
+        dstChild = addChildNoQuotaCheck(dstInodes, 0, dstInodes.length - 1,
             srcChild, -1, false);
       if (dstChild != null) {
           srcChild = null;
@@ -768,7 +819,7 @@ private boolean unprotectedRenameTo(String src, String srcLocalName, byte[] srcC
         if (dstChild == null && srcChild != null) {
           // put it back
           srcChild.setLocalName(srcChildName);
-          addChildNoQuotaCheck(srcInodes, srcInodes.length - 1, srcChild, -1,
+          addChildNoQuotaCheck(srcInodes, 0, srcInodes.length - 1, srcChild, -1,
               false);
         }
       }
@@ -782,14 +833,14 @@ private boolean unprotectedRenameTo(String src, String srcLocalName, byte[] srcC
 
   /**
    * Set file replication
-   * 
+   *
    * @param src file name
    * @param replication new replication
    * @param oldReplication old replication - output parameter
    * @return array of file blocks
    * @throws IOException
    */
-  Block[] setReplication(String src, 
+  Block[] setReplication(String src,
                          short replication,
                          int[] oldReplication
                          ) throws IOException {
@@ -800,7 +851,7 @@ Block[] setReplication(String src,
     return fileBlocks;
   }
 
-  Block[] unprotectedSetReplication( String src, 
+  Block[] unprotectedSetReplication( String src,
                                      short replication,
                                      int[] oldReplication
                                      ) throws IOException {
@@ -818,11 +869,18 @@ Block[] unprotectedSetReplication( String src,
         return null;
       INodeFile fileNode = (INodeFile)inode;
       oldReplication[0] = fileNode.getReplication();
-
-      // check disk quota
-      long dsDelta = (replication - oldReplication[0]) *
-           (fileNode.diskspaceConsumed()/oldReplication[0]);
-      updateCount(inodes, inodes.length-1, 0, dsDelta, true);
+      long dsDelta = (replication - oldReplication[0]) * 
+                     (fileNode.diskspaceConsumed()/oldReplication[0]);
+      
+      if (fileNode instanceof INodeHardLinkFile) {
+        // check the disk quota for the hard link file
+        INodeHardLinkFile hardLinkedFile = (INodeHardLinkFile)fileNode;
+        INode[] anncestorINodeArray = hardLinkedFile.getAncestorSet().toArray(new INode[0]);
+        updateCount(anncestorINodeArray, anncestorINodeArray.length-1, 0, dsDelta, true);
+      } else {
+        // check disk quota for the regular file
+        updateCount(inodes, inodes.length-1, 0, dsDelta, true);
+      }
 
       fileNode.setReplication(replication);
       fileBlocks = fileNode.getBlocks();
@@ -835,7 +893,7 @@ Block[] unprotectedSetReplication( String src,
   /**
    * Get the blocksize of a file
    * @param filename the filename
-   * @return the number of bytes 
+   * @return the number of bytes
    * @throws IOException if it is a directory or does not exist.
    */
   long getPreferredBlockSize(String filename) throws IOException {
@@ -846,7 +904,7 @@ long getPreferredBlockSize(String filename) throws IOException {
         throw new IOException("Unknown file: " + filename);
       }
       if (fileNode.isDirectory()) {
-        throw new IOException("Getting block size of a directory: " + 
+        throw new IOException("Getting block size of a directory: " +
                               filename);
       }
       return ((INodeFile)fileNode).getPreferredBlockSize();
@@ -854,14 +912,14 @@ long getPreferredBlockSize(String filename) throws IOException {
       readUnlock();
     }
   }
-  
+
   /**
    * Updates the in memory inode for the file with the new information and
    * returns a reference to the INodeFile. This method in most cases would
    * return a {@link INodeFileUnderConstruction}, the only case where it should
    * return a {@link INodeFile} would be when it tries to update an already
    * closed file.
-   * 
+   *
    * @return reference to the {@link INodeFile}
    * @throws IOException
    */
@@ -926,7 +984,7 @@ protected INodeFile updateINodefile(String path,
    * It returns the INode regardless of its type
    * getFileInode only returns the inode if it is
    * of a file type
-   */  
+   */
   INode getInode(String src) {
     src = normalizePath(src);
     readLock();
@@ -938,6 +996,49 @@ INode getInode(String src) {
     }
   }
 
+  /**
+   * See {@link ClientProtocol#getHardLinkedFiles(String)}.
+   */
+  public String[] getHardLinkedFiles(String src) throws IOException {
+    byte[][] components = INode.getPathComponents(src);
+    byte [][][] results = null;
+    readLock();
+    try {
+      INodeFile inode = getFileINode(components);
+      if (!exists(inode)) {
+        throw new IOException(src + " does not exist");
+      }
+      if (inode instanceof INodeHardLinkFile) {
+        HardLinkFileInfo info = ((INodeHardLinkFile) inode)
+          .getHardLinkFileInfo();
+        // Only get the list of names as byte arrays under the lock.
+        results = new byte[info.getReferenceCnt()][][];
+        for (int i = 0; i < info.getReferenceCnt(); i++) {
+          results[i] = getINodeByteArray(info.getHardLinkedFile(i));
+        }
+      } else {
+        return new String[] {};
+      }
+    } finally {
+      readUnlock();
+    }
+
+    // Convert byte arrays to strings outside the lock since this is expensive.
+    String[] files = new String[results.length - 1];
+    int size = 0;
+    for (int i = 0; i < results.length; i++) {
+      String file = getFullPathName(results[i]);
+      if (!file.equals(src)) {
+        if (size >= files.length) {
+          throw new IOException(src + " is not part of the list of hardlinked "
+              + "files! This is a serious bug!");
+        }
+        files[size++] = file;
+      }
+    }
+    return files;
+  }
+
   private boolean exists(INode inode) {
     if (inode == null) {
       return false;
@@ -1052,7 +1153,6 @@ public void unprotectedConcat(String target, String [] srcs, long now) {
       trgParent.setModificationTime(now);
       // update quota on the parent directory ('count' files removed, 0 space)
       unprotectedUpdateCount(trgINodes, trgINodes.length-1, - count, 0);
-      totalFiles -= srcs.length;
     } finally {
       writeUnlock();
     }
@@ -1075,7 +1175,7 @@ INode delete(String src, INode[] inodes, List<Block> collectedBlocks,
     }
     return deletedNode;
   }
-  
+
   /** Return if an inode is empty or not **/
   boolean isDirEmpty(INode targetNode) {
 	   boolean dirNotEmpty = true;
@@ -1100,7 +1200,7 @@ boolean isDirEmpty(INode targetNode) {
    * @param src a string representation of a path to an inode
    * @param modificationTime the time the inode is removed
    * @return the deleted target inode, null if deletion failed
-   */ 
+   */
   INode unprotectedDelete(String src, long modificationTime) {
     return unprotectedDelete(src, this.getExistingPathINodes(src), null,
         BLOCK_DELETION_NO_LIMIT, modificationTime);
@@ -1110,7 +1210,7 @@ INode unprotectedDelete(String src, INode[] inodes, long modificationTime) {
     return unprotectedDelete(src, inodes, null,
         BLOCK_DELETION_NO_LIMIT, modificationTime);
   }
-  
+
   /**
    * Delete a path from the name space
    * Update the count at each ancestor directory with quota
@@ -1121,7 +1221,7 @@ INode unprotectedDelete(String src, INode[] inodes, long modificationTime) {
    * @param blocksLimit up limit number of blocks to be returned
    * @param modificationTime the time the inode is removed
    * @return the deleted target inode, null if deletion failed
-   */ 
+   */
   INode unprotectedDelete(String src, INode inodes[], List<Block> toBeDeletedBlocks,
                           int blocksLimit, long modificationTime) {
     src = normalizePath(src);
@@ -1145,7 +1245,6 @@ INode unprotectedDelete(String src, INode inodes[], List<Block> toBeDeletedBlock
         try {
           // Remove the node from the namespace
           removeChild(inodes, inodes.length-1);
-          totalFiles--;
           // set the parent's modification time
           inodes[inodes.length-2].setModificationTime(modificationTime);
           // GC all the blocks underneath the node.
@@ -1178,30 +1277,30 @@ INode unprotectedDelete(String src, INode inodes[], List<Block> toBeDeletedBlock
   /**
    * Replaces the specified inode with the specified one.
    */
-  void replaceNode(String path, INodeFile oldnode, INodeFile newnode) 
+  void replaceNode(String path, INodeFile oldnode, INodeFile newnode)
                                                    throws IOException {
     replaceNode(path, null, oldnode, newnode, true);
   }
-  
+
   /**
    * @see #replaceNode(String, INodeFile, INodeFile)
    */
   void replaceNode(String path, INode[] inodes, INodeFile oldnode, INodeFile newnode,
-                           boolean updateDiskspace) throws IOException {    
+                           boolean updateDiskspace) throws IOException {
     writeLock();
     try {
       long dsOld = oldnode.diskspaceConsumed();
-      
+
       //
-      // Remove the node from the namespace 
+      // Remove the node from the namespace
       //
       if (!oldnode.removeNode()) {
         NameNode.stateChangeLog.warn("DIR* FSDirectory.replaceNode: " +
                                      "failed to remove " + path);
         throw new IOException("FSDirectory.replaceNode: " +
                               "failed to remove " + path);
-      } 
-      
+      }
+
       /* Currently oldnode and newnode are assumed to contain the same
        * blocks. Otherwise, blocks need to be removed from the blocksMap.
        */
@@ -1224,7 +1323,7 @@ void replaceNode(String path, INode[] inodes, INodeFile oldnode, INodeFile newno
           throw e;
         }
       }
-      
+
       int index = 0;
       for (Block b : newnode.getBlocks()) {
         BlockInfo info = getFSNamesystem().blocksMap.addINode(b, newnode);
@@ -1238,21 +1337,24 @@ void replaceNode(String path, INode[] inodes, INodeFile oldnode, INodeFile newno
 
   /**
    * Retrieves a list of random files with some information.
-   * 
-   * @param maxFiles
-   *          the maximum number of files to return
+   *
+   * @param percent
+   *          the percent of files to return
    * @return the list of files
    */
-  public List<FileStatusExtended> getRandomFileStats(int maxFiles) {
+  public List<FileStatusExtended> getRandomFileStats(double percent) {
     readLock();
     try {
       List<FileStatusExtended> stats = new LinkedList<FileStatusExtended>();
-      for (INodeFile file : getRandomFiles(maxFiles)) {
+      for (INodeFile file : getRandomFiles(percent)) {
         String path = file.getFullPathName();
         FileStatus stat = createFileStatus(path, file);
         Lease lease = this.getFSNamesystem().leaseManager.getLeaseByPath(path);
         String holder = (lease == null) ? null : lease.getHolder();
-        stats.add(new FileStatusExtended(stat, file.getBlocks(), holder));
+        long hardlinkId = (file instanceof INodeHardLinkFile) ? ((INodeHardLinkFile) file)
+            .getHardLinkID() : -1;
+        stats.add(new FileStatusExtended(stat, file.getBlocks(), holder,
+            hardlinkId));
       }
       return stats;
     } finally {
@@ -1260,33 +1362,29 @@ public List<FileStatusExtended> getRandomFileStats(int maxFiles) {
     }
   }
 
-  private List<INodeFile> getRandomFiles(int maxFiles) {
+  private List<INodeFile> getRandomFiles(double percent) {
     List<INodeFile> files = new LinkedList<INodeFile>();
     // This is an expensive operation (proportional to maxFiles) under a lock,
     // but we don't expect to call this function with a very large maxFiles
     // argument.
-    double prob = (double) maxFiles / totalFiles;
-    getRandomFiles(rootDir, maxFiles, files, prob);
+    getRandomFiles(rootDir, files, percent);
     return files;
   }
 
-  private boolean chooseNode(int maxFiles, double prob) {
+  private boolean chooseNode(double prob) {
     return (random.nextDouble() < prob);
   }
 
-  private void getRandomFiles(INode node, int maxFiles, List<INodeFile> files,
+  private void getRandomFiles(INode node, List<INodeFile> files,
       double prob) {
-    if (files.size() >= maxFiles) {
-      return;
-    }
 
-    if (!node.isDirectory() && chooseNode(maxFiles, prob)) {
+    if (!node.isDirectory() && chooseNode(prob)) {
       files.add((INodeFile)node);
     }
 
     if (node.isDirectory()) {
       for (INode child : ((INodeDirectory) node).getChildren()) {
-        getRandomFiles(child, maxFiles, files, prob);
+        getRandomFiles(child, files, prob);
       }
     }
   }
@@ -1409,7 +1507,7 @@ DirectoryListing getPartialListing(String src, INode targetNode,
     readUnlock();
   }
   }
-  
+
   /** Get the file info for a specific file.
    * @param src The string representation of the path to the file
    * @return object containing information regarding the file
@@ -1432,7 +1530,7 @@ FileStatus getFileInfo(String src, INode targetNode) {
 
   /**
    * Get the extended file info for a specific file.
-   * 
+   *
    * @param src
    *          The string representation of the path to the file
    * @param targetNode
@@ -1453,8 +1551,10 @@ FileStatusExtended getFileInfoExtended(String src, INode targetNode,
         return null;
       }
       FileStatus stat = createFileStatus(src, targetNode);
+      long hardlinkId = (targetNode instanceof INodeHardLinkFile) ? ((INodeHardLinkFile) targetNode)
+          .getHardLinkID() : -1;
       return new FileStatusExtended(stat, ((INodeFile) targetNode).getBlocks(),
-          leaseHolder);
+          leaseHolder, hardlinkId);
     } finally {
       readUnlock();
     }
@@ -1517,7 +1617,7 @@ INodeFile getFileINode(String src) {
       readUnlock();
     }
   }
-  
+
   /**
    * Get {@link INode} associated with the file.
    * Given name components.
@@ -1536,20 +1636,20 @@ INodeFile getFileINode(byte[][] components) {
 
   /**
    * Retrieve the existing INodes along the given path.
-   * 
+   *
    * @param path the path to explore
    * @return INodes array containing the existing INodes in the order they
    *         appear when following the path from the root INode to the
    *         deepest INodes. The array size will be the number of expected
    *         components in the path, and non existing components will be
    *         filled with null
-   *         
+   *
    * @see INodeDirectory#getExistingPathINodes(byte[][], INode[])
    */
   public INode[] getExistingPathINodes(String path) {
     byte[][] components = INode.getPathComponents(path);
     INode[] inodes = new INode[components.length];
-    
+
     readLock();
     try {
       rootDir.getExistingPathINodes(components, inodes);
@@ -1558,7 +1658,7 @@ public INode[] getExistingPathINodes(String path) {
       readUnlock();
     }
   }
-  
+
   /**
    * Get the parent node of path.
    *
@@ -1574,15 +1674,15 @@ INodeDirectory getParent(byte[][] path) throws FileNotFoundException {
     }
   }
 
-  /** 
+  /**
    * Check whether the filepath could be created
    */
   boolean isValidToCreate(String src) {
     String srcs = normalizePath(src);
     readLock();
     try {
-      if (srcs.startsWith("/") && 
-          !srcs.endsWith("/") && 
+      if (srcs.startsWith("/") &&
+          !srcs.endsWith("/") &&
           rootDir.getNode(srcs) == null) {
         return true;
       } else {
@@ -1612,7 +1712,7 @@ static boolean isDir(INode inode) {
 
   /** Updates namespace and diskspace consumed for all
    * directories until the parent directory of file represented by path.
-   * 
+   *
    * @param path path for the file.
    * @param nsDelta the delta change of namespace
    * @param dsDelta the delta change of diskspace
@@ -1624,10 +1724,10 @@ void updateSpaceConsumed(String path, long nsDelta, long dsDelta)
                                                 FileNotFoundException {
     updateSpaceConsumed(path, null, nsDelta, dsDelta);
   }
-  
+
   /** Updates namespace and diskspace consumed for all
    * directories until the parent directory of file represented by path.
-   * 
+   *
    * @param path path for the file.
    * @param inodes inode array representation of the path
    * @param nsDelta the delta change of namespace
@@ -1645,7 +1745,7 @@ void updateSpaceConsumed(String path, INode[] inodes, long nsDelta, long dsDelta
       }
       int len = inodes.length;
       if (inodes[len - 1] == null) {
-        throw new FileNotFoundException(path + 
+        throw new FileNotFoundException(path +
                                         " does not exist under rootDir.");
       }
       updateCount(inodes, len-1, nsDelta, dsDelta, true);
@@ -1653,9 +1753,11 @@ void updateSpaceConsumed(String path, INode[] inodes, long nsDelta, long dsDelta
       writeUnlock();
     }
   }
-  
-  /** update count of each inode with quota
-   * 
+
+  /** 
+   * Update count of each inode with quota in the inodes array from the position of 0 to
+   * the position of numOfINodes
+   *
    * @param inodes an array of inodes on a path
    * @param numOfINodes the number of inodes to update starting from index 0
    * @param nsDelta the delta change of namespace
@@ -1663,35 +1765,65 @@ void updateSpaceConsumed(String path, INode[] inodes, long nsDelta, long dsDelta
    * @param checkQuota if true then check if quota is exceeded
    * @throws QuotaExceededException if the new count violates any quota limit
    */
-  private void updateCount(INode[] inodes, int numOfINodes, 
+  private void updateCount(INode[] inodes, int numOfINodes,
+      long nsDelta, long dsDelta, boolean checkQuota)
+  throws QuotaExceededException {
+    this.updateCount(inodes, 0, numOfINodes, nsDelta, dsDelta, checkQuota);
+  }
+
+  /** 
+   * Update NS quota of each inode with quota in the inodes array from the position 0 to
+   * the position of endPos.
+   * 
+   * And update DS quota of each inode with quota in the inodes array from the position of 
+   * dsUpdateStartPos to the position of endPos.
+   * 
+   * Currently only HardLink operations use a dsUpdateStartPos that is non-zero 
+   * and hence we have the special handling of DS quota, 
+   * but for NS quota we always assume 0.
+   *
+   * @param inodes an array of inodes on a path
+   * @param dsUpdateStartPos The start position to update the DS quota
+   * @param endPos the endPos of inodes to update the both NS and DS quota
+   * @param nsDelta the delta change of namespace
+   * @param dsDelta the delta change of diskspace
+   * @param checkQuota if true then check if quota is exceeded
+   * @throws QuotaExceededException if the new count violates any quota limit
+   */
+  private void updateCount(INode[] inodes, int dsUpdateStartPos, int endPos,
                            long nsDelta, long dsDelta, boolean checkQuota)
-                           throws QuotaExceededException {
+  throws QuotaExceededException {
     if (!ready) {
-      //still intializing. do not check or update quotas.
+      // still intializing. do not check or update quotas.
       return;
     }
-    if (numOfINodes>inodes.length) {
-      numOfINodes = inodes.length;
+    if (endPos > inodes.length) {
+      endPos = inodes.length;
     }
     if (checkQuota) {
-      verifyQuota(inodes, numOfINodes, nsDelta, dsDelta, null);
-      }
-    for(int i = 0; i < numOfINodes; i++) {
-          if (inodes[i].isQuotaSet()) { // a directory with quota
-            INodeDirectoryWithQuota node =(INodeDirectoryWithQuota)inodes[i]; 
-        node.updateNumItemsInTree(nsDelta, dsDelta);
-          }
+      verifyQuota(inodes, 0, dsUpdateStartPos, endPos, nsDelta, dsDelta);
+    }
+    for (int i = 0; i < endPos; i++) {
+      if (inodes[i].isQuotaSet()) { // a directory with quota
+        INodeDirectoryWithQuota node = (INodeDirectoryWithQuota) inodes[i];
+        if (i >= dsUpdateStartPos) {
+          node.updateNumItemsInTree(nsDelta, dsDelta);
+        } else {
+          node.updateNumItemsInTree(nsDelta, 0);
         }
+        
       }
-  
-  /** 
-   * update quota of each inode and check to see if quota is exceeded. 
-   * See {@link #updateCount(INode[], int, long, long, boolean)}
-   */ 
-  private void updateCountNoQuotaCheck(INode[] inodes, int numOfINodes, 
+    }
+  }
+
+  /**
+   * Update quota of each inode in the inodes array from the position of startPos to
+   * the position of endPos. But it won't throw out the QuotaExceededException.
+   */
+  private void updateCountNoQuotaCheck(INode[] inodes, int startPos, int endPos,
                            long nsDelta, long dsDelta) {
     try {
-      updateCount(inodes, numOfINodes, nsDelta, dsDelta, false);
+      updateCount(inodes, startPos, endPos, nsDelta, dsDelta, false);
     } catch (QuotaExceededException e) {
       NameNode.LOG.warn("FSDirectory.updateCountNoQuotaCheck - unexpected ", e);
     }
@@ -1710,12 +1842,12 @@ private void unprotectedUpdateCount(INode[] inodes, int numOfINodes,
     for(int i=0; i < numOfINodes; i++) {
       if (inodes[i].isQuotaSet()) { // a directory with quota
         INodeDirectoryWithQuota node =(INodeDirectoryWithQuota)inodes[i];
-        node.unprotectedUpdateNumItemsInTree(nsDelta, dsDelta);
+        node.updateNumItemsInTree(nsDelta, dsDelta);
       }
     }
   }
 
-  
+
   /** Return the name of the path represented by inodes at [0, pos] */
   private static String getFullPathName(INode[] inodes, int pos) {
     StringBuilder fullPathName = new StringBuilder();
@@ -1725,6 +1857,17 @@ private static String getFullPathName(INode[] inodes, int pos) {
     return fullPathName.toString();
   }
 
+  /** Return the name of the path represented by the byte array*/
+  private static String getFullPathName(byte[][] names) {
+    StringBuilder fullPathName = new StringBuilder();
+    for (int i = 1; i < names.length; i++) {
+      byte[] name = names[i];
+      fullPathName.append(Path.SEPARATOR_CHAR)
+        .append(DFSUtil.bytes2String(name));
+    }
+    return fullPathName.toString();
+  }
+
   /** Return the inode array representing the given inode's full path name */
   static INode[] getINodeArray(INode inode) {
     // calculate the depth of this inode from root
@@ -1741,15 +1884,32 @@ static INode[] getINodeArray(INode inode) {
     }
     return inodes;
   }
-  
+
+  /** Return the byte array representing the given inode's full path name */
+  static byte[][] getINodeByteArray(INode inode) {
+    // calculate the depth of this inode from root
+    int depth = 0;
+    for (INode i = inode; i != null; i = i.parent) {
+      depth++;
+    }
+    byte[][] names = new byte[depth][];
+
+    // fill up the inodes in the path from this inode to root
+    for (int i = 0; i < depth; i++) {
+      names[depth-i-1] = inode.getLocalNameBytes();
+      inode = inode.parent;
+    }
+    return names;
+  }
+
   /** Return the full path name of the specified inode */
   static String getFullPathName(INode inode) {
     INode[] inodes = getINodeArray(inode);
     return getFullPathName(inodes, inodes.length-1);
   }
-  
+
   /**
-   * Create a directory 
+   * Create a directory
    * If ancestor directories do not exist, automatically create them.
 
    * @param src string representation of the path to the directory
@@ -1824,7 +1984,7 @@ boolean mkdirs(String src, String[] names, byte[][] components,
           return false;
         }
         // Directory creation also count towards FilesCreated
-        // to match count of files_deleted metric. 
+        // to match count of files_deleted metric.
         if (getFSNamesystem() != null)
           NameNode.getNameNodeMetrics().numFilesCreated.inc();
         fsImage.getEditLog().logMkDir(cur, inodes[i]);
@@ -1863,16 +2023,16 @@ INode unprotectedMkdir(String src, PermissionStatus permissions,
   private void unprotectedMkdir(INode[] inodes, int pos,
       byte[] name, PermissionStatus permission, boolean inheritPermission,
       long timestamp) throws QuotaExceededException {
-    inodes[pos] = addChild(inodes, pos, 
+    inodes[pos] = addChild(inodes, pos,
         new INodeDirectory(name, permission, timestamp),
         -1, inheritPermission );
   }
-  
+
   /** Add a node child to the namespace. The full path name of the node is src.
-   * childDiskspace should be -1, if unknown. 
+   * childDiskspace should be -1, if unknown.
    * QuotaExceededException is thrown if it violates quota limit */
-  private <T extends INode> T addNode(String src, T child, 
-        long childDiskspace, boolean inheritPermission) 
+  private <T extends INode> T addNode(String src, T child,
+        long childDiskspace, boolean inheritPermission)
   throws QuotaExceededException {
     byte[][] components = INode.getPathComponents(src);
     byte[] path = components[components.length - 1];
@@ -1888,41 +2048,46 @@ private <T extends INode> T addNode(String src, T child,
       writeUnlock();
     }
   }
-  
+
   /**
-   * Verify quota for adding or moving a new INode with required 
+   * Verify quota for adding or moving a new INode with required
    * namespace and diskspace to a given position.
-   *  
+   * 
+   * This functiuon assumes that the nsQuotaStartPos is less or equal than the dsQuotaStartPos
+   *
    * @param inodes INodes corresponding to a path
-   * @param pos position where a new INode will be added
+   * @param dsQuotaStartPos the start position where the NS quota needs to be updated
+   * @param dsQuotaStartPos the start position where the DS quota needs to be updated
+   * @param endPos the end position where the NS and DS quota need to be updated
    * @param nsDelta needed namespace
    * @param dsDelta needed diskspace
-   * @param commonAncestor Last node in inodes array that is a common ancestor
-   *          for a INode that is being moved from one location to the other.
-   *          Pass null if a node is not being moved.
    * @throws QuotaExceededException if quota limit is exceeded.
    */
-  private void verifyQuota(INode[] inodes, int pos, long nsDelta, long dsDelta,
-      INode commonAncestor) throws QuotaExceededException {
+  private void verifyQuota(INode[] inodes, int nsQuotaStartPos, int dsQuotaStartPos,
+      int endPos, long nsDelta, long dsDelta)
+  throws QuotaExceededException {
     if (!ready) {
       // Do not check quota if edits log is still being processed
       return;
     }
-    if (pos>inodes.length) {
-      pos = inodes.length;
+    if (endPos >inodes.length) {
+      endPos = inodes.length;
     }
-    int i = pos - 1;
+    int i = endPos - 1;
+    Assert.assertTrue("nsQuotaStartPos shall be less or equal than the dsQuotaStartPos",
+        (nsQuotaStartPos <= dsQuotaStartPos));
     try {
-      // check existing components in the path  
-      for(; i >= 0; i--) {
-        if (commonAncestor == inodes[i]) {
-          // Moving an existing node. Stop checking for quota when common
-          // ancestor is reached
-          return;
-        }
+      // check existing components in the path
+      for(; i >= nsQuotaStartPos; i--) {
         if (inodes[i].isQuotaSet()) { // a directory with quota
-          INodeDirectoryWithQuota node =(INodeDirectoryWithQuota)inodes[i]; 
-          node.verifyQuota(nsDelta, dsDelta);
+          INodeDirectoryWithQuota node =(INodeDirectoryWithQuota)inodes[i];
+          if (i >= dsQuotaStartPos) {
+            // Verify both nsQuota and dsQuota
+            node.verifyQuota(nsDelta, dsDelta);
+          } else {
+            // Verify the nsQuota only
+            node.verifyQuota(nsDelta, 0);
+          }
         }
       }
     } catch (QuotaExceededException e) {
@@ -1930,36 +2095,88 @@ private void verifyQuota(INode[] inodes, int pos, long nsDelta, long dsDelta,
       throw e;
     }
   }
+
+  /**
+   * Verify quota for the hardlink operation where srcInodes[srcInodes.length-1] copies to
+   * dstInodes[dstInodes.length-1]
+   *
+   * @param srcInodes directory from where node is being moved.
+   * @param dstInodes directory to where node is moved to.
+   * @throws QuotaExceededException if quota limit is exceeded.
+   */
+  private int verifyQuotaForHardLink(INode[] srcInodes, INode[] dstInodes)
+  throws QuotaExceededException {
+    if (!ready) {
+      // Do not check quota if edits log is still being processed
+      return 0;
+    }
+    Set<INode> ancestorSet = null;  
+    INode srcInode = srcInodes[srcInodes.length - 1]; 
+    int minLength = Math.min(srcInodes.length, dstInodes.length); 
+    int nonCommonAncestor;
+    
+    // Get the counts from the src file
+    INode.DirCounts counts = new INode.DirCounts(); 
+    srcInode.spaceConsumedInTree(counts); 
+      
+    if (srcInode instanceof INodeHardLinkFile) {
+      // handle the hardlink file 
+      INodeHardLinkFile srcHardLinkFile = (INodeHardLinkFile) srcInode; 
+      ancestorSet = srcHardLinkFile.getAncestorSet(); 
+      for (nonCommonAncestor = 0; nonCommonAncestor < minLength; nonCommonAncestor++) { 
+        if (!ancestorSet.contains(dstInodes[nonCommonAncestor])) {  
+          break;
+        } 
+      }
+    } else {
+      // handle the regular file  
+      for (nonCommonAncestor = 0; nonCommonAncestor < minLength; nonCommonAncestor++) { 
+        if (srcInodes[nonCommonAncestor] != dstInodes[nonCommonAncestor]) { 
+          break;  
+        } 
+      } 
+    }
+    // Verify the NS quota from the beginning and verify the DS quota from the 1st nonCommonAncestor
+    verifyQuota(dstInodes, 0, nonCommonAncestor, dstInodes.length - 1,  
+        counts.getNsCount(), counts.getDsCount());
+    
+    return nonCommonAncestor;
+  }
   
   /**
-   * Verify quota for rename operation where srcInodes[srcInodes.length-1] moves
+   * Verify quota for the rename operation where srcInodes[srcInodes.length-1] copies to
    * dstInodes[dstInodes.length-1]
-   * 
+   *
    * @param srcInodes directory from where node is being moved.
    * @param dstInodes directory to where node is moved to.
    * @throws QuotaExceededException if quota limit is exceeded.
    */
-  private void verifyQuotaForRename(INode[] srcInodes, INode[]dstInodes)
-      throws QuotaExceededException {
+  private void verifyQuotaForRename(INode[] srcInodes, INode[] dstInodes)
+  throws QuotaExceededException {
     if (!ready) {
       // Do not check quota if edits log is still being processed
       return;
     }
     INode srcInode = srcInodes[srcInodes.length - 1];
-    INode commonAncestor = null;
-    for(int i =0;srcInodes[i] == dstInodes[i]; i++) {
-      commonAncestor = srcInodes[i];
-    }
+    int minLength = Math.min(srcInodes.length, dstInodes.length);
+    int nonCommonAncestor;
     INode.DirCounts counts = new INode.DirCounts();
     srcInode.spaceConsumedInTree(counts);
-    verifyQuota(dstInodes, dstInodes.length - 1, counts.getNsCount(),
-            counts.getDsCount(), commonAncestor);
+    // handle the regular file
+    for (nonCommonAncestor = 0; nonCommonAncestor < minLength; nonCommonAncestor++) {
+      if (srcInodes[nonCommonAncestor] != dstInodes[nonCommonAncestor]) {
+        break;
+      }
+    }
+    // Verify the NS and DS quota from the 1st nonCommonAncestor
+    verifyQuota(dstInodes, nonCommonAncestor, nonCommonAncestor, dstInodes.length - 1,
+        counts.getNsCount(), counts.getDsCount());
   }
-  
-  /** Add a node child to the inodes at index pos. 
-   * Its ancestors are stored at [0, pos-1]. 
+
+  /** Add a node child to the inodes at index pos.
+   * Its ancestors are stored at [startPos, endPos-1].
    * QuotaExceededException is thrown if it violates quota limit */
-  private <T extends INode> T addChild(INode[] pathComponents, int pos,
+  private <T extends INode> T addChild(INode[] pathComponents, int startPos, int endPos,
       T child, long childDiskspace, boolean inheritPermission,
       boolean checkQuota) throws QuotaExceededException {
     INode.DirCounts counts = new INode.DirCounts();
@@ -1967,53 +2184,55 @@ private <T extends INode> T addChild(INode[] pathComponents, int pos,
     if (childDiskspace < 0) {
       childDiskspace = counts.getDsCount();
     }
-    updateCount(pathComponents, pos, counts.getNsCount(), childDiskspace,
+    updateCount(pathComponents, startPos, endPos, counts.getNsCount(), childDiskspace,
         checkQuota);
-    T addedNode = ((INodeDirectory)pathComponents[pos-1]).addChild(
+    T addedNode = ((INodeDirectory)pathComponents[endPos-1]).addChild(
         child, inheritPermission);
     if (addedNode == null) {
-      updateCount(pathComponents, pos, -counts.getNsCount(), 
+      updateCount(pathComponents, startPos, endPos, -counts.getNsCount(),
           -childDiskspace, true);
     }
     return addedNode;
   }
-  
+
   private <T extends INode> T addChild(INode[] pathComponents, int pos,
       T child, long childDiskspace, boolean inheritPermission)
       throws QuotaExceededException {
-    return addChild(pathComponents, pos, child, childDiskspace,
+    return addChild(pathComponents, 0, pos, child, childDiskspace,
         inheritPermission, true);
   }
-  
+
   private <T extends INode> T addChildNoQuotaCheck(INode[] pathComponents,
-      int pos, T child, long childDiskspace, boolean inheritPermission) {
+      int startPos, int endPos, T child, long childDiskspace, boolean inheritPermission) {
     T inode = null;
     try {
-      inode = addChild(pathComponents, pos, child, childDiskspace,
+      inode = addChild(pathComponents, startPos, endPos, child, childDiskspace,
           inheritPermission, false);
     } catch (QuotaExceededException e) {
-      NameNode.LOG.warn("FSDirectory.addChildNoQuotaCheck - unexpected", e); 
+      NameNode.LOG.warn("FSDirectory.addChildNoQuotaCheck - unexpected", e);
     }
     return inode;
   }
-  
+
   /** Remove an inode at index pos from the namespace.
    * Its ancestors are stored at [0, pos-1].
    * Count of each ancestor with quota is also updated.
    * Return the removed node; null if the removal fails.
    */
-  private INode removeChild(INode[] pathComponents, int pos) {
-    INode removedNode = 
-      ((INodeDirectory)pathComponents[pos-1]).removeChild(pathComponents[pos]);
+  private INode removeChild(INode[] pathComponents, int endPos) {
+    INode removedNode = pathComponents[endPos];
+    int startPos = removedNode.getStartPosForQuoteUpdate();
+    removedNode =
+      ((INodeDirectory)pathComponents[endPos-1]).removeChild(pathComponents[endPos]);
     if (removedNode != null) {
       INode.DirCounts counts = new INode.DirCounts();
       removedNode.spaceConsumedInTree(counts);
-      updateCountNoQuotaCheck(pathComponents, pos,
+      updateCountNoQuotaCheck(pathComponents, startPos, endPos,
                   -counts.getNsCount(), -counts.getDsCount());
     }
     return removedNode;
   }
-  
+
   /**
    */
   String normalizePath(String src) {
@@ -2042,50 +2261,50 @@ ContentSummary getContentSummary(String src) throws IOException {
   /** Update the count of each directory with quota in the namespace
    * A directory's count is defined as the total number inodes in the tree
    * rooted at the directory.
-   * 
+   *
    * This is an update of existing state of the filesystem and does not
    * throw QuotaExceededException.
    */
   void updateCountForINodeWithQuota() {
-    updateCountForINodeWithQuota(rootDir, new INode.DirCounts(), 
+    updateCountForINodeWithQuota(rootDir, new INode.DirCounts(),
                                  new ArrayList<INode>(50));
   }
-  
-  /** 
+
+  /**
    * Update the count of the directory if it has a quota and return the count
-   * 
+   *
    * This does not throw a QuotaExceededException. This is just an update
    * of of existing state and throwing QuotaExceededException does not help
    * with fixing the state, if there is a problem.
-   * 
+   *
    * @param dir the root of the tree that represents the directory
    * @param counters counters for name space and disk space
    * @param nodesInPath INodes for the each of components in the path.
    * @return the size of the tree
    */
-  private static void updateCountForINodeWithQuota(INodeDirectory dir, 
+  private static void updateCountForINodeWithQuota(INodeDirectory dir,
                                                INode.DirCounts counts,
                                                ArrayList<INode> nodesInPath) {
     long parentNamespace = counts.nsCount;
     long parentDiskspace = counts.dsCount;
-    
+
     counts.nsCount = 1L;//for self. should not call node.spaceConsumedInTree()
     counts.dsCount = 0L;
-    
-    /* We don't need nodesInPath if we could use 'parent' field in 
+
+    /* We don't need nodesInPath if we could use 'parent' field in
      * INode. using 'parent' is not currently recommended. */
     nodesInPath.add(dir);
 
     for (INode child : dir.getChildren()) {
       if (child.isDirectory()) {
-        updateCountForINodeWithQuota((INodeDirectory)child, 
+        updateCountForINodeWithQuota((INodeDirectory)child,
                                      counts, nodesInPath);
       } else { // reduce recursive calls
         counts.nsCount += 1;
         counts.dsCount += ((INodeFile)child).diskspaceConsumed();
       }
     }
-      
+
     if (dir.isQuotaSet()) {
       ((INodeDirectoryWithQuota)dir).setSpaceConsumed(counts.nsCount,
                                                       counts.dsCount);
@@ -2100,49 +2319,49 @@ private static void updateCountForINodeWithQuota(INodeDirectory dir,
           path.append('/');
           path.append(n.getLocalName());
         }
-        
-        NameNode.LOG.warn("Quota violation in image for " + path + 
+
+        NameNode.LOG.warn("Quota violation in image for " + path +
                           " (Namespace quota : " + dir.getNsQuota() +
                           " consumed : " + counts.nsCount + ")" +
                           " (Diskspace quota : " + dir.getDsQuota() +
                           " consumed : " + counts.dsCount + ").");
-      }            
+      }
     }
-      
-    // pop 
+
+    // pop
     nodesInPath.remove(nodesInPath.size()-1);
-    
+
     counts.nsCount += parentNamespace;
     counts.dsCount += parentDiskspace;
   }
-  
+
   /**
    * See {@link ClientProtocol#setQuota(String, long, long)} for the contract.
    * Sets quota for for a directory.
    * @returns INodeDirectory if any of the quotas have changed. null other wise.
    * @throws FileNotFoundException if the path does not exist or is a file
-   * @throws QuotaExceededException if the directory tree size is 
+   * @throws QuotaExceededException if the directory tree size is
    *                                greater than the given quota
    */
-  INodeDirectory unprotectedSetQuota(String src, long nsQuota, long dsQuota) 
+  INodeDirectory unprotectedSetQuota(String src, long nsQuota, long dsQuota)
                        throws FileNotFoundException, QuotaExceededException {
     // sanity check
-    if ((nsQuota < 0 && nsQuota != FSConstants.QUOTA_DONT_SET && 
-         nsQuota < FSConstants.QUOTA_RESET) || 
-        (dsQuota < 0 && dsQuota != FSConstants.QUOTA_DONT_SET && 
+    if ((nsQuota < 0 && nsQuota != FSConstants.QUOTA_DONT_SET &&
+         nsQuota < FSConstants.QUOTA_RESET) ||
+        (dsQuota < 0 && dsQuota != FSConstants.QUOTA_DONT_SET &&
           dsQuota < FSConstants.QUOTA_RESET)) {
       throw new IllegalArgumentException("Illegal value for nsQuota or " +
                                          "dsQuota : " + nsQuota + " and " +
                                          dsQuota);
     }
-    
+
     String srcs = normalizePath(src);
     INode[] inodes = rootDir.getExistingPathINodes(src);
     INode targetNode = inodes[inodes.length-1];
     if (targetNode == null) {
       throw new FileNotFoundException("Directory does not exist: " + srcs);
     } else if (!targetNode.isDirectory()) {
-      throw new FileNotFoundException("Cannot set quota on a file: " + srcs);  
+      throw new FileNotFoundException("Cannot set quota on a file: " + srcs);
     } else { // a directory inode
       INodeDirectory dirNode = (INodeDirectory)targetNode;
       long oldNsQuota = dirNode.getNsQuota();
@@ -2152,14 +2371,14 @@ INodeDirectory unprotectedSetQuota(String src, long nsQuota, long dsQuota)
       }
       if (dsQuota == FSConstants.QUOTA_DONT_SET) {
         dsQuota = oldDsQuota;
-      }        
+      }
 
-      if (dirNode instanceof INodeDirectoryWithQuota) { 
+      if (dirNode instanceof INodeDirectoryWithQuota) {
         // a directory with quota; so set the quota to the new value
         ((INodeDirectoryWithQuota)dirNode).setQuota(nsQuota, dsQuota);
       } else {
         // a non-quota directory; so replace it with a directory with quota
-        INodeDirectoryWithQuota newNode = 
+        INodeDirectoryWithQuota newNode =
           new INodeDirectoryWithQuota(nsQuota, dsQuota, dirNode);
         // non-root directory node; parent != null
         INodeDirectory parent = (INodeDirectory)inodes[inodes.length-2];
@@ -2169,26 +2388,26 @@ INodeDirectory unprotectedSetQuota(String src, long nsQuota, long dsQuota)
       return (oldNsQuota != nsQuota || oldDsQuota != dsQuota) ? dirNode : null;
     }
   }
-  
+
   /**
-   * See {@link ClientProtocol#setQuota(String, long, long)} for the 
+   * See {@link ClientProtocol#setQuota(String, long, long)} for the
    * contract.
    * @see #unprotectedSetQuota(String, long, long)
    */
-  void setQuota(String src, long nsQuota, long dsQuota) 
+  void setQuota(String src, long nsQuota, long dsQuota)
                 throws FileNotFoundException, QuotaExceededException {
     writeLock();
     try {
       INodeDirectory dir = unprotectedSetQuota(src, nsQuota, dsQuota);
       if (dir != null) {
-        fsImage.getEditLog().logSetQuota(src, dir.getNsQuota(), 
+        fsImage.getEditLog().logSetQuota(src, dir.getNsQuota(),
                                          dir.getDsQuota());
       }
     } finally {
       writeUnlock();
     }
   }
-  
+
   long totalInodes() {
     readLock();
     try {
@@ -2198,15 +2417,6 @@ long totalInodes() {
     }
   }
 
-  long totalFiles() {
-    readLock();
-    try {
-      return totalFiles;
-    } finally {
-      readUnlock();
-    }
-  }
-
   long totalDiskSpace() {
     readLock();
     try {
@@ -2219,14 +2429,14 @@ long totalDiskSpace() {
   /**
    * Sets the access time on the file. Logs it in the transaction log
    */
-  void setTimes(String src, INodeFile inode, long mtime, long atime, boolean force) 
+  void setTimes(String src, INodeFile inode, long mtime, long atime, boolean force)
                                                         throws IOException {
     if (unprotectedSetTimes(src, inode, mtime, atime, force)) {
       fsImage.getEditLog().logTimes(src, mtime, atime);
     }
   }
 
-  boolean unprotectedSetTimes(String src, long mtime, long atime, boolean force) 
+  boolean unprotectedSetTimes(String src, long mtime, long atime, boolean force)
                               throws IOException {
     INodeFile inode = getFileINode(src);
     return unprotectedSetTimes(src, inode, mtime, atime, force);
@@ -2250,18 +2460,18 @@ private boolean unprotectedSetTimes(String src, INodeFile inode, long mtime,
         inode.setAccessTime(atime);
         status = true;
       }
-    } 
+    }
     return status;
   }
-  
+
   /**
-   * Create HdfsFileStatus by file INode 
+   * Create HdfsFileStatus by file INode
    */
    static FileStatus createFileStatus(String path, INode node) {
     // length is zero for directories
-    return new FileStatus(node.isDirectory() ? 0 : node.computeContentSummary().getLength(), 
-        node.isDirectory(), 
-        node.isDirectory() ? 0 : ((INodeFile)node).getReplication(), 
+    return new FileStatus(node.isDirectory() ? 0 : node.computeContentSummary().getLength(),
+        node.isDirectory(),
+        node.isDirectory() ? 0 : ((INodeFile)node).getReplication(),
         node.isDirectory() ? 0 : ((INodeFile)node).getPreferredBlockSize(),
         node.getModificationTime(),
         node.getAccessTime(),
@@ -2272,7 +2482,7 @@ static FileStatus createFileStatus(String path, INode node) {
   }
 
   /**
-   * Create HdfsFileStatus by file INode 
+   * Create HdfsFileStatus by file INode
    */
    private static HdfsFileStatus createHdfsFileStatus(byte[] path, INode node) {
      long size = 0;     // length is zero for directories
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
index 1ee16006..5c32824d 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
@@ -18,12 +18,12 @@
 package org.apache.hadoop.hdfs.server.namenode;
 
 import java.io.DataInput;
-import java.io.DataInputStream;
 import java.io.DataOutput;
-import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.net.URI;
 import java.util.ArrayList;
-import java.util.EnumMap;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -31,17 +31,23 @@
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.zip.Checksum;
 
-import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.*;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.JournalSet.JournalAndStream;
 import org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics;
-import org.apache.hadoop.hdfs.util.Holder;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.io.*;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.util.PureJavaCrc32;
-import org.apache.hadoop.fs.ChecksumException;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.permission.*;
 
 /**
@@ -49,6 +55,9 @@
  * 
  */
 public class FSEditLog {
+  
+  static final Log LOG = LogFactory.getLog(FSEditLog.class);
+  
   static int sizeFlushBuffer = HdfsConstants.DEFAULT_EDIT_BUFFER_SIZE;
   static long preallocateSize= HdfsConstants.DEFAULT_EDIT_PREALLOCATE_SIZE;
   static long maxBufferedTransactions= HdfsConstants.DEFAULT_MAX_BUFFERED_TRANSACTIONS;
@@ -56,21 +65,47 @@ public class FSEditLog {
     new ConcurrentSkipListMap<Long, List<Long>>();
   private Thread syncThread;
   private SyncThread syncer;
+  
+  /**
+   * State machine for edit log. The log starts in UNITIALIZED state upon
+   * construction. Once it's initialized, it is usually in IN_SEGMENT state,
+   * indicating that edits may be written. In the middle of a roll, or while
+   * saving the namespace, it briefly enters the BETWEEN_LOG_SEGMENTS state,
+   * indicating that the previous segment has been closed, but the new one has
+   * not yet been opened.
+   */
+  protected enum State {
+    UNINITIALIZED, 
+    BETWEEN_LOG_SEGMENTS, 
+    IN_SEGMENT, 
+    CLOSED;
+  }
+
+  protected State state = State.UNINITIALIZED;
 
-  private ArrayList<EditLogOutputStream> editStreams = null;
-  private FSImage fsimage = null;
+  // initialize
+  private JournalSet journalSet;
+  private EditLogOutputStream editLogStream = null;
 
   // a monotonically increasing counter that represents transactionIds.
-  private long txid = 0;
+  private long txid = -1;
 
   // stores the last synced transactionId.
-  private long synctxid = 0;
+  private long synctxid = -1;
+
+  // the first txid of the log that's currently open for writing.
+  // If this value is N, we are currently writing to edits_inprogress_N
+  private long curSegmentTxId = HdfsConstants.INVALID_TXID;
 
   // the time of printing the statistics to the log file.
   private long lastPrintTime;
 
   // is a sync currently running?
   private volatile boolean isSyncRunning;
+    
+  // Used to exit in the event of a failure to sync to all journals. It's a
+  // member variable so it can be swapped out for testing.
+  static volatile Runtime runtime = Runtime.getRuntime();
 
   // these are statistics counters.
   private long numTransactions;        // number of transactions
@@ -78,17 +113,19 @@ public class FSEditLog {
   private long totalTimeTransactions;  // total time for all transactions
   private NameNodeMetrics metrics;
   
-  private static ThreadLocal<Checksum> localChecksumForRead =
-    new ThreadLocal<Checksum>() {
+  private NNStorage storage;  
+  private Configuration conf;
+  private Collection<URI> editsDirs;
+  
+  private static ThreadLocal<Checksum> localChecksumForRead = new ThreadLocal<Checksum>() {
     protected Checksum initialValue() {
-        return new PureJavaCrc32();
+      return new PureJavaCrc32();
     }
   };
 
-  private static ThreadLocal<Checksum> localChecksumForWrite =
-    new ThreadLocal<Checksum>() {
+  private static ThreadLocal<Checksum> localChecksumForWrite = new ThreadLocal<Checksum>() {
     protected Checksum initialValue() {
-        return new PureJavaCrc32();
+      return new PureJavaCrc32();
     }
   };
 
@@ -110,9 +147,16 @@ static Checksum getChecksumForWrite() {
    * @param txid
    *          the last transaction id
    */
-  public void setStartTransactionId(long txid) {
+  public void setLastWrittenTxId(long txid) {
     this.txid = txid;
   }
+  
+  public void resetTxIds(long txid) {
+    this.txid = txid;
+    this.synctxid = txid;
+    this.curSegmentTxId = HdfsConstants.INVALID_TXID;
+    this.state = State.BETWEEN_LOG_SEGMENTS;
+  }
 
   private static class TransactionId {
     public long txid;
@@ -131,248 +175,152 @@ protected synchronized TransactionId initialValue() {
 
 
 
-  FSEditLog(FSImage image) {
-    fsimage = image;
-    isSyncRunning = false;
-    metrics = NameNode.getNameNodeMetrics();
-    lastPrintTime = FSNamesystem.now();
-  }
-  
-  private File getEditFile(StorageDirectory sd) {
-    return fsimage.getEditFile(sd);
+  FSEditLog(NNStorage storage) throws IOException {
+    Configuration conf = new Configuration();
+    // Make sure the edits dirs are set in the provided configuration object.
+    conf.set(FSConstants.DFS_NAMENODE_EDITS_DIR_KEY,
+        StringUtils.join(storage.getEditsDirectories(), ","));
+    init(conf, storage, NNStorageConfiguration.getNamespaceEditsDirs(conf));
   }
   
-  private File getEditNewFile(StorageDirectory sd) {
-    return fsimage.getEditNewFile(sd);
-  }
-  
-  private int getNumStorageDirs() {
- int numStorageDirs = 0;
- for (Iterator<StorageDirectory> it = 
-       fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext(); it.next())
-   numStorageDirs++;
-    return numStorageDirs;
+  /**
+   * Constructor for FSEditLog. Underlying journals are constructed, but no
+   * streams are opened until open() is called.
+   * 
+   * @param conf The namenode configuration
+   * @param storage Storage object used by namenode
+   * @param editsDirs List of journals to use
+   */
+  FSEditLog(Configuration conf, NNStorage storage, Collection<URI> editsDirs) {
+    init(conf, storage, editsDirs);
   }
   
-  synchronized int getNumEditStreams() {
-    return editStreams == null ? 0 : editStreams.size();
-  }
+  private void init(Configuration conf, NNStorage storage,
+      Collection<URI> editsDirs) {
+
+    isSyncRunning = false;
+    this.conf = conf;
+    this.storage = storage;
+    metrics = NameNode.getNameNodeMetrics();
+    lastPrintTime = FSNamesystem.now();
 
-  boolean isOpen() {
-    return getNumEditStreams() > 0;
+    // If this list is empty, an error will be thrown on first use
+    // of the editlog, as no journals will exist
+    this.editsDirs = new ArrayList<URI>(editsDirs);
+
+    journalSet = new JournalSet(conf, storage);
+    for (URI u : this.editsDirs) {
+      boolean required = NNStorageConfiguration.getRequiredNamespaceEditsDirs(
+          conf).contains(u);
+      if (u.getScheme().equals(NNStorage.LOCAL_URI_SCHEME)) {
+        StorageDirectory sd = storage.getStorageDirectory(u);
+        if (sd != null) {
+          LOG.info("Adding local file journal: " + u + ", required: " + required);
+          journalSet.add(new FileJournalManager(sd, metrics), required);
+        }
+      } else {
+        LOG.info("Adding journal: " + u + ", required: " + required);
+        journalSet.add(createJournal(u, conf), required);
+      }
+    }
+    if (journalSet.isEmpty()) {
+      LOG.error("No edits directories configured!");
+    }
+    state = State.BETWEEN_LOG_SEGMENTS;
   }
 
+  /**
+   * Get the list of URIs the editlog is using for storage
+   * 
+   * @return collection of URIs in use by the edit log
+   */
+  Collection<URI> getEditURIs() {
+    return editsDirs;
+  }
+  
   /**
    * Create empty edit log files.
    * Initialize the output stream for logging.
    * 
    * @throws IOException
    */
-  public synchronized void open() throws IOException {
+  synchronized void open() throws IOException {
     if (syncer == null) {
       syncer = new SyncThread();
       syncThread = new Thread(syncer);
       syncThread.start();
     }
-    numTransactions = totalTimeTransactions = numTransactionsBatchedInSync = 0;
-    if (editStreams == null)
-      editStreams = new ArrayList<EditLogOutputStream>();
-    for (Iterator<StorageDirectory> it = 
-           fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      File eFile = getEditFile(sd);
-      try {
-        EditLogOutputStream eStream = new EditLogFileOutputStream(eFile, metrics);
-        editStreams.add(eStream);
-      } catch (IOException e) {
-        FSNamesystem.LOG.warn("Unable to open edit log file " + eFile);
-        // Remove the directory from list of storage directories
-        fsimage.removedStorageDirs.add(sd);
-        it.remove();
-      }
-    }
-  }
+    if (state != State.BETWEEN_LOG_SEGMENTS)
+      throw new IOException("Bad state: " + state);
 
-  public synchronized void createEditLogFile(File name) throws IOException {
-    EditLogOutputStream eStream = new EditLogFileOutputStream(name, metrics);
-    eStream.create();
-    eStream.close();
+    startLogSegment(getLastWrittenTxId() + 1, true);
+    if (state != State.IN_SEGMENT)
+      throw new IOException("Bad state: " + state);
   }
-  
-  public synchronized void close() throws IOException {
-    close(false);
+
+  synchronized boolean isOpen() {
+    return state == State.IN_SEGMENT;
   }
 
-  /**
-   * Shutdown the file store.
-   */
-  public synchronized void close(boolean shutdown) throws IOException {
-    while (isSyncRunning) {
-      try {
-        wait(1000);
-      } catch (InterruptedException ie) { 
-      }
+  public synchronized void close() throws IOException {
+    if (state == State.CLOSED) {
+      LOG.info("Closing log when already closed");
+      return;
     }
-    
-    if (shutdown && syncThread != null) {
+    if (state == State.IN_SEGMENT) {
+      assert editLogStream != null;
+      waitForSyncToFinish();
+      endCurrentLogSegment(true && InjectionHandler
+          .trueCondition(InjectionEvent.FSEDIT_LOG_WRITE_END_LOG_SEGMENT));
+    }
+
+    if (syncThread != null) {
       syncer.stop();
       syncThread.interrupt();
     }
 
-    if (editStreams == null) {
-      return;
-    }
-    printStatistics(true);
-    numTransactions = totalTimeTransactions = numTransactionsBatchedInSync = 0;
+    try {
+      journalSet.close();
+    } catch (IOException ioe) {
+      LOG.warn("Error closing journalSet", ioe);
 
-    for (int idx = 0; idx < editStreams.size(); idx++) {
-      EditLogOutputStream eStream = editStreams.get(idx);
-      try {
-        eStream.setReadyToFlush();
-        eStream.flush();
-        eStream.close();
-      } catch (IOException e) {
-        FSNamesystem.LOG.warn("FSEditLog:close - failed to close stream " 
-            + eStream.getName(), e);
-        processIOError(idx);
-        idx--;
-      }
+      state = State.CLOSED;
     }
-    editStreams.clear();
   }
 
-  /**
-   * If there is an IO Error on any log operations, remove that
-   * directory from the list of directories.
-   * If no more directories remain, then exit.
-   */
-  synchronized void processIOError(int index) {
-    if (editStreams == null || editStreams.size() <= 1) {
-      FSNamesystem.LOG.fatal(
-      "Fatal Error : All storage directories are inaccessible."); 
-      Runtime.getRuntime().exit(-1);
-    }
-    assert(index < getNumStorageDirs());
-    assert(getNumStorageDirs() == editStreams.size());
-    
-    EditLogFileOutputStream eStream = (EditLogFileOutputStream)editStreams.get(index);
-    File parentStorageDir = ((EditLogFileOutputStream)editStreams
-                                      .get(index)).getFile()
-                                      .getParentFile().getParentFile();
-    
-    try {
-      eStream.close();
-    } catch (Exception e) {}
-    
-    editStreams.remove(index);
-    //
-    // Invoke the ioerror routine of the fsimage
-    //
-    fsimage.processIOError(parentStorageDir);
-  }
-  
-  /**
-   * If there is an IO Error on any log operations on storage directory,
-   * remove any stream associated with that directory 
-   */
-  synchronized void processIOError(StorageDirectory sd) {
-    // Try to remove stream only if one should exist
-    if (!sd.getStorageDirType().isOfType(NameNodeDirType.EDITS))
-      return;
-    if (editStreams == null || editStreams.size() <= 1) {
-      FSNamesystem.LOG.fatal(
-          "Fatal Error : All storage directories are inaccessible."); 
-      Runtime.getRuntime().exit(-1);
-    }
-    for (int idx = 0; idx < editStreams.size(); idx++) {
-      File parentStorageDir = ((EditLogFileOutputStream)editStreams
-                                       .get(idx)).getFile()
-                                       .getParentFile().getParentFile();
-      if (parentStorageDir.getName().equals(sd.getRoot().getName()))
-        editStreams.remove(idx);
- }
-  }
-  
-  /**
-   * The specified streams have IO errors. Remove them from logging
-   * new transactions.
-   */
-  private void processIOError(ArrayList<EditLogOutputStream> errorStreams) {
-    if (errorStreams == null) {
-      return;                       // nothing to do
-    }
-    for (int idx = 0; idx < errorStreams.size(); idx++) {
-      EditLogOutputStream eStream = errorStreams.get(idx);
-      int j = 0;
-      int numEditStreams = editStreams.size();
-      for (j = 0; j < numEditStreams; j++) {
-        if (editStreams.get(j) == eStream) {
-          break;
+  void logEdit(final FSEditLogOp op) {
+    synchronized (this) {
+      assert state != State.CLOSED;
+      // this will increase txid
+      long start = beginTransaction();
+      op.setTransactionId(txid);
+
+      try {
+        if (editLogStream != null) {
+          // if stream is null it will be handled in sync
+          editLogStream.write(op);
         }
+      } catch (IOException ex) {
+        LOG.fatal("Could not write to required number of streams", ex);
+        runtime.exit(1);
       }
-      if (j == numEditStreams) {
-          FSNamesystem.LOG.error("Unable to find sync log on which " +
-                                 " IO error occured. " +
-                                 "Fatal Error.");
-          Runtime.getRuntime().exit(-1);
-      }
-      processIOError(j);
+      endTransaction(start);
+      // check if it is time to schedule an automatic sync
     }
-    fsimage.incrementCheckpointTime();
   }
 
   /**
-   * check if ANY edits.new log exists
-   */
-  boolean existsNew() throws IOException {
-    for (Iterator<StorageDirectory> it = 
-           fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-      if (getEditNewFile(it.next()).exists()) { 
-        return true;
-      }
-    }
-    return false;
-  }  
-
-  /**
-   * Validate a transaction's checksum
+   * Check if should automatically sync buffered edits to persistent store
+   * 
+   * @return true if any of the edit stream says that it should sync
    */
-  static void validateChecksum(boolean supportChecksum, 
-      DataInputStream rawStream, Checksum checksum, int tid)
-  throws IOException {
-    if (supportChecksum) {
-      int expectedChecksum = rawStream.readInt();  // read in checksum
-      int calculatedChecksum = (int)checksum.getValue();
-      if (expectedChecksum != calculatedChecksum) {
-        throw new ChecksumException(
-            "Transaction " + tid + " is corrupt.", tid);
-      }
-    }
+  private boolean shouldForceSync() {
+    // if editLogStream is null, just fast fail
+    return editLogStream == null ? true : editLogStream.shouldForceSync();
   }
-  
-  // a place holder for reading a long
-  private static final LongWritable longWritable = new LongWritable();
 
-  /**
-   * Write an operation to the edit log. Do not sync to persistent
-   * store yet.
-   */
-  synchronized void logEdit(final FSEditLogOp op) {
-    op.setTransactionId(txid);
-    assert this.getNumEditStreams() > 0 : "no editlog streams";
-    long start = FSNamesystem.now();
-    for (int idx = 0; idx < editStreams.size(); idx++) {
-      EditLogOutputStream eStream = editStreams.get(idx);
-      try {
-        eStream.write(op);
-      } catch (IOException ie) {
-        FSImage.LOG.warn("logEdit: removing "+ eStream.getName(), ie);
-        processIOError(idx);         
-        // processIOError will remove the idx's stream 
-        // from the editStreams collection, so we need to update idx
-        idx--; 
-      }
-    }
+  private long beginTransaction() {
+    assert Thread.holdsLock(this);
     // get a new transactionId
     txid++;
 
@@ -381,24 +329,43 @@ synchronized void logEdit(final FSEditLogOp op) {
     //
     TransactionId id = myTransactionId.get();
     id.txid = txid;
+    // obtain time in nanoseconds 
+    // endTransaction will compute time in microseconds 
+    return System.nanoTime();
+
+  }
+
+  private void endTransaction(long start) {
+    assert Thread.holdsLock(this);
 
     // update statistics
-    long end = FSNamesystem.now();
     numTransactions++;
-    totalTimeTransactions += (end-start);
-    if (metrics != null) { // Metrics is non-null only when used inside name node
-      metrics.transactions.inc((end-start));
-      metrics.numBufferedTransactions.set((int)(txid-synctxid));
+    long txnTime = DFSUtil.getElapsedTimeMicroSeconds(start);
+    totalTimeTransactions += txnTime;
+    if (metrics != null) { // Metrics is non-null only when used inside name
+                           // node
+      metrics.transactions.inc(txnTime);
+      metrics.numBufferedTransactions.set((int) (txid - synctxid));
+      metrics.currentTxnId.set(txid);
     }
+
   }
 
   /**
-   * Syncs all pending transactions from all threads.
+   * Blocks until all ongoing edits have been synced to disk. This differs from
+   * logSync in that it waits for edits that have been written by other threads,
+   * not just edits from the calling thread.
+   * 
+   * NOTE: this should be done while holding the FSNamesystem lock, or else more
+   * operations can start writing while this is in progress.
    */
-  synchronized void logSyncAll() throws IOException {
-    // stores in the Thread local variable of current threads
-    TransactionId id = myTransactionId.get();
-    id.txid = txid;
+  public void logSyncAll() throws IOException {
+    // Record the most recent transaction ID as our own id
+    synchronized (this) {
+      TransactionId id = myTransactionId.get();
+      id.txid = txid;
+    }
+    // Then make sure we're synced up to this point
     logSync();
   }
 
@@ -409,7 +376,7 @@ synchronized void logSyncAll() throws IOException {
    * when there are a large number of listStatus calls which update
    * the access time of files.
    */
-  public void logSyncIfNeeded() throws IOException {
+  public void logSyncIfNeeded() {
     boolean doSync = false;
     synchronized (this) {
       if (txid > synctxid + maxBufferedTransactions) {
@@ -420,120 +387,163 @@ public void logSyncIfNeeded() throws IOException {
                               " is more than the configured limit of " +
                               maxBufferedTransactions);
         doSync = true;
-      }   
+      } 
+      if (shouldForceSync()) {
+        FSNamesystem.LOG.info("Log sync triggered by the output stream");
+        doSync = true;
+      }
     }
     if (doSync) {
       logSync();
     }
   }
   
-  public void logSync() throws IOException {
+  public void logSync() {
     logSync(true);
   }
 
-  //
-  // Sync all modifications done by this thread.
-  //
-  public void logSync(boolean doWait) throws IOException {
-    
-    long syncStart = 0;
+  /** 
+   * Sync all modifications done by this thread.  
+   *  
+   * The internal concurrency design of this class is as follows: 
+   * - Log items are written synchronized into an in-memory buffer, 
+   * and each assigned a transaction ID.  
+   * - When a thread (client) would like to sync all of its edits, logSync()  
+   * uses a ThreadLocal transaction ID to determine what edit number must 
+   * be synced to.  
+   * - The isSyncRunning volatile boolean tracks whether a sync is currently  
+   * under progress.  
+   *  
+   * The data is double-buffered within each edit log implementation so that  
+   * in-memory writing can occur in parallel with the on-disk writing.  
+   *  
+   * Each sync occurs in three steps: 
+   * 1. synchronized, it swaps the double buffer and sets the isSyncRunning 
+   * flag.  
+   * 2. unsynchronized, it flushes the data to storage  
+   * 3. synchronized, it resets the flag and notifies anyone waiting on the 
+   * sync.  
+   *  
+   * The lack of synchronization on step 2 allows other threads to continue 
+   * to write into the memory buffer while the sync is in progress. 
+   * Because this step is unsynchronized, actions that need to avoid  
+   * concurrency with sync() should be synchronized and also call 
+   * waitForSyncToFinish() before assuming they are running alone.  
+   */ 
+  public void logSync(boolean doWait) {
+
+    long syncStart = 0;    
+    boolean thisThreadSuccess = false;
+    boolean thisThreadSyncing = false;
+    EditLogOutputStream logStream = null;
+    try {
+      synchronized (this) {
 
-    final int numEditStreams;
-    synchronized (this) {
-      // Fetch the transactionId of this thread. 
-      long mytxid = myTransactionId.get().txid;
-      myTransactionId.get().txid = -1L;
-      if (mytxid == -1) {
-        mytxid = txid;
-      }
-      numEditStreams = editStreams.size();
-      assert numEditStreams > 0 : "no editlog streams";
-      printStatistics(false);
-
-      // if somebody is already syncing, then wait
-      while (mytxid > synctxid && isSyncRunning) {
-        if (!doWait) {
-          long delayedId = Server.delayResponse();
-          List<Long> responses = delayedSyncs.get(mytxid);
-          if (responses == null) { 
-            responses = new LinkedList<Long>();
-            delayedSyncs.put(mytxid, responses);
+        long mytxid = myTransactionId.get().txid;
+        myTransactionId.get().txid = -1L;
+        if (mytxid == -1) {
+          mytxid = txid;
+        }
+
+        printStatistics(false);
+
+        // if somebody is already syncing, then wait
+        while (mytxid > synctxid && isSyncRunning) {
+          if (!doWait) {
+            long delayedId = Server.delayResponse();
+            List<Long> responses = delayedSyncs.get(mytxid);
+            if (responses == null) {
+              responses = new LinkedList<Long>();
+              delayedSyncs.put(mytxid, responses);
+            }
+            responses.add(delayedId);
+            return;
+          }
+          try {
+            wait(1000);
+          } catch (InterruptedException ie) {
           }
-          responses.add(delayedId);
+        }
+
+        //
+        // If this transaction was already flushed, then nothing to do
+        //
+        if (mytxid <= synctxid) {
+          numTransactionsBatchedInSync++;
+          if (metrics != null) // Metrics is non-null only when used inside name
+            // node
+            metrics.transactionsBatchedInSync.inc();
           return;
         }
+
+        // now, this thread will do the sync
+        syncStart = txid;
+        isSyncRunning = true;
+        thisThreadSyncing = true;
+
+        // swap buffers
         try {
-          wait(1000);
-        } catch (InterruptedException ie) { }
+          if (journalSet.isEmpty()) {
+            throw new IOException(
+                "No journals available to flush, journalset is empty");
+          }
+          if (editLogStream == null) {
+            throw new IOException(
+                "No journals available to flush, editlogstream is null");
+          }
+          editLogStream.setReadyToFlush();          
+        } catch (IOException e) {
+          LOG.fatal("Could not sync enough journals to persistent storage. "
+              + "Unsynced transactions: " + (txid - synctxid), new Exception(e));
+          runtime.exit(1);
+        }
+        // editLogStream may become null,
+        // so store a local variable for flush.
+        logStream = editLogStream;
       }
 
-      //
-      // If this transaction was already flushed, then nothing to do
-      //
-      if (mytxid <= synctxid) {
-        numTransactionsBatchedInSync++;
-        if (metrics != null) // Metrics is non-null only when used inside name node
-          metrics.transactionsBatchedInSync.inc();
-        return;
-      }
-   
-      // now, this thread will do the sync
-      syncStart = txid;
-      isSyncRunning = true;   
-
-      // swap buffers
-      for (int idx = 0; idx < numEditStreams; idx++) {
-        editStreams.get(idx).setReadyToFlush();
+      // do the sync
+      sync(logStream, syncStart);
+      thisThreadSuccess = true;
+    } finally {
+      synchronized (this) {
+        if (thisThreadSyncing) {
+          if(thisThreadSuccess) {
+            // only set this if the sync succeeded
+            synctxid = syncStart;
+          }
+          // if this thread was syncing, clear isSyncRunning
+          isSyncRunning = false;
+        }
+        this.notifyAll();
       }
     }
-    sync(syncStart);
-
-    synchronized (this) {
-       synctxid = syncStart;
-       isSyncRunning = false;
-       this.notifyAll();
-    }
     endDelay(syncStart);
   }
   
-  private void sync(long syncStart) {
-    ArrayList<EditLogOutputStream> errorStreams = null;
+  private void sync(EditLogOutputStream logStream, long syncStart) {
     // do the sync
-    long start = FSNamesystem.now();
-    final int numEditStreams;
-    synchronized (this) {
-      numEditStreams = editStreams.size();
-      assert numEditStreams > 0: "no editlog streams";
-    }
-    for (int idx = 0; idx < numEditStreams; idx++) {
-      EditLogOutputStream eStream = editStreams.get(idx);
-      try {
-        eStream.flush();
-      } catch (IOException ie) {
-        //
-        // remember the streams that encountered an error.
-        //
-        if (errorStreams == null) {
-          errorStreams = new ArrayList<EditLogOutputStream>(1);
-        }
-        errorStreams.add(eStream);
-        FSNamesystem.LOG.error("Unable to sync edit log. " +
-                               "Fatal Error.", ie);
+    long start = System.nanoTime();
+    try {
+      if (logStream != null) {
+        logStream.flush();
+      }
+    } catch (IOException ex) {
+      synchronized (this) {
+        LOG.fatal("Could not sync enough journals to persistent storage. "
+            + "Unsynced transactions: " + (txid - synctxid), new Exception());
+        runtime.exit(1);
       }
     }
-    long elapsed = FSNamesystem.now() - start;
+    long elapsed = DFSUtil.getElapsedTimeMicroSeconds(start);
     if (metrics != null) // Metrics is non-null only when used inside name node
       metrics.syncs.inc(elapsed);
-
-    synchronized (this) {
-      processIOError(errorStreams);
-    }
   }
   
   private void endDelay(long synced) {
-    ConcurrentNavigableMap<Long, List<Long>> syncs = delayedSyncs.headMap(synced, true);
-    for (Iterator<List<Long>> iter = syncs.values().iterator();
-            iter.hasNext();) {
+    ConcurrentNavigableMap<Long, List<Long>> syncs = delayedSyncs.headMap(
+        synced, true);
+    for (Iterator<List<Long>> iter = syncs.values().iterator(); iter.hasNext();) {
       List<Long> responses = iter.next();
       for (Long responseId : responses) {
         try {
@@ -556,47 +566,59 @@ public void stop() {
 
     @Override
     public void run() {
-      long syncStart = 0;
-      int numEditStreams;
-      while (isRunning) {
-        synchronized (FSEditLog.this) {
-          numEditStreams = editStreams.size();
-          assert numEditStreams > 0 : "no editlog streams";
-
-          while (isSyncRunning || (isRunning && delayedSyncs.size() == 0)) {
-            try {
-              FSEditLog.this.wait();
-            } catch (InterruptedException iex) {
+      try {
+        long syncStart = 0;
+        while (isRunning) {
+          synchronized (FSEditLog.this) {
+            while (isSyncRunning || (isRunning && delayedSyncs.size() == 0)) {
+              try {
+                FSEditLog.this.wait();
+              } catch (InterruptedException iex) {
+              }
+            }
+            if (!isRunning) {
+              // Shutting down the edits log
+              return;
             }
-          }
-          if (!isRunning) {
-            // Shutting down the edits log
-            return;
-          }
 
-          // There are delayed transactions waiting to be synced and
-          // nobody to sync them
-          syncStart = txid;
-          isSyncRunning = true;
+            // There are delayed transactions waiting to be synced and
+            // nobody to sync them
+            syncStart = txid;
+            isSyncRunning = true;
 
-          for (int idx = 0; idx < numEditStreams; idx++) {
+            
             try {
-              editStreams.get(idx).setReadyToFlush();
+              if (journalSet.isEmpty()) {
+                throw new IOException(
+                    "No journals available to flush, journalset is empty");
+              }
+              if (editLogStream == null) {
+                throw new IOException(
+                    "No journals available to flush, editlogstream is null");
+              }
+              editLogStream.flush();
             } catch (IOException ex) {
-              FSNamesystem.LOG.error(ex);
-              isSyncRunning = false;
-              continue;
+              synchronized (this) {
+                LOG.fatal(
+                    "Could not sync enough journals to persistent storage. "
+                        + "Unsynced transactions: " + (txid - synctxid),
+                    new Exception());
+                runtime.exit(1);
+              }
             }
           }
 
+          sync(editLogStream, syncStart);
+          synchronized (FSEditLog.this) {
+            synctxid = syncStart;
+            isSyncRunning = false;
+            FSEditLog.this.notifyAll();
+          }
+          endDelay(syncStart);
         }
-        sync(syncStart);
-        synchronized (FSEditLog.this) {
-          synctxid = syncStart;
-          isSyncRunning = false;
-          FSEditLog.this.notifyAll();
-        }
-        endDelay(syncStart);
+      } catch (Throwable t) {
+        FSNamesystem.LOG.fatal("SyncThread received Runtime exception: ", t);
+        Runtime.getRuntime().exit(-1);
       }
     }
     
@@ -604,6 +626,10 @@ public String toString() {
       return "SyncThread";
     }
   }
+  
+  protected int  checkJournals() throws IOException {
+    return journalSet.checkJournals("");
+  }
 
   //
   // print statistics every 1 minute.
@@ -613,28 +639,19 @@ private void printStatistics(boolean force) {
     if (lastPrintTime + 60000 > now && !force) {
       return;
     }
-    if (editStreams == null || editStreams.size()==0) {
-      return;
-    }
     lastPrintTime = now;
     StringBuilder buf = new StringBuilder();
     buf.append("Number of transactions: ");
     buf.append(numTransactions);
-    buf.append(" Total time for transactions(ms): ");
-    buf.append(totalTimeTransactions);
     buf.append(" Number of transactions batched in Syncs: ");
     buf.append(numTransactionsBatchedInSync);
     buf.append(" Number of syncs: ");
-    buf.append(editStreams.get(0).getNumSync());
-    buf.append(" SyncTimes(ms): ");
-
-    int numEditStreams = editStreams.size();
-    for (int idx = 0; idx < numEditStreams; idx++) {
-      EditLogOutputStream eStream = editStreams.get(idx);
-      buf.append(" " + eStream.getName() + ":");
-      buf.append(eStream.getTotalSyncTime());
-      buf.append(" ");
-    }
+    buf.append(editLogStream != null ? editLogStream.getNumSync() : "null");
+    buf.append(" Total time for writing transactions (us): ");
+    buf.append(totalTimeTransactions);
+    buf.append(" Journal sync times (us): ");
+    buf.append(journalSet.getSyncTimes());
+    
     FSNamesystem.LOG.info(buf);
   }
 
@@ -684,6 +701,15 @@ public void logMkDir(String path, INode newNode) {
     logEdit(op);
   }
   
+  /** 
+   * Add hardlink record to edit log
+   */
+  public void logHardLink(String src, String dst, long timestamp) {
+    HardLinkOp op = HardLinkOp.getInstance();
+    op.set(src, dst, timestamp);
+    logEdit(op);
+  }
+  
   /** 
    * Add rename record to edit log
    */
@@ -764,159 +790,255 @@ public void logTimes(String src, long mtime, long atime) {
   }
 
   /**
-   * Return the size of the current EditLog
+   * Get all journal streams
    */
-  synchronized long getEditLogSize() throws IOException {
-    assert(getNumStorageDirs() == editStreams.size());
-    long size = 0;
-    for (int idx = 0; idx < editStreams.size(); idx++) {
-      EditLogOutputStream es = editStreams.get(idx);
-      try {
-        long curSize = es.length();
-        assert (size == 0 || size == curSize) : "All streams must be the same";
-        size = curSize;
-      } catch (IOException e) {
-        FSImage.LOG.warn("getEditLogSize: editstream.length failed. removing editlog (" +
-            idx + ") " + es.getName(), e);
-        processIOError(idx);
-      }
-    }
-    return size;
+  public List<JournalAndStream> getJournals() {
+    return journalSet.getAllJournalStreams();
   }
 
   /**
-   * Closes the current edit log and opens edits.new. 
-   * Returns the lastModified time of the edits log.
+   * Used only by unit tests.
    */
-  synchronized void rollEditLog() throws IOException {
-    //
-    // If edits.new already exists in some directory, verify it
-    // exists in all directories.
-    //
-    if (existsNew()) {
-      for (Iterator<StorageDirectory> it = 
-               fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-        File editsNew = getEditNewFile(it.next());
-     if (!editsNew.exists()) { 
-          throw new IOException("Inconsistent existance of edits.new " +
-                                editsNew);
-        }
-      }
-      return; // nothing to do, edits.new exists!
+  static synchronized void setRuntimeForTesting(Runtime rt) {
+    runtime = rt;
+  }
+  
+  /**
+   * Return a manifest of what finalized edit logs are available
+   */
+  public synchronized RemoteEditLogManifest getEditLogManifest(long fromTxId)
+      throws IOException {
+    return journalSet.getEditLogManifest(fromTxId);
+  }
+  
+  /** 
+   * Finalizes the current edit log and opens a new log segment.  
+   * @return the transaction id of the BEGIN_LOG_SEGMENT transaction  
+   * in the new log.  
+   */ 
+  synchronized long rollEditLog() throws IOException {
+    LOG.info("Rolling edit logs.");
+    long start = System.nanoTime();
+    
+    endCurrentLogSegment(true);
+    long nextTxId = getLastWrittenTxId() + 1;
+    startLogSegment(nextTxId, true);
+
+    assert curSegmentTxId == nextTxId;
+    long rollTime = DFSUtil.getElapsedTimeMicroSeconds(start);
+    if (metrics != null) {
+      metrics.rollEditLogTime.inc(rollTime);
+    }
+    return nextTxId;
+  }
+  
+    /** 
+     * Start writing to the log segment with the given txid.  
+     * Transitions from BETWEEN_LOG_SEGMENTS state to IN_LOG_SEGMENT state.   
+     */ 
+    synchronized void startLogSegment(final long segmentTxId,
+      boolean writeHeaderTxn) throws IOException {
+    LOG.info("Starting log segment at " + segmentTxId);
+    if (segmentTxId < 0) {
+      throw new IOException("Bad txid: " + segmentTxId);
+    }
+    if (state != State.BETWEEN_LOG_SEGMENTS) {
+      throw new IOException("Bad state: " + state);
+    }
+    if (segmentTxId <= curSegmentTxId) {
+      throw new IOException("Cannot start writing to log segment "
+          + segmentTxId + " when previous log segment started at "
+          + curSegmentTxId);
+    }
+    if (segmentTxId != txid + 1) {
+      throw new IOException("Cannot start log segment at txid " + segmentTxId
+          + " when next expected " + (txid + 1));
     }
 
-    close();                     // close existing edit log
+    numTransactions = totalTimeTransactions = numTransactionsBatchedInSync = 0;
+
+    // TODO no need to link this back to storage anymore!
+    // See HDFS-2174.
+    storage.attemptRestoreRemovedStorage();
+    try {
+      editLogStream = journalSet.startLogSegment(segmentTxId);
+    } catch (IOException ex) {
+      throw new IOException("Unable to start log segment " + segmentTxId
+          + ": no journals successfully started.");
 
-    fsimage.attemptRestoreRemovedStorage();
-    
-    //
-    // Open edits.new
-    //
-    boolean failedSd = false;
-    for (Iterator<StorageDirectory> it = 
-           fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      try {
-        EditLogFileOutputStream eStream = 
-             new EditLogFileOutputStream(getEditNewFile(sd), metrics);
-        eStream.create();
-        editStreams.add(eStream);
-      } catch (IOException e) {
-        failedSd = true;
-        // remove stream and this storage directory from list
-        FSImage.LOG.warn("rollEdidLog: removing storage " + sd.getRoot().getPath(), e);
-        sd.unlock();
-        fsimage.removedStorageDirs.add(sd);
-        it.remove();
-      }
     }
-    if(failedSd)
-      fsimage.incrementCheckpointTime();  // update time for the valid ones
+    curSegmentTxId = segmentTxId;
+    state = State.IN_SEGMENT;
+    if (writeHeaderTxn) {
+      logEdit(LogSegmentOp.getInstance(FSEditLogOpCodes.OP_START_LOG_SEGMENT));
+      logSync();
+    }
   }
-
+      
   /**
-   * Removes the old edit log and renamed edits.new as edits.
-   * Reopens the edits file.
+   * Finalize the current log segment. Transitions from IN_SEGMENT state to
+   * BETWEEN_LOG_SEGMENTS state.
    */
-  synchronized void purgeEditLog() throws IOException {
-    //
-    // If edits.new does not exists, then return error.
-    //
-    if (!existsNew()) {
-      throw new IOException("Attempt to purge edit log " +
-                            "but edits.new does not exist.");
+  synchronized void endCurrentLogSegment(boolean writeEndTxn)
+      throws IOException {
+    LOG.info("Ending log segment " + curSegmentTxId);
+    if (state != State.IN_SEGMENT) {
+      throw new IllegalStateException("Bad state: " + state);
+    }
+    waitForSyncToFinish();
+    if (writeEndTxn) {
+      logEdit(LogSegmentOp.getInstance(FSEditLogOpCodes.OP_END_LOG_SEGMENT));
     }
-    close();
+    logSyncAll();
+    printStatistics(true);
+    final long lastTxId = getLastWrittenTxId();
 
-    //
-    // Delete edits and rename edits.new to edits.
-    //
-    for (Iterator<StorageDirectory> it = 
-           fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      if (!getEditNewFile(sd).renameTo(getEditFile(sd))) {
-        //
-        // renameTo() fails on Windows if the destination
-        // file exists.
-        //
-        getEditFile(sd).delete();
-        if (!getEditNewFile(sd).renameTo(getEditFile(sd))) {
-          // Should we also remove from edits
-          NameNode.LOG.warn("purgeEditLog: removing failed storage " + sd.getRoot().getPath());
-          fsimage.removedStorageDirs.add(sd);
-          it.remove(); 
-        }
+    try {
+      journalSet.finalizeLogSegment(curSegmentTxId, lastTxId);
+      editLogStream = null;
+    } catch (IOException e) {
+      // All journals have failed, it will be handled in logSync.
+      FSNamesystem.LOG.info("Cannot finalize log segment: " + e.toString());
+    }
+    state = State.BETWEEN_LOG_SEGMENTS;
+  }
+    
+  /**
+   * Archive any log files that are older than the given txid.
+   */
+  public void purgeLogsOlderThan(final long minTxIdToKeep) {
+    synchronized (this) {
+      // synchronized to prevent findbugs warning about inconsistent
+      // synchronization. This will be JIT-ed out if asserts are
+      // off.
+      assert curSegmentTxId == HdfsConstants.INVALID_TXID || // on format this
+                                                             // is no-op
+          minTxIdToKeep <= curSegmentTxId : "cannot purge logs older than txid "
+          + minTxIdToKeep + " when current segment starts at " + curSegmentTxId;
+      try {
+        journalSet.purgeLogsOlderThan(minTxIdToKeep);
+      } catch (IOException ex) {
+        // All journals have failed, it will be handled in logSync.
       }
+
     }
-    //
-    // Reopen all the edits logs.
-    //
-    open();
+  }
+  
+    /**
+     * The actual sync activity happens while not synchronized on this object.
+     * Thus, synchronized activities that require that they are not concurrent
+     * with file operations should wait for any running sync to finish.
+     */
+  synchronized void waitForSyncToFinish() {
+    while (isSyncRunning) {
+      try {
+        wait(1000);
+      } catch (InterruptedException ie) {
+      }
+    }
+  }
+  
+  /**
+   * Return the txid of the last synced transaction. For test use only
+   */
+  synchronized long getSyncTxId() {
+    return synctxid;
   }
 
   /**
-   * Return the name of the edit file
+   * Run recovery on all journals to recover any unclosed segments
    */
-  synchronized File getFsEditName() throws IOException {
-    StorageDirectory sd = null;
-    for (Iterator<StorageDirectory> it = 
-        fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-      sd = it.next();
-      File fsEdit = getEditFile(sd);
-      if (sd.getRoot().canRead() && fsEdit.exists()) {
-        return fsEdit;
-      }
+  void recoverUnclosedStreams() {
+    try {
+      journalSet.recoverUnfinalizedSegments();
+    } catch (IOException ex) {
+      // All journals have failed, it is handled in logSync.
     }
-    return null;
   }
   
   /**
-   * Return the name of the edit.new file
+   * Select a list of input streams to load.
+   * 
+   * @param fromTxId first transaction in the selected streams
+   * @param toAtLeast the selected streams must contain this transaction
    */
-  synchronized File getFsEditNewName() throws IOException {
-    StorageDirectory sd = null;
-    for (Iterator<StorageDirectory> it = 
-        fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-      sd = it.next();
-      File fsEdit = getEditNewFile(sd);
-      if (sd.getRoot().canRead() && fsEdit.exists()) {
-        return fsEdit;
-      }
+  Collection<EditLogInputStream> selectInputStreams(long fromTxId,
+      long toAtLeastTxId) throws IOException {
+    LOG.info("Selecting input stream from: " + fromTxId + " to at least: "
+        + toAtLeastTxId);
+    List<EditLogInputStream> streams = new ArrayList<EditLogInputStream>();
+    EditLogInputStream stream = journalSet.getInputStream(fromTxId);
+    while (stream != null) {
+      fromTxId = stream.getLastTxId() + 1;
+      streams.add(stream);
+      stream = journalSet.getInputStream(fromTxId);
+    }
+    if (fromTxId <= toAtLeastTxId) {
+      closeAllStreams(streams);
+      throw new IOException("No non-corrupt logs for txid ::::" + fromTxId);
     }
-    return null;
+    return streams;
   }
 
   /**
-   * Returns the timestamp of the edit log
+   * Close all the streams in a collection
+   * 
+   * @param streams The list of streams to close
+   */
+  static void closeAllStreams(Iterable<EditLogInputStream> streams) {
+    for (EditLogInputStream s : streams) {
+      IOUtils.closeStream(s);
+    }
+  }
+  
+  /** 
+   * Retrieve the implementation class for a Journal scheme.  
+   * @param conf The configuration to retrieve the information from 
+   * @param uriScheme The uri scheme to look up.  
+   * @return the class of the journal implementation  
+   * @throws IllegalArgumentException if no class is configured for uri 
+   */ 
+  static Class<? extends JournalManager> getJournalClass(Configuration conf,
+      String uriScheme) {
+    String key = "dfs.name.edits.journal-plugin" + "." + uriScheme;
+    Class<? extends JournalManager> clazz = null;
+    try {
+      clazz = conf.getClass(key, null, JournalManager.class);
+    } catch (RuntimeException re) {
+      throw new IllegalArgumentException("Invalid class specified for "
+          + uriScheme, re);
+    }
+
+    if (clazz == null) {
+      LOG.warn("No class configured for " + uriScheme + ", " + key
+          + " is empty");
+      throw new IllegalArgumentException("No class configured for " + uriScheme);
+    }
+    return clazz;
+  }
+    
+  /**
+   * Construct a custom journal manager.
+   * The class to construct is taken from the configuration.
+   * @param uri Uri to construct
+   * @return The constructed journal manager
+   * @throws IllegalArgumentException if no class is configured for uri
    */
-  synchronized long getFsEditTime() {
-    Iterator<StorageDirectory> it = fsimage.dirIterator(NameNodeDirType.EDITS);
-    if(it.hasNext())
-      return getEditFile(it.next()).lastModified();
-    return 0;
+  public static JournalManager createJournal(URI uri, Configuration conf) {
+    Class<? extends JournalManager> clazz = getJournalClass(conf,
+        uri.getScheme());
+
+    try {
+      Constructor<? extends JournalManager> cons = clazz.getConstructor(
+          Configuration.class, URI.class);
+      return cons.newInstance(conf, uri);
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Unable to construct journal, " + uri,
+          e);
+    }
   }
 
-  // sets the initial capacity of the flush buffer.
+    // sets the initial capacity of the flush buffer.
   static void setBufferCapacity(int size) {
     sizeFlushBuffer = size;
   }
@@ -931,24 +1053,35 @@ static void setPreallocateSize(long size) {
     preallocateSize = size;
   }
 
-  /**
-   * Return the current transaction ID for the edit log.
-   * This is the transaction ID that would be issued to the next transaction.
-   */
-  public synchronized long getCurrentTxId() {
-    return txid;
-  }
-
   /**
    * Return the transaction ID for the transaction that was written last.
    */
   synchronized long getLastWrittenTxId() {
-    return getCurrentTxId() - 1;
+    return txid;
+  }
+  
+  public synchronized long getCurrentTxId() {
+    return txid + 1;
   }
   
   synchronized long getLastSyncedTxId() {
     return synctxid;
   }
+  
+  /**
+   * @return the first transaction ID in the current log segment
+   */
+  public synchronized long getCurSegmentTxId() {
+    assert state == State.IN_SEGMENT : "Bad state: " + state;
+    return curSegmentTxId;
+  }
+  
+  /**
+   * Get number of journals available
+   */
+  public int getNumberOfAvailableJournals() throws IOException {
+    return checkJournals();
+  }
 
   /**
    * A class to read in blocks stored in the old format. The only two
@@ -984,44 +1117,4 @@ public void readFields(DataInput in) throws IOException {
       this.len = in.readLong();
     }
   }
-
-  /** This method is defined for compatibility reason. */
-  static private DatanodeDescriptor[] readDatanodeDescriptorArray(DataInput in
-      ) throws IOException {
-    DatanodeDescriptor[] locations = new DatanodeDescriptor[in.readInt()];
-    for (int i = 0; i < locations.length; i++) {
-      locations[i] = new DatanodeDescriptor();
-      locations[i].readFieldsFromFSEditLog(in);
-    }
-    return locations;
-  }
-
-  static private Block[] readBlocks(DataInputStream in) throws IOException {
-    int numBlocks = in.readInt();
-    Block[] blocks = new Block[numBlocks];
-    for (int i = 0; i < numBlocks; i++) {
-      blocks[i] = new Block();
-      blocks[i].readFields(in);
-    }
-    return blocks;
-  }
-  
-  private static void incrOpCount(FSEditLogOpCodes opCode,
-      EnumMap<FSEditLogOpCodes, Holder<Integer>> opCounts) {
-    Holder<Integer> holder = opCounts.get(opCode);
-    if (holder == null) {
-      holder = new Holder<Integer>(1);
-      opCounts.put(opCode, holder);
-    } else {
-      holder.held++;
-    }
-  }
-  
-  public static void dumpOpCounts(
-      EnumMap<FSEditLogOpCodes, Holder<Integer>> opCounts) {
-    StringBuilder sb = new StringBuilder();
-    sb.append("Summary of operations loaded from edit log:\n  ");
-    sb.append(opCounts);
-    FSImage.LOG.debug(sb.toString());
-  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
index 3f22d99a..46b40e7e 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
@@ -27,13 +27,13 @@
 
 import org.apache.hadoop.fs.permission.PermissionStatus;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
-import org.apache.hadoop.hdfs.server.common.Storage;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.AddCloseOp;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.ClearNSQuotaOp;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.ConcatDeleteOp;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.DeleteOp;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.HardLinkOp;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.MkdirOp;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.RenameOp;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp.SetGenstampOp;
@@ -47,7 +47,6 @@
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 
 import org.apache.hadoop.hdfs.util.Holder;
-import org.apache.hadoop.util.StringUtils;
 import org.mortbay.log.Log;
 
 import com.google.common.base.Joiner;
@@ -55,7 +54,7 @@
 public class FSEditLogLoader {
   private final FSNamesystem fsNamesys;
   public static final long TXID_IGNORE = -1;
-  private long currentTxId;
+  private long lastAppliedTxId = -1;
 
   public FSEditLogLoader(FSNamesystem fsNamesys) {
     this.fsNamesys = fsNamesys;
@@ -66,14 +65,14 @@ public FSEditLogLoader(FSNamesystem fsNamesys) {
    * This is where we apply edits that we've been writing to disk all
    * along.
    */
-  int loadFSEdits(EditLogInputStream edits, long expectedStartingTxId)
+  int loadFSEdits(EditLogInputStream edits, long lastAppliedTxId)
   throws IOException {
     long startTime = now();
-    currentTxId = expectedStartingTxId;
+    this.lastAppliedTxId = lastAppliedTxId;
     int numEdits = loadFSEdits(edits, true);
     FSImage.LOG.info("Edits file " + edits.getName() 
-        + " of size " + edits.length() + " edits # " + numEdits 
-        + " loaded in " + (now()-startTime)/1000 + " seconds.");
+        + " of size: " + edits.length() + ", # of edits: " + numEdits 
+        + " loaded in: " + (now()-startTime)/1000 + " seconds.");
     return numEdits;
   }
 
@@ -89,9 +88,6 @@ int loadFSEdits(EditLogInputStream edits, boolean closeOnExit)
         edits.close();
       }
     }
-    
-    if (logVersion != FSConstants.LAYOUT_VERSION) // other version
-      numEdits++; // save this image asap
     return numEdits;
   }
   
@@ -199,6 +195,11 @@ static void loadEditRecord(int logVersion,
           concatDeleteOp.timestamp);
       break;
     }
+    case OP_HARDLINK: {
+      HardLinkOp hardLinkOp = (HardLinkOp)op;
+      fsDir.unprotectedHardLinkTo(hardLinkOp.src, hardLinkOp.dst, hardLinkOp.timestamp);
+      break;
+    }
     case OP_RENAME: {
       RenameOp renameOp = (RenameOp)op;
       HdfsFileStatus dinfo = fsDir.getHdfsFileInfo(renameOp.dst);
@@ -301,20 +302,22 @@ int loadEditRecords(int logVersion, EditLogInputStream in, boolean closeOnExit)
     try {
       try {
         FSEditLogOp op;
+        FSEditLog.LOG.info("Planning to load: " + numEdits);
+        
         while ((op = in.readOp()) != null) {
           if (logVersion <= FSConstants.STORED_TXIDS) {
             long diskTxid = op.txid;
-            if (diskTxid != currentTxId) {
+            if (diskTxid != (lastAppliedTxId + 1)) {
               if (fsNamesys.failOnTxIdMismatch()) {
                 throw new IOException("The transaction id in the edit log : "
                     + diskTxid + " does not match the transaction id inferred"
-                    + " from FSIMAGE : " + currentTxId);
+                    + " from FSIMAGE : " + (lastAppliedTxId + 1));
               } else {
                 FSNamesystem.LOG.error("The transaction id in the edit log : "
                     + diskTxid + " does not match the transaction id inferred"
-                    + " from FSIMAGE : " + currentTxId +
+                    + " from FSIMAGE : " + (lastAppliedTxId + 1) +
                     ", continuing with transaction id : " + diskTxid);
-                currentTxId = diskTxid;
+                lastAppliedTxId = diskTxid - 1;
               }
             }
           }
@@ -327,7 +330,7 @@ int loadEditRecords(int logVersion, EditLogInputStream in, boolean closeOnExit)
               fsDir, 
               numEdits, 
               op);
-          currentTxId++;
+          lastAppliedTxId++;
           numEdits++;
         }
       } finally {
@@ -337,37 +340,40 @@ int loadEditRecords(int logVersion, EditLogInputStream in, boolean closeOnExit)
     } catch (Throwable t) {
       // Catch Throwable because in the case of a truly corrupt edits log, any
       // sort of error might be thrown (NumberFormat, NullPointer, EOF, etc.)
-      StringBuilder sb = new StringBuilder();
-      sb.append("Error replaying edit log at offset " + in.getPosition());
-      if (recentOpcodeOffsets[0] != -1) {
-        Arrays.sort(recentOpcodeOffsets);
-        sb.append("\nRecent opcode offsets:");
-        for (long offset : recentOpcodeOffsets) {
-          if (offset != -1) {
-            sb.append(' ').append(offset);
-          }
-        }
-      }
-      String errorMessage = sb.toString();
+      String errorMessage = getErrorMessage(recentOpcodeOffsets, in.getPosition());
       FSImage.LOG.error(errorMessage);
       throw new IOException(errorMessage, t);
     } finally {
       fsDir.writeUnlock();
       fsNamesys.writeUnlock();
     }
-    if (FSImage.LOG.isDebugEnabled()) {
-      dumpOpCounts(opCounts);
-    }
+    dumpOpCounts(opCounts);
     return numEdits;
   }
   
-  public long getCurrentTxId() {
-    return currentTxId;
+  public static String getErrorMessage(long[] recentOpcodeOffsets, long position) {
+    StringBuilder sb = new StringBuilder();
+    sb.append("Error replaying edit log at offset " + position);
+    if (recentOpcodeOffsets[0] != -1) {
+      Arrays.sort(recentOpcodeOffsets);
+      sb.append("\nRecent opcode offsets:");
+      for (long offset : recentOpcodeOffsets) {
+        if (offset != -1) {
+          sb.append(' ').append(offset);
+        }
+      }
+    }
+    return sb.toString();
+  }
+  
+  public long getLastAppliedTxId() {
+    return lastAppliedTxId;
   }
 
-
-  private static void dumpOpCounts(
+  static void dumpOpCounts(
       EnumMap<FSEditLogOpCodes, Holder<Integer>> opCounts) {
+    if (!FSImage.LOG.isDebugEnabled())
+      return;
     StringBuilder sb = new StringBuilder();
     sb.append("Summary of operations loaded from edit log:\n  ");
     Joiner.on("\n  ").withKeyValueSeparator("=").appendTo(sb, opCounts);
@@ -457,7 +463,7 @@ long getNumTransactions() {
   /**
    * Stream wrapper that keeps track of the current stream position.
    */
-  static class PositionTrackingInputStream extends FilterInputStream {
+  public static class PositionTrackingInputStream extends FilterInputStream {
     private long curPos = 0;
     private long markPos = -1;
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java
index 7940a871..1da5b05e 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java
@@ -54,7 +54,7 @@
  */
 public abstract class FSEditLogOp {
   public static final Log LOG = LogFactory.getLog(FSEditLogOp.class);
-  final FSEditLogOpCodes opCode;
+  public final FSEditLogOpCodes opCode;
   long txid;
 
 
@@ -86,6 +86,7 @@ protected EnumMap<FSEditLogOpCodes, FSEditLogOp> initialValue() {
                       new LogSegmentOp(OP_START_LOG_SEGMENT));
         instances.put(OP_END_LOG_SEGMENT,
                       new LogSegmentOp(OP_END_LOG_SEGMENT));
+        instances.put(OP_HARDLINK, new HardLinkOp());
         return instances;
       }
   };
@@ -99,11 +100,11 @@ private FSEditLogOp(FSEditLogOpCodes opCode) {
     this.txid = 0;
   }
 
-  long getTransactionId() {
+  public long getTransactionId() {
     return txid;
   }
 
-  void setTransactionId(long txid) {
+  public void setTransactionId(long txid) {
     this.txid = txid;
   }
   
@@ -118,9 +119,9 @@ abstract void writeFields(DataOutputStream out)
       throws IOException;
 
   @SuppressWarnings("unchecked")
-  static abstract class AddCloseOp extends FSEditLogOp {
+  public static abstract class AddCloseOp extends FSEditLogOp {
     int length;
-    String path;
+    public String path;
     short replication;
     long mtime;
     long atime;
@@ -135,7 +136,7 @@ private AddCloseOp(FSEditLogOpCodes opCode) {
       assert(opCode == OP_ADD || opCode == OP_CLOSE);
     }
     
-    void set(String path,
+    public void set(String path,
         short replication,
         long mtime,
         long atime,
@@ -157,12 +158,11 @@ void set(String path,
 
     @Override 
     void writeFields(DataOutputStream out) throws IOException {
-      out.writeInt(5);
       FSImageSerialization.writeString(path, out);
-      FSImageSerialization.writeShortAsString(replication, out);
-      FSImageSerialization.writeLongAsString(mtime, out);
-      FSImageSerialization.writeLongAsString(atime, out);
-      FSImageSerialization.writeLongAsString(blockSize, out);
+      FSImageSerialization.writeShort(replication, out);
+      FSImageSerialization.writeLong(mtime, out);
+      FSImageSerialization.writeLong(atime, out);
+      FSImageSerialization.writeLong(blockSize, out);
       new ArrayWritable(Block.class, blocks).write(out);
       permissions.write(out);
 
@@ -177,10 +177,13 @@ void readFields(DataInputStream in, int logVersion)
         throws IOException {
       // versions > 0 support per file replication
       // get name and replication
-      this.length = in.readInt();
+      if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.length = in.readInt();
+      }
       if (-7 == logVersion && length != 3||
           -17 < logVersion && logVersion < -7 && length != 4 ||
-          (logVersion <= -17 && length != 5)) {
+          (logVersion <= -17 && length != 5 && !LayoutVersion.supports(
+              Feature.EDITLOG_OP_OPTIMIZATION, logVersion))) {
         throw new IOException("Incorrect data format."  +
                               " logVersion is " + logVersion +
                               " but writables.length is " +
@@ -188,16 +191,29 @@ void readFields(DataInputStream in, int logVersion)
       }
       this.path = FSImageSerialization.readString(in);
 
-      this.replication = readShort(in);
-      this.mtime = readLong(in);
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.replication = FSImageSerialization.readShort(in);
+        this.mtime = FSImageSerialization.readLong(in);
+      } else {
+        this.replication = readShort(in);
+        this.mtime = readLong(in);
+      }
 
       if (LayoutVersion.supports(Feature.FILE_ACCESS_TIME, logVersion)) {
-        this.atime = readLong(in);
+        if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+          this.atime = FSImageSerialization.readLong(in);
+        } else {
+          this.atime = readLong(in);
+        }
       } else {
         this.atime = 0;
       }
       if (logVersion < -7) {
-        this.blockSize = readLong(in);
+        if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+          this.blockSize = FSImageSerialization.readLong(in);
+        } else {
+          this.blockSize = readLong(in);
+        }
       } else {
         this.blockSize = 0;
       }
@@ -256,8 +272,8 @@ private static Block[] readBlocks(
     }
   }
 
-  static class AddOp extends AddCloseOp {
-    private AddOp() {
+  public static class AddOp extends AddCloseOp {
+    public AddOp() {
       super(OP_ADD);
     }
 
@@ -266,8 +282,8 @@ static AddOp getInstance() {
     }
   }
 
-  static class CloseOp extends AddCloseOp {
-    private CloseOp() {
+  public static class CloseOp extends AddCloseOp {
+    public CloseOp() {
       super(OP_CLOSE);
     }
 
@@ -297,14 +313,18 @@ void set(String path, short replication) {
     @Override 
     void writeFields(DataOutputStream out) throws IOException {
       FSImageSerialization.writeString(path, out);
-      FSImageSerialization.writeShortAsString(replication, out);
+      FSImageSerialization.writeShort(replication, out);
     }
     
     @Override
     void readFields(DataInputStream in, int logVersion)
         throws IOException {
       this.path = FSImageSerialization.readString(in);
-      this.replication = readShort(in);
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.replication = FSImageSerialization.readShort(in);
+      } else {
+        this.replication = readShort(in);
+      }
     }
   }
 
@@ -331,29 +351,76 @@ void set (String trg, String[] srcs, long timestamp) {
 
     @Override 
     void writeFields(DataOutputStream out) throws IOException {
-      out.writeInt(1 + srcs.length + 1);
       FSImageSerialization.writeString(trg, out);
+      out.writeInt(srcs.length);
       for(int i=0; i<srcs.length; i++) {
         FSImageSerialization.writeString(srcs[i], out);
       }
-      FSImageSerialization.writeLongAsString(timestamp, out);
+      FSImageSerialization.writeLong(timestamp, out);
     }
 
     @Override
     void readFields(DataInputStream in, int logVersion)
         throws IOException {
-      this.length = in.readInt();
-      if (length < 3) { // trg, srcs.., timestamp
-        throw new IOException("Incorrect data format. "
-            + "Concat delete operation.");
+      if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.length = in.readInt();
+        if (length < 3) { // trg, srcs.., timestamp
+          throw new IOException("Incorrect data format. "
+              + "Concat delete operation.");
+        }
       }
       this.trg = FSImageSerialization.readString(in);
-      int srcSize = this.length -1 -1;
+      int srcSize = 0;
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        srcSize = in.readInt();
+      } else {
+        srcSize = this.length - 1 - 1; // trg and timestamp
+      }
       this.srcs = new String [srcSize];
       for(int i=0; i<srcSize;i++) {
         srcs[i]= FSImageSerialization.readString(in);
-      }  
-      this.timestamp = readLong(in);
+      }
+      
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.timestamp = FSImageSerialization.readLong(in);
+      } else {
+        this.timestamp = readLong(in);
+      }
+    }
+  }
+
+  static class HardLinkOp extends FSEditLogOp {
+    String src;
+    String dst;
+    long timestamp;
+
+    private HardLinkOp() {
+      super(OP_HARDLINK);
+    }
+
+    static HardLinkOp getInstance() {
+      return (HardLinkOp)opInstances.get().get(OP_HARDLINK);
+    }
+    
+    void set(String src, String dst, long timestamp) {
+      this.src = src;
+      this.dst = dst;
+      this.timestamp = timestamp;
+    }
+
+    @Override 
+    void writeFields(DataOutputStream out) throws IOException {
+      FSImageSerialization.writeString(src, out);
+      FSImageSerialization.writeString(dst, out);
+      FSImageSerialization.writeLong(timestamp, out);
+    }
+
+    @Override
+    void readFields(DataInputStream in, int logVersion)
+        throws IOException {
+      this.src = FSImageSerialization.readString(in);
+      this.dst = FSImageSerialization.readString(in);
+      this.timestamp = FSImageSerialization.readLong(in);
     }
   }
 
@@ -380,29 +447,34 @@ void set(String src, String dst, long timestamp) {
 
     @Override 
     void writeFields(DataOutputStream out) throws IOException {
-      out.writeInt(3);
       FSImageSerialization.writeString(src, out);
       FSImageSerialization.writeString(dst, out);
-      FSImageSerialization.writeLongAsString(timestamp, out);
+      FSImageSerialization.writeLong(timestamp, out);
     }
 
     @Override
     void readFields(DataInputStream in, int logVersion)
         throws IOException {
-      this.length = in.readInt();
-      if (this.length != 3) {
-        throw new IOException("Incorrect data format. "
-            + "Old rename operation.");
+      if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.length = in.readInt();
+        if (this.length != 3) {
+          throw new IOException("Incorrect data format. "
+              + "Old rename operation.");
+        }
       }
       this.src = FSImageSerialization.readString(in);
       this.dst = FSImageSerialization.readString(in);
-      this.timestamp = readLong(in);
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.timestamp = FSImageSerialization.readLong(in);
+      } else {
+        this.timestamp = readLong(in);
+      }
     }
   }
 
-  static class DeleteOp extends FSEditLogOp {
+  public static class DeleteOp extends FSEditLogOp {
     int length;
-    String path;
+    public String path;
     long timestamp;
 
     private DeleteOp() {
@@ -421,20 +493,25 @@ void set(String path, long timestamp) {
 
     @Override 
     void writeFields(DataOutputStream out) throws IOException {
-      out.writeInt(2);
       FSImageSerialization.writeString(path, out);
-      FSImageSerialization.writeLongAsString(timestamp, out);
+      FSImageSerialization.writeLong(timestamp, out);
     }
 
     @Override
     void readFields(DataInputStream in, int logVersion)
         throws IOException {
-      this.length = in.readInt();
-      if (this.length != 2) {
-        throw new IOException("Incorrect data format. " + "delete operation.");
+      if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.length = in.readInt();
+        if (this.length != 2) {
+          throw new IOException("Incorrect data format. " + "delete operation.");
+        }
       }
       this.path = FSImageSerialization.readString(in);
-      this.timestamp = readLong(in);
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.timestamp = FSImageSerialization.readLong(in);
+      } else {
+        this.timestamp = readLong(in);
+      }
     }
   }
 
@@ -461,10 +538,9 @@ void set(String path, long timestamp, PermissionStatus permissions) {
 
     @Override 
     void writeFields(DataOutputStream out) throws IOException {
-      out.writeInt(3);
       FSImageSerialization.writeString(path, out);
-      FSImageSerialization.writeLongAsString(timestamp, out); // mtime
-      FSImageSerialization.writeLongAsString(timestamp, out); // atime, unused at this
+      FSImageSerialization.writeLong(timestamp, out); // mtime
+      FSImageSerialization.writeLong(timestamp, out); // atime, unused at this
       permissions.write(out);
     }
     
@@ -472,22 +548,33 @@ void writeFields(DataOutputStream out) throws IOException {
     void readFields(DataInputStream in, int logVersion)
         throws IOException {
 
-      this.length = in.readInt();
+      if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.length = in.readInt();
+      }
       if (-17 < logVersion && length != 2 ||
-          logVersion <= -17 && length != 3) {
+          logVersion <= -17 && length != 3
+          && !LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
         throw new IOException("Incorrect data format. "
                               + "Mkdir operation.");
       }
       this.path = FSImageSerialization.readString(in);
-      this.timestamp = readLong(in);
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.timestamp = FSImageSerialization.readLong(in);
+      } else {
+        this.timestamp = readLong(in);
+      }
 
       // The disk format stores atimes for directories as well.
       // However, currently this is not being updated/used because of
       // performance reasons.
       if (LayoutVersion.supports(Feature.FILE_ACCESS_TIME, logVersion)) {
         /* unused this.atime = */
-        readLong(in);
-       }
+        if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+          FSImageSerialization.readLong(in);
+        } else {
+          readLong(in);
+        }
+      }
 
       if (logVersion <= -11) {
         this.permissions = PermissionStatus.read(in);
@@ -664,7 +751,7 @@ void writeFields(DataOutputStream out) throws IOException {
     void readFields(DataInputStream in, int logVersion)
         throws IOException {
       this.src = FSImageSerialization.readString(in);
-      this.nsQuota = FSImageSerialization.readLongAsString(in);
+      this.nsQuota = FSImageSerialization.readLong(in);
     }
   }
 
@@ -751,23 +838,29 @@ void set(String path, long mtime, long atime) {
 
     @Override 
     void writeFields(DataOutputStream out) throws IOException {
-      out.writeInt(3);
       FSImageSerialization.writeString(path, out);
-      FSImageSerialization.writeLongAsString(mtime, out);
-      FSImageSerialization.writeLongAsString(atime, out);
+      FSImageSerialization.writeLong(mtime, out);
+      FSImageSerialization.writeLong(atime, out);
     }
 
     @Override
     void readFields(DataInputStream in, int logVersion)
         throws IOException {
-      this.length = in.readInt();
-      if (length != 3) {
-        throw new IOException("Incorrect data format. " + "times operation.");
+      if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.length = in.readInt();
+        if (length != 3) {
+          throw new IOException("Incorrect data format. " + "times operation.");
+        }
       }
       this.path = FSImageSerialization.readString(in);
 
-      this.mtime = readLong(in);
-      this.atime = readLong(in);
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, logVersion)) {
+        this.mtime = FSImageSerialization.readLong(in);
+        this.atime = FSImageSerialization.readLong(in);
+      } else {
+        this.mtime = readLong(in);
+        this.atime = readLong(in);
+      }
     }
   }
   
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogOpCodes.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogOpCodes.java
index a93f2f7e..fff4fe92 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogOpCodes.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLogOpCodes.java
@@ -53,7 +53,9 @@ public enum FSEditLogOpCodes {
   OP_REASSIGN_LEASE             ((byte) 22),
 
   OP_END_LOG_SEGMENT            ((byte) 23),
-  OP_START_LOG_SEGMENT          ((byte) 24);
+  OP_START_LOG_SEGMENT          ((byte) 24),
+  
+  OP_HARDLINK                   ((byte) 25);
 
   private byte opCode;
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java
index 7613e9da..9e48bfb5 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java
@@ -17,175 +17,71 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
-import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.RandomAccessFile;
-import java.text.SimpleDateFormat;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
+import java.util.Map.Entry;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
-import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.protocol.LayoutVersion;
+import org.apache.hadoop.hdfs.protocol.LayoutVersion.Feature;
 import org.apache.hadoop.hdfs.server.common.InconsistentFSStateException;
 import org.apache.hadoop.hdfs.server.common.Storage;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirType;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageState;
 import org.apache.hadoop.hdfs.server.common.StorageInfo;
-import org.apache.hadoop.hdfs.server.common.UpgradeManager;
-import org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
-import org.apache.hadoop.hdfs.server.namenode.EditLogFileInputStream;
-import org.apache.hadoop.hdfs.util.DataTransferThrottler;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
+import org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
 import org.apache.hadoop.hdfs.util.InjectionEvent;
 import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.hdfs.util.MD5FileUtils;
 import org.apache.hadoop.io.MD5Hash;
 
 /**
  * FSImage handles checkpointing and logging of the namespace edits.
  * 
  */
-public class FSImage extends Storage {
+public class FSImage {
 
-  private static final SimpleDateFormat DATE_FORM =
-    new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+  static final Log LOG = LogFactory.getLog(FSImage.class.getName());
   
-  static final String MESSAGE_DIGEST_PROPERTY = "imageMD5Digest";
+  NNStorage storage;
+  Configuration conf;
+  private NNStorageRetentionManager archivalManager;
   
   private final SaveNamespaceContext saveNamespaceContext 
     = new SaveNamespaceContext();
-
-  //
-  // The filenames used for storing the images
-  //
-  enum NameNodeFile {
-    IMAGE     ("fsimage"),
-    TIME      ("fstime"),
-    EDITS     ("edits"),
-    IMAGE_NEW ("fsimage.ckpt"),
-    EDITS_NEW ("edits.new");
-    
-    private String fileName = null;
-    private NameNodeFile(String name) {this.fileName = name;}
-    String getName() {return fileName;}
-  }
-
-  // checkpoint states
-  enum CheckpointStates {
-    START(0), 
-    ROLLED_EDITS(1), 
-    UPLOAD_START(2), 
-    UPLOAD_DONE(3); 
-
-    private final int code;
-
-    CheckpointStates(int code) {
-      this.code = code;
-    }
-
-    public int serialize() {
-      return this.code;
-    }
-
-    public static CheckpointStates deserialize(int code) {
-      switch(code) {
-      case 0:
-        return CheckpointStates.START;
-      case 1:
-        return CheckpointStates.ROLLED_EDITS;
-      case 2:
-        return CheckpointStates.UPLOAD_START;
-      case 3:
-        return CheckpointStates.UPLOAD_DONE;
-      default: // illegal
-        return null;
-      }
-    }
-  }
-
-  /**
-   * Implementation of StorageDirType specific to namenode storage
-   * A Storage directory could be of type IMAGE which stores only fsimage,
-   * or of type EDITS which stores edits or of type IMAGE_AND_EDITS which 
-   * stores both fsimage and edits.
-   */
-  static enum NameNodeDirType implements StorageDirType {
-    UNDEFINED,
-    IMAGE,
-    EDITS,
-    IMAGE_AND_EDITS;
-    
-    public StorageDirType getStorageDirType() {
-      return this;
-    }
-    
-    public boolean isOfType(StorageDirType type) {
-      if ((this == IMAGE_AND_EDITS) && (type == IMAGE || type == EDITS))
-        return true;
-      return this == type;
-    }
-  }
   
   protected FSNamesystem namesystem = null;
-  protected long checkpointTime = -1L;
   FSEditLog editLog = null;
   private boolean isUpgradeFinalized = false;
-  MD5Hash imageDigest = new MD5Hash();
-  private boolean newImageDigest = true;
-  MD5Hash checkpointImageDigest = null;
-  
-  /**
-   * flag that controls if we try to restore failed storages
-   */
-  private boolean restoreFailedStorage = false;
-  public void setRestoreFailedStorage(boolean val) {
-    LOG.info("enabled failed storage replicas restore");
-    restoreFailedStorage=val;
-  }
   
-  public boolean getRestoreFailedStorage() {
-    return restoreFailedStorage;
-  }
+  private NameNodeMetrics metrics = NameNode.getNameNodeMetrics();
 
   /**
-   * list of failed (and thus removed) storages
-   */
-  protected List<StorageDirectory> removedStorageDirs = new ArrayList<StorageDirectory>();
-  
-  /**
-   * Directories for importing an image from a checkpoint.
    */
-  private Collection<File> checkpointDirs;
-  private Collection<File> checkpointEditsDirs;
-
-  DataTransferThrottler imageTransferThrottler = null; // throttle image transfer
-  
-  /**
-   * Can fs-image be rolled?
-   */
-  volatile CheckpointStates ckptState = FSImage.CheckpointStates.START; 
-
-  /**
-   */
-  FSImage() {
-    this((FSNamesystem)null);
-  }
-
-  FSImage(FSNamesystem ns) {
-    super(NodeType.NAME_NODE);
-    this.editLog = new FSEditLog(this);
-    setFSNamesystem(ns);
+  FSImage() throws IOException{
+    storage = new NNStorage(new StorageInfo());
+    this.editLog = new FSEditLog(storage);
+    setFSNamesystem(null);
   }
 
   /**
@@ -194,39 +90,30 @@ public boolean getRestoreFailedStorage() {
    */
   FSImage(Configuration conf) throws IOException {
     this();
-    setCheckpointDirectories(FSImage.getCheckpointDirs(conf, null),
-        FSImage.getCheckpointEditsDirs(conf, null));
-    long transferBandwidth = conf.getLong(
-        HdfsConstants.DFS_IMAGE_TRANSFER_RATE_KEY,
-        HdfsConstants.DFS_IMAGE_TRANSFER_RATE_DEFAULT);
-
-    if (transferBandwidth > 0) {
-      this.imageTransferThrottler = new DataTransferThrottler(transferBandwidth);
-    }
+    this.conf = conf;
+    archivalManager = new NNStorageRetentionManager(conf, storage, editLog);
   }
   
   /**
    */
-  FSImage(Collection<File> fsDirs, Collection<File> fsEditsDirs) 
+  FSImage(Configuration conf, Collection<URI> fsDirs, Collection<URI> fsEditsDirs) 
     throws IOException {
-    this();
-    setStorageDirectories(fsDirs, fsEditsDirs);
-  }
-
-  public FSImage(StorageInfo storageInfo) {
-    super(NodeType.NAME_NODE, storageInfo);
+    this.conf = conf;
+    storage = new NNStorage(conf, fsDirs, fsEditsDirs);
+    this.editLog = new FSEditLog(conf, storage, fsEditsDirs);
+    archivalManager = new NNStorageRetentionManager(conf, storage, editLog);
   }
 
   /**
    * Represents an Image (image and edit file).
    */
-  public FSImage(File imageDir) throws IOException {
+  public FSImage(URI imageDir) throws IOException {
     this();
-    ArrayList<File> dirs = new ArrayList<File>(1);
-    ArrayList<File> editsDirs = new ArrayList<File>(1);
+    ArrayList<URI> dirs = new ArrayList<URI>(1);
+    ArrayList<URI> editsDirs = new ArrayList<URI>(1);
     dirs.add(imageDir);
     editsDirs.add(imageDir);
-    setStorageDirectories(dirs, editsDirs);
+    storage = new NNStorage(new Configuration(), dirs, editsDirs);
   }
 
   public boolean failOnTxIdMismatch() {
@@ -244,94 +131,25 @@ protected FSNamesystem getFSNamesystem() {
   protected void setFSNamesystem(FSNamesystem ns) {
     namesystem = ns;
   }
-
-  void setStorageDirectories(Collection<File> fsNameDirs,
-                        Collection<File> fsEditsDirs
-                             ) throws IOException {
-    this.storageDirs = new ArrayList<StorageDirectory>();
-    this.removedStorageDirs = new ArrayList<StorageDirectory>();
-   // Add all name dirs with appropriate NameNodeDirType 
-    for (File dirName : fsNameDirs) {
-      boolean isAlsoEdits = false;
-      for (File editsDirName : fsEditsDirs) {
-        if (editsDirName.compareTo(dirName) == 0) {
-          isAlsoEdits = true;
-          fsEditsDirs.remove(editsDirName);
-          break;
-        }
-      }
-      NameNodeDirType dirType = (isAlsoEdits) ?
-                          NameNodeDirType.IMAGE_AND_EDITS :
-                          NameNodeDirType.IMAGE;
-      this.addStorageDir(new StorageDirectory(dirName, dirType));
-    }
-    
-    // Add edits dirs if they are different from name dirs
-    for (File dirName : fsEditsDirs) {
-      this.addStorageDir(new StorageDirectory(dirName, 
-                    NameNodeDirType.EDITS));
-    }
-  }
-
-  void setCheckpointDirectories(Collection<File> dirs,
-                                Collection<File> editsDirs) {
-    checkpointDirs = dirs;
-    checkpointEditsDirs = editsDirs;
-  }
   
-  static File getImageFile(StorageDirectory sd, NameNodeFile type) {
-    return new File(sd.getCurrentDir(), type.getName());
+  public long getLastAppliedTxId() {
+    return editLog.getLastWrittenTxId();
   }
   
   List<StorageDirectory> getRemovedStorageDirs() {
-	  return this.removedStorageDirs;
-  }
-  
-  File getEditFile(StorageDirectory sd) {
-    return getImageFile(sd, NameNodeFile.EDITS);
-  }
-  
-  File getEditNewFile(StorageDirectory sd) {
-    return getImageFile(sd, NameNodeFile.EDITS_NEW);
-  }
-
-  File[] getFileNames(NameNodeFile type, NameNodeDirType dirType) {
-    ArrayList<File> list = new ArrayList<File>();
-    Iterator<StorageDirectory> it = (dirType == null) ? dirIterator() :
-                                    dirIterator(dirType);
-    for ( ;it.hasNext(); ) {
-      list.add(getImageFile(it.next(), type));
-    }
-    return list.toArray(new File[list.size()]);
-  }
-
-  File[] getImageFiles() {
-    return getFileNames(NameNodeFile.IMAGE, NameNodeDirType.IMAGE);
-  }
-
-  File[] getEditsFiles() {
-    return getFileNames(NameNodeFile.EDITS, NameNodeDirType.EDITS);
-  }
-
-  File[] getEditsNewFiles() {
-    return getFileNames(NameNodeFile.EDITS_NEW, NameNodeDirType.EDITS);
-  }
-
-  File[] getTimeFiles() {
-    return getFileNames(NameNodeFile.TIME, null);
+	  return storage.getRemovedStorageDirs();
   }
 
   /**
    * Get the MD5 digest of the current image
    * @return the MD5 digest of the current image
    */ 
-  MD5Hash getImageDigest() {
-    return imageDigest;
+  MD5Hash getImageDigest(long txid) throws IOException {
+    return storage.getCheckpointImageDigest(txid);
   }
 
-  void setImageDigest(MD5Hash imageDigest) {
-    newImageDigest = false;
-    this.imageDigest.set(imageDigest);
+  void setImageDigest(long txid, MD5Hash imageDigest) throws IOException {
+    this.storage.setCheckpointImageDigest(txid, imageDigest);
   }
   
   /**
@@ -345,96 +163,79 @@ void setImageDigest(MD5Hash imageDigest) {
    * @throws IOException
    * @return true if the image needs to be saved or false otherwise
    */
-  boolean recoverTransitionRead(Collection<File> dataDirs,
-                             Collection<File> editsDirs,
-                                StartupOption startOpt
-                                ) throws IOException {
+  
+  /**
+   * Analyze storage directories.
+   * Recover from previous transitions if required. 
+   * Perform fs state transition if necessary depending on the namespace info.
+   * Read storage info. 
+   * 
+   * @throws IOException
+   * @return true if the image needs to be saved or false otherwise
+   */
+  public boolean recoverTransitionRead(StartupOption startOpt)
+      throws IOException {
     assert startOpt != StartupOption.FORMAT : 
       "NameNode formatting should be performed before reading the image";
     
+    Collection<File> imageDirs = storage.getImageDirectories();
+
     // none of the data dirs exist
-    if (dataDirs.size() == 0 || editsDirs.size() == 0)  
+    if(imageDirs.size() == 0 && startOpt != StartupOption.IMPORT)  
       throw new IOException(
-        "All specified directories are not accessible or do not exist.");
+          "All specified directories are not accessible or do not exist.");
+    editLog.checkJournals();
     
-    if(startOpt == StartupOption.IMPORT 
-        && (checkpointDirs == null || checkpointDirs.isEmpty()))
-      throw new IOException("Cannot import image from a checkpoint. "
-                          + "\"fs.checkpoint.dir\" is not set." );
-
-    if(startOpt == StartupOption.IMPORT 
-        && (checkpointEditsDirs == null || checkpointEditsDirs.isEmpty()))
-      throw new IOException("Cannot import image from a checkpoint. "
-                          + "\"fs.checkpoint.edits.dir\" is not set." );
+    storage.setUpgradeManager(namesystem.upgradeManager);
     
-    setStorageDirectories(dataDirs, editsDirs);
     // 1. For each data directory calculate its state and 
     // check whether all is consistent before transitioning.
     Map<StorageDirectory, StorageState> dataDirStates = 
              new HashMap<StorageDirectory, StorageState>();
-    boolean isFormatted = false;
-    for (Iterator<StorageDirectory> it = 
-                      dirIterator(); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      StorageState curState;
-      try {
-        curState = sd.analyzeStorage(startOpt);
-        // sd is locked but not opened
-        switch(curState) {
-        case NON_EXISTENT:
-          // name-node fails if any of the configured storage dirs are missing
-          throw new InconsistentFSStateException(sd.getRoot(),
-                                                 "storage directory does not exist or is not accessible.");
-        case NOT_FORMATTED:
-          break;
-        case NORMAL:
-          break;
-        default:  // recovery is possible
-          sd.doRecover(curState);      
-        }
-        if (curState != StorageState.NOT_FORMATTED 
-            && startOpt != StartupOption.ROLLBACK) {
-          sd.read(); // read and verify consistency with other directories
-          isFormatted = true;
-        }
-        if (startOpt == StartupOption.IMPORT && isFormatted)
-          // import of a checkpoint is allowed only into empty image directories
-          throw new IOException("Cannot import image from a checkpoint. " 
-              + " NameNode already contains an image in " + sd.getRoot());
-      } catch (IOException ioe) {
-        sd.unlock();
-        throw ioe;
-      }
-      dataDirStates.put(sd,curState);
-    }
+    boolean isFormatted = recoverStorageDirs(startOpt, dataDirStates);
     
     if (!isFormatted && startOpt != StartupOption.ROLLBACK 
-                     && startOpt != StartupOption.IMPORT)
-      throw new IOException("NameNode is not formatted.");
-    if (layoutVersion < LAST_PRE_UPGRADE_LAYOUT_VERSION) {
-      checkVersionUpgradable(layoutVersion);
+                     && startOpt != StartupOption.IMPORT) {
+      for(Entry<StorageDirectory, StorageState> e : dataDirStates.entrySet()) {
+        LOG.info("State : " + e.getKey().getCurrentDir() + " state: " +e.getValue());
+      }
+      throw new IOException("NameNode is not formatted." + dataDirStates);      
+    }
+
+
+    int layoutVersion = storage.getLayoutVersion();
+    if (layoutVersion < Storage.LAST_PRE_UPGRADE_LAYOUT_VERSION) {
+      NNStorage.checkVersionUpgradable(storage.getLayoutVersion());
     }
     if (startOpt != StartupOption.UPGRADE
-          && layoutVersion < LAST_PRE_UPGRADE_LAYOUT_VERSION
-          && layoutVersion != FSConstants.LAYOUT_VERSION)
-        throw new IOException(
-                          "\nFile system image contains an old layout version " + layoutVersion
-                          + ".\nAn upgrade to version " + FSConstants.LAYOUT_VERSION
-                          + " is required.\nPlease restart NameNode with -upgrade option.");
-    // check whether distributed upgrade is reguired and/or should be continued
-    verifyDistributedUpgradeProgress(startOpt);
+        && layoutVersion < Storage.LAST_PRE_UPGRADE_LAYOUT_VERSION
+        && layoutVersion != FSConstants.LAYOUT_VERSION) {
+      throw new IOException(
+          "\nFile system image contains an old layout version " 
+          + storage.getLayoutVersion() + ".\nAn upgrade to version "
+          + FSConstants.LAYOUT_VERSION + " is required.\n"
+          + "Please restart NameNode with -upgrade option.");
+    }
+
+    // check whether distributed upgrade is required and/or should be continued
+    storage.verifyDistributedUpgradeProgress(startOpt);
 
     // 2. Format unformatted dirs.
-    this.checkpointTime = 0L;
-    for (Iterator<StorageDirectory> it = 
-                     dirIterator(); it.hasNext();) {
+    for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
       StorageDirectory sd = it.next();
       StorageState curState = dataDirStates.get(sd);
       switch(curState) {
       case NON_EXISTENT:
-        assert false : StorageState.NON_EXISTENT + " state cannot be here";
-      case NOT_FORMATTED:
+        throw new IOException(StorageState.NON_EXISTENT + 
+                              " state cannot be here");
+      case NOT_FORMATTED:        
         LOG.info("Storage directory " + sd.getRoot() + " is not formatted.");
+        if (!sd.isEmpty()) {
+          LOG.error("Storage directory " + sd.getRoot()
+            + " is not empty, and will not be formatted! Exiting.");
+          throw new IOException(
+            "Storage directory " + sd.getRoot() + " is not empty!");
+        }   
         LOG.info("Formatting ...");
         sd.clearDirectory(); // create empty currrent dir
         break;
@@ -450,7 +251,7 @@ boolean recoverTransitionRead(Collection<File> dataDirs,
       return false; // upgrade saved image already
     case IMPORT:
       doImportCheckpoint();
-      return true;
+      return false; // import checkpoint saved image already
     case ROLLBACK:
       doRollback();
       break;
@@ -459,7 +260,7 @@ boolean recoverTransitionRead(Collection<File> dataDirs,
     }
     
     if (inUpgradeStatus()) {
-    	namesystem.setUpgradeStartTime(FSNamesystem.now());
+      namesystem.setUpgradeStartTime(FSNamesystem.now());
     }
     return loadFSImage();
   }
@@ -468,7 +269,7 @@ boolean recoverTransitionRead(Collection<File> dataDirs,
    * @return true if Nn is under upgrade.
    */
   private boolean inUpgradeStatus() {
-    for (Iterator <StorageDirectory> it = dirIterator(); it.hasNext();) {
+    for (Iterator <StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
       StorageDirectory sd = it.next();
       File preDir = sd.getPreviousDir();
       if (preDir.exists()) {
@@ -477,113 +278,143 @@ private boolean inUpgradeStatus() {
     }
     return false;
   }
+  
+  /**
+   * For each storage directory, performs recovery of incomplete transitions
+   * (eg. upgrade, rollback, checkpoint) and inserts the directory's storage
+   * state into the dataDirStates map.
+   * @param dataDirStates output of storage directory states
+   * @return true if there is at least one valid formatted storage directory
+   */
+  private boolean recoverStorageDirs(StartupOption startOpt,
+      Map<StorageDirectory, StorageState> dataDirStates) throws IOException {
+    boolean isFormatted = false;
+    for (Iterator<StorageDirectory> it = 
+                      storage.dirIterator(); it.hasNext();) {
+      StorageDirectory sd = it.next();
+      StorageState curState;
+      try {
+        curState = sd.analyzeStorage(startOpt);
+        // sd is locked but not opened
+        switch(curState) {
+        case NON_EXISTENT:
+          // name-node fails if any of the configured storage dirs are missing
+          throw new InconsistentFSStateException(sd.getRoot(),
+                      "storage directory does not exist or is not accessible.");
+        case NOT_FORMATTED:
+          break;
+        case NORMAL:
+          break;
+        default:  // recovery is possible
+          sd.doRecover(curState);      
+        }
+        if (curState != StorageState.NOT_FORMATTED 
+            && startOpt != StartupOption.ROLLBACK) {
+          // read and verify consistency with other directories
+          sd.read();
+          isFormatted = true;
+        }
+        if (startOpt == StartupOption.IMPORT && isFormatted)
+          // import of a checkpoint is allowed only into empty image directories
+          throw new IOException("Cannot import image from a checkpoint. " 
+              + " NameNode already contains an image in " + sd.getRoot());
+      } catch (IOException ioe) {
+        sd.unlock();
+        throw ioe;
+      }
+      dataDirStates.put(sd,curState);
+    }
+    return isFormatted;
+  }
 
   private void doUpgrade() throws IOException {
     namesystem.setUpgradeStartTime(FSNamesystem.now());
-    if(getDistributedUpgradeState()) {
+    if(storage.getDistributedUpgradeState()) {
       // only distributed upgrade need to continue
       // don't do version upgrade
       this.loadFSImage();
-      initializeDistributedUpgrade();
+      storage.initializeDistributedUpgrade();
       return;
     }
     // Upgrade is allowed only if there are 
     // no previous fs states in any of the directories
-    for (Iterator<StorageDirectory> it = 
-                           dirIterator(); it.hasNext();) {
+    for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
       StorageDirectory sd = it.next();
       if (sd.getPreviousDir().exists())
         throw new InconsistentFSStateException(sd.getRoot(),
-                                               "previous fs state should not exist during upgrade. "
-                                               + "Finalize or rollback first.");
+            "previous fs state should not exist during upgrade. "
+            + "Finalize or rollback first.");
     }
 
     // load the latest image
     this.loadFSImage();
+    // clear the digest for the loaded image, it might change during upgrade
+    this.storage.clearCheckpointImageDigest(storage
+        .getMostRecentCheckpointTxId());
 
     // Do upgrade for each directory
-    long oldCTime = this.getCTime();
-    this.cTime = FSNamesystem.now();  // generate new cTime for the state
-    int oldLV = this.getLayoutVersion();
-    this.layoutVersion = FSConstants.LAYOUT_VERSION;
-    this.checkpointTime = FSNamesystem.now();
-    List<Thread> savers = new ArrayList<Thread>();
-    saveNamespaceContext.set(namesystem, editLog.getLastWrittenTxId());
-
-    for (Iterator<StorageDirectory> it = 
-                           dirIterator(); it.hasNext();) {
+    long oldCTime = storage.getCTime();
+    this.storage.cTime = FSNamesystem.now();  // generate new cTime for the state
+    int oldLV = storage.getLayoutVersion();
+    this.storage.layoutVersion = FSConstants.LAYOUT_VERSION;
+    
+    List<StorageDirectory> errorSDs =
+      Collections.synchronizedList(new ArrayList<StorageDirectory>());
+    for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
       StorageDirectory sd = it.next();
-      LOG.info("Upgrading image directory " + sd.getRoot()
+      LOG.info("Starting upgrade of image directory " + sd.getRoot()
                + ".\n   old LV = " + oldLV
                + "; old CTime = " + oldCTime
-               + ".\n   new LV = " + this.getLayoutVersion()
-               + "; new CTime = " + this.getCTime());
-      File curDir = sd.getCurrentDir();
-      File prevDir = sd.getPreviousDir();
-      File tmpDir = sd.getPreviousTmp();
+               + ".\n   new LV = " + storage.getLayoutVersion()
+               + "; new CTime = " + storage.getCTime());
       try {
+        File curDir = sd.getCurrentDir();
+        File prevDir = sd.getPreviousDir();
+        File tmpDir = sd.getPreviousTmp();
         assert curDir.exists() : "Current directory must exist.";
         assert !prevDir.exists() : "prvious directory must not exist.";
         assert !tmpDir.exists() : "prvious.tmp directory must not exist.";
+        assert !editLog.isOpen() : "Edits log must not be open.";
+
         // rename current to tmp
-        rename(curDir, tmpDir);
-        // save new image
-        if (!curDir.mkdir())
+        NNStorage.rename(curDir, tmpDir);
+        
+        if (!curDir.mkdir()) {
           throw new IOException("Cannot create directory " + curDir);
+        }
       } catch (Exception e) {
-        LOG.error("Error upgrading " + sd.getRoot(), e);
-        saveNamespaceContext.reportErrorOnStorageDirectory(sd);
+        LOG.error("Failed to move aside pre-upgrade storage " +
+            "in image directory " + sd.getRoot(), e);
+        errorSDs.add(sd);
         continue;
       }
-    }    
-    for (Iterator<StorageDirectory> it = dirIterator(NameNodeDirType.IMAGE); 
-                it.hasNext();) {
-    StorageDirectory sd = it.next();
-      // save image to image directory
-      FSImageSaver saver = new FSImageSaver(saveNamespaceContext, sd, false, NameNodeFile.IMAGE);
-      Thread saverThread = new Thread(saver, saver.toString());
-      savers.add(saverThread);
-      saverThread.start();
-    }
- 
-    // wait until all images are saved
-    for (Thread saver : savers) {
-      try {
-        saver.join();
-      } catch (InterruptedException iex) {
-        LOG.info("Caught exception while waiting for thread " + 
-            saver.getName() + " to finish. Retrying join");
-        throw (IOException)new InterruptedIOException().initCause(iex);
-      }
-    }  
-    for (Iterator<StorageDirectory> it = dirIterator(NameNodeDirType.EDITS);
-                it.hasNext();) {
-      // create empty edit log file
-      StorageDirectory sd = it.next();
-      editLog.createEditLogFile(getImageFile(sd, NameNodeFile.EDITS));
     }
+    storage.reportErrorsOnDirectories(errorSDs);
+    errorSDs.clear();
+
+    saveFSImageInAllDirs(editLog.getLastWrittenTxId(), false);
 
-    for (Iterator<StorageDirectory> it = dirIterator(); it.hasNext();) {
+    for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
       StorageDirectory sd = it.next();
-      if (saveNamespaceContext.getErrorSDs().contains(sd)) continue;
       try {
-        // write version and time files
+        // Write the version file, since saveFsImage above only makes the
+        // fsimage, and the directory is otherwise empty.
         sd.write();
+        
+        File prevDir = sd.getPreviousDir();
+        File tmpDir = sd.getPreviousTmp();
         // rename tmp to previous
-        rename(sd.getPreviousTmp(), sd.getPreviousDir());
+        NNStorage.rename(tmpDir, prevDir);
       } catch (IOException ioe) {
-        LOG.error("Error upgrading " + sd.getRoot(), ioe);
-        saveNamespaceContext.reportErrorOnStorageDirectory(sd);
+        LOG.error("Unable to rename temp to previous for " + sd.getRoot(), ioe);
+        errorSDs.add(sd);
         continue;
       }
       isUpgradeFinalized = false;
       LOG.info("Upgrade of " + sd.getRoot() + " is complete.");
     }
-    saveNamespaceContext.clear();
-    processIOError(saveNamespaceContext.getErrorSDs());
-    initializeDistributedUpgrade();
-    editLog.open();
-    saveNamespaceContext.clear();
+    storage.reportErrorsOnDirectories(errorSDs);
+    storage.initializeDistributedUpgrade();
   }
 
   private void doRollback() throws IOException {
@@ -591,54 +422,63 @@ private void doRollback() throws IOException {
     // a previous fs states in at least one of the storage directories.
     // Directories that don't have previous state do not rollback
     boolean canRollback = false;
-    FSImage prevState = new FSImage(getFSNamesystem());
-    prevState.layoutVersion = FSConstants.LAYOUT_VERSION;
-    for (Iterator<StorageDirectory> it = 
-                       dirIterator(); it.hasNext();) {
+    FSImage prevState = new FSImage(conf);
+    prevState.storage.layoutVersion = FSConstants.LAYOUT_VERSION;
+    for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
       StorageDirectory sd = it.next();
       File prevDir = sd.getPreviousDir();
       if (!prevDir.exists()) {  // use current directory then
         LOG.info("Storage directory " + sd.getRoot()
                  + " does not contain previous fs state.");
-        sd.read(); // read and verify consistency with other directories
+        // read and verify consistency with other directories
+        sd.read();
         continue;
       }
-      StorageDirectory sdPrev = prevState.new StorageDirectory(sd.getRoot());
-      sdPrev.read(sdPrev.getPreviousVersionFile());  // read and verify consistency of the prev dir
+
+      // read and verify consistency of the prev dir
+      sd.read(sd.getPreviousVersionFile());
+
+      if (prevState.getLayoutVersion() != FSConstants.LAYOUT_VERSION) {
+        throw new IOException(
+          "Cannot rollback to storage version " +
+          prevState.getLayoutVersion() +
+          " using this version of the NameNode, which uses storage version " +
+          FSConstants.LAYOUT_VERSION + ". " +
+          "Please use the previous version of HDFS to perform the rollback.");
+      }
       canRollback = true;
     }
     if (!canRollback)
-      throw new IOException("Cannot rollback. " 
-                            + "None of the storage directories contain previous fs state.");
+      throw new IOException("Cannot rollback. None of the storage "
+                            + "directories contain previous fs state.");
 
     // Now that we know all directories are going to be consistent
     // Do rollback for each directory containing previous state
-    for (Iterator<StorageDirectory> it = 
-                          dirIterator(); it.hasNext();) {
+    for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
       StorageDirectory sd = it.next();
       File prevDir = sd.getPreviousDir();
       if (!prevDir.exists())
         continue;
 
       LOG.info("Rolling back storage directory " + sd.getRoot()
-               + ".\n   new LV = " + prevState.getLayoutVersion()
-               + "; new CTime = " + prevState.getCTime());
+               + ".\n   new LV = " + prevState.storage.getLayoutVersion()
+               + "; new CTime = " + prevState.storage.getCTime());
       File tmpDir = sd.getRemovedTmp();
       assert !tmpDir.exists() : "removed.tmp directory must not exist.";
       // rename current to tmp
       File curDir = sd.getCurrentDir();
       assert curDir.exists() : "Current directory must exist.";
-      rename(curDir, tmpDir);
+      NNStorage.rename(curDir, tmpDir);
       // rename previous to current
-      rename(prevDir, curDir);
+      NNStorage.rename(prevDir, curDir);
 
       // delete tmp dir
-      deleteDir(tmpDir);
+      NNStorage.deleteDir(tmpDir);
       LOG.info("Rollback of " + sd.getRoot()+ " is complete.");
     }
     isUpgradeFinalized = true;
     // check whether name-node can start in regular mode
-    verifyDistributedUpgradeProgress(StartupOption.REGULAR);
+    storage.verifyDistributedUpgradeProgress(StartupOption.REGULAR);
   }
 
   private void doFinalize(StorageDirectory sd) throws IOException {
@@ -650,14 +490,15 @@ private void doFinalize(StorageDirectory sd) throws IOException {
     }
     LOG.info("Finalizing upgrade for storage directory " 
              + sd.getRoot() + "."
-             + (getLayoutVersion()==0 ? "" :
-                   "\n   cur LV = " + this.getLayoutVersion()
-                   + "; cur CTime = " + this.getCTime()));
+             + (storage.getLayoutVersion()==0 ? "" :
+                   "\n   cur LV = " + storage.getLayoutVersion()
+                   + "; cur CTime = " + storage.getCTime()));
     assert sd.getCurrentDir().exists() : "Current directory must exist.";
     final File tmpDir = sd.getFinalizedTmp();
     // rename previous to tmp and remove
-    rename(prevDir, tmpDir);
-    deleteDir(tmpDir);
+    NNStorage.rename(prevDir, tmpDir);
+    NNStorage.deleteDir(tmpDir);
+    isUpgradeFinalized = true;
     LOG.info("Finalize upgrade for " + sd.getRoot()+ " is complete.");
   }
 
@@ -665,30 +506,53 @@ private void doFinalize(StorageDirectory sd) throws IOException {
    * Load image from a checkpoint directory and save it into the current one.
    * @throws IOException
    */
+  /**
+   * Load image from a checkpoint directory and save it into the current one.
+   * @param target the NameSystem to import into
+   * @throws IOException
+   */
   void doImportCheckpoint() throws IOException {
-    FSNamesystem fsNamesys = getFSNamesystem();
-    FSImage ckptImage = new FSImage(fsNamesys);
+    Collection<URI> checkpointDirs =
+      NNStorageConfiguration.getCheckpointDirs(conf, null);
+    Collection<URI> checkpointEditsDirs =
+        NNStorageConfiguration.getCheckpointEditsDirs(conf, null);
+
+    if (checkpointDirs == null || checkpointDirs.isEmpty()) {
+      throw new IOException("Cannot import image from a checkpoint. "
+                            + "\"dfs.namenode.checkpoint.dir\" is not set." );
+    }
+    
+    if (checkpointEditsDirs == null || checkpointEditsDirs.isEmpty()) {
+      throw new IOException("Cannot import image from a checkpoint. "
+                            + "\"dfs.namenode.checkpoint.dir\" is not set." );
+    }
+
     // replace real image with the checkpoint image
-    FSImage realImage = fsNamesys.getFSImage();
+    FSImage realImage = namesystem.getFSImage();
     assert realImage == this;
-    fsNamesys.dir.fsImage = ckptImage;
+    FSImage ckptImage = new FSImage(conf, 
+                                    checkpointDirs, checkpointEditsDirs);
+    ckptImage.setFSNamesystem(namesystem);
+    namesystem.dir.fsImage = ckptImage;
     // load from the checkpoint dirs
     try {
-      ckptImage.recoverTransitionRead(checkpointDirs, checkpointEditsDirs,
-                                              StartupOption.REGULAR);
+      ckptImage.recoverTransitionRead(StartupOption.REGULAR);
     } finally {
       ckptImage.close();
     }
     // return back the real image
-    realImage.setStorageInfo(ckptImage);
-    fsNamesys.dir.fsImage = realImage;
-    // and save it
-    saveNamespace(false);
+    realImage.storage.setStorageInfo(ckptImage.storage);
+    realImage.getEditLog().setLastWrittenTxId(ckptImage.getEditLog().getLastWrittenTxId() + 1);
+
+    namesystem.dir.fsImage = realImage;
+
+    // and save it but keep the same checkpointTime
+    // parameters
+    saveNamespace();
   }
 
-  void finalizeUpgrade() throws IOException {
-    for (Iterator<StorageDirectory> it = 
-                          dirIterator(); it.hasNext();) {
+  public void finalizeUpgrade() throws IOException {
+    for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
       doFinalize(it.next());
     }
     isUpgradeFinalized = true;
@@ -699,392 +563,140 @@ boolean isUpgradeFinalized() {
     return isUpgradeFinalized;
   }
 
-  protected void getFields(Properties props, 
-                           StorageDirectory sd 
-                           ) throws IOException {
-    super.getFields(props, sd);
-    if (layoutVersion == 0)
-      throw new IOException("NameNode directory " 
-                            + sd.getRoot() + " is not formatted.");
-    String sDUS, sDUV;
-    sDUS = props.getProperty("distributedUpgradeState"); 
-    sDUV = props.getProperty("distributedUpgradeVersion");
-    setDistributedUpgradeState(
-        sDUS == null? false : Boolean.parseBoolean(sDUS),
-        sDUV == null? getLayoutVersion() : Integer.parseInt(sDUV));
-    String sMd5 = props.getProperty(MESSAGE_DIGEST_PROPERTY);
-    if (layoutVersion <= -26) {
-      if (sMd5 == null) {
-        throw new InconsistentFSStateException(sd.getRoot(),
-            "file " + STORAGE_FILE_VERSION + " does not have MD5 image digest.");
-      }
-      this.setImageDigest(new MD5Hash(sMd5));
-    } else if (sMd5 != null) {
-      throw new InconsistentFSStateException(sd.getRoot(),
-          "file " + STORAGE_FILE_VERSION + 
-          " has image MD5 digest when version is " + layoutVersion);
-    }
-    this.checkpointTime = readCheckpointTime(sd);
-  }
-
-  long readCheckpointTime(StorageDirectory sd) throws IOException {
-    File timeFile = getImageFile(sd, NameNodeFile.TIME);
-    long timeStamp = 0L;
-    if (timeFile.exists() && timeFile.canRead()) {
-      DataInputStream in = new DataInputStream(new FileInputStream(timeFile));
-      try {
-        timeStamp = in.readLong();
-      } finally {
-        in.close();
-      }
-    }
-    return timeStamp;
+  public FSEditLog getEditLog() {
+    return editLog;
   }
-
-  /**
-   * Write last checkpoint time and version file into the storage directory.
-   * 
-   * The version file should always be written last.
-   * Missing or corrupted version file indicates that 
-   * the checkpoint is not valid.
-   * 
-   * @param sd storage directory
-   * @throws IOException
-   */
-  protected void setFields(Properties props, 
-                           StorageDirectory sd 
-                           ) throws IOException {
-    super.setFields(props, sd);
-    boolean uState = getDistributedUpgradeState();
-    int uVersion = getDistributedUpgradeVersion();
-    if(uState && uVersion != getLayoutVersion()) {
-      props.setProperty("distributedUpgradeState", Boolean.toString(uState));
-      props.setProperty("distributedUpgradeVersion", Integer.toString(uVersion)); 
+  
+  void openEditLog() throws IOException {
+    if (editLog == null) {
+      throw new IOException("EditLog must be initialized");
     }
-    if (this.newImageDigest) {
-      this.setImageDigest(MD5Hash.digest(
-          new FileInputStream(getImageFile(sd, NameNodeFile.IMAGE))));
+    if (!editLog.isOpen()) {
+      editLog.open();
+      storage.writeTransactionIdFileToStorage(editLog.getCurSegmentTxId());
     }
-    props.setProperty(MESSAGE_DIGEST_PROPERTY, 
-        this.getImageDigest().toString());
-    writeCheckpointTime(sd);
-  }
+  };
 
   /**
-   * Write last checkpoint time into a separate file.
+   * Choose latest image from one of the directories,
+   * load it and merge with the edits from that directory.
    * 
-   * @param sd
+   * @return whether the image should be saved
    * @throws IOException
    */
-  void writeCheckpointTime(StorageDirectory sd) throws IOException {
-    if (checkpointTime < 0L)
-      return; // do not write negative time
-    File timeFile = getImageFile(sd, NameNodeFile.TIME);
-    if (timeFile.exists()) { timeFile.delete(); }
-    DataOutputStream out = new DataOutputStream(
-                                                new FileOutputStream(timeFile));
-    try {
-      out.writeLong(checkpointTime);
-    } finally {
-      out.close();
-    }
-  }
+  boolean loadFSImage() throws IOException {
+    FSImageStorageInspector inspector = storage.readAndInspectDirs();
+    isUpgradeFinalized = inspector.isUpgradeFinalized();
 
-  /**
-   * Record new checkpoint time in order to
-   * distinguish healthy directories from the removed ones.
-   * If there is an error writing new checkpoint time, the corresponding
-   * storage directory is removed from the list.
-   */
-  void incrementCheckpointTime() {
-    this.checkpointTime++;
+    FSImageStorageInspector.FSImageFile imageFile = inspector.getLatestImage();
+    boolean needToSave = inspector.needToSave();
+
+    Iterable<EditLogInputStream> editStreams = null;
+    editLog.recoverUnclosedStreams();
     
-    // Write new checkpoint time in all storage directories
-    for(Iterator<StorageDirectory> it =
-                          dirIterator(); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      try {
-        writeCheckpointTime(sd);
-      } catch(IOException e) {
-        // Close any edits stream associated with this dir and remove directory
-        LOG.warn("incrementCheckpointTime failed on " + sd.getRoot().getPath() + ";type="+sd.getStorageDirType());
-        if (sd.getStorageDirType().isOfType(NameNodeDirType.EDITS))
-          editLog.processIOError(sd);
-
-        //add storage to the removed list
-        removedStorageDirs.add(sd);
-        it.remove();
-      }
-    }
-  }
-  
-  /**
-   * Remove storage directory given directory
-   */
-  void processIOError(File dirName) {
-    for (Iterator<StorageDirectory> it = 
-      dirIterator(); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      if (sd.getRoot().getPath().equals(dirName.getPath())) {
-        //add storage to the removed list
-        LOG.warn("FSImage:processIOError: removing storage: " + dirName.getPath());
-        try {
-          sd.unlock(); //try to unlock before removing (in case it is restored)
-        } catch (Exception e) {
-          LOG.info("Unable to unlock bad storage directory : " +  dirName.getPath());
-        }
-        removedStorageDirs.add(sd);
-        it.remove();
-      }
+    if (LayoutVersion.supports(Feature.TXID_BASED_LAYOUT, getLayoutVersion())) {
+      LOG.info("Load Image: checkpoint txid: " + imageFile.getCheckpointTxId()
+          + " max seen: " + inspector.getMaxSeenTxId());
+      editStreams = editLog.selectInputStreams(
+          imageFile.getCheckpointTxId() + 1, inspector.getMaxSeenTxId());
+    } else {
+      editStreams = FSImagePreTransactionalStorageInspector.getEditLogStreams(
+          storage, conf);
     }
-  }
 
-  /**
-   * @param sds - array of SDs to process
-   */
-  void processIOError(List<StorageDirectory> sds) throws IOException {
-    synchronized (sds) {
-      for (StorageDirectory sd : sds) {
-        for (Iterator<StorageDirectory> it = dirIterator(); it.hasNext();) {
-          StorageDirectory sd1 = it.next();
-          if (sd.equals(sd1)) {
-            // add storage to the removed list
-            LOG.warn("FSImage:processIOError: removing storage: "
-                + sd.getRoot().getPath());
-            try {
-              sd1.unlock(); // unlock before removing (in case it will be
-                            // restored)
-            } catch (Exception e) {
-              LOG.info("Unable to unlock bad storage directory : " +  sd.getRoot().getPath());
-            }
-            removedStorageDirs.add(sd1);
-            it.remove();
-            break;
-          }
-        }
-      }
+    LOG.info("Load Image: planning to load image :\n" + imageFile);
+    for (EditLogInputStream l : editStreams) {
+      LOG.info("Load Image: planning to load edit stream: " + l);
     }
-    if (this.getNumStorageDirs() == 0)
-      throw new IOException("No more storage directory left");
-  }
 
-  public FSEditLog getEditLog() {
-    return editLog;
-  }
-
-  public boolean isConversionNeeded(StorageDirectory sd) throws IOException {
-    File oldImageDir = new File(sd.getRoot(), "image");
-    if (!oldImageDir.exists()) {
-      if(sd.getVersionFile().exists())
-        throw new InconsistentFSStateException(sd.getRoot(),
-            oldImageDir + " does not exist.");
-      return false;
-    }
-    // check the layout version inside the image file
-    File oldF = new File(oldImageDir, "fsimage");
-    RandomAccessFile oldFile = new RandomAccessFile(oldF, "rws");
     try {
-      oldFile.seek(0);
-      int odlVersion = oldFile.readInt();
-      if (odlVersion < LAST_PRE_UPGRADE_LAYOUT_VERSION)
-        return false;
-    } finally {
-      oldFile.close();
-    }
-    return true;
-  }
-  
-  //
-  // Atomic move sequence, to recover from interrupted checkpoint
-  //
-  boolean recoverInterruptedCheckpoint(StorageDirectory nameSD,
-                                       StorageDirectory editsSD) 
-                                       throws IOException {
-    boolean needToSave = false;
-    File curFile = getImageFile(nameSD, NameNodeFile.IMAGE);
-    File ckptFile = getImageFile(nameSD, NameNodeFile.IMAGE_NEW);
-
-    //
-    // If we were in the midst of a checkpoint
-    //
-    if (ckptFile.exists()) {
-      needToSave = true;
-      if (getImageFile(editsSD, NameNodeFile.EDITS_NEW).exists()) {
-        //
-        // checkpointing migth have uploaded a new
-        // merged image, but we discard it here because we are
-        // not sure whether the entire merged image was uploaded
-        // before the namenode crashed.
-        //
-        if (!ckptFile.delete()) {
-          throw new IOException("Unable to delete " + ckptFile);
+      StorageDirectory sdForProperties = imageFile.sd;
+      sdForProperties.read();
+
+      if (LayoutVersion.supports(Feature.TXID_BASED_LAYOUT, getLayoutVersion())) {
+        // For txid-based layout, we should have a .md5 file
+        // next to the image file
+        loadFSImage(imageFile.getFile());
+      } else if (LayoutVersion.supports(Feature.FSIMAGE_CHECKSUM,
+          getLayoutVersion())) {
+        // In 0.22, we have the checksum stored in the VERSION file.
+        String md5 = storage
+            .getDeprecatedProperty(NNStorage.MESSAGE_DIGEST_PROPERTY);
+        if (md5 == null) {
+          throw new InconsistentFSStateException(sdForProperties.getRoot(),
+              "Message digest property " + NNStorage.MESSAGE_DIGEST_PROPERTY
+                  + " not set for storage directory "
+                  + sdForProperties.getRoot());
         }
+        loadFSImage(imageFile.getFile(), new MD5Hash(md5));
       } else {
-        //
-        // checkpointing was in progress when the namenode
-        // shutdown. The fsimage.ckpt was created and the edits.new
-        // file was moved to edits. We complete that checkpoint by
-        // moving fsimage.new to fsimage. There is no need to 
-        // update the fstime file here. renameTo fails on Windows
-        // if the destination file already exists.
-        //
-        if (!ckptFile.renameTo(curFile)) {
-          if (!curFile.delete())
-            LOG.warn("Unable to delete dir " + curFile + " before rename");
-          if (!ckptFile.renameTo(curFile)) {
-            throw new IOException("Unable to rename " + ckptFile +
-                                  " to " + curFile);
-          }
-        }
+        // We don't have any record of the md5sum
+        loadFSImage(imageFile.getFile(), null);
       }
+    } catch (IOException ioe) {
+      FSEditLog.closeAllStreams(editStreams);
+      throw new IOException("Failed to load image from " + imageFile, ioe);
     }
+           
+    editLog.setLastWrittenTxId(storage.getMostRecentCheckpointTxId());
+
+    long numLoaded = loadEdits(editStreams);
+    needToSave |= needsResaveBasedOnStaleCheckpoint(imageFile.getFile(),
+                                                   numLoaded);             
     return needToSave;
   }
-
+  
   /**
-   * Choose latest image from one of the directories,
-   * load it and merge with the edits from that directory.
-   * 
-   * @return whether the image should be saved
-   * @throws IOException
+   * @param imageFile
+   *          the image file that was loaded
+   * @param numEditsLoaded
+   *          the number of edits loaded from edits logs
+   * @return true if the NameNode should automatically save the namespace when
+   *         it is started, due to the latest checkpoint being too old.
    */
-  boolean loadFSImage() throws IOException {
-    // Now check all curFiles and see which is the newest
-    long latestNameCheckpointTime = Long.MIN_VALUE;
-    long latestEditsCheckpointTime = Long.MIN_VALUE;
-    StorageDirectory latestNameSD = null;
-    StorageDirectory latestEditsSD = null;
-    boolean needToSave = false;
-    isUpgradeFinalized = true;
-    Collection<String> imageDirs = new ArrayList<String>();
-    Collection<String> editsDirs = new ArrayList<String>();
-    for (Iterator<StorageDirectory> it = dirIterator(); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      if (!sd.getVersionFile().exists()) {
-        needToSave |= true;
-        continue; // some of them might have just been formatted
-      }
-      boolean imageExists = false, editsExists = false;
-      if (sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE)) {
-        imageExists = getImageFile(sd, NameNodeFile.IMAGE).exists();
-        imageDirs.add(sd.getRoot().getCanonicalPath());
-      }
-      if (sd.getStorageDirType().isOfType(NameNodeDirType.EDITS)) {
-        editsExists = getImageFile(sd, NameNodeFile.EDITS).exists();
-        editsDirs.add(sd.getRoot().getCanonicalPath());
-        needToSave |= getImageFile(sd, NameNodeFile.EDITS_NEW).exists();
-      }
-      
-      checkpointTime = readCheckpointTime(sd);
-      if ((checkpointTime != latestNameCheckpointTime &&
-            latestNameCheckpointTime != Long.MIN_VALUE) || 
-           (checkpointTime != latestEditsCheckpointTime &&
-            latestEditsCheckpointTime != Long.MIN_VALUE)) {
-        // Force saving of new image if checkpoint time
-        // is not same in all of the storage directories.
-        needToSave |= true;
-      }
-      if (sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE) && 
-         (latestNameCheckpointTime < checkpointTime) && imageExists) {
-        latestNameCheckpointTime = checkpointTime;
-        latestNameSD = sd;
-      }
-      if (sd.getStorageDirType().isOfType(NameNodeDirType.EDITS) && 
-           (latestEditsCheckpointTime < checkpointTime) && editsExists) {
-        latestEditsCheckpointTime = checkpointTime;
-        latestEditsSD = sd;
-      }
-      if (checkpointTime <= 0L)
-        needToSave |= true;
-      // set finalized flag
-      isUpgradeFinalized = isUpgradeFinalized && !sd.getPreviousDir().exists();
-    }
+  private boolean needsResaveBasedOnStaleCheckpoint(File imageFile,
+      long numEditsLoaded) {
+    final long checkpointPeriod = conf.getLong("fs.checkpoint.period", 3600);
+    final long checkpointTxnCount = NNStorageConfiguration.getCheckpointTxnCount(conf);
+    long checkpointAge = System.currentTimeMillis() - imageFile.lastModified();
+    boolean needToSave = (checkpointAge > checkpointPeriod * 1000)
+        || (numEditsLoaded > checkpointTxnCount);
+    LOG.info("Load Image: Need to save based on stale checkpoint: " + needToSave);
+    return needToSave;
+  }
 
-    // We should have at least one image and one edits dirs
-    if (latestNameSD == null)
-      throw new IOException("Image file is not found in " + imageDirs);
-    if (latestEditsSD == null)
-      throw new IOException("Edits file is not found in " + editsDirs);
-
-    // Make sure we are loading image and edits from same checkpoint
-    if (latestNameCheckpointTime > latestEditsCheckpointTime
-        && latestNameSD != latestEditsSD
-        && latestNameSD.getStorageDirType() == NameNodeDirType.IMAGE
-        && latestEditsSD.getStorageDirType() == NameNodeDirType.EDITS) {
-      // This is a rare failure when NN has image-only and edits-only
-      // storage directories, and fails right after saving images,
-      // in some of the storage directories, but before purging edits.
-      // See -NOTE- in saveNamespace().
-      LOG.error("This is a rare failure scenario!!!");
-      LOG.error("Image checkpoint time " + latestNameCheckpointTime
-          + " > edits checkpoint time " + latestEditsCheckpointTime);
-      LOG.error("Name-node will treat the image as the latest state of "
-          + "the namespace. Old edits will be discarded.");
-    } else if (latestNameCheckpointTime != latestEditsCheckpointTime)
-      throw new IOException("Inconsistent storage detected, "
-          + "image and edits checkpoint times do not match. "
-          + "image checkpoint time = " + latestNameCheckpointTime
-          + "edits checkpoint time = " + latestEditsCheckpointTime);
-    
-    // Recover from previous interrrupted checkpoint if any
-    needToSave |= recoverInterruptedCheckpoint(latestNameSD, latestEditsSD);
-
-    //
-    // Load in bits
-    //
-    latestNameSD.read();
-    //triggers re-save if image version is older
-    needToSave |= loadFSImage(getImageFile(latestNameSD, NameNodeFile.IMAGE));
-
-    if (latestNameCheckpointTime > latestEditsCheckpointTime) {
-      // the image is already current, discard edits
-      needToSave |= true;
-    }
-    else {
-      // latestNameCheckpointTime == latestEditsCheckpointTime
-      if(loadFSEdits(latestEditsSD) > 0) {
-        // trigger to save the image only if the edit log is bigger than
-        // fs.checkpoint.size or last checkpoint was done longer than 
-        // fs.checkpoint.period   
-        boolean checkpointTimeTrigger = 
-            latestNameCheckpointTime
-            + namesystem.getConf().getLong("fs.checkpoint.period", 3600) * 1000 
-            < FSNamesystem.now();
-        boolean checkpointSizeTrigger = 
-            getEditFile(latestEditsSD).length()
-            > namesystem.getConf().getLong("fs.checkpoint.size", 4194304);
-        needToSave |= (checkpointTimeTrigger || checkpointSizeTrigger);
-      }        
+  /**
+   * Load the image namespace from the given image file, verifying it against
+   * the MD5 sum stored in its associated .md5 file.
+   */
+  protected void loadFSImage(File imageFile) throws IOException {
+    MD5Hash expectedMD5 = MD5FileUtils.readStoredMd5ForFile(imageFile);
+    if (expectedMD5 == null) {
+      throw new IOException("No MD5 file found corresponding to image file "
+          + imageFile);
     }
-    return needToSave;
+    loadFSImage(imageFile, expectedMD5);
   }
 
-  boolean loadFSImage(File curFile) throws IOException {
+  boolean loadFSImage(File curFile, MD5Hash expectedMd5) throws IOException {
     assert curFile != null : "curFile is null";
 
-    FSImageFormat.Loader loader = new FSImageFormat.Loader(namesystem.getConf(), namesystem, this);
+    FSImageFormat.Loader loader = new FSImageFormat.Loader(
+        namesystem.getConf(), namesystem, storage);
     loader.load(curFile, null);
-    editLog.setStartTransactionId(loader.getLoadedImageTxId() + 1);
+    saveNamespaceContext.set(null, loader.getLoadedImageTxId());
+    // Check that the image digest we loaded matches up with what
+    // we expected
     MD5Hash readImageMd5 = loader.getLoadedImageMd5();
-    
-    if (this.newImageDigest) {
-      this.setImageDigest(readImageMd5); // set this fsimage's checksum
-    } else if (!this.getImageDigest().equals(readImageMd5)) {
-      throw new IOException("Image file " + curFile + " is corrupt!");
+    if (expectedMd5 != null && !expectedMd5.equals(readImageMd5)) {
+      throw new IOException("Image file " + curFile
+          + " is corrupt with MD5 checksum of " + readImageMd5
+          + " but expecting " + expectedMd5);
     }
     
-    return loader.getNeedToSave();
-  }
-  /**
-   * Load in the filesystem imagefrom file. It's a big list of
-   * filenames and blocks.  Return whether we should
-   * "re-save" and consolidate the edit-logs
-   */
-  boolean loadFSImage(File curFile, DataInputStream dis) throws IOException {
-    assert curFile != null : "curFile is null";
-
-    FSImageFormat.Loader loader = new FSImageFormat.Loader(namesystem.getConf(), namesystem, this);
-    loader.load(curFile, dis);
+    this.setImageDigest(loader.getLoadedImageTxId(), readImageMd5); // set this fsimage's checksum 
+    
+    storage.setMostRecentCheckpointTxId(loader.getLoadedImageTxId());
     return loader.getNeedToSave();
   }
 
@@ -1105,30 +717,30 @@ byte[][] getParent(byte[][] path) {
   }
 
   /**
-   * Load and merge edits from two edits files
-   * 
-   * @param sd storage directory
-   * @return number of edits loaded
-   * @throws IOException
+   * Load the specified list of edit files into the image.
+   * @return the txid of the current transaction (next to be loaded
    */
-  int loadFSEdits(StorageDirectory sd) throws IOException {
-    int numEdits = 0;
-    EditLogFileInputStream edits = 
-      new EditLogFileInputStream(getImageFile(sd, NameNodeFile.EDITS));
-    
+  protected long loadEdits(Iterable<EditLogInputStream> editStreams) 
+      throws IOException {
+
+    long lastAppliedTxId = storage.getMostRecentCheckpointTxId();
+    int numLoaded = 0;
     FSEditLogLoader loader = new FSEditLogLoader(namesystem);
-    numEdits += loader.loadFSEdits(edits, editLog.getCurrentTxId());
-    edits.close();
-    File editsNew = getImageFile(sd, NameNodeFile.EDITS_NEW);
-    if (editsNew.exists() && editsNew.length() > 0) {
-      edits = new EditLogFileInputStream(editsNew);
-      numEdits += loader.loadFSEdits(edits, loader.getCurrentTxId());
-      edits.close();
+      
+    // Load latest edits
+    for (EditLogInputStream editIn : editStreams) {
+      LOG.info("Load Image: Reading edits: " + editIn + " last applied txid#: "
+          + lastAppliedTxId);
+      numLoaded += loader.loadFSEdits(editIn, lastAppliedTxId);  
+      lastAppliedTxId = loader.getLastAppliedTxId();
     }
-    editLog.setStartTransactionId(loader.getCurrentTxId());
-    // update the counts.
-    getFSNamesystem().dir.updateCountForINodeWithQuota();    
-    return numEdits;
+    editLog.setLastWrittenTxId(lastAppliedTxId);
+    LOG.info("Load Image: Number of edit transactions loaded: "
+        + numLoaded + " last applied txid: " + lastAppliedTxId);
+
+    // update the counts
+    namesystem.dir.updateCountForINodeWithQuota();    
+    return numLoaded;
   }
 
   // for snapshot
@@ -1139,6 +751,25 @@ void saveFSImage(String dest, DataOutputStream fstream) throws IOException {
     saver.save(new File(dest), compression, fstream);
   }
   
+  /**
+   * Save the contents of the FS image to the file.
+   */
+  void saveFSImage(SaveNamespaceContext context, StorageDirectory sd, boolean forceUncompressed)
+      throws IOException {
+    LOG.info("Saving image to: "  + sd.getRoot().getAbsolutePath());
+    long txid = context.getTxId();
+    File newFile = NNStorage.getStorageFile(sd, NameNodeFile.IMAGE_NEW, txid);
+    File dstFile = NNStorage.getStorageFile(sd, NameNodeFile.IMAGE, txid);
+    
+    FSImageFormat.Saver saver = new FSImageFormat.Saver(context);
+    FSImageCompression compression = FSImageCompression.createCompression(conf, forceUncompressed);
+    saver.save(newFile, compression);
+    
+    MD5FileUtils.saveMD5File(dstFile, saver.getSavedDigest());
+    InjectionHandler.processEvent(InjectionEvent.FSIMAGE_SAVED_IMAGE, txid);
+    storage.setCheckpointImageDigest(txid, saver.getSavedDigest());
+  }
+  
   private class FSImageSaver implements Runnable {
     private SaveNamespaceContext context;
     private StorageDirectory sd;
@@ -1152,7 +783,7 @@ private class FSImageSaver implements Runnable {
     FSImageSaver(SaveNamespaceContext ctx, StorageDirectory sd, boolean forceUncompressed, NameNodeFile type) {
       this.context = ctx;
       this.sd = sd;
-      this.imageFile = getImageFile(sd, type);
+      this.imageFile = NNStorage.getImageFile(sd, ctx.getTxId());
       this.forceUncompressed = forceUncompressed;
     }
     
@@ -1163,14 +794,14 @@ public String toString() {
     public void run() {
       try {
         InjectionHandler
-            .processEvent(InjectionEvent.FSIMAGE_STARTING_SAVER_THREAD);
-
-        saveCurrent(context, sd, forceUncompressed);
+          .processEvent(InjectionEvent.FSIMAGE_STARTING_SAVER_THREAD);
+        
+        saveFSImage(context, sd, forceUncompressed);
 
       } catch (SaveNamespaceCancelledException ex) {
         LOG.warn("FSImageSaver: - cancelling operation");
       } catch (IOException ex) {
-        LOG.error("Unable to write image to " + imageFile.getAbsolutePath());
+        LOG.error("Unable to write image to " + imageFile.getAbsolutePath(), ex);
         context.reportErrorOnStorageDirectory(sd);
       }
     }
@@ -1180,110 +811,92 @@ public void run() {
    * Save the contents of the FS image
    * and create empty edits.
    */
-  public void saveNamespace(boolean renewCheckpointTime) throws IOException {
-    saveNamespace(false, renewCheckpointTime);
+  public void saveNamespace() throws IOException {
+    saveNamespace(false);
   }
-
+  
   /**
-   * Save the contents of the FS image
-   * and create empty edits.
-   * If forceUncompressed, the image will be saved uncompressed regardless of
-   * the fsimage compression configuration.
+   * Save the contents of the FS image to a new image file in each of the
+   * current storage directories.
    */
-  public void saveNamespace(boolean forUncompressed, boolean renewCheckpointTime)
-    throws IOException {
+  public synchronized void saveNamespace(boolean forUncompressed) 
+      throws IOException {
     
     InjectionHandler
-        .processEvent(InjectionEvent.FSIMAGE_STARTING_SAVE_NAMESPACE);
-    try {
+      .processEvent(InjectionEvent.FSIMAGE_STARTING_SAVE_NAMESPACE);
+    
+    if (editLog == null) {
+      throw new IOException("editLog must be initialized");
+    }
+    storage.attemptRestoreRemovedStorage();
 
-      // try to restore all failed edit logs here
-      assert editLog != null : "editLog must be initialized";
-      attemptRestoreRemovedStorage();
-  
-      saveNamespaceContext.set(namesystem, editLog.getLastWrittenTxId());
-      
-      InjectionHandler
-        .processEvent(InjectionEvent.FSIMAGE_STARTING_SAVE_NAMESPACE);
-      
-      editLog.close(); // close all open streams before truncating
-      if (renewCheckpointTime)
-        this.checkpointTime = FSNamesystem.now();
-      // mv current -> lastcheckpoint.tmp
-      for (Iterator<StorageDirectory> it = dirIterator(); it.hasNext();) {
-        StorageDirectory sd = it.next();
-        try {
-          moveCurrent(sd);
-        } catch (IOException ex) {
-          LOG.error("Unable to move current for " + sd.getRoot(), ex);
-          processIOError(sd.getRoot());
-        }
-      }
-      
+    InjectionHandler
+      .processEvent(InjectionEvent.FSIMAGE_STARTING_SAVE_NAMESPACE);
+    
+    boolean editLogWasOpen = editLog.isOpen();
+    
+    if (editLogWasOpen) {
+      editLog.endCurrentLogSegment(true);
+    }
+    long imageTxId = editLog.getLastWrittenTxId();
+    try {    
       // for testing only - we will wait until interruption comes
       InjectionHandler
           .processEvent(InjectionEvent.FSIMAGE_CREATING_SAVER_THREADS);
-      
-      // Save image into current using parallel threads for saving
-      List<Thread> savers = new ArrayList<Thread>();
-      for (Iterator<StorageDirectory> it = dirIterator(NameNodeDirType.IMAGE); 
-                                                                it.hasNext();) {
-        StorageDirectory sd = it.next();
-        FSImageSaver saver = new FSImageSaver(saveNamespaceContext, sd, forUncompressed);
-        Thread saverThread = new Thread(saver, saver.toString());
-        savers.add(saverThread);
-        saverThread.start();
-      }
-
-      waitForThreads(savers);       
-      savers.clear();
-      
-      if (saveNamespaceContext.isCancelled()) {
-        processIOError(saveNamespaceContext.getErrorSDs());
-        deleteCancelledCheckpoint();
-        if (!editLog.isOpen()) editLog.open();  
-        saveNamespaceContext.checkCancelled();
-      } 
-      
-      // -NOTE-
-      // If NN has image-only and edits-only storage directories and fails here
-      // the image will have the latest namespace state.
-      // During startup the image-only directories will recover by discarding
-      // lastcheckpoint.tmp, while
-      // the edits-only directories will recover by falling back
-      // to the old state contained in their lastcheckpoint.tmp.
-      // The edits directories should be discarded during startup because their
-      // checkpointTime is older than that of image directories.
-      
-      // recreate edits in current
-      InjectionHandler.processEvent(InjectionEvent.FSIMAGE_SN_CLEANUP);
-      for (Iterator<StorageDirectory> it = dirIterator(NameNodeDirType.EDITS);
-                                                                it.hasNext();) {
-        StorageDirectory sd = it.next();
-        try {
-          saveCurrent(saveNamespaceContext, sd, forUncompressed);
-        } catch (IOException ex) {
-          LOG.error("Unable to save edits for " + sd.getRoot(), ex);
-          processIOError(sd.getRoot());
-        }
-      }
-      
-      // mv lastcheckpoint.tmp -> previous.checkpoint
-      for (Iterator<StorageDirectory> it = dirIterator(); it.hasNext();) {
-        StorageDirectory sd = it.next();
-        try {
-          moveLastCheckpoint(sd);
-        } catch (IOException ex) {
-          LOG.error("Unable to move last checkpoint for " + sd.getRoot(), ex);
-          processIOError(sd.getRoot());
-        }
-      }
-      if (!editLog.isOpen()) editLog.open();
-      processIOError(saveNamespaceContext.getErrorSDs());
-      ckptState = CheckpointStates.UPLOAD_DONE;
+      saveFSImageInAllDirs(imageTxId, forUncompressed);
+      storage.writeAll();
     } finally {
+      if (editLogWasOpen) {
+        editLog.startLogSegment(imageTxId + 1, true);
+        // Take this opportunity to note the current transaction.
+        // Even if the namespace save was cancelled, this marker
+        // is only used to determine what transaction ID is required
+        // for startup. So, it doesn't hurt to update it unnecessarily.
+        storage.writeTransactionIdFileToStorage(imageTxId + 1);
+      }
       saveNamespaceContext.clear();
     }
+    
+  }
+  
+  protected synchronized void saveFSImageInAllDirs(long txid, boolean forceUncompressed)
+      throws IOException {    
+    if (storage.getNumStorageDirs(NameNodeDirType.IMAGE) == 0) {
+      throw new IOException("No image directories available!");
+    }
+    
+    saveNamespaceContext.set(namesystem, txid); 
+    
+    List<Thread> saveThreads = new ArrayList<Thread>();
+    // save images into current
+    for (Iterator<StorageDirectory> it
+           = storage.dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
+      StorageDirectory sd = it.next();
+      FSImageSaver saver = new FSImageSaver(saveNamespaceContext, sd, forceUncompressed);
+      Thread saveThread = new Thread(saver, saver.toString());
+      saveThreads.add(saveThread);
+      saveThread.start();
+    }
+    waitForThreads(saveThreads);
+    saveThreads.clear();
+    storage.reportErrorsOnDirectories(saveNamespaceContext.getErrorSDs());
+
+    if (storage.getNumStorageDirs(NameNodeDirType.IMAGE) == 0) {
+      throw new IOException(
+        "Failed to save in any storage directories while saving namespace.");
+    }
+    
+    if (saveNamespaceContext.isCancelled()) {
+      deleteCheckpoint(saveNamespaceContext.getTxId());  
+      saveNamespaceContext.checkCancelled();
+    } 
+    renameCheckpoint(txid, storage);
+    
+    storage.setMostRecentCheckpointTxId(txid);
+    
+    // Since we now have a new checkpoint, we can clean up some
+    // old edit logs and checkpoints.
+    purgeOldStorage();
   }
   
   private void waitForThreads(List<Thread> threads) {
@@ -1298,459 +911,190 @@ private void waitForThreads(List<Thread> threads) {
       }
     }
   }
+
+  public void format() throws IOException {
+    storage.format();
+    saveFSImageInAllDirs(-1, false);
+  }
   
   /**
-   * Save current image and empty journal into {@code current} directory.
+   * Deletes the checkpoint file in every storage directory,
+   * since the checkpoint was cancelled. Attepmts to remove
+   * image/md5/ckptimage files.
    */
-  protected void saveCurrent(SaveNamespaceContext ctx, StorageDirectory sd, boolean forceUncompressed)
-    throws IOException {
-    File curDir = sd.getCurrentDir();
-    LOG.info("Saving image to: "  + sd.getRoot().getAbsolutePath());
-    NameNodeDirType dirType = (NameNodeDirType) sd.getStorageDirType();
-    // save new image or new edits
-    if (!curDir.exists() && !curDir.mkdir())
-      throw new IOException("Cannot create directory " + curDir);
-    if (dirType.isOfType(NameNodeDirType.IMAGE)) { 
-      FSImageFormat.Saver saver = new FSImageFormat.Saver(ctx);
-      FSImageCompression compression = FSImageCompression.createCompression(namesystem.getConf(), forceUncompressed);
-      saver.save(getImageFile(sd, NameNodeFile.IMAGE), compression);
-      this.setImageDigest(saver.getSavedDigest());
+  void deleteCheckpoint(long txId) throws IOException {
+    for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
+      StorageDirectory sd = it.next();
+      // image file
+      File imageFile = NNStorage.getImageFile(sd, txId);
+      if (imageFile.delete())
+        LOG.info("Delete checkpoint: deleted: " + imageFile);
+      
+      // md5 file
+      File imageFileMD5 = MD5FileUtils.getDigestFileForFile(imageFile);
+      if (imageFileMD5.delete())
+        LOG.info("Delete checkpoint: deleted: " + imageFileMD5);
+      
+      // image ckpt file
+      File imageCkptFile = NNStorage.getCheckpointImageFile(sd, txId);
+      if (imageCkptFile.delete())
+        LOG.info("Delete checkpoint: deleted: " + imageCkptFile);
     }
-    if (dirType.isOfType(NameNodeDirType.EDITS))
-      editLog.createEditLogFile(getImageFile(sd, NameNodeFile.EDITS));
-    // write version and time files
-    sd.write();
   }
 
-  /*
-   * Move {@code current} to {@code lastcheckpoint.tmp} and recreate empty
-   * {@code current}. {@code current} is moved only if it is well formatted,
-   * that is contains VERSION file.
-   * 
-   * @see org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory#
-   * getLastCheckpointTmp()
-   * 
-   * @see org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory#
-   * getPreviousCheckpoint()
-   */
-  protected void moveCurrent(StorageDirectory sd) throws IOException {
-    File curDir = sd.getCurrentDir();
-    File tmpCkptDir = sd.getLastCheckpointTmp();
-    // mv current -> lastcheckpoint.tmp
-    // only if current is formatted - has VERSION file
-    if (sd.getVersionFile().exists()) {
-      assert curDir.exists() : curDir + " directory must exist.";
-      assert !tmpCkptDir.exists() : tmpCkptDir + " directory must not exist.";
-      rename(curDir, tmpCkptDir);
-    }
-    // recreate current
-    if (!curDir.exists() && !curDir.mkdir())
-      throw new IOException("Cannot create directory " + curDir);
-  }
-  
-  /**
-   * Move {@code lastcheckpoint.tmp} to {@code previous.checkpoint}
-   * 
-   * @see org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory#
-   * getPreviousCheckpoint()
-   * @see org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory#
-   * getLastCheckpointTmp()
-   */
-  protected void moveLastCheckpoint(StorageDirectory sd) throws IOException {
-    File tmpCkptDir = sd.getLastCheckpointTmp();
-    File prevCkptDir = sd.getPreviousCheckpoint();
-    // remove previous.checkpoint
-    if (prevCkptDir.exists())
-      deleteDir(prevCkptDir);
-    // rename lastcheckpoint.tmp -> previous.checkpoint
-    if (tmpCkptDir.exists())
-      rename(tmpCkptDir, prevCkptDir);
+  CheckpointSignature rollEditLog() throws IOException {
+    getEditLog().rollEditLog();
+    // Record this log segment ID in all of the storage directories, so
+    // we won't miss this log segment on a restart if the edits directories
+    // go missing.
+    storage.writeTransactionIdFileToStorage(getEditLog().getCurSegmentTxId());
+    return new CheckpointSignature(this);
   }
 
   /**
-   * Generate new namespaceID.
-   * 
-   * namespaceID is a persistent attribute of the namespace.
-   * It is generated when the namenode is formatted and remains the same
-   * during the life cycle of the namenode.
-   * When a datanodes register they receive it as the registrationID,
-   * which is checked every time the datanode is communicating with the 
-   * namenode. Datanodes that do not 'know' the namespaceID are rejected.
+   * End checkpoint.
+   * Validate the current storage info with the given signature.
    * 
-   * @return new namespaceID
+   * @param sig to validate the current storage info against
+   * @throws IOException if the checkpoint fields are inconsistent
    */
-  private int newNamespaceID() {
-    Random r = new Random();
-    r.setSeed(FSNamesystem.now());
-    int newID = 0;
-    while(newID == 0)
-      newID = r.nextInt(0x7FFFFFFF);  // use 31 bits only
-    return newID;
-  }
-
-  /** Create new dfs name directory.  Caution: this destroys all files
-   * in this filesystem. */
-  void format(StorageDirectory sd) throws IOException {
-    saveNamespaceContext.set(namesystem, -1);
-    sd.clearDirectory(); // create currrent dir
-    sd.lock();
-    try {
-      saveCurrent(saveNamespaceContext, sd, false);
-    } finally {
-      sd.unlock();
+  void rollFSImage(CheckpointSignature sig) throws IOException {
+    long start = System.nanoTime();
+    sig.validateStorageInfo(this.storage);
+    FSImage.saveDigestAndRenameCheckpointImage(sig.mostRecentCheckpointTxId, sig.imageDigest, storage);
+    long rollTime = DFSUtil.getElapsedTimeMicroSeconds(start);
+    if (metrics != null) {
+      metrics.rollFsImageTime.inc(rollTime);
     }
-    LOG.info("Storage directory " + sd.getRoot()
-             + " has been successfully formatted.");
   }
-
-  public void format() throws IOException {
-    this.layoutVersion = FSConstants.LAYOUT_VERSION;
-    this.namespaceID = newNamespaceID();
-    this.cTime = 0L;
-    this.checkpointTime = FSNamesystem.now();
-    for (Iterator<StorageDirectory> it = 
-                           dirIterator(); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      format(sd);
-    }
+    
+  synchronized void checkpointUploadDone(long txid, MD5Hash checkpointImageMd5)
+      throws IOException {
+    storage.checkpointUploadDone(txid, checkpointImageMd5);
   }
-
+  
   /**
-   * Moves fsimage.ckpt to fsImage and edits.new to edits
-   * Reopens the new edits file.
-   * 
-   * @param newImageSignature the signature of the new image
+   * This is called by the 2NN after having downloaded an image, and by
+   * the NN after having received a new image from the 2NN. It
+   * renames the image from fsimage_N.ckpt to fsimage_N and also
+   * saves the related .md5 file into place.
    */
-  void rollFSImage(CheckpointSignature newImageSignature) throws IOException {
-    MD5Hash newImageDigest = newImageSignature.getImageDigest();
-    if (!newImageDigest.equals(checkpointImageDigest)) {
+  static synchronized void saveDigestAndRenameCheckpointImage(
+      long txid, MD5Hash digest, NNStorage storage) throws IOException {
+    if (!digest.equals(storage.getCheckpointImageDigest(txid))) {
       throw new IOException(
           "Checkpoint image is corrupt: expecting an MD5 checksum of" +
-          newImageDigest + " but is " + checkpointImageDigest);
-    }
-    rollFSImage(newImageSignature.getImageDigest());
-  }
-  
-  private void rollFSImage(MD5Hash newImageDigest)  throws IOException {
-    if (ckptState != CheckpointStates.UPLOAD_DONE) {
-      throw new IOException("Cannot roll fsImage before rolling edits log.");
-    }
-    //
-    // First, verify that edits.new and fsimage.ckpt exists in all
-    // checkpoint directories.
-    //
-    if (!editLog.existsNew()) {
-      throw new IOException("New Edits file does not exist");
-    }
-    for (Iterator<StorageDirectory> it = 
-                       dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      File ckpt = getImageFile(sd, NameNodeFile.IMAGE_NEW);
-      if (!ckpt.exists()) {
-        throw new IOException("Checkpoint file " + ckpt +
-                              " does not exist");
-      }
-    }
-    editLog.purgeEditLog(); // renamed edits.new to edits
-    LOG.debug("rollFSImage after purgeEditLog: storageList=" + listStorageDirectories());
-    //
-    // Renames new image
-    //
-    for (Iterator<StorageDirectory> it = 
-                       dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      File ckpt = getImageFile(sd, NameNodeFile.IMAGE_NEW);
-      File curFile = getImageFile(sd, NameNodeFile.IMAGE);
-      // renameTo fails on Windows if the destination file 
-      // already exists.
-      LOG.debug("renaming  " + ckpt.getAbsolutePath() + " to "  + curFile.getAbsolutePath());
-      if (!ckpt.renameTo(curFile)) {
-        curFile.delete();
-        if (!ckpt.renameTo(curFile)) {
-          LOG.warn("renaming  " + ckpt.getAbsolutePath() + " to "  + 
-              curFile.getAbsolutePath() + " FAILED");
-          
-          // Close edit stream, if this directory is also used for edits
-          if (sd.getStorageDirType().isOfType(NameNodeDirType.EDITS))
-            editLog.processIOError(sd);
-          
-          // add storage to the removed list
-          removedStorageDirs.add(sd);
-          it.remove();
-        }
-      }
+              digest + " but is " + storage.getCheckpointImageDigest(txid));
     }
-
-    //
-    // Updates the fstime file on all directories (fsimage and edits)
-    // and write version file
-    //
-    this.layoutVersion = FSConstants.LAYOUT_VERSION;
-    this.checkpointTime = FSNamesystem.now();
-    this.setImageDigest(newImageDigest);
-    for (Iterator<StorageDirectory> it = 
-                           dirIterator(); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      // delete old edits if sd is the image only the directory
-      if (!sd.getStorageDirType().isOfType(NameNodeDirType.EDITS)) {
-        File editsFile = getImageFile(sd, NameNodeFile.EDITS);
-        editsFile.delete();
-      }
-      // delete old fsimage if sd is the edits only the directory
-      if (!sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE)) {
-        File imageFile = getImageFile(sd, NameNodeFile.IMAGE);
-        imageFile.delete();
-      }
+       
+    renameCheckpoint(txid, storage);
+    List<StorageDirectory> badSds = new ArrayList<StorageDirectory>();
+    
+    for (StorageDirectory sd : storage.dirIterable(NameNodeDirType.IMAGE)) {
+      File imageFile = NNStorage.getImageFile(sd, txid);
       try {
-        sd.write();
-      } catch (IOException e) {
-        LOG.error("Cannot write file " + sd.getRoot(), e);
-        // Close edit stream, if this directory is also used for edits
-        if (sd.getStorageDirType().isOfType(NameNodeDirType.EDITS))
-          editLog.processIOError(sd);
-      //add storage to the removed list
-        removedStorageDirs.add(sd);
-        it.remove();
+        MD5FileUtils.saveMD5File(imageFile, digest);
+      } catch (IOException ioe) {
+        badSds.add(sd);
       }
     }
-    ckptState = FSImage.CheckpointStates.START;
+    storage.reportErrorsOnDirectories(badSds);
+    
+    // So long as this is the newest image available,
+    // advertise it as such to other checkpointers
+    // from now on
+    storage.setMostRecentCheckpointTxId(txid);
   }
   
   /**
-   * Deletes the checkpoint file in every storage directory,
-   * since the checkpoint was cancelled. Moves lastcheckpoint.tmp -> current
-   */
-  private void deleteCancelledCheckpoint() throws IOException {
-    ArrayList<StorageDirectory> errorDirs = new ArrayList<StorageDirectory>();
-    for (Iterator<StorageDirectory> it = dirIterator(); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      deleteCancelledChecpointDir(sd, errorDirs);
-    }
-    processIOError(errorDirs);
-  }
-
-  /**
-   * Deletes the checkpoint file in given storage directory.
-   * Moves lastcheckpoint.tmp -> current
+   * Purge any files in the storage directories that are no longer
+   * necessary.
    */
-  private void deleteCancelledChecpointDir(StorageDirectory sd, 
-      Collection<StorageDirectory> errorDirs) throws IOException {
-    LOG.info("Reverting checkpoint for : " + sd.getCurrentDir());
+  public synchronized void purgeOldStorage() {
     try {
-      File tmpCkptDir = sd.getLastCheckpointTmp();
-      File curDir = sd.getCurrentDir();
-      if (!tmpCkptDir.exists()) {
-        LOG.warn("Reverting checkpoint - lastcheckpoint.tmp "
-            + "does not exist for storage directory: " + sd);
-        errorDirs.add(sd);
-        return;
-      }
-      // remove current
-      if (curDir.exists())
-        deleteDir(curDir);
-      // rename lastcheckpoint.tmp -> current
-      rename(tmpCkptDir, curDir);
-    } catch (IOException e) {
-      LOG.warn("Unable to revet checkpoint for : " + sd.getCurrentDir());
-      errorDirs.add(sd);
+      archivalManager.purgeOldStorage();
+    } catch (Exception e) {
+      LOG.warn("Unable to purge old storage", e);
     }
   }
-
-  CheckpointSignature rollEditLog() throws IOException {
-    getEditLog().rollEditLog();
-    ckptState = CheckpointStates.ROLLED_EDITS;
-    return new CheckpointSignature(this);
-  }
-
+  
   /**
-   * This is called just before a new checkpoint is uploaded to the
-   * namenode.
+   * Renames new image
    */
-  void validateCheckpointUpload(CheckpointSignature sig) throws IOException {
-    if (ckptState != CheckpointStates.ROLLED_EDITS) {
-      throw new IOException("Namenode is not expecting an new image " +
-                             ckptState);
-    } 
-    // verify token
-    long modtime = getEditLog().getFsEditTime();
-    if (sig.editsTime != modtime) {
-      throw new IOException("Namenode has an edit log with timestamp of " +
-                            DATE_FORM.format(new Date(modtime)) +
-                            " but new checkpoint was created using editlog " +
-                            " with timestamp " + 
-                            DATE_FORM.format(new Date(sig.editsTime)) + 
-                            ". Checkpoint Aborted.");
+  private static void renameCheckpoint(long txid, NNStorage storage) throws IOException {
+    ArrayList<StorageDirectory> al = null;
+
+    for (StorageDirectory sd : storage.dirIterable(NameNodeDirType.IMAGE)) {
+      try {
+        renameCheckpointInDir(sd, txid);
+      } catch (IOException ioe) {
+        LOG.warn("Unable to rename checkpoint in " + sd, ioe);
+        if (al == null) {
+          al = new ArrayList<StorageDirectory>();
+        }
+        al.add(sd);
+      }
     }
-    sig.validateStorageInfo(this);
-    ckptState = FSImage.CheckpointStates.UPLOAD_START;
+    if(al != null) storage.reportErrorsOnDirectories(al);
   }
-
-  /**
-   * This is called when a checkpoint upload finishes successfully.
-   */
-  synchronized void checkpointUploadDone(MD5Hash checkpointImageMd5) {
-    checkpointImageDigest = checkpointImageMd5;
-    ckptState = CheckpointStates.UPLOAD_DONE;
+  
+  private static void renameCheckpointInDir(StorageDirectory sd, long txid)
+      throws IOException {
+    File ckpt = NNStorage.getStorageFile(sd, NameNodeFile.IMAGE_NEW, txid);
+    File curFile = NNStorage.getStorageFile(sd, NameNodeFile.IMAGE, txid);
+    // renameTo fails on Windows if the destination file 
+    // already exists.
+    LOG.info("Renaming  " + ckpt.getAbsolutePath() + " to "
+        + curFile.getAbsolutePath());
+    if (!ckpt.renameTo(curFile)) {
+      if (!curFile.delete() || !ckpt.renameTo(curFile)) {
+        throw new IOException("renaming  " + ckpt.getAbsolutePath() + " to "  + 
+            curFile.getAbsolutePath() + " FAILED");
+      }
+    }    
   }
 
   void close() throws IOException {
-    getEditLog().close(true);
-    unlockAll();
+    if(editLog != null)
+      editLog.close();
+    storage.unlockAll();
   }
 
   /**
-   * Return the name of the image file.
+   * Return the name of the latest image file.
    */
   File getFsImageName() {
-    StorageDirectory sd = null;
-    for (Iterator<StorageDirectory> it = 
-                dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
-      sd = it.next();
-      File fsImage = getImageFile(sd, NameNodeFile.IMAGE);
-      if (sd.getRoot().canRead() && fsImage.exists()) {
-        return fsImage;
-      }
-    }
-    return null;
+    return storage.getFsImageName(storage.getMostRecentCheckpointTxId());
   }
   
   /**
-   * See if any of removed storages iw "writable" again, and can be returned 
-   * into service
+   * Returns the txid of the last checkpoint
    */
-  void attemptRestoreRemovedStorage() {   
-    // if directory is "alive" - copy the images there...
-    if(!restoreFailedStorage || removedStorageDirs.size() == 0) 
-      return; //nothing to restore
-    
-    LOG.info("FSImage.attemptRestoreRemovedStorage: check removed(failed) " +
-    		"storarge. removedStorages size = " + removedStorageDirs.size());
-    for(Iterator<StorageDirectory> it = this.removedStorageDirs.iterator(); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      File root = sd.getRoot();
-      LOG.info("currently disabled dir " + root.getAbsolutePath() + 
-          "; type="+sd.getStorageDirType() + ";canwrite="+root.canWrite());
-      try {
-        
-        if(root.exists() && root.canWrite()) { 
-          // when we try to restore we just need to remove all the data
-          // without saving current in-memory state (which could've changed).
-          sd.clearDirectory();
-          LOG.info("restoring dir " + sd.getRoot().getAbsolutePath());
-          this.addStorageDir(sd); // restore
-          it.remove();
-        }
-      } catch(IOException e) {
-        LOG.warn("failed to restore " + sd.getRoot().getAbsolutePath(), e);
-      }
-    }    
-  }
-  
-  public File getFsEditName() throws IOException {
-    return getEditLog().getFsEditName();
+  public long getLastCheckpointTxId() {
+    return storage.getMostRecentCheckpointTxId();
   }
   
-  public File getFsEditNewName() throws IOException {
-    return getEditLog().getFsEditNewName();
-  }
-
-  File getFsTimeName() {
-    StorageDirectory sd = null;
-    // NameNodeFile.TIME shoul be same on all directories
-    for (Iterator<StorageDirectory> it = 
-             dirIterator(); it.hasNext();)
-      sd = it.next();
-    return getImageFile(sd, NameNodeFile.TIME);
-  }
-
   /**
-   * Return the name of the image file that is uploaded by periodic
-   * checkpointing.
+   * Retrieve checkpoint dirs from configuration.
+   *
+   * @param conf the Configuration
+   * @param defaultValue a default value for the attribute, if null
+   * @return a Collection of URIs representing the values in 
+   * dfs.namenode.checkpoint.dir configuration property
    */
-  File[] getFsImageNameCheckpoint() {
-    ArrayList<File> list = new ArrayList<File>();
-    for (Iterator<StorageDirectory> it = 
-                 dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
-      list.add(getImageFile(it.next(), NameNodeFile.IMAGE_NEW));
-    }
-    return list.toArray(new File[list.size()]);
-  }
-
-  protected void corruptPreUpgradeStorage(File rootDir) throws IOException {
-    File oldImageDir = new File(rootDir, "image");
-    if (!oldImageDir.exists())
-      if (!oldImageDir.mkdir())
-        throw new IOException("Cannot create directory " + oldImageDir);
-    File oldImage = new File(oldImageDir, "fsimage");
-    if (!oldImage.exists())
-      // recreate old image file to let pre-upgrade versions fail
-      if (!oldImage.createNewFile())
-        throw new IOException("Cannot create file " + oldImage);
-    RandomAccessFile oldFile = new RandomAccessFile(oldImage, "rws");
-    // write new version into old image file
-    try {
-      writeCorruptedData(oldFile);
-    } finally {
-      oldFile.close();
-    }
-  }
-
-  private boolean getDistributedUpgradeState() {
-    FSNamesystem ns = getFSNamesystem();
-    return ns == null ? false : ns.getDistributedUpgradeState();
-  }
-
-  private int getDistributedUpgradeVersion() {
-    FSNamesystem ns = getFSNamesystem();
-    return ns == null ? 0 : ns.getDistributedUpgradeVersion();
-  }
-
-  private void setDistributedUpgradeState(boolean uState, int uVersion) {
-    getFSNamesystem().upgradeManager.setUpgradeState(uState, uVersion);
-  }
-
-  private void verifyDistributedUpgradeProgress(StartupOption startOpt
-                                                ) throws IOException {
-    if(startOpt == StartupOption.ROLLBACK || startOpt == StartupOption.IMPORT)
-      return;
-    UpgradeManager um = getFSNamesystem().upgradeManager;
-    assert um != null : "FSNameSystem.upgradeManager is null.";
-    if(startOpt != StartupOption.UPGRADE) {
-      if(um.getUpgradeState())
-        throw new IOException(
-                    "\n   Previous distributed upgrade was not completed. "
-                  + "\n   Please restart NameNode with -upgrade option.");
-      if(um.getDistributedUpgrades() != null)
-        throw new IOException("\n   Distributed upgrade for NameNode version " 
-          + um.getUpgradeVersion() + " to current LV " + FSConstants.LAYOUT_VERSION
-          + " is required.\n   Please restart NameNode with -upgrade option.");
-    }
-  }
-
-  private void initializeDistributedUpgrade() throws IOException {
-    UpgradeManagerNamenode um = getFSNamesystem().upgradeManager;
-    if(! um.initializeUpgrade())
-      return;
-    // write new upgrade state into disk
-    writeAll();
-    NameNode.LOG.info("\n   Distributed upgrade for NameNode version " 
-        + um.getUpgradeVersion() + " to current LV " 
-        + FSConstants.LAYOUT_VERSION + " is initialized.");
-  }
-
   static Collection<File> getCheckpointDirs(Configuration conf,
-                                            String defaultName) {
+      String defaultName) {
     Collection<String> dirNames = conf.getStringCollection("fs.checkpoint.dir");
     if (dirNames.size() == 0 && defaultName != null) {
       dirNames.add(defaultName);
     }
     Collection<File> dirs = new ArrayList<File>(dirNames.size());
-    for(String name : dirNames) {
+    for (String name : dirNames) {
       dirs.add(new File(name));
     }
     return dirs;
   }
-  
+
   static Collection<File> getCheckpointEditsDirs(Configuration conf,
       String defaultName) {
     Collection<String> dirNames = conf
@@ -1764,9 +1108,48 @@ static Collection<File> getCheckpointEditsDirs(Configuration conf,
     }
     return dirs;
   }
+
+  public int getLayoutVersion() {
+    return storage.getLayoutVersion();
+  }
+  
+  public int getNamespaceID() {
+    return storage.getNamespaceID();
+  }
   
   public void cancelSaveNamespace(String reason) {
     saveNamespaceContext.cancel(reason);
     InjectionHandler.processEvent(InjectionEvent.FSIMAGE_CANCEL_REQUEST_RECEIVED);
   }
+  
+  protected long getImageTxId() {
+    return saveNamespaceContext.getTxId();
+  }
+
+  public Iterator<StorageDirectory> dirIterator(StorageDirType dirType) {
+    return storage.dirIterator(dirType);
+  }
+
+  public Iterator<StorageDirectory> dirIterator() {
+    return storage.dirIterator();
+  }
+  
+  static void rollForwardByApplyingLogs(
+      RemoteEditLogManifest manifest,
+      FSImage dstImage) throws IOException {
+    NNStorage dstStorage = dstImage.storage;
+  
+    List<EditLogInputStream> editsStreams = new ArrayList<EditLogInputStream>();    
+    for (RemoteEditLog log : manifest.getLogs()) {
+      if (log.inProgress())
+        break;
+      File f = dstStorage.findFinalizedEditsFile(
+          log.getStartTxId(), log.getEndTxId());
+      if (log.getStartTxId() > dstImage.getLastAppliedTxId()) {
+        editsStreams.add(new EditLogFileInputStream(f, log.getStartTxId(), 
+                                                    log.getEndTxId()));
+       }
+    }
+    dstImage.loadEdits(editsStreams);
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageCompression.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageCompression.java
index d0558071..d86c6187 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageCompression.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageCompression.java
@@ -31,16 +31,19 @@
 import org.apache.hadoop.io.compress.CompressionCodecFactory;
 
 import org.apache.hadoop.io.Text;
-import org.mortbay.log.Log;
 
 /**
  * Simple container class that handles support for compressed fsimage files.
  */
-class FSImageCompression {
+public class FSImageCompression {
 
   /** Codec to use to save or load image, or null if the image is not compressed */
   private CompressionCodec imageCodec;
 
+  public boolean isNoOpCompression() {
+    return imageCodec == null;
+  }
+  
   /**
    * Create a "noop" compression - i.e. uncompressed
    */
@@ -57,7 +60,7 @@ private FSImageCompression(CompressionCodec codec) {
   /**
    * Create a "noop" compression - i.e. uncompressed
    */
-  static FSImageCompression createNoopCompression() {
+  public static FSImageCompression createNoopCompression() {
     return new FSImageCompression();
   }
 
@@ -104,7 +107,7 @@ private static FSImageCompression createCompression(Configuration conf,
    * @throws IOException if the specified codec is not available or the
    * underlying IO fails.
    */
-  static FSImageCompression readCompressionHeader(
+  public static FSImageCompression readCompressionHeader(
     Configuration conf,
     DataInputStream dis) throws IOException
   {
@@ -126,7 +129,7 @@ static FSImageCompression readCompressionHeader(
    * @throws IOException If the decompressor cannot be instantiated or an IO
    * error occurs.
    */
-  DataInputStream unwrapInputStream(InputStream is) throws IOException {
+  public DataInputStream unwrapInputStream(InputStream is) throws IOException {
     if (imageCodec != null) {
       return new DataInputStream(imageCodec.createInputStream(is));
     } else {
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
index bbfa4f81..9061b6a4 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
@@ -32,7 +32,9 @@
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.hadoop.conf.Configuration;
@@ -47,6 +49,7 @@
 import org.apache.hadoop.hdfs.server.common.InconsistentFSStateException;
 import org.apache.hadoop.hdfs.server.common.StorageInfo;
 import org.apache.hadoop.io.MD5Hash;
+import org.apache.hadoop.io.WritableUtils;
 
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 
@@ -123,11 +126,11 @@ private void checkNotLoaded() {
       }
     }
 
-    void load(File curFile, DataInputStream in)
-      throws IOException
-    {
+    void load(File curFile, DataInputStream in) throws IOException {
       checkNotLoaded();
-      assert curFile != null : "curFile is null";
+      DigestInputStream fin = null;
+      if (curFile == null )
+        throw new IOException("curFile is null");
 
       long startTime = now();
 
@@ -139,9 +142,8 @@ void load(File curFile, DataInputStream in)
       if (in == null) {
         FileInputStream fis = new FileInputStream(curFile);
         digester = MD5Hash.getDigester();
-        DigestInputStream fin = new DigestInputStream(
-           fis, digester);
-        in = new DataInputStream(fin); 
+        fin = new DigestInputStream(fis, digester);
+        in = new DataInputStream(fin);
       }     
       try {
         /*
@@ -192,15 +194,17 @@ void load(File curFile, DataInputStream in)
         } else {
           compression = FSImageCompression.createNoopCompression();
         }
-        in = compression.unwrapInputStream(in);
+        in = compression.unwrapInputStream(fin != null ? fin : in);
 
         LOG.info("Loading image file " + curFile + " using " + compression);
-
+        
         // load all inodes
         LOG.info("Number of files = " + numFiles);
+        
         if (LayoutVersion.supports(Feature.FSIMAGE_NAME_OPTIMIZATION,
             imgVersion)) {
-          loadLocalNameINodes(numFiles, in);
+          FSImageLoadingContext context = new FSImageLoadingContext(this.namesystem.dir);
+          loadLocalNameINodes(numFiles, in, context);
         } else {
           loadFullNameINodes(numFiles, in);
         }
@@ -243,20 +247,22 @@ private void updateRootAttr(INode root) throws QuotaExceededException{
    *   
    * @param numFiles number of files expected to be read
    * @param in image input stream
+   * @param context The context when loading the FSImage
    * @throws IOException
    */  
-   private void loadLocalNameINodes(long numFiles, DataInputStream in) 
+   private void loadLocalNameINodes(long numFiles, DataInputStream in,
+       FSImageLoadingContext context) 
    throws IOException {
      assert LayoutVersion.supports(Feature.FSIMAGE_NAME_OPTIMIZATION,
          getLayoutVersion());
      assert numFiles > 0;
      long filesLoaded = 0;
-
      // load root
      if( in.readShort() != 0) {
        throw new IOException("First node is not root");
-     }   
-     INode root = loadINode(in);
+     }
+     
+     INode root = loadINode(in, context);
      // update the root's attributes
      updateRootAttr(root);
      filesLoaded++;
@@ -264,7 +270,7 @@ private void loadLocalNameINodes(long numFiles, DataInputStream in)
      // load rest of the nodes directory by directory
      int percentDone = 0;
      while (filesLoaded < numFiles) {
-       filesLoaded += loadDirectory(in);
+       filesLoaded += loadDirectory(in, context);
        percentDone = printProgress(filesLoaded, numFiles, percentDone);
      }
      if (numFiles != filesLoaded) {
@@ -276,15 +282,20 @@ private void loadLocalNameINodes(long numFiles, DataInputStream in)
     * Load all children of a directory
     * 
     * @param in
+    * @param context The context when loading the FSImage
     * @return number of child inodes read
     * @throws IOException
     */
-   private int loadDirectory(DataInputStream in) throws IOException {
-     String parentPath = FSImageSerialization.readString(in);
+   private int loadDirectory(DataInputStream in, FSImageLoadingContext context) throws IOException {
+     // read the parent 
+     byte[] parentName = new byte[in.readShort()];
+     in.readFully(parentName);
+     
      FSDirectory fsDir = namesystem.dir;
-     INode parent = fsDir.rootDir.getNode(parentPath);
+     INode parent = fsDir.rootDir.getNode(parentName);
      if (parent == null || !parent.isDirectory()) {
-       throw new IOException("Path " + parentPath + "is not a directory.");
+       throw new IOException("Path " + new String(parentName, "UTF8")
+           + "is not a directory.");
      }
 
      int numChildren = in.readInt();
@@ -292,14 +303,11 @@ private int loadDirectory(DataInputStream in) throws IOException {
        // load single inode
        byte[] localName = new byte[in.readShort()];
        in.readFully(localName); // read local name
-       INode newNode = loadINode(in); // read rest of inode
+       INode newNode = loadINode(in, context); // read rest of inode
 
        // add to parent
         namesystem.dir.addToParent(localName, (INodeDirectory) parent, newNode,
             false, i);
-        if (!newNode.isDirectory()) {
-          namesystem.dir.totalFiles++;
-        }
      }
      return numChildren;
    }
@@ -311,8 +319,7 @@ private int loadDirectory(DataInputStream in) throws IOException {
    * @param in data input stream
    * @throws IOException if any error occurs
    */
-  private void loadFullNameINodes(long numFiles,
-      DataInputStream in) throws IOException {
+  private void loadFullNameINodes(long numFiles, DataInputStream in) throws IOException {
     byte[][] pathComponents;
     byte[][] parentPath = {{}};      
     FSDirectory fsDir = namesystem.dir;
@@ -322,7 +329,7 @@ private void loadFullNameINodes(long numFiles,
       percentDone = printProgress(i, numFiles, percentDone);
       
       pathComponents = FSImageSerialization.readPathComponents(in);
-      INode newNode = loadINode(in);
+      INode newNode = loadINode(in, null);
 
       if (isRoot(pathComponents)) { // it is the root
         // update the root's attributes
@@ -338,9 +345,6 @@ private void loadFullNameINodes(long numFiles,
       // add new inode
       parentINode = fsDir.addToParent(pathComponents[pathComponents.length-1], 
           parentINode, newNode, false, INodeDirectory.UNKNOWN_INDEX);
-      if (!newNode.isDirectory()) {
-        namesystem.dir.totalFiles++;
-      }
     }
   }
 
@@ -348,15 +352,25 @@ private void loadFullNameINodes(long numFiles,
    * load an inode from fsimage except for its name
    * 
    * @param in data input stream from which image is read
+   * @param context The context when loading the FSImage
    * @return an inode
    */
-  private INode loadINode(DataInputStream in)
+  private INode loadINode(DataInputStream in, FSImageLoadingContext context)
       throws IOException {
     long modificationTime = 0;
     long atime = 0;
     long blockSize = 0;
-    
     int imgVersion = getLayoutVersion();
+    
+    byte inodeType = INode.INodeType.REGULAR_INODE.type;
+    long hardLinkID = -1; 
+    if (LayoutVersion.supports(Feature.HARDLINK, imgVersion)) {  
+      inodeType = in.readByte();  
+      if (inodeType == INode.INodeType.HARDLINKED_INODE.type) {  
+        hardLinkID = WritableUtils.readVLong(in); 
+      } 
+    }
+    
     short replication = in.readShort();
     replication = namesystem.adjustReplication(replication);
     modificationTime = in.readLong();
@@ -415,7 +429,7 @@ private INode loadINode(DataInputStream in)
     }
 
     return INode.newINode(permissions, blocks, replication,
-        modificationTime, atime, nsQuota, dsQuota, blockSize);
+        modificationTime, atime, nsQuota, dsQuota, blockSize, inodeType, hardLinkID, context);
     }
 
     private void loadDatanodes(DataInputStream in)
@@ -682,4 +696,26 @@ private static int printProgress(long numOfFilesProcessed, long totalFiles, int
     }
     return newPercentDone;
   }
+  
+  static class FSImageLoadingContext {
+    Map<Long, HardLinkFileInfo> hardLinkIDToFileInfoMap = new HashMap<Long, HardLinkFileInfo>();
+    final FSDirectory dir;
+    
+    FSImageLoadingContext(FSDirectory dir) {
+      this.dir = dir;
+    }
+    
+    FSDirectory getFSDirectory() {
+      return this.dir;
+    }
+    
+    HardLinkFileInfo getHardLinkFileInfo(Long hardLinkID) {
+      return hardLinkIDToFileInfoMap.get(hardLinkID);
+    }
+    
+    void associateHardLinkIDWithFileInfo(Long hardLinkID, HardLinkFileInfo fileInfo) {
+      hardLinkIDToFileInfoMap.put(hardLinkID, fileInfo);
+    }
+    
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java
new file mode 100644
index 00000000..77494571
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java
@@ -0,0 +1,305 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
+import org.apache.hadoop.io.IOUtils;
+
+/**
+ * Inspects a FSImage storage directory in the "old" (pre-HDFS-1073) format.
+ * This format has the following data files:
+ *   - fsimage
+ *   - fsimage.ckpt (when checkpoint is being uploaded)
+ *   - edits
+ *   - edits.new (when logs are "rolled")
+ */
+class FSImagePreTransactionalStorageInspector extends FSImageStorageInspector {
+  private static final Log LOG =
+    LogFactory.getLog(FSImagePreTransactionalStorageInspector.class);
+  
+  /* Flag if there is at least one storage dir that doesn't contain the newest
+   * fstime */
+  private boolean hasOutOfDateStorageDirs = false;
+  /* Flag set false if there are any "previous" directories found */
+  private boolean isUpgradeFinalized = true;
+  private boolean needToSaveAfterRecovery = false;
+  private boolean editsSaveTrigger = false;
+  
+  // Track the name and edits dir with the latest times
+  private long latestNameCheckpointTime = Long.MIN_VALUE;
+  private long latestEditsCheckpointTime = Long.MIN_VALUE;
+  private StorageDirectory latestNameSD = null;
+  private StorageDirectory latestEditsSD = null;
+
+  /** Set to determine if all of storageDirectories share the same checkpoint */
+  Set<Long> checkpointTimes = new HashSet<Long>();
+
+  private List<String> imageDirs = new ArrayList<String>();
+  private List<String> editsDirs = new ArrayList<String>();
+  
+  private Configuration conf;
+  
+  public FSImagePreTransactionalStorageInspector(Configuration conf) {
+    this.conf = conf;
+  }
+  
+  @Override
+  void inspectDirectory(StorageDirectory sd) throws IOException {
+    // Was the file just formatted?
+    if (!sd.getVersionFile().exists()) {
+      hasOutOfDateStorageDirs = true;
+      return;
+    }
+    
+    boolean imageExists = false;
+    boolean editsExists = false;
+    
+    // Determine if sd is image, edits or both
+    if (sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE)) {
+      imageExists = NNStorage.getStorageFile(sd, NameNodeFile.IMAGE).exists();        
+      imageDirs.add(sd.getRoot().getCanonicalPath());
+    }
+    
+    if (sd.getStorageDirType().isOfType(NameNodeDirType.EDITS)) {
+      editsExists = NNStorage.getStorageFile(sd, NameNodeFile.EDITS).exists();
+      editsDirs.add(sd.getRoot().getCanonicalPath());
+    }
+    
+    long checkpointTime = readCheckpointTime(sd);
+    boolean checkpointTimeTrigger = false;
+    boolean checkpointSizeTrigger = false;
+
+    checkpointTimes.add(checkpointTime);
+    
+    if (sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE) && 
+       (latestNameCheckpointTime < checkpointTime) && imageExists) {
+      latestNameCheckpointTime = checkpointTime;
+      latestNameSD = sd;
+    }
+    
+    if (sd.getStorageDirType().isOfType(NameNodeDirType.EDITS) && 
+         (latestEditsCheckpointTime < checkpointTime) && editsExists) {
+      latestEditsCheckpointTime = checkpointTime;
+      latestEditsSD = sd;
+           
+      checkpointSizeTrigger = 
+          NNStorage.getStorageFile(latestEditsSD, NameNodeFile.EDITS).length()
+          > conf.getLong("fs.checkpoint.size", 4194304);
+          
+      checkpointTimeTrigger = 
+          latestNameCheckpointTime
+          + conf.getLong("fs.checkpoint.period", 3600) * 1000 
+          < FSNamesystem.now();
+    }
+    
+    editsSaveTrigger |= (checkpointTimeTrigger || checkpointSizeTrigger);
+    
+    // check that we have a valid, non-default checkpointTime
+    if (checkpointTime <= 0L)
+      hasOutOfDateStorageDirs = true;
+    
+    // set finalized flag
+    isUpgradeFinalized = isUpgradeFinalized && !sd.getPreviousDir().exists();    
+  }
+
+  /**
+   * Determine the checkpoint time of the specified StorageDirectory
+   *
+   * @param sd StorageDirectory to check
+   * @return If file exists and can be read, last checkpoint time. If not, 0L.
+   * @throws IOException On errors processing file pointed to by sd
+   */
+  static long readCheckpointTime(StorageDirectory sd) throws IOException {
+    File timeFile = NNStorage.getStorageFile(sd, NameNodeFile.TIME);
+    long timeStamp = 0L;
+    if (timeFile.exists() && timeFile.canRead()) {
+      DataInputStream in = new DataInputStream(new FileInputStream(timeFile));
+      try {
+        timeStamp = in.readLong();
+      } finally {
+        IOUtils.cleanup(LOG, in);
+      }
+    }
+    return timeStamp;
+  }
+
+  @Override
+  boolean isUpgradeFinalized() {
+    return isUpgradeFinalized;
+  }
+    
+  @Override
+  FSImageFile getLatestImage() throws IOException {
+    // We should have at least one image and one edits dirs
+    if (latestNameSD == null)
+      throw new IOException("Image file is not found in " + imageDirs);
+    if (latestEditsSD == null)
+      throw new IOException("Edits file is not found in " + editsDirs);
+    
+    // Make sure we are loading image and edits from same checkpoint
+    if (latestNameCheckpointTime > latestEditsCheckpointTime
+        && latestNameSD != latestEditsSD
+        && latestNameSD.getStorageDirType() == NameNodeDirType.IMAGE
+        && latestEditsSD.getStorageDirType() == NameNodeDirType.EDITS) {
+      // This is a rare failure when NN has image-only and edits-only
+      // storage directories, and fails right after saving images,
+      // in some of the storage directories, but before purging edits.
+      // See -NOTE- in saveNamespace().
+      LOG.error("This is a rare failure scenario!!!");
+      LOG.error("Image checkpoint time " + latestNameCheckpointTime +
+                " > edits checkpoint time " + latestEditsCheckpointTime);
+      LOG.error("Name-node will treat the image as the latest state of " +
+                "the namespace. Old edits will be discarded.");
+    } else if (latestNameCheckpointTime != latestEditsCheckpointTime) {
+      throw new IOException("Inconsistent storage detected, " +
+                      "image and edits checkpoint times do not match. " +
+                      "image checkpoint time = " + latestNameCheckpointTime +
+                      "edits checkpoint time = " + latestEditsCheckpointTime);
+    }
+
+    needToSaveAfterRecovery = doRecovery();
+    
+    return new FSImageFile(latestNameSD, 
+        NNStorage.getStorageFile(latestNameSD, NameNodeFile.IMAGE),
+        HdfsConstants.INVALID_TXID);
+  }
+
+  @Override
+  boolean needToSave() {
+    return hasOutOfDateStorageDirs ||
+      checkpointTimes.size() != 1 ||
+      latestNameCheckpointTime > latestEditsCheckpointTime ||
+      needToSaveAfterRecovery;
+  }
+  
+  @Override
+  boolean forceSave() {
+    return editsSaveTrigger;
+  }
+  
+  boolean doRecovery() throws IOException {
+    LOG.debug(
+        "Performing recovery in "+ latestNameSD + " and " + latestEditsSD);
+      
+    boolean needToSave = false;
+    File curFile =
+        NNStorage.getStorageFile(latestNameSD, NameNodeFile.IMAGE);
+    File ckptFile =
+        NNStorage.getStorageFile(latestNameSD, NameNodeFile.IMAGE_NEW);
+    
+    //
+    // If we were in the midst of a checkpoint
+    //
+    if (ckptFile.exists()) {
+      needToSave = true;
+      if (NNStorage.getStorageFile(latestEditsSD, NameNodeFile.EDITS_NEW)
+          .exists()) {
+        //
+        // checkpointing migth have uploaded a new
+        // merged image, but we discard it here because we are
+        // not sure whether the entire merged image was uploaded
+        // before the namenode crashed.
+        //
+        if (!ckptFile.delete()) {
+          throw new IOException("Unable to delete " + ckptFile);
+        }
+      } else {
+        //
+        // checkpointing was in progress when the namenode
+        // shutdown. The fsimage.ckpt was created and the edits.new
+        // file was moved to edits. We complete that checkpoint by
+        // moving fsimage.new to fsimage. There is no need to 
+        // update the fstime file here. renameTo fails on Windows
+        // if the destination file already exists.
+        //
+        if (!ckptFile.renameTo(curFile)) {
+          if (!curFile.delete())
+            LOG.warn("Unable to delete dir " + curFile + " before rename");
+          if (!ckptFile.renameTo(curFile)) {
+            throw new IOException("Unable to rename " + ckptFile +
+                                  " to " + curFile);
+          }
+        }
+      }
+    }
+    return needToSave;
+  }
+  
+  /**
+   * @return a list with the paths to EDITS and EDITS_NEW (if it exists)
+   * in a given storage directory.
+   */
+  static List<File> getEditsInStorageDir(StorageDirectory sd) {
+    ArrayList<File> files = new ArrayList<File>();
+    File edits = NNStorage.getStorageFile(sd, NameNodeFile.EDITS);
+    assert edits.exists() : "Expected edits file at " + edits;
+    files.add(edits);
+    File editsNew = NNStorage.getStorageFile(sd, NameNodeFile.EDITS_NEW);
+    if (editsNew.exists()) {
+      files.add(editsNew);
+    }
+    return files;
+  }
+  
+  private List<File> getLatestEditsFiles() {
+    if (latestNameCheckpointTime > latestEditsCheckpointTime) {
+      // the image is already current, discard edits
+      LOG.debug(
+          "Name checkpoint time is newer than edits, not loading edits.");
+      return Collections.<File>emptyList();
+    }
+    
+    return getEditsInStorageDir(latestEditsSD);
+  }
+  
+  @Override
+  long getMaxSeenTxId() {
+    return 0L;
+  }
+
+  static Collection<EditLogInputStream> getEditLogStreams(NNStorage storage, Configuration conf)
+      throws IOException {
+    FSImagePreTransactionalStorageInspector inspector 
+      = new FSImagePreTransactionalStorageInspector(conf);
+    storage.inspectStorageDirs(inspector);
+
+    List<EditLogInputStream> editStreams = new ArrayList<EditLogInputStream>();
+    for (File f : inspector.getLatestEditsFiles()) {
+      editStreams.add(new EditLogFileInputStream(f));
+    }
+    return editStreams;
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java
index 1cb8edd6..f1bce2c5 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java
@@ -30,8 +30,10 @@
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.io.LongWritable;
+import org.apache.hadoop.io.ShortWritable;
 import org.apache.hadoop.io.UTF8;
 import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableUtils;
 
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 
@@ -67,7 +69,6 @@ protected TLData initialValue() {
   @SuppressWarnings("deprecation")
   static private final class TLData {
     final UTF8 U_STR = new UTF8();
-    final LongWritable U_LONG = new LongWritable();
     final FsPermission FILE_PERM = new FsPermission((short) 0);
   }
 
@@ -77,7 +78,6 @@ static private final class TLData {
   static INodeFileUnderConstruction readINodeUnderConstruction(
                             DataInputStream in) throws IOException {
     byte[] name = readBytes(in);
-    String path = DFSUtil.bytes2String(name);
     short blockReplication = in.readShort();
     long modificationTime = in.readLong();
     long preferredBlockSize = in.readLong();
@@ -142,6 +142,25 @@ static void saveINode2Image(INode node,
     byte[] name = node.getLocalNameBytes();
     out.writeShort(name.length);
     out.write(name);
+    
+    if (node instanceof INodeHardLinkFile) {
+      // Process the hard link file:  
+      // If the hard link has more than 1 reference cnt, then store its type with the hard link ID  
+      // Otherwise, just store the regular INodeFile's inode type.  
+      INodeHardLinkFile hardLink = (INodeHardLinkFile)node; 
+      if (hardLink.getHardLinkFileInfo().getReferenceCnt() > 1) {
+        out.writeByte(INode.INodeType.HARDLINKED_INODE.type); 
+        WritableUtils.writeVLong(out, ((INodeHardLinkFile)node).getHardLinkID()); 
+      } else {
+        throw new IOException("Invalid reference count for the hardlink file: " +
+            node.getFullPathName() + " with the hardlink ID: " + hardLink.getHardLinkID() +
+            " and reference cnt: " + hardLink.getHardLinkFileInfo().getReferenceCnt());
+      }
+    } else {
+      // Process the regular files and directory: just store its inode type 
+      out.writeByte(INode.INodeType.REGULAR_INODE.type); 
+    }
+
     FsPermission filePerm = TL_DATA.get().FILE_PERM;
     if (!node.isDirectory()) {  // write file inode
       INodeFile fileINode = (INodeFile)node;
@@ -196,52 +215,22 @@ static void writeString(String str, DataOutputStream out) throws IOException {
 
   /** read the long value */
   static long readLong(DataInputStream in) throws IOException {
-    LongWritable ustr = TL_DATA.get().U_LONG;
-    ustr.readFields(in);
-    return ustr.get();
+    return in.readLong();
   }
 
   /** write the long value */
   static void writeLong(long value, DataOutputStream out) throws IOException {
-    LongWritable uLong = TL_DATA.get().U_LONG;
-    uLong.set(value);
-    uLong.write(out);
-  }
-  
-  /** read the long value */
-  static long readLongAsString(DataInputStream in) throws IOException {
-    UTF8 ustr = TL_DATA.get().U_STR;
-    ustr.readFields(in);
-    return Long.parseLong(ustr.toString());
-  }
-
-  /** write the long value */
-  static void writeLongAsString(long value, DataOutputStream out) throws IOException {
-    UTF8 ustr = TL_DATA.get().U_STR;
-    ustr.set(toLogLong(value), true);
-    ustr.write(out);
+    out.writeLong(value);
   }
   
-  /** read the long value */
-  static short readShortAsString(DataInputStream in) throws IOException {
-    UTF8 ustr = TL_DATA.get().U_STR;
-    ustr.readFields(in);
-    return Short.parseShort(ustr.toString());
+  /** read short value */
+  static short readShort(DataInputStream in) throws IOException {
+    return in.readShort();
   }
 
-  /** write the long value */
-  static void writeShortAsString(short value, DataOutputStream out) throws IOException {
-    UTF8 ustr = TL_DATA.get().U_STR;
-    ustr.set(toLogShort(value), true);
-    ustr.write(out);
-  }
-  
-  static private String toLogShort(short value) {
-    return Short.toString(value);
-  }
-  
-  static private String toLogLong(long value) {
-    return Long.toString(value);
+  /** write short value */
+  static void writeShort(short value, DataOutputStream out) throws IOException {
+    out.writeShort(value);
   }
   
   // Same comments apply for this method as for readString()
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageStorageInspector.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageStorageInspector.java
new file mode 100644
index 00000000..a592c597
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageStorageInspector.java
@@ -0,0 +1,95 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.File;
+import java.io.IOException;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+
+/**
+ * Interface responsible for inspecting a set of storage directories and devising
+ * a plan to load the namespace from them.
+ */
+abstract class FSImageStorageInspector {
+  /**
+   * Inspect the contents of the given storage directory.
+   */
+  abstract void inspectDirectory(StorageDirectory sd) throws IOException;
+
+  /**
+   * @return false if any of the storage directories have an unfinalized upgrade 
+   */
+  abstract boolean isUpgradeFinalized();
+  
+  /**
+   * Get the image files which should be loaded into the filesystem.
+   * @throws IOException if not enough files are available (eg no image found in any directory)
+   */
+  abstract FSImageFile getLatestImage() throws IOException;
+
+  /** 
+   * Get the minimum tx id which should be loaded with this set of images.
+   */
+  abstract long getMaxSeenTxId();
+
+  /**
+   * @return true if the directories are in such a state that the image should be re-saved
+   * following the load
+   */
+  abstract boolean needToSave();
+  
+  /**
+   * @return true if the edits properties necessitate re-saving 
+   * following the load of edits
+   */
+  abstract boolean forceSave();
+
+  /**
+   * Record of an image that has been located and had its filename parsed.
+   */
+  static class FSImageFile {
+    final StorageDirectory sd;    
+    final long txId;
+    private final File file;
+    
+    FSImageFile(StorageDirectory sd, File file, long txId) {
+      assert txId >= 0 || txId == HdfsConstants.INVALID_TXID 
+        : "Invalid txid on " + file +": " + txId;
+      
+      this.sd = sd;
+      this.txId = txId;
+      this.file = file;
+    } 
+    
+    File getFile() {
+      return file;
+    }
+
+    public long getCheckpointTxId() {
+      return txId;
+    }
+    
+    @Override
+    public String toString() {
+      return String.format("FSImageFile(file=%s, cpktTxId=%019d)", 
+                           file.toString(), txId);
+    }
+  }
+
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageTransactionalStorageInspector.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageTransactionalStorageInspector.java
new file mode 100644
index 00000000..bdabb42f
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImageTransactionalStorageInspector.java
@@ -0,0 +1,172 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
+
+import com.google.common.collect.ImmutableList;
+
+class FSImageTransactionalStorageInspector extends FSImageStorageInspector {
+  public static final Log LOG = LogFactory.getLog(
+    FSImageTransactionalStorageInspector.class);
+
+  private boolean needToSave = false;
+  private boolean isUpgradeFinalized = true;
+  
+  List<FSImageFile> foundImages = new ArrayList<FSImageFile>();
+  List<FSImageFile> foundCkptImages = new ArrayList<FSImageFile>();
+  
+  private long maxSeenTxId = -1;
+  
+  private static final Pattern IMAGE_REGEX = Pattern.compile(
+    NameNodeFile.IMAGE.getName() + "_(-?\\d+)");
+  
+  private static final Pattern IMAGE_CKPT_REGEX = Pattern.compile(
+      NameNodeFile.IMAGE_NEW.getName() + "_(-?\\d+)");
+  
+  @Override
+  public void inspectDirectory(StorageDirectory sd) throws IOException {
+    // Was the directory just formatted?
+    if (!sd.getVersionFile().exists()) {
+      LOG.info("No version file in " + sd.getRoot());
+      needToSave |= true;
+      return;
+    }
+    
+    maxSeenTxId = Math.max(maxSeenTxId, NNStorage.readTransactionIdFile(sd));
+
+    File currentDir = sd.getCurrentDir();
+    File filesInStorage[];
+    try {
+      filesInStorage = FileUtil.listFiles(currentDir);
+    } catch (IOException ioe) {
+      LOG.warn("Unable to inspect storage directory " + currentDir,
+          ioe);
+      return;
+    }
+    
+    for (File f : filesInStorage) {
+      LOG.info("Inspecting images: Checking file " + f);
+      String name = f.getName();
+      
+      // Check for fsimage_*
+      Matcher imageMatch = IMAGE_REGEX.matcher(name);
+      addImageIfMatching(imageMatch, foundImages, sd, f);
+      
+      // Check for fsimage_*
+      Matcher imageCkptMatch = IMAGE_CKPT_REGEX.matcher(name);
+      addImageIfMatching(imageCkptMatch, foundCkptImages, sd, f);
+      
+    }
+    
+    // Check for a seen_txid file, which marks a minimum transaction ID that
+    // must be included in our load plan.
+    try {
+      maxSeenTxId = Math.max(maxSeenTxId, NNStorage.readTransactionIdFile(sd));
+    } catch (IOException ioe) {
+      LOG.warn("Unable to determine the max transaction ID seen by " + sd, ioe);
+    }
+    
+    // set finalized flag
+    isUpgradeFinalized = isUpgradeFinalized && !sd.getPreviousDir().exists();
+  }
+  
+  private void addImageIfMatching(Matcher imageMatch,
+      List<FSImageFile> foundImages, StorageDirectory sd, File f) {
+    if (imageMatch.matches()) {
+      if (sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE)) {
+        try {
+          long txid = Long.valueOf(imageMatch.group(1));
+          LOG.info("Found image for txid: " + txid + " file: " + f);
+          foundImages.add(new FSImageFile(sd, f, txid));
+        } catch (NumberFormatException nfe) {
+          LOG.error("Image file " + f + " has improperly formatted " +
+                    "transaction ID");
+          // skip
+        }
+      } else {
+        LOG.warn("Found image file at " + f + " but storage directory is " +
+                 "not configured to contain images.");
+      }
+    }
+  }
+
+  @Override
+  public boolean isUpgradeFinalized() {
+    return isUpgradeFinalized;
+  }
+  
+  /**
+   * @return the image that has the most recent associated transaction ID.
+   * If there are multiple storage directories which contain equal images 
+   * the storage directory that was inspected first will be preferred.
+   * 
+   * @throws FileNotFoundException if not images are found.
+   */
+  FSImageFile getLatestImage() throws IOException {
+    if (foundImages.isEmpty()) {
+      throw new FileNotFoundException("No valid image files found");
+    }
+
+    FSImageFile ret = null;
+    for (FSImageFile img : foundImages) {
+      if (ret == null || img.txId > ret.txId) {
+        ret = img;
+      }
+    }
+    return ret;
+  }
+  
+  public List<FSImageFile> getFoundImages() {
+    return ImmutableList.copyOf(foundImages);
+  }
+  
+  public List<FSImageFile> getFoundCkptImages() {
+    return ImmutableList.copyOf(foundCkptImages);
+  }
+  
+  @Override
+  public boolean needToSave() {
+    return needToSave;
+  }
+
+  @Override
+  long getMaxSeenTxId() {
+    return maxSeenTxId;
+  }
+
+  @Override
+  boolean forceSave() {
+    // used for pre-transactional inspector
+    return false;
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 87472ded..f3ce8903 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -20,6 +20,8 @@
 import org.apache.commons.logging.*;
 import org.apache.hadoop.conf.*;
 import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.hdfs.util.LightWeightHashSet;
 import org.apache.hadoop.hdfs.util.PathValidator;
 import org.apache.hadoop.hdfs.protocol.*;
@@ -48,8 +50,7 @@
 import org.apache.hadoop.net.ScriptBasedMapping;
 import org.apache.hadoop.hdfs.server.namenode.LeaseManager.Lease;
 import org.apache.hadoop.hdfs.server.namenode.UnderReplicatedBlocks.BlockIterator;
-import org.apache.hadoop.hdfs.server.protocol.BlockCommand;
-import org.apache.hadoop.hdfs.server.protocol.BlockReport;
+import org.apache.hadoop.hdfs.server.protocol.BlockAlreadyCommittedException;
 import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations;
 import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations.BlockWithLocations;
 import org.apache.hadoop.hdfs.server.protocol.BlockFlags;
@@ -58,7 +59,6 @@
 import org.apache.hadoop.hdfs.server.protocol.DisallowedDatanodeException;
 import org.apache.hadoop.hdfs.server.protocol.IncrementalBlockReport;
 import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
-import org.apache.hadoop.hdfs.server.protocol.ReceivedDeletedBlockInfo;
 import org.apache.hadoop.hdfs.server.protocol.UpgradeCommand;
 import org.apache.hadoop.hdfs.util.LightWeightLinkedSet;
 import org.apache.hadoop.hdfs.FileStatusExtended;
@@ -66,29 +66,22 @@
 import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.FileAlreadyExistsException;
 import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.OpenFileInfo;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.*;
-import org.apache.hadoop.ipc.ProtocolSignature;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.io.IOUtils;
 
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.InterruptedIOException;
 import java.io.PrintWriter;
 import java.io.DataOutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.URL;
-import java.net.URLConnection;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -96,11 +89,9 @@
 import java.lang.management.ManagementFactory;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
-import javax.management.ObjectInstance;
 import javax.management.StandardMBean;
 import javax.security.auth.login.LoginException;
 import org.mortbay.util.ajax.JSON;
-import javax.management.MBeanServer;
 
 /**
  * ************************************************
@@ -202,7 +193,8 @@ private static final void logAuditEvent(UserGroupInformation ugi,
   // Mapping: Block -> { INode, datanodes, self ref }
   // Updated only in response to client-sent information.
   //
-  final BlocksMap blocksMap = new BlocksMap(DEFAULT_INITIAL_MAP_CAPACITY,
+  public final BlocksMap blocksMap = new BlocksMap(
+      DEFAULT_INITIAL_MAP_CAPACITY,
       DEFAULT_MAP_LOAD_FACTOR, this);
 
   //
@@ -281,6 +273,7 @@ private static final void logAuditEvent(UserGroupInformation ugi,
   // getting heartbeats from all clients.
   //
   Daemon hbthread = null;   // HeartbeatMonitor thread
+  private LeaseManager.Monitor lmmonitor;
   public Daemon lmthread = null;   // LeaseMonitor thread
   Daemon smmthread = null;  // SafeModeMonitor thread
 
@@ -321,6 +314,7 @@ private static final void logAuditEvent(UserGroupInformation ugi,
   private long defaultBlockSize = 0;
   // allow appending to hdfs files
   private boolean supportAppends = true;
+  private boolean accessTimeTouchable = true;
 
   /**
    * Last block index used for replication work per priority
@@ -382,7 +376,9 @@ private static final void logAuditEvent(UserGroupInformation ugi,
   protected long blocksSafe = 0;
 
   /** flag indicating whether replication queues have been initialized */
-  protected boolean initializedReplQueues = false;
+  volatile protected boolean initializedReplQueues = false;
+  
+  volatile private boolean isInitialized = false;
 
   /**
    * FSNamesystem constructor.
@@ -427,10 +423,13 @@ private void initialize(NameNode nn, Configuration conf) throws IOException {
     // The getter for this is deprecated
     this.nameNodeAddress = nn.getNameNodeAddress();
     this.nameNode = nn;
-    this.dir = new FSDirectory(this, conf);
+    this.dir = new FSDirectory(this, conf, 
+        NNStorageConfiguration.getNamespaceDirs(conf), 
+        NNStorageConfiguration.getNamespaceEditsDirs(conf));
     StartupOption startOpt = NameNode.getStartupOption(conf);
-    this.dir.loadFSImage(getNamespaceDirs(conf),
-      getNamespaceEditsDirs(conf), startOpt);
+    // Validate the Namespace Directory policy before loading them
+    ValidateNamespaceDirPolicy.validate(conf);
+    this.dir.loadFSImage(startOpt, conf);
     long timeTakenToLoadFSImage = now() - systemStart;
     LOG.info("Finished loading FSImage in " + timeTakenToLoadFSImage + " msecs");
     NameNode.getNameNodeMetrics().fsImageLoadTime.set(
@@ -452,8 +451,9 @@ private void initialize(NameNode nn, Configuration conf) throws IOException {
     }
 
     // initialize heartbeat & leasemanager threads
-    this.hbthread = new Daemon(new HeartbeatMonitor());
-    this.lmthread = new Daemon(leaseManager.new Monitor());
+    this.hbthread = new Daemon(new HeartbeatMonitor(conf));
+    this.lmmonitor = leaseManager.new Monitor();
+    this.lmthread = new Daemon(lmmonitor);
 
     // start heartbeat & leasemanager threads
     hbthread.start();
@@ -468,7 +468,7 @@ private void initialize(NameNode nn, Configuration conf) throws IOException {
     overreplthread.start();
 
     this.hostsReader = new HostsFileReader(conf.get("dfs.hosts", ""),
-      conf.get("dfs.hosts.exclude", ""));
+      conf.get("dfs.hosts.exclude", ""), true);
     this.dnthread = new Daemon(new DecommissionManager(this).new Monitor(
       conf.getInt("dfs.namenode.decommission.interval", 30),
       conf.getInt("dfs.namenode.decommission.nodes.per.interval", 5)));
@@ -497,31 +497,7 @@ private void initialize(NameNode nn, Configuration conf) throws IOException {
     this.registerMXBean();
     // Whether or not to sync each addBlock() operation to the edit log.
     this.syncAddBlock = conf.getBoolean("dfs.sync.on.every.addblock", false);
-  }
-
-  public static Collection<File> getNamespaceDirs(Configuration conf) {
-    Collection<String> dirNames = conf.getStringCollection("dfs.name.dir");
-    if (dirNames.isEmpty()) {
-      dirNames.add("/tmp/hadoop/dfs/name");
-    }
-    Collection<File> dirs = new ArrayList<File>(dirNames.size());
-    for (String name : dirNames) {
-      dirs.add(new File(name));
-    }
-    return dirs;
-  }
-
-  public static Collection<File> getNamespaceEditsDirs(Configuration conf) {
-    Collection<String> editsDirNames =
-      conf.getStringCollection("dfs.name.edits.dir");
-    if (editsDirNames.isEmpty()) {
-      editsDirNames.add("/tmp/hadoop/dfs/name");
-    }
-    Collection<File> dirs = new ArrayList<File>(editsDirNames.size());
-    for (String name : editsDirNames) {
-      dirs.add(new File(name));
-    }
-    return dirs;
+    this.isInitialized = true;
   }
 
   /**
@@ -667,6 +643,7 @@ private void setConfigurationParameters(Configuration conf)
     this.maxFsObjects = conf.getLong("dfs.max.objects", 0);
     this.accessTimePrecision = conf.getLong("dfs.access.time.precision", 0);
     this.supportAppends = conf.getBoolean("dfs.support.append", false);
+    this.accessTimeTouchable = conf.getBoolean("dfs.access.time.touchable", true);
 
     long editPreallocateSize = conf.getLong("dfs.edit.preallocate.size",
       HdfsConstants.DEFAULT_EDIT_PREALLOCATE_SIZE);
@@ -690,7 +667,7 @@ private void setConfigurationParameters(Configuration conf)
     this.leaseManager.setLeasePeriod(
         Math.min(hardLeaseLimit, softLeaseLimit), hardLeaseLimit);
   }
-
+  
   /**
    * Return the default path permission when upgrading from releases with no
    * permissions (<=0.15) to releases with permissions (>=0.16)
@@ -703,7 +680,7 @@ NamespaceInfo getNamespaceInfo() {
     writeLock();
     try {
       return new NamespaceInfo(dir.fsImage.getNamespaceID(),
-        dir.fsImage.getCTime(),
+        dir.fsImage.storage.getCTime(),
         getDistributedUpgradeVersion());
     } finally {
       writeUnlock();
@@ -713,12 +690,12 @@ NamespaceInfo getNamespaceInfo() {
   /**
    * Retrieves a list of random files with some information.
    * 
-   * @param maxFiles
-   *          the maximum number of files to return
+   * @param percent
+   *          the percent of files to return
    * @return the list of files
    */
-  public List<FileStatusExtended> getRandomFiles(int maxFiles) {
-    return dir.getRandomFileStats(maxFiles);
+  public List<FileStatusExtended> getRandomFiles(double percent) {
+    return dir.getRandomFileStats(percent);
   }
 
   public OpenFilesInfo getOpenFiles() throws IOException {
@@ -734,6 +711,20 @@ public OpenFilesInfo getOpenFiles() throws IOException {
     }
     return new OpenFilesInfo(openFiles, this.getGenerationStamp());
   }
+  
+  /**
+   * Stops lease monitor thread.
+   */
+  public void stopLeaseMonitor() throws InterruptedException {
+    if (lmmonitor != null) {
+      lmmonitor.stop();
+      InjectionHandler
+          .processEvent(InjectionEvent.FSNAMESYSTEM_STOP_LEASEMANAGER);
+    }
+    if (lmthread != null) {
+      lmthread.join();
+    }
+  }
 
   /**
    * Close down this file system manager.
@@ -766,17 +757,13 @@ public void close() {
     } finally {
       // using finally to ensure we also wait for lease daemon
       try {
-        if (lmthread != null) {
-          lmthread.interrupt();
-          lmthread.join(3000);
-        }
-        if (getConf().getBoolean("dfs.simulate.editlog.crash", false)) {
-          LOG.warn("Simulating edit log crash, not closing edit log cleanly as"
-              + "part of shutdown");
-        } else {
-          dir.close();
+        stopLeaseMonitor();
+        if (InjectionHandler
+            .trueCondition(InjectionEvent.FSNAMESYSTEM_CLOSE_DIRECTORY)) {
+          if (dir != null) {
+            dir.close();
+          }
         }
-        blocksMap.close();
       } catch (InterruptedException ie) {
       } catch (IOException ie) {
         LOG.error("Error closing FSDirectory", ie);
@@ -791,11 +778,11 @@ public void close() {
   boolean isRunning() {
     return fsRunning;
   }
-
+  
   /**
    * Dump all metadata into specified file
    */
-  void metaSave(String filename) throws IOException {
+  void metaSave(String filename) throws IOException {    
     readLock();
     try {
       checkSuperuserPrivilege();
@@ -856,6 +843,11 @@ void metaSave(String filename) throws IOException {
       // Dump blocks that are waiting to be deleted
       //
       dumpRecentInvalidateSets(out);
+      
+      //
+      // Dump blocks that are excess and waiting to be deleted
+      //
+      dumpExcessReplicasSets(out);
 
       //
       // Dump all datanodes
@@ -1262,7 +1254,7 @@ LocatedBlocks getBlockLocationsInternal(INodeFile inode,
       if (blocks.length == 0) {
         return inode.createLocatedBlocks(
             new ArrayList<LocatedBlock>(blocks.length), 
-            type, this.getFSImage().namespaceID,
+            type, this.getFSImage().storage.namespaceID,
             this.nameNode.getClientProtocolMethodsFingerprint());
       }
       List<LocatedBlock> results;
@@ -1330,7 +1322,7 @@ LocatedBlocks getBlockLocationsInternal(INodeFile inode,
         && results.size() < nrBlocksToReturn);
 
       return inode.createLocatedBlocks(results, type,
-          this.getFSImage().namespaceID, this.nameNode
+          this.getFSImage().storage.namespaceID, this.nameNode
               .getClientProtocolMethodsFingerprint());
     } finally {
       readUnlock();
@@ -1501,6 +1493,9 @@ public void concat(String target, String [] srcs, boolean restricted)
    * written to the edits log but is not flushed.
    */
   public void setTimes(String src, long mtime, long atime) throws IOException {
+    if ( !accessTimeTouchable && atime != -1) {
+      throw new AccessTimeException("setTimes is not allowed for accessTime");
+	}    
     setTimesInternal(src, mtime, atime);
     getEditLog().logSync(false);
   }
@@ -1738,7 +1733,8 @@ private INodeFileUnderConstruction startFileInternal(String src,
       try {
         INode myFile = (INodeFile) inode;
         recoverLeaseInternal(myFile, src, holder, clientMachine, false, false);
-
+        long oldAccessTime = -1;
+        
         try {
           verifyReplication(src, replication, clientMachine);
         } catch (IOException e) {
@@ -1754,6 +1750,10 @@ private INodeFileUnderConstruction startFileInternal(String src,
           }
         } else if (myFile != null) {
           if (overwrite) {
+        	// if the accessTime is not changable, keep the previous time
+            if (!isAccessTimeSupported() && (inodes.length > 0)) {
+              oldAccessTime = inodes[inodes.length - 1].getAccessTime();
+            }
             deleteInternal(src, inodes, false, true);
           } else {
             throw new IOException("failed to create file " + src
@@ -1782,6 +1782,7 @@ private INodeFileUnderConstruction startFileInternal(String src,
             node.getLocalNameBytes(),
             node.getReplication(),
             node.getModificationTime(),
+            isAccessTimeSupported() ? node.getModificationTime() : node.getAccessTime(),
             node.getPreferredBlockSize(),
             node.getBlocks(),
             node.getPermissionStatus(),
@@ -1802,7 +1803,7 @@ private INodeFileUnderConstruction startFileInternal(String src,
           long genstamp = nextGenerationStamp();
           INodeFileUnderConstruction newNode = dir.addFile(
             src, names, components, inodes, permissions,
-            replication, blockSize, holder, clientMachine, clientNode, genstamp);
+            replication, blockSize, holder, clientMachine, clientNode, genstamp, oldAccessTime);
           if (newNode == null) {
             throw new IOException("DIR* NameSystem.startFile: " +
               "Unable to add file to namespace.");
@@ -1864,15 +1865,14 @@ boolean recoverLease(String src, String holder, String clientMachine,
         checkPathAccess(src, inodes, FsAction.WRITE);
       }
 
-      recoverLeaseInternal(inode, src, holder, clientMachine,
+      return recoverLeaseInternal(inode, src, holder, clientMachine,
                            true, discardLastBlock);
-      return false;
     } finally {
       writeUnlock();
     }
   }
 
-  private void recoverLeaseInternal(INode fileInode,
+  private boolean recoverLeaseInternal(INode fileInode,
       String src, String holder, String clientMachine, boolean force,
       boolean discardLastBlock)
   throws IOException {
@@ -1912,7 +1912,9 @@ private void recoverLeaseInternal(INode fileInode,
         LOG.info("recoverLease: recover lease " + lease + ", src=" + src +
                  " from client " + pendingFile.clientName +
                  " discardLastBloc = " + discardLastBlock);
-        internalReleaseLeaseOne(lease, src, pendingFile, discardLastBlock);
+        // We have to tell the client that the lease recovery has succeeded e.g. in case the file
+        // has no blocks. Otherwise, the client will get stuck in an infinite loop.
+        return internalReleaseLeaseOne(lease, src, pendingFile, discardLastBlock);
       } else {
         //
         // If the original holder has not renewed in the last SOFTLIMIT
@@ -1931,6 +1933,9 @@ private void recoverLeaseInternal(INode fileInode,
             " on " + pendingFile.getClientMachine());
       }
     }
+    // This does not necessarily mean lease recovery has failed, but we will
+    // have the client retry.
+    return false;
   }
 
   /** 
@@ -1970,7 +1975,7 @@ public LocatedBlock appendFile(String src, String holder, String clientMachine,
         Block last = blocks[blocks.length - 1];
         BlockInfo storedBlock = blocksMap.getStoredBlock(last);
         if (file.getPreferredBlockSize() > storedBlock.getNumBytes()) {
-          long fileLength = file.computeContentSummary().getLength();
+          long fileLength = file.computeContentSummary().getLength();          
           DatanodeDescriptor[] targets = new DatanodeDescriptor[blocksMap.numNodes(last)];
           Iterator<DatanodeDescriptor> it = blocksMap.nodeIterator(last);
           for (int i = 0; it != null && it.hasNext(); i++) {
@@ -2331,7 +2336,7 @@ private LocatedBlock createLocatedBlock(Block block,
     switch (type) {
     case VERSION_AND_NAMESPACEID:
       return new LocatedBlockWithMetaInfo(block, targets, fileLen,
-          transferProtocolVersion, this.getFSImage().namespaceID, this.nameNode
+          transferProtocolVersion, this.getFSImage().storage.namespaceID, this.nameNode
               .getClientProtocolMethodsFingerprint());
     case VERSION:
       return new VersionedLocatedBlock(block, targets, fileLen,
@@ -2608,9 +2613,9 @@ private CompleteFileStatus completeFileInternal(String src,
                   + fileLen + " name-node: " + sumBlockLen);
         }
       }
-
+      
       finalizeINodeFileUnderConstruction(src, inodes, pendingFile);
-
+      
     } finally {
       writeUnlock();
     }
@@ -2710,8 +2715,11 @@ void removeFromInvalidates(String storageID) {
    */
   void addToInvalidates(Block b, DatanodeInfo n, boolean ackRequired) {
     addToInvalidatesNoLog(b, n, ackRequired);
-    NameNode.stateChangeLog.info("BLOCK* NameSystem.addToInvalidates: "
-      + b.getBlockName() + " is added to invalidSet of " + n.getName());
+    if (isInitialized && !isInSafeMode()) {
+      // do not log in startup phase
+      NameNode.stateChangeLog.info("BLOCK* NameSystem.addToInvalidates: "
+        + b.getBlockName() + " is added to invalidSet of " + n.getName());
+    }
   }
 
   /**
@@ -2755,8 +2763,31 @@ private void addToInvalidates(Block b, boolean ackRequired) {
       sb.append(node.getName());
       sb.append(' ');
     }
-    NameNode.stateChangeLog.info("BLOCK* NameSystem.addToInvalidates: "
-            + b.getBlockName() + " is added to invalidSet of " + sb);
+    if (isInitialized && !isInSafeMode()) {
+      // do not log in startup phase
+      NameNode.stateChangeLog.info("BLOCK* NameSystem.addToInvalidates: "
+              + b.getBlockName() + " is added to invalidSet of " + sb);
+    }
+  }
+  
+  /**
+   * dumps the contents of recentInvalidateSets
+   */
+  void dumpExcessReplicasSets(PrintWriter out) {
+    int size = excessReplicateMap.values().size();
+    out.println("Metasave: Blocks " + excessBlocksCount
+      + " waiting deletion from " + size + " datanodes.");
+    if (size == 0) {
+      return;
+    }
+    for (Map.Entry<String, LightWeightHashSet<Block>> entry : excessReplicateMap
+        .entrySet()) {
+      LightWeightHashSet<Block> blocks = entry.getValue();
+      if (blocks.size() > 0) {
+        out.println(datanodeMap.get(entry.getKey()).getName());
+        blocks.printDetails(out);
+      }
+    }
   }
 
   /**
@@ -2882,6 +2913,13 @@ private void invalidateBlock(Block blk, DatanodeInfo dn, boolean ackRequired)
   // are made, edit namespace and return to client.
   ////////////////////////////////////////////////////////////////
 
+  /**
+   * See {@link ClientProtocol#getHardLinkedFiles(String)}.
+   */
+  public String[] getHardLinkedFiles(String src) throws IOException {
+    return dir.getHardLinkedFiles(src);
+  }
+
   /** 
    * Create the hard link from src file to the dest file. 
    */ 
@@ -2895,7 +2933,7 @@ public boolean hardLinkTo(String src, String dst) throws IOException {
     return dstNode != null; 
   } 
     
-  private INode hardLinkToInternal(String src, String dst) throws IOException { 
+  private INode hardLinkToInternal(String src, String dst) throws IOException {
     // Check the dst name 
     String[] dstNames = INode.getPathNames(dst);  
     if (!pathValidator.isValidName(dst, dstNames)) {  
@@ -2929,9 +2967,8 @@ private INode hardLinkToInternal(String src, String dst) throws IOException {
       } 
         
       // Create the hard link 
-      if (dir.hardLinkTo(src, srcNames[srcNames.length-1],  
-                       srcComponents[srcComponents.length-1], srcInodes,  
-                       dst, dstInodes, dstComponents[dstComponents.length-1])) {  
+      if (dir.hardLinkTo(src, srcNames, srcComponents, srcInodes,  
+                         dst, dstNames, dstComponents, dstInodes)) {  
         return dstInodes[dstInodes.length-1]; 
       } 
       return null;  
@@ -3035,7 +3072,7 @@ public boolean delete(String src, boolean recursive) throws IOException {
   }
 
   static void incrDeletedFileCount(FSNamesystem fsnamesystem, int count) {
-    if (fsnamesystem != null)
+    if (fsnamesystem != null && NameNode.getNameNodeMetrics() != null)
       NameNode.getNameNodeMetrics().numFilesDeleted.inc(count);
   }
     
@@ -3163,7 +3200,7 @@ FileStatus getFileInfo(String src) throws IOException {
     return dir.getFileInfo(src, inodes[inodes.length-1]);
   }
 
-  FileStatusExtended getFileInfoExtended(String src) throws IOException {
+  public FileStatusExtended getFileInfoExtended(String src) throws IOException {
     Lease lease = leaseManager.getLeaseByPath(src);
     String leaseHolder = (lease == null) ? "" : lease.getHolder();
     return getFileInfoExtended(src, leaseHolder);
@@ -3426,12 +3463,14 @@ void internalReleaseLeaseOne(Lease lease, String src,
    *
    * @param src   The filename
    * @param lease The lease for the client creating the file
+   * @return true if lease recovery has completed, false if the client has to retry
    */
-  void internalReleaseLeaseOne(Lease lease, String src,
+  boolean internalReleaseLeaseOne(Lease lease, String src,
         INodeFileUnderConstruction pendingFile, boolean discardLastBlock) throws IOException {
     // if it is safe to discard the last block, then do so
     if (discardLastBlock && discardDone(pendingFile, src)) {
-      return;
+      // Have client retry lease recovery.
+      return false;
     }
 
     // Initialize lease recovery for pendingFile. If there are no blocks
@@ -3443,7 +3482,8 @@ void internalReleaseLeaseOne(Lease lease, String src,
         finalizeINodeFileUnderConstruction(src, pendingFile);
         NameNode.stateChangeLog.warn("BLOCK*"
           + " internalReleaseLease: No blocks found, lease removed for " +  src);
-        return;
+        // Tell the client that lease recovery has succeeded.
+        return true;
       }
       // setup the Inode.targets for the last block from the blocksMap
       //
@@ -3464,6 +3504,7 @@ void internalReleaseLeaseOne(Lease lease, String src,
     );
     getEditLog().logOpenFile(src, pendingFile);
     leaseManager.renewLease(reassignedLease);
+    return false;  // Have the client retry lease recovery.
   }
 
   // If we are part of recoverLease call and no fsync has
@@ -3517,7 +3558,7 @@ private void finalizeINodeFileUnderConstruction(String src,
 
     // The file is no longer pending.
     // Create permanent INode, update blockmap
-    INodeFile newFile = pendingFile.convertToInodeFile();
+    INodeFile newFile = pendingFile.convertToInodeFile(isAccessTimeSupported());
     dir.replaceNode(src, inodes, pendingFile, newFile, true);
 
     // close file and persist block allocations for this file
@@ -3935,7 +3976,7 @@ void resolveNetworkLocation(DatanodeInfo node) {
    * @see FSImage#newNamespaceID()
    */
   public String getRegistrationID() {
-    return Storage.getRegistrationID(dir.fsImage);
+    return Storage.getRegistrationID(dir.fsImage.storage);
   }
 
   /**
@@ -3957,12 +3998,12 @@ private String newStorageID() {
     return newID;
   }
 
-  private boolean isDatanodeDead(DatanodeDescriptor node) {
+  boolean isDatanodeDead(DatanodeDescriptor node) {
     return (node.getLastUpdate() <
       (now() - heartbeatExpireInterval));
   }
 
-  void setDatanodeDead(DatanodeDescriptor node) throws IOException {
+  public void setDatanodeDead(DatanodeDescriptor node) throws IOException {
     node.setLastUpdate(0);
   }
 
@@ -4085,22 +4126,82 @@ private void updateStats(DatanodeDescriptor node, boolean isAdded) {
   }
 
   /**
-   * Periodically calls heartbeatCheck().
+   * Periodically calls heartbeatCheck() and updateSuspectStatus().
    */
   class HeartbeatMonitor implements Runnable {
+    private long reevaluateSuspectFailNodesIntervalMs;
+    private long suspectFailUponHeartBeatMissTimeoutMs;
+    private int maxSuspectNodesAllowed;
+
+    public HeartbeatMonitor(Configuration conf) {
+      suspectFailUponHeartBeatMissTimeoutMs = conf.getLong(
+          "dfs.heartbeat.timeout.millis", 120000); // 2 min, default
+      reevaluateSuspectFailNodesIntervalMs = 
+          suspectFailUponHeartBeatMissTimeoutMs / 2; // 1 min, default
+      maxSuspectNodesAllowed = conf.getInt( "dfs.heartbeat.timeout.suspect-fail.max", 
+          25); // more than 1 rack. but less than 2.
+    }
+
     /**
      */
     public void run() {
+      long now = now();
+      long nextHeartBeatCheckTime = now + heartbeatRecheckInterval;
+      long nextUpdateSuspectTime = now + reevaluateSuspectFailNodesIntervalMs;
+      long sleepTime;
+      
       while (fsRunning) {
         try {
-          heartbeatCheck();
-        } catch (Exception e) {
-          FSNamesystem.LOG.error("Error in heartbeatCheck: ", e);
-        }
-        try {
-          Thread.sleep(heartbeatRecheckInterval);
+          // 5 mins too slow for suspect?
+          sleepTime = Math.min(nextUpdateSuspectTime, nextHeartBeatCheckTime) - now;
+          Thread.sleep(sleepTime);
         } catch (InterruptedException ie) {
         }
+        
+        now = now();
+        
+        if (now > nextUpdateSuspectTime) {
+          updateSuspectStatus(now);
+          nextUpdateSuspectTime = now + reevaluateSuspectFailNodesIntervalMs;
+        }
+        
+        if (now > nextHeartBeatCheckTime) {
+          try {
+            heartbeatCheck();
+            nextHeartBeatCheckTime = now + heartbeatRecheckInterval;
+          } catch (Exception e) {
+            FSNamesystem.LOG.error("Error in heartbeatCheck: ", e);
+          }
+        }
+      }
+    }
+
+    boolean isDatanodeSuspectFail(long now, DatanodeDescriptor node) {
+      return (node.getLastUpdate() <
+        (now - suspectFailUponHeartBeatMissTimeoutMs));
+    }
+    
+    void updateSuspectStatus(long now) {
+      int numSuspectNodes = 0;
+      synchronized (heartbeats) {
+        for (Iterator<DatanodeDescriptor> it = heartbeats.iterator();
+             it.hasNext();) {
+          DatanodeDescriptor nodeInfo = it.next();
+          if (isDatanodeSuspectFail(now, nodeInfo)) {
+            nodeInfo.setSuspectFail(true);
+            if (++numSuspectNodes > maxSuspectNodesAllowed) {
+              break;
+            }
+          } else {
+            nodeInfo.setSuspectFail(false);
+          }
+        }
+        
+        if (numSuspectNodes <= maxSuspectNodesAllowed) {
+          DatanodeInfo.enableSuspectNodes();
+        } else { // Too many suspects. Disable failure detection
+          DatanodeInfo.disableSuspectNodes();
+        }
       }
     }
   }
@@ -4119,17 +4220,28 @@ public void run() {
           processPendingReplications();
           Thread.sleep(underReplicationRecheckInterval);
         } catch (InterruptedException ie) {
-          LOG.warn("UnderReplicationMonitor thread received InterruptedException." + ie);
+          LOG.warn("UnderReplicationMonitor thread received InterruptedException.", ie);
           break;
         } catch (IOException ie) {
-          LOG.warn("UnderReplicationMonitor thread received exception. " + ie);
+          LOG.warn("UnderReplicationMonitor thread received exception. ", ie);
         } catch (Throwable t) {
-          LOG.warn("UnderReplicationMonitor thread received Runtime exception. " + t);
+          LOG.warn("UnderReplicationMonitor thread received Runtime exception. ", t);
           Runtime.getRuntime().exit(-1);
         }
       }
     }
   }
+  
+  class OverReplicatedBlock extends Block {
+    public DatanodeDescriptor addedNode;
+    public DatanodeDescriptor delNodeHint;
+    OverReplicatedBlock(Block b, DatanodeDescriptor newAddedNode,
+        DatanodeDescriptor newDelNodeHint) {
+      super(b);
+      this.addedNode = newAddedNode;
+      this.delNodeHint = newDelNodeHint;
+    }
+  }
 
   /**
    * Periodically calls processOverReplicatedBlocksAsync().
@@ -4173,6 +4285,7 @@ public int computeDatanodeWork() throws IOException {
     int nodesToProcess = 0;
     // blocks should not be replicated or removed if safe mode is on
     if (isInSafeMode()) {
+      updateReplicationCounts(workFound);
       return workFound;
     }
     synchronized (heartbeats) {
@@ -4185,6 +4298,13 @@ public int computeDatanodeWork() throws IOException {
     workFound = computeReplicationWork(blocksToProcess);
 
     // Update FSNamesystemMetrics counters
+    updateReplicationCounts(workFound);
+
+    workFound += computeInvalidateWork(nodesToProcess);
+    return workFound;
+  }
+  
+  private void updateReplicationCounts(int workFound) {
     writeLock();
     try {
       pendingReplicationBlocksCount = pendingReplications.size();
@@ -4194,9 +4314,6 @@ public int computeDatanodeWork() throws IOException {
     } finally {
       writeUnlock();
     }
-
-    workFound += computeInvalidateWork(nodesToProcess);
-    return workFound;
   }
 
   /**
@@ -4762,6 +4879,29 @@ public void removeDatanode(DatanodeID nodeID)
       writeUnlock();
     }
   }
+  
+  /**
+   * Clear replication queues. This is used by standby avatar to reclaim memory.
+   */
+  void clearReplicationQueues() {
+    writeLock();
+    try {
+      synchronized (neededReplications) {
+        neededReplications.clear();
+      }
+      underReplicatedBlocksCount = 0;
+
+      corruptReplicas.clear();
+      corruptReplicaBlocksCount = 0;
+
+      overReplicatedBlocks.clear();
+
+      excessReplicateMap = new HashMap<String, LightWeightHashSet<Block>>();
+      excessBlocksCount = 0;
+    } finally {
+      writeUnlock();
+    }
+  }
 
   /**
    * remove a datanode descriptor
@@ -4839,7 +4979,7 @@ FSImage getFSImage() {
     return dir.fsImage;
   }
 
-  FSEditLog getEditLog() {
+  public FSEditLog getEditLog() {
     return getFSImage().getEditLog();
   }
 
@@ -4851,8 +4991,8 @@ FSEditLog getEditLog() {
    * effect causes more datanodes to be declared dead.
    */
   void heartbeatCheck() {
-    if (isInSafeMode()) {
-      // not to check dead nodes if in safemode 
+    if (!getNameNode().shouldCheckHeartbeat()) {
+      // not to check dead nodes.
       return;
     }
     boolean allAlive = false;
@@ -4962,12 +5102,16 @@ public void processBlocksBeingWrittenReport(DatanodeID nodeID,
 
         INodeFileUnderConstruction pendingFile = 
                             (INodeFileUnderConstruction)inode;
-        pendingFile.addTarget(dataNode);
-        incrementSafeBlockCount(pendingFile.getTargets().length, true);
+        boolean added = pendingFile.addTarget(dataNode);
+        if (!dataNode.isDecommissioned()
+            && !dataNode.isDecommissionInProgress() && added) {
+          // Increment only once for each datanode.
+          incrementSafeBlockCount(pendingFile.getTargets().length, true);
+        }
       }
     } finally {
-      checkSafeMode();
       writeUnlock();
+      checkSafeMode();
     }
   }
   
@@ -5001,7 +5145,7 @@ public Collection<Block> processReport(DatanodeID nodeID,
     try {
       long startTime = now();
       if (NameNode.stateChangeLog.isDebugEnabled()) {
-        NameNode.stateChangeLog.debug("BLOCK* NameSystem.processReport: "
+         NameNode.stateChangeLog.debug("BLOCK* NameSystem.processReport: "
           + "from " + nodeID.getName() + " " +
           newReport.getNumberOfBlocks() + " blocks");
       }
@@ -5057,8 +5201,8 @@ public Collection<Block> processReport(DatanodeID nodeID,
       processTime = (int)(now() - startTime);
       NameNode.getNameNodeMetrics().blockReport.inc(processTime);
     } finally {
-      checkSafeMode();
       writeUnlock();
+      checkSafeMode();
     }
     if (toInvalidate != null) {
       for (Block b : toInvalidate) {
@@ -5149,29 +5293,27 @@ private boolean addStoredBlockInternal(Block block,
       boolean isLastBlock = inode.getLastBlock() != null &&
         inode.getLastBlock().getBlockId() == block.getBlockId();
 
-      // We can report a stale generation stamp for the last block under construction,
-      // we just need to make sure it ends up in targets.
-      if (reportedOldGS && !(underConstruction && isLastBlock)) {
-        rejectAddStoredBlock(
-          new Block(block), node,
-          "Reported block has old generation stamp but is not the last block of " +
-          "an under-construction file. (current generation is " +
-          storedBlock.getGenerationStamp() + ")",
-          initialBlockReport);
-        return false;
-      }
-
       // Don't add blocks to the DN when they're part of the in-progress last block
       // and have an inconsistent generation stamp. Instead just add them to targets
       // for recovery purposes. They will get added to the node when
       // commitBlockSynchronization runs
-      if (underConstruction && isLastBlock && (reportedOldGS || reportedNewGS)) {
-        NameNode.stateChangeLog.info(
-          "BLOCK* NameSystem.addStoredBlock: "
-          + "Targets updated: block " + block + " on " + node.getName() +
-          " is added as a target for block " + storedBlock + " with size " +
-          block.getNumBytes());
-        ((INodeFileUnderConstruction)inode).addTarget(node);
+      if (reportedOldGS || reportedNewGS) {  // mismatched generation stamp
+        if (underConstruction && isLastBlock) {
+          NameNode.stateChangeLog.info(
+              "BLOCK* NameSystem.addStoredBlock: "
+              + "Targets updated: block " + block + " on " + node.getName() +
+              " is added as a target for block " + storedBlock + " with size " +
+              block.getNumBytes());
+          ((INodeFileUnderConstruction)inode).addTarget(node);
+        } else {
+          rejectAddStoredBlock(
+              new Block(block), node,
+              "Reported block has mismatched generation stamp " +
+              "but is not the last block of " +
+              "an under-construction file. (current generation is " +
+              storedBlock.getGenerationStamp() + ")",
+              initialBlockReport);
+        }
         return false;
       }
     }
@@ -5273,24 +5415,6 @@ private boolean addStoredBlockInternal(Block block,
             LOG.warn("Error in deleting bad block " + block + e);
           }
         }
-
-        //Updated space consumed if required.
-        long diff = (file == null) ? 0 :
-          (file.getPreferredBlockSize() - storedBlock.getNumBytes());
-
-        if (diff > 0 && file.isUnderConstruction() &&
-          cursize < storedBlock.getNumBytes()) {
-          try {
-            // get all the inodes on the path
-            INode[] inodes = FSDirectory.getINodeArray(file);
-            INodeFileUnderConstruction cons = (INodeFileUnderConstruction) file;
-            dir.updateSpaceConsumed(cons.getFullPathName(),
-                inodes, 0, -diff * file.getReplication());
-          } catch (IOException e) {
-            LOG.warn("Unexpected exception while updating disk space : " +
-              e.getMessage());
-          }
-        }
       }
       block = storedBlock;
     } else {
@@ -5370,7 +5494,12 @@ private boolean addStoredBlockInternal(Block block,
         num.decommissionedReplicas, node, fileReplication);
     // handle over-replication
     if (numCurrentReplica > fileReplication) {
-      processOverReplicatedBlock(block, fileReplication, node, delNodeHint);
+      // Put block into a queue and handle excess block asyncly
+      if (delNodeHint == null || node == delNodeHint) {
+        overReplicatedBlocks.add(block);
+      } else {
+        overReplicatedBlocks.add(new OverReplicatedBlock(block, node, delNodeHint));
+      }
     }
     // If the file replication has reached desired value
     // we can remove any corrupt replicas the block may have
@@ -5454,6 +5583,9 @@ void invalidateCorruptReplicas(Block blk) {
   protected void processMisReplicatedBlocks() {
     writeLock();
     try {
+      if (this.initializedReplQueues) {
+        return;
+      }
       String logPrefix = "Processing mis-replicated blocks: ";
       long nrInvalid = 0, nrOverReplicated = 0, nrUnderReplicated = 0;
       neededReplications.clear();
@@ -5475,7 +5607,7 @@ protected void processMisReplicatedBlocks() {
           continue;
         }
         // If this is a last block of a file under construction ignore it.
-        if (fileINode.getLastBlock().equals(block)
+        if (block.equals(fileINode.getLastBlock())
             && fileINode.isUnderConstruction()) {
           continue;
         }
@@ -5498,6 +5630,7 @@ protected void processMisReplicatedBlocks() {
           overReplicatedBlocks.add(block);
         }
       }
+      this.initializedReplQueues = true;
       LOG.info(logPrefix + "Total number of blocks = " + blocksMap.size());
       LOG.info(logPrefix + "Number of invalid blocks = " + nrInvalid);
       LOG.info(logPrefix + "Number of under-replicated blocks = " +
@@ -5516,6 +5649,10 @@ protected void processMisReplicatedBlocks() {
    */
   private void processOverReplicatedBlocksAsync() {
 
+    // blocks should not be scheduled for deletion during safemode
+    if (isInSafeMode()) {
+      return;
+    }
     List<Block> blocksToProcess = new LinkedList<Block>();
     writeLock();
     try {
@@ -5531,7 +5668,13 @@ private void processOverReplicatedBlocksAsync() {
         NameNode.stateChangeLog
             .debug("BLOCK* NameSystem.processOverReplicatedBlocksAsync: " + block);
       }
-      processOverReplicatedBlock(block, (short) -1, null, null);
+      if (block instanceof OverReplicatedBlock) {
+        OverReplicatedBlock opb = (OverReplicatedBlock)block;
+        processOverReplicatedBlock(block, (short) -1, opb.addedNode, opb.delNodeHint);
+      } else {
+        processOverReplicatedBlock(block, (short) -1, null, null);
+      }
+        
     }
   }
 
@@ -5837,8 +5980,12 @@ public void blockReceivedAndDeleted(DatanodeRegistration nodeReg,
           receivedAndDeletedBlocks[i] = null; 
           deleted++;
         } else {
-          blockReceived(receivedAndDeletedBlocks[i],
-              receivedAndDeletedBlocks[i].getDelHints(),node);
+          if(!blockReceived(receivedAndDeletedBlocks[i],
+              receivedAndDeletedBlocks[i].getDelHints(),node)) {
+            // block was rejected
+            receivedAndDeletedBlocks[i] = null;
+            continue;
+          }
           received++;
         }
       }
@@ -5873,11 +6020,7 @@ public void blockReceivedAndDeleted(DatanodeRegistration nodeReg,
                 + "blockMap updated: " + nodeReg.getName() + " is added to "
                 + receivedAndDeletedBlocks[i] + " size "
                 + receivedAndDeletedBlocks[i].getNumBytes());
-          } else {
-            NameNode.stateChangeLog.info("BLOCK* NameSystem.blockReceived: "
-                + "for block "
-                + receivedAndDeletedBlocks[i] + " was rejected");
-          }
+          } 
         }
       }
     }
@@ -5890,7 +6033,8 @@ public void blockReceivedAndDeleted(DatanodeRegistration nodeReg,
     int deleted = 0;
     int processTime = 0;
     
-    Block blk = new Block();   
+    Block blk = new Block(); 
+    int numberOfAcks = receivedAndDeletedBlocks.getLength();
     
     writeLock();
     long startTime = now();
@@ -5909,7 +6053,7 @@ public void blockReceivedAndDeleted(DatanodeRegistration nodeReg,
       }
 
       receivedAndDeletedBlocks.resetIterator();
-      while(receivedAndDeletedBlocks.hasNext()) {
+      for (int currentBlock = 0; currentBlock < numberOfAcks; currentBlock++) {
         String hint = receivedAndDeletedBlocks.getNext(blk);
         //avatar datanode mighs send nulls in the array
         if (blk.getNumBytes() == BlockFlags.IGNORE) {
@@ -5920,7 +6064,12 @@ public void blockReceivedAndDeleted(DatanodeRegistration nodeReg,
           removeStoredBlock(blk, node); 
           deleted++;
         } else {
-          blockReceived(blk, hint, node);
+          if(!blockReceived(blk, hint, node)) {
+            // block was rejected, and deleted
+            blk.setNumBytes(BlockFlags.DELETED);
+            receivedAndDeletedBlocks.setBlock(blk, currentBlock);
+            continue;
+          }
           received++;
         }
       }
@@ -5942,24 +6091,20 @@ public void blockReceivedAndDeleted(DatanodeRegistration nodeReg,
         // So, we log only when namenode is out of safemode.
         // We log only blockReceived messages.
         receivedAndDeletedBlocks.resetIterator();
-        while(receivedAndDeletedBlocks.hasNext()) { 
+        while(receivedAndDeletedBlocks.hasNext()) {
           receivedAndDeletedBlocks.getNext(blk);
           if (count > received) {
             break;
           }
-          if (DFSUtil.isDeleted(blk) || blk.getNumBytes() == BlockFlags.IGNORE) 
-              continue;
+          if (DFSUtil.isDeleted(blk) || blk.getNumBytes() == BlockFlags.IGNORE)
+            continue;
           ++count;
           if (blk.getNumBytes() != BlockFlags.NO_ACK) {       
             NameNode.stateChangeLog.info("BLOCK* NameSystem.blockReceived: "
                 + "blockMap updated: " + nodeReg.getName() + " is added to "
                 + blk + " size "
                 + blk.getNumBytes());
-          } else {
-            NameNode.stateChangeLog.info("BLOCK* NameSystem.blockReceived: "
-                + "for block "
-                + blk + " was rejected");
-          }
+          } 
         }
       }
     }
@@ -6006,11 +6151,14 @@ private void removeStoredBlock(Block block, DatanodeDescriptor node) {
       decrementSafeBlockCount(block);
       // handle under replication
       // Use storedBlock here because block maybe a deleted block with size DELETED
-      NumberReplicas num = countNodes(storedBlock);
-      int numCurrentReplicas = num.liveReplicas() +
+      if (isPopulatingReplQueues()) {
+        NumberReplicas num = countNodes(storedBlock);
+        int numCurrentReplicas = num.liveReplicas()
+            +
         pendingReplications.getNumReplicas(storedBlock);
-      updateNeededReplicationQueue(storedBlock, -1, numCurrentReplicas,
-          num.decommissionedReplicas, node, fileINode.getReplication());
+        updateNeededReplicationQueue(storedBlock, -1, numCurrentReplicas,
+            num.decommissionedReplicas, node, fileINode.getReplication());
+      }
     }
 
     //
@@ -6084,7 +6232,7 @@ private void removeFromExcessReplicateMap(Block block){
   /**
    * The given node is reporting that it received a certain block.
    */
-  private void blockReceived(Block block,
+  private boolean blockReceived(Block block,
                             String delHint,
                             DatanodeDescriptor node) throws IOException {
     assert (hasWriteLock());
@@ -6107,7 +6255,7 @@ private void blockReceived(Block block,
     // Modify the blocks->datanode map and node's map.
     //
     pendingReplications.remove(block);
-    addStoredBlock(block, node, delHintNode);
+    return addStoredBlock(block, node, delHintNode);
   }
 
   public long getMissingBlocksCount() {
@@ -6119,38 +6267,6 @@ public String getRaidHttpUrl() {
     return this.getConf().get(
         FSConstants.DFS_RAIDNODE_HTTP_ADDRESS_KEY, null);
   }
-  
-  /*
-   * Connect to the raidnode to get the corrupt file HTML information
-   */
-  public String getCorruptFileHTMLInfo(String raidHttpUrl) throws IOException {
-    // Connect to the raid node
-    final StringBuffer url = new StringBuffer("http://"+raidHttpUrl+"/corruptfilecounter");
-    InputStream stream = null;
-    URL path = new URL(url.toString());
-    LOG.info("Connect to " + url.toString());
-    URLConnection connection = path.openConnection();
-    stream = connection.getInputStream();
-    BufferedReader input = new BufferedReader(
-        new InputStreamReader(stream));
-    StringBuilder sb = new StringBuilder();
-    String line = null;
-    try {
-      while (true) {
-        line = input.readLine();
-        if (line == null) {
-          break;
-        }
-        sb.append(line + "\n");
-      }
-      return sb.toString();
-    } catch (IOException e) {
-      LOG.error("Error to get the corrupt file information", e);
-      throw e;
-    } finally {
-      input.close();
-    }
-  }
 
   long[] getStats() throws IOException {
     checkSuperuserPrivilege();
@@ -6264,7 +6380,7 @@ int getNumberOfDatanodes(DatanodeReportType type) {
     return getDatanodeListForReport(type).size();
   }
  
-  private ArrayList<DatanodeDescriptor> getDatanodeListForReport(
+  ArrayList<DatanodeDescriptor> getDatanodeListForReport(
     DatanodeReportType type) {
     readLock();
     try {
@@ -6363,7 +6479,7 @@ void saveNamespace(boolean force, boolean uncompressed) throws AccessControlExce
         throw new IOException("Safe mode should be turned ON " +
           "in order to create namespace image.");
       }
-      getFSImage().saveNamespace(uncompressed, true);
+      getFSImage().saveNamespace(uncompressed);
       LOG.info("New namespace image has been created.");
     } finally {
       writeUnlock();
@@ -6732,7 +6848,7 @@ public void refreshNodes(Configuration conf) throws IOException {
       conf = new Configuration();
     }
     hostsReader.updateFileNames(conf.get("dfs.hosts", ""),
-      conf.get("dfs.hosts.exclude", ""));
+      conf.get("dfs.hosts.exclude", ""), true);
     Set<String> includes = hostsReader.getNewIncludes();
     Set<String> excludes = hostsReader.getNewExcludes();
     Set<String> prevIncludes = hostsReader.getHosts();
@@ -6900,27 +7016,37 @@ void setSafeModeManualOverride(boolean flag) {
    *
    * @return true if safe mode is ON, false otherwise
    */
-  public synchronized boolean isInSafeMode() {
-    if (safeMode == null) {
-      return false;
+  public boolean isInSafeMode() {
+    readLock();
+    try {
+      return safeMode != null && safeMode.isOn();
+    } finally {
+      readUnlock();
     }
-    return safeMode.isOn();
   }
 
   /**
    * Check whether replication queues are populated.
    */
-  synchronized boolean isPopulatingReplQueues() {
-    return (!isInSafeMode() || initializedReplQueues);
+  boolean isPopulatingReplQueues() {
+    readLock();
+    try {
+      return (!isInSafeMode() || initializedReplQueues);
+    } finally {
+      readUnlock();
+    }
   }
 
   /**
    * Check whether the name node is in startup mode.
    */
-  synchronized boolean isInStartupSafeMode() {
-    if (safeMode == null)
-      return false;
-    return safeMode.isOn() && !safeMode.isManual();
+  boolean isInStartupSafeMode() {
+    readLock();
+    try {
+      return safeMode != null && safeMode.isOn() && !safeMode.isManual();
+    } finally {
+      readUnlock();
+    }
   }
 
   /**
@@ -6947,8 +7073,13 @@ void incrementSafeBlockCount(int replication, boolean skipCheck) {
    * to avoid multiple check() calls.
    */
   void checkSafeMode() {
-    if (safeMode != null && safeMode.isOn()) {
-      safeMode.checkMode();
+    writeLock();
+    try {
+      if (safeMode != null && safeMode.isOn()) {
+        safeMode.checkMode();
+      }
+    } finally {
+      writeUnlock();
     }
   }
 
@@ -7023,6 +7154,10 @@ public long getBlocksTotal() {
   void enterSafeMode() throws IOException {
     writeLock();
     try {
+      // Ensure that any concurrent operations have been fully synced
+      // before entering safe mode. This ensures that the FSImage
+      // is entirely stable on disk as soon as we're in safe mode.
+      getEditLog().logSyncAll();
       if (!isInSafeMode()) {
         safeMode = SafeModeUtil.getInstance(this);
         safeMode.setManual();
@@ -7067,8 +7202,13 @@ String getSafeModeTip() {
     return safeMode.getTurnOffTip();
   }
 
-  long getEditLogSize() throws IOException {
-    return getEditLog().getEditLogSize();
+  /**
+   * @return The most recent transaction ID that has been synced to
+   * persistent storage.
+   * @throws IOException
+   */
+  public long getTransactionID() throws IOException {
+    return getEditLog().getLastSyncedTxId();
   }
 
   CheckpointSignature rollEditLog() throws IOException {
@@ -7079,18 +7219,28 @@ CheckpointSignature rollEditLog() throws IOException {
           safeMode);
       }
       LOG.info("Roll Edit Log from " + Server.getRemoteAddress() +
-        " editlog file " + getFSImage().getEditLog().getFsEditName() +
-        " editlog timestamp " + getFSImage().getEditLog().getFsEditTime());
+        " starting stransaction id " + getFSImage().getEditLog().getCurSegmentTxId() +
+        " ending transaction id: " + (getFSImage().getEditLog().getLastWrittenTxId() + 1));
       return getFSImage().rollEditLog();
     } finally {
       writeUnlock();
     }
   }
+  
+  CheckpointSignature getCheckpointSignature() throws IOException {
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException(
+            "Safemode is ON. Cannot obtain checkpoint signature", safeMode);
+      }
+      return new CheckpointSignature(getFSImage());
+    } finally {
+      writeUnlock();
+    }
+  }
 
   /**
-   * Moves fsimage.ckpt to fsImage and edits.new to edits
-   * Reopens the new edits file.
-   *
    * @param newImageSignature the signature of the new image
    */
   void rollFSImage(CheckpointSignature newImageSignature) throws IOException {
@@ -7105,6 +7255,9 @@ void rollFSImage(CheckpointSignature newImageSignature) throws IOException {
     } finally {
       writeUnlock();
     }
+    // Now that we have a new checkpoint, we might be able to
+    // remove some old ones.          
+    getFSImage().purgeOldStorage();
   }
 
   /**
@@ -7254,10 +7407,6 @@ public long getFilesAndDirectoriesTotal() {
     return this.dir.totalInodes();
   }
 
-  public long getFilesTotal() {
-    return this.dir.totalFiles();
-  }
-
   public long getDiskSpaceTotal() {
     return this.dir.totalDiskSpace();
   }
@@ -7429,13 +7578,13 @@ public long nextGenerationStampForBlock(Block block, boolean fromNN) throws IOEx
       if (storedBlock == null) {
         String msg = block + " is already commited, storedBlock == null.";
         LOG.info(msg);
-        throw new IOException(msg);
+        throw new BlockAlreadyCommittedException(msg);
       }
       INodeFile fileINode = storedBlock.getINode();
       if (!fileINode.isUnderConstruction()) {
         String msg = block + " is already commited, !fileINode.isUnderConstruction().";
         LOG.info(msg);
-        throw new IOException(msg);
+        throw new BlockAlreadyCommittedException(msg);
       }
       // Disallow client-initiated recovery once
       // NameNode initiated lease recovery starts
@@ -8001,8 +8150,8 @@ public long getTotalBlocks() {
   }
 
   @Override // NameNodeMXBean
-  public long getTotalFiles() {
-    return getFilesTotal();
+  public long getTotalFilesAndDirectories() {
+    return getFilesAndDirectoriesTotal();
   }
 
   @Override // NameNodeMXBean
@@ -8118,11 +8267,45 @@ public Map<NameNodeKey, String> getNNSpecificKeys() {
     return getNameNode().getNameNodeSpecificKeys();
   }
   
+  public Map<String, String> getJsonFriendlyNNSpecificKeys() {
+    Map<String, String> clone = new HashMap<String, String>();
+    Map<NameNodeKey, String> original = this.getNNSpecificKeys();
+    for (NameNodeKey nnk : original.keySet()) {
+      clone.put(nnk.toString(), original.get(nnk));
+    }
+    return clone;
+  }
+  
   @Override // NameNodeMXBean
   public boolean getIsPrimary() {
     return getNameNode().getIsPrimary();
   }
   
+  public String getNameNodeStatus() {
+    Map<String, Object> result = new HashMap<String, Object>();
+    result.put(ClusterJspHelper.TOTAL_FILES_AND_DIRECTORIES,
+        Long.toString(this.getTotalFilesAndDirectories()));
+    result.put(ClusterJspHelper.TOTAL, Long.toString(this.getTotal()));
+    result.put(ClusterJspHelper.FREE, Long.toString(this.getFree()));
+    result.put(ClusterJspHelper.NAMESPACE_USED,
+        Long.toString(this.getNamespaceUsed()));
+    result.put(ClusterJspHelper.NON_DFS_USEDSPACE,
+        Long.toString(this.getNonDfsUsedSpace()));
+    result.put(ClusterJspHelper.TOTAL_BLOCKS,
+        Long.toString(this.getTotalBlocks()));
+    result.put(ClusterJspHelper.NUMBER_MISSING_BLOCKS,
+        Long.toString(this.getNumberOfMissingBlocks()));
+    result.put(ClusterJspHelper.SAFE_MODE_TEXT, this.getSafeModeText());
+    result.put(ClusterJspHelper.LIVE_NODES, this.getLiveNodes());
+    result.put(ClusterJspHelper.DEAD_NODES, this.getDeadNodes());
+    result.put(ClusterJspHelper.DECOM_NODES, this.getDecomNodes());
+    result.put(ClusterJspHelper.NNSPECIFIC_KEYS,
+        JSON.toString(this.getJsonFriendlyNNSpecificKeys()));
+    result.put(ClusterJspHelper.IS_PRIMARY,
+        Boolean.toString(this.getIsPrimary()));
+    return JSON.toString(result);
+  }
+  
   /**
    * Remove an already decommissioned data node who is neither in include nor
    * exclude hosts lists from the the list of live or dead nodes.  This is used
@@ -8204,7 +8387,7 @@ public short adjustReplication(short replication) {
   }
   
   /** Re-populate the namespace and diskspace count of every node with quota */
-  void recount() throws IOException {
+  void recount() {
     writeLock();
     try {
       dir.updateCountForINodeWithQuota();
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java.orig b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java.orig
new file mode 100644
index 00000000..ee9509bd
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java.orig
@@ -0,0 +1,8375 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.apache.commons.logging.*;
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.hdfs.util.LightWeightHashSet;
+import org.apache.hadoop.hdfs.util.PathValidator;
+import org.apache.hadoop.hdfs.protocol.*;
+import org.apache.hadoop.hdfs.server.common.GenerationStamp;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.common.Storage;
+import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
+import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
+import org.apache.hadoop.hdfs.server.namenode.ClusterJspHelper.NameNodeKey;
+import org.apache.hadoop.hdfs.server.namenode.DatanodeDescriptor.DecommissioningStatus;
+import org.apache.hadoop.hdfs.server.namenode.DecommissionManager.Monitor;
+import org.apache.hadoop.hdfs.server.namenode.metrics.FSNamesystemMBean;
+import org.apache.hadoop.hdfs.server.namenode.metrics.FSNamesystemMetrics;
+import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.security.PermissionChecker;
+import org.apache.hadoop.security.UnixUserGroupInformation;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.util.*;
+import org.apache.hadoop.metrics.util.MBeanUtil;
+import org.apache.hadoop.net.CachedDNSToSwitchMapping;
+import org.apache.hadoop.net.DNSToSwitchMapping;
+import org.apache.hadoop.net.NetworkTopology;
+import org.apache.hadoop.net.Node;
+import org.apache.hadoop.net.NodeBase;
+import org.apache.hadoop.net.ScriptBasedMapping;
+import org.apache.hadoop.hdfs.server.namenode.LeaseManager.Lease;
+import org.apache.hadoop.hdfs.server.namenode.UnderReplicatedBlocks.BlockIterator;
+import org.apache.hadoop.hdfs.server.protocol.BlockAlreadyCommittedException;
+import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations;
+import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations.BlockWithLocations;
+import org.apache.hadoop.hdfs.server.protocol.BlockFlags;
+import org.apache.hadoop.hdfs.server.protocol.DatanodeCommand;
+import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
+import org.apache.hadoop.hdfs.server.protocol.DisallowedDatanodeException;
+import org.apache.hadoop.hdfs.server.protocol.IncrementalBlockReport;
+import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
+import org.apache.hadoop.hdfs.server.protocol.UpgradeCommand;
+import org.apache.hadoop.hdfs.util.LightWeightLinkedSet;
+import org.apache.hadoop.hdfs.FileStatusExtended;
+import org.apache.hadoop.hdfs.OpenFilesInfo;
+import org.apache.hadoop.fs.ContentSummary;
+import org.apache.hadoop.fs.FileAlreadyExistsException;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.OpenFileInfo;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.*;
+import org.apache.hadoop.ipc.Server;
+import org.apache.hadoop.io.IOUtils;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.PrintWriter;
+import java.io.DataOutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import java.lang.management.ManagementFactory;
+import javax.management.NotCompliantMBeanException;
+import javax.management.ObjectName;
+import javax.management.StandardMBean;
+import javax.security.auth.login.LoginException;
+import org.mortbay.util.ajax.JSON;
+
+/**
+ * ************************************************
+ * FSNamesystem does the actual bookkeeping work for the
+ * DataNode.
+ * <p/>
+ * It tracks several important tables.
+ * <p/>
+ * 1)  valid fsname --> blocklist  (kept on disk, logged)
+ * 2)  Set of all valid blocks (inverted #1)
+ * 3)  block --> machinelist (kept in memory, rebuilt dynamically from reports)
+ * 4)  machine --> blocklist (inverted #2)
+ * 5)  LRU cache of updated-heartbeat machines
+ * *************************************************
+ */
+public class FSNamesystem extends ReconfigurableBase
+  implements FSConstants, FSNamesystemMBean, FSClusterStats,
+  NameNodeMXBean {
+  public static final Log LOG = LogFactory.getLog(FSNamesystem.class);
+  public static int BLOCK_DELETION_INCREMENT = 1000;  
+  public static final String AUDIT_FORMAT =
+    "ugi=%s\t" +  // ugi
+      "ip=%s\t" +   // remote IP
+      "cmd=%s\t" +  // command
+      "src=%s\t" +  // src path
+      "dst=%s\t" +  // dst path (optional)
+      "perm=%s";    // permissions (optional)
+
+  private static final ThreadLocal<Formatter> auditFormatter =
+    new ThreadLocal<Formatter>() {
+      protected Formatter initialValue() {
+        return new Formatter(new StringBuilder(AUDIT_FORMAT.length() * 4));
+      }
+    };
+
+  private static final ThreadLocal<StringBuilder> auditStringBuilder =
+    new ThreadLocal<StringBuilder>() {
+    protected StringBuilder initialValue() {
+      return new StringBuilder(AUDIT_FORMAT.length() * 4);
+    }
+  };
+
+  private static final void logAuditEvent(UserGroupInformation ugi,
+                                          InetAddress addr, String cmd, String src, String dst,
+                                          INode node) {
+    final StringBuilder builder = auditStringBuilder.get();
+    builder.setLength(0);
+    builder.append("ugi=").append(ugi).append("\t").
+            append("ip=").append(addr).append("\t").
+            append("cmd=").append(cmd).append("\t").
+            append("src=").append(src).append("\t").
+            append("dst=").append(dst).append("\t").
+            append("perm=");
+    if (node == null) {
+      builder.append("null");
+    } else {
+      builder.append(node.getUserName() + ':' +
+          node.getGroupName() + ':' + node.getFsPermission());
+    }
+    auditLog.info(builder.toString());
+  }
+
+  public static final Log auditLog = LogFactory.getLog(
+    FSNamesystem.class.getName() + ".audit");
+
+  // Default initial capacity and load factor of map
+  public static final int DEFAULT_INITIAL_MAP_CAPACITY = 16;
+  public static final float DEFAULT_MAP_LOAD_FACTOR = 0.75f;
+  public static final int DEFAULT_MAX_CORRUPT_FILEBLOCKS_RETURNED = 500;
+
+  private boolean isPermissionEnabled;
+  private boolean persistBlocks;
+  private UserGroupInformation fsOwner;
+  private String supergroup;
+  private PermissionStatus defaultPermission;
+  // FSNamesystemMetrics counter variables
+  private FSNamesystemMetrics myFSMetrics;
+  private long capacityTotal = 0L, capacityUsed = 0L, capacityRemaining = 0L, capacityNamespaceUsed = 0L;
+  private int totalLoad = 0;
+
+  // number of datanodes that have reported (used during safemode only)
+  private int dnReporting = 0;
+
+  volatile long pendingReplicationBlocksCount = 0L;
+  volatile long corruptReplicaBlocksCount = 0L;
+  volatile long underReplicatedBlocksCount = 0L;
+  volatile long numInvalidFilePathOperations = 0L;
+  volatile long scheduledReplicationBlocksCount = 0L;
+  volatile long excessBlocksCount = 0L;
+  volatile long pendingDeletionBlocksCount = 0L;
+  volatile long upgradeStartTime = 0L;
+  
+  //
+  // Stores the correct file name hierarchy
+  //
+  public FSDirectory dir;
+
+  //
+  // Mapping: Block -> { INode, datanodes, self ref }
+  // Updated only in response to client-sent information.
+  //
+  public final BlocksMap blocksMap = new BlocksMap(
+      DEFAULT_INITIAL_MAP_CAPACITY,
+      DEFAULT_MAP_LOAD_FACTOR, this);
+
+  //
+  // Store blocks-->datanodedescriptor(s) map of corrupt replicas
+  //
+  public CorruptReplicasMap corruptReplicas = new CorruptReplicasMap();
+
+  /**
+   * Stores the datanode -> block map.
+   * <p/>
+   * Done by storing a set of {@link DatanodeDescriptor} objects, sorted by
+   * storage id. In order to keep the storage map consistent it tracks
+   * all storages ever registered with the namenode.
+   * A descriptor corresponding to a specific storage id can be
+   * <ul>
+   * <li>added to the map if it is a new storage id;</li>
+   * <li>updated with a new datanode started as a replacement for the old one
+   * with the same storage id; and </li>
+   * <li>removed if and only if an existing datanode is restarted to serve a
+   * different storage id.</li>
+   * </ul> <br>
+   * The list of the {@link DatanodeDescriptor}s in the map is checkpointed
+   * in the namespace image file. Only the {@link DatanodeInfo} part is
+   * persistent, the list of blocks is restored from the datanode block
+   * reports.
+   * <p/>
+   * Mapping: StorageID -> DatanodeDescriptor
+   */
+  NavigableMap<String, DatanodeDescriptor> datanodeMap =
+    new TreeMap<String, DatanodeDescriptor>();
+
+  //
+  // Keeps a Collection for every named machine containing
+  // blocks that have recently been invalidated and are thought to live
+  // on the machine in question.
+  // Mapping: StorageID -> ArrayList<Block>
+  //
+  private Map<String, LightWeightHashSet<Block>> recentInvalidateSets =
+    new TreeMap<String, LightWeightHashSet<Block>>();
+
+  //
+  // Keeps a TreeSet for every named node.  Each treeset contains
+  // a list of the blocks that are "extra" at that location.  We'll
+  // eventually remove these extras.
+  // Mapping: StorageID -> TreeSet<Block>
+  //
+  Map<String, Collection<Block>> excessReplicateMap =
+    new TreeMap<String, Collection<Block>>();
+
+  Random r = new Random();
+
+  /**
+   * Stores a set of DatanodeDescriptor objects.
+   * This is a subset of {@link #datanodeMap}, containing nodes that are
+   * considered alive.
+   * The {@link HeartbeatMonitor} periodically checks for outdated entries,
+   * and removes them from the list.
+   */
+  ArrayList<DatanodeDescriptor> heartbeats = new ArrayList<DatanodeDescriptor>();
+
+  //
+  // Store set of Blocks that need to be replicated 1 or more times.
+  // We also store pending replication-orders.
+  // Set of: Block
+  //
+  private UnderReplicatedBlocks neededReplications = new UnderReplicatedBlocks();
+  private PendingReplicationBlocks pendingReplications;
+
+  // list of blocks that need to be checked for possible overreplication
+  private LightWeightLinkedSet<Block> overReplicatedBlocks = new LightWeightLinkedSet<Block>();
+
+  public LeaseManager leaseManager = new LeaseManager(this);
+
+  //
+  // Threaded object that checks to see if we have been
+  // getting heartbeats from all clients.
+  //
+  Daemon hbthread = null;   // HeartbeatMonitor thread
+  private LeaseManager.Monitor lmmonitor;
+  public Daemon lmthread = null;   // LeaseMonitor thread
+  Daemon smmthread = null;  // SafeModeMonitor thread
+
+  public Daemon underreplthread = null;  // Replication thread for under replicated blocks
+  public Daemon overreplthread = null;  // Replication thread for over replicated blocks
+
+  private volatile boolean fsRunning = true;
+  long systemStart = 0;
+
+  //  The maximum number of replicates we should allow for a single block
+  private int maxReplication;
+  //  How many outgoing replication streams a given node should have at one time
+  private int maxReplicationStreams;
+  // MIN_REPLICATION is how many copies we need in place or else we disallow the write
+  private int minReplication;
+  // Min replication for closing a file
+  private int minCloseReplication;
+  // Default replication
+  private int defaultReplication;
+  // Variable to stall new replication checks for testing purposes
+  private volatile boolean stallReplicationWork = false;
+  // How many entries are returned by getCorruptInodes()
+  int maxCorruptFilesReturned;
+  // How many blocks (heartbeats.size() * multiplier) are replicated in a round
+  private float replicationWorkMultiplier;
+  // heartbeat interval from configuration
+  long heartbeatInterval;
+  // heartbeatRecheckInterval is how often namenode checks for expired datanodes
+  long heartbeatRecheckInterval;
+  // heartbeatExpireInterval is how long namenode waits for datanode to report
+  // heartbeat
+  private long heartbeatExpireInterval;
+  // underReplicationRecheckInterval is how often namenode checks for new under replication work
+  private long underReplicationRecheckInterval;
+  // overReplicationRecheckInterval is how often namenode checks for new over replication work
+  private long overReplicationRecheckInterval;
+  // default block size of a file
+  private long defaultBlockSize = 0;
+  // allow appending to hdfs files
+  private boolean supportAppends = true;
+  private boolean accessTimeTouchable = true;
+
+  /**
+   * Last block index used for replication work per priority
+   */
+  private int[] replIndex = new int[UnderReplicatedBlocks.LEVEL];
+
+  /**
+   * NameNode RPC address
+   */
+  private InetSocketAddress nameNodeAddress = null; // TODO: name-node has this field, it should be removed here
+  private NameNode nameNode = null;
+  private SafeModeInfo safeMode; // safe mode information
+  private Host2NodesMap host2DataNodeMap = new Host2NodesMap();
+
+  // datanode networktoplogy
+  NetworkTopology clusterMap = null;
+  DNSToSwitchMapping dnsToSwitchMapping;
+
+  // for block replicas placement
+  BlockPlacementPolicy replicator;
+  private boolean syncAddBlock;
+
+  private HostsFileReader hostsReader;
+  private Daemon dnthread = null;
+
+  private long maxFsObjects = 0;          // maximum number of fs objects
+
+  /**
+   * The global generation stamp for this file system.
+   */
+  private final GenerationStamp generationStamp = new GenerationStamp();
+
+  // Ask Datanode only up to this many blocks to delete.
+  int blockInvalidateLimit;
+
+  // precision of access times.
+  private long accessTimePrecision = 0;
+
+  // lock to protect FSNamesystem.
+  private ReentrantReadWriteLock fsLock;
+  boolean hasRwLock = false; // shall we use read/write locks?
+
+  // do not use manual override to exit safemode
+  volatile boolean manualOverrideSafeMode = false;
+
+  private PathValidator pathValidator;
+
+  // Permission violations only result in entries in the namenode log.
+  // The operation does not actually fail.
+  private boolean permissionAuditOnly = false;
+
+  // set of absolute path names that cannot be deleted
+  Set<String> neverDeletePaths = new TreeSet<String>();
+
+  // dynamic loading of config files
+  private ConfigManager configManager;
+
+  /** Denotes the number of safe blocks during safe mode */
+  protected long blocksSafe = 0;
+
+  /** flag indicating whether replication queues have been initialized */
+  volatile protected boolean initializedReplQueues = false;
+  
+  volatile private boolean isInitialized = false;
+
+  /**
+   * FSNamesystem constructor.
+   */
+  FSNamesystem(NameNode nn, Configuration conf) throws IOException {
+    super(conf);
+    try {
+      clusterMap = new NetworkTopology(conf);
+      initialize(nn, getConf());
+      pathValidator = new PathValidator(conf);
+    } catch (IOException e) {
+      LOG.error(getClass().getSimpleName() + " initialization failed.", e);
+      close();
+      throw e;
+    }
+  }
+
+  /**
+   * For testing.
+   */
+  FSNamesystem() {
+
+  }
+
+  /**
+   * Initialize FSNamesystem.
+   */
+  private void initialize(NameNode nn, Configuration conf) throws IOException {
+    // Register MBean first since pedingReplication refers to myFSMetrics
+    this.registerMBean(conf); // register the MBean for the FSNamesystemStutus
+    // This needs to be initialized first, since it is referenced by other
+    // operations in the initialization.
+    pendingReplications = new PendingReplicationBlocks(
+        conf.getInt("dfs.replication.pending.timeout.sec",
+          -1) * 1000L, myFSMetrics);
+    this.systemStart = now();
+    this.fsLock = new ReentrantReadWriteLock(); // non-fair
+    configManager = new ConfigManager(this, conf);
+    setConfigurationParameters(conf);
+
+    // This can be null if two ports are running. Should not rely on the value.
+    // The getter for this is deprecated
+    this.nameNodeAddress = nn.getNameNodeAddress();
+    this.nameNode = nn;
+    this.dir = new FSDirectory(this, conf, 
+        NNStorageConfiguration.getNamespaceDirs(conf), 
+        NNStorageConfiguration.getNamespaceEditsDirs(conf));
+    StartupOption startOpt = NameNode.getStartupOption(conf);
+    // Validate the Namespace Directory policy before loading them
+    ValidateNamespaceDirPolicy.validate(conf);
+    this.dir.loadFSImage(startOpt, conf);
+    long timeTakenToLoadFSImage = now() - systemStart;
+    LOG.info("Finished loading FSImage in " + timeTakenToLoadFSImage + " msecs");
+    NameNode.getNameNodeMetrics().fsImageLoadTime.set(
+      (int) timeTakenToLoadFSImage);
+    this.safeMode = SafeModeUtil.getInstance(conf, this);
+    this.safeMode.checkMode();
+    if ("true".equals(conf.get("dfs.namenode.initialize.counting"))) {
+      LOG.info("Start counting items in the file tree");
+      dir.rootDir.countItems();
+      LOG.info("Finish counting items in the file tree");
+      INodeDirectory.ItemCounts counts = dir.rootDir.getItemCounts();
+      LOG.info("Counting result: " +
+        counts.numDirectories + " directories, " +
+        counts.numFiles + " files, and " +
+        counts.numBlocks + " blocks in file tree. " +
+        blocksMap.size() + " blocks in block map.");
+    } else {
+      LOG.info("Skip counting items in the file tree");
+    }
+
+    // initialize heartbeat & leasemanager threads
+    this.hbthread = new Daemon(new HeartbeatMonitor(conf));
+    this.lmmonitor = leaseManager.new Monitor();
+    this.lmthread = new Daemon(lmmonitor);
+
+    // start heartbeat & leasemanager threads
+    hbthread.start();
+    lmthread.start();
+
+    // initialize replication threads
+    this.underreplthread = new Daemon(new UnderReplicationMonitor());
+    this.overreplthread = new Daemon(new OverReplicationMonitor());
+
+    // start replication threds
+    underreplthread.start();
+    overreplthread.start();
+
+    this.hostsReader = new HostsFileReader(conf.get("dfs.hosts", ""),
+      conf.get("dfs.hosts.exclude", ""), true);
+    this.dnthread = new Daemon(new DecommissionManager(this).new Monitor(
+      conf.getInt("dfs.namenode.decommission.interval", 30),
+      conf.getInt("dfs.namenode.decommission.nodes.per.interval", 5)));
+    dnthread.start();
+
+    this.dnsToSwitchMapping = ReflectionUtils.newInstance(
+      conf.getClass("topology.node.switch.mapping.impl", ScriptBasedMapping.class,
+        DNSToSwitchMapping.class), conf);
+
+    /* If the dns to swith mapping supports cache, resolve network
+    * locations of those hosts in the include list,
+    * and store the mapping in the cache; so future calls to resolve
+    * will be fast.
+    */
+    if (dnsToSwitchMapping instanceof CachedDNSToSwitchMapping) {
+      dnsToSwitchMapping.resolve(new ArrayList<String>(hostsReader.getHostNames()));
+    }
+
+    this.replicator = BlockPlacementPolicy.getInstance(
+        conf,
+        this,
+        this.clusterMap,
+        this.hostsReader,
+        this.dnsToSwitchMapping,
+        this);
+    this.registerMXBean();
+    // Whether or not to sync each addBlock() operation to the edit log.
+    this.syncAddBlock = conf.getBoolean("dfs.sync.on.every.addblock", false);
+    this.isInitialized = true;
+  }
+
+  /**
+   * dirs is a list of directories where the filesystem directory state
+   * is stored
+   */
+  FSNamesystem(FSImage fsImage, Configuration conf) throws IOException {
+    super(conf);
+    this.clusterMap = new NetworkTopology(conf);
+    this.fsLock = new ReentrantReadWriteLock();
+    setConfigurationParameters(conf);
+    this.dir = new FSDirectory(fsImage, this, conf);
+  }
+
+  // utility methods to acquire and release read lock and write lock
+  // If hasRwLock is false, then a readLock actually turns into  write lock.
+
+  void readLock() {
+    if (this.hasRwLock) {
+      this.fsLock.readLock().lock();
+    } else {
+      writeLock();
+    }
+  }
+
+  void readUnlock() {
+    if (this.hasRwLock) {
+      this.fsLock.readLock().unlock();
+    } else {
+      writeUnlock();
+    }
+  }
+
+  void writeLock() {
+    this.fsLock.writeLock().lock();
+  }
+
+  void writeUnlock() {
+    this.fsLock.writeLock().unlock();
+  }
+
+  boolean hasWriteLock() {
+    return this.fsLock.isWriteLockedByCurrentThread();
+  }
+
+  /**
+   * Set parameters derived from heartbeat interval.
+   */
+  private void setHeartbeatInterval(long heartbeatInterval,
+                                    long heartbeatRecheckInterval) {
+    this.heartbeatInterval = heartbeatInterval;
+    this.heartbeatRecheckInterval = heartbeatRecheckInterval;
+    this.heartbeatExpireInterval = 2 * heartbeatRecheckInterval +
+      10 * heartbeatInterval;
+    this.blockInvalidateLimit =
+      Math.max(this.blockInvalidateLimit,
+               20 * (int) (heartbeatInterval/1000L));
+  }
+
+
+  /**
+   * Initializes some of the members from configuration
+   */
+  private void setConfigurationParameters(Configuration conf)
+    throws IOException {
+    if (conf.getBoolean("hadoop.disable.shell", false)) {
+      conf.setStrings(UnixUserGroupInformation.UGI_PROPERTY_NAME, new String[]{"hadoop", "hadoop"});
+      Shell.setDisabled(true);
+    }
+
+    try {
+      fsOwner = UnixUserGroupInformation.login(conf);
+    } catch (LoginException e) {
+      throw new IOException(StringUtils.stringifyException(e));
+    }
+
+    LOG.info("fsOwner=" + fsOwner);
+
+    this.hasRwLock = conf.getBoolean("dfs.rwlock", false);
+    this.supergroup = conf.get("dfs.permissions.supergroup", "supergroup");
+    this.isPermissionEnabled = conf.getBoolean("dfs.permissions", true);
+    this.setPersistBlocks(conf.getBoolean("dfs.persist.blocks", false));
+    LOG.info("supergroup=" + supergroup);
+    LOG.info("isPermissionEnabled=" + isPermissionEnabled);
+    short filePermission = (short) conf.getInt("dfs.upgrade.permission", 0777);
+    this.defaultPermission = PermissionStatus.createImmutable(
+      fsOwner.getUserName(), supergroup, new FsPermission(filePermission));
+
+
+    this.maxCorruptFilesReturned = conf.getInt("dfs.corruptfilesreturned.max",
+      DEFAULT_MAX_CORRUPT_FILEBLOCKS_RETURNED);
+    this.defaultReplication = conf.getInt("dfs.replication", 3);
+    this.maxReplication = conf.getInt("dfs.replication.max", 512);
+    this.minReplication = conf.getInt("dfs.replication.min", 1);
+    this.minCloseReplication = conf.getInt("dfs.close.replication.min",
+        minReplication);
+    if (minReplication <= 0) {
+      throw new IOException(
+        "Unexpected configuration parameters: dfs.replication.min = "
+          + minReplication
+          + " must be greater than 0");
+    }
+    if (maxReplication >= (int) Short.MAX_VALUE) {
+      throw new IOException(
+        "Unexpected configuration parameters: dfs.replication.max = "
+          + maxReplication + " must be less than " + (Short.MAX_VALUE));
+    }
+    if (maxReplication < minReplication) {
+      throw new IOException(
+        "Unexpected configuration parameters: dfs.replication.min = "
+          + minReplication
+          + " must be less than dfs.replication.max = "
+          + maxReplication);
+    }
+    if (minCloseReplication < minReplication) {
+      throw new IOException(
+          "Unexpected configuration parameters: dfs.close.replication.min = "
+          + minCloseReplication
+          + " must be no less than dfs.replication.min = "
+          + minReplication);
+    }
+    if (minCloseReplication > maxReplication) {
+      throw new IOException(
+          "Unexpected configuration paramerters: dfs.close.replication.min = "
+          + minCloseReplication
+          + " must be no greater than dfs.replication.max = "
+          + maxReplication);
+    }
+    blockInvalidateLimit = conf.getInt("dfs.block.invalidate.limit",
+        FSConstants.BLOCK_INVALIDATE_CHUNK);
+    this.maxReplicationStreams = conf.getInt("dfs.max-repl-streams", 2);
+    this.replicationWorkMultiplier =
+        conf.getFloat("dfs.replication.iteration.multiplier",
+            UnderReplicationMonitor.REPLICATION_WORK_MULTIPLIER_PER_ITERATION);
+    long heartbeatInterval = conf.getLong("dfs.heartbeat.interval", 3) * 1000;
+    long heartbeatRecheckInterval = conf.getInt(
+      "heartbeat.recheck.interval", 5 * 60 * 1000); // 5 minutes
+    setHeartbeatInterval(heartbeatInterval, heartbeatRecheckInterval);
+    this.underReplicationRecheckInterval =
+      conf.getInt("dfs.replication.interval", 3) * 1000L;
+    this.overReplicationRecheckInterval = 2 * underReplicationRecheckInterval;
+    this.defaultBlockSize = conf.getLong("dfs.block.size", DEFAULT_BLOCK_SIZE);
+    this.maxFsObjects = conf.getLong("dfs.max.objects", 0);
+    this.accessTimePrecision = conf.getLong("dfs.access.time.precision", 0);
+    this.supportAppends = conf.getBoolean("dfs.support.append", false);
+    this.accessTimeTouchable = conf.getBoolean("dfs.access.time.touchable", true);
+
+    long editPreallocateSize = conf.getLong("dfs.edit.preallocate.size",
+      HdfsConstants.DEFAULT_EDIT_PREALLOCATE_SIZE);
+    FSEditLog.setPreallocateSize(editPreallocateSize);
+    int editBufferSize = conf.getInt("dfs.edit.buffer.size",
+      HdfsConstants.DEFAULT_EDIT_BUFFER_SIZE);
+    FSEditLog.setBufferCapacity(editBufferSize);
+    int maxBufferedTransactions = conf.getInt("dfs.max.buffered.transactions",
+      HdfsConstants.DEFAULT_MAX_BUFFERED_TRANSACTIONS);
+    FSEditLog.setMaxBufferedTransactions(maxBufferedTransactions);
+
+    // Permission violations are logged in the namenode logs. The operation
+    // does not fail.
+    this.permissionAuditOnly = conf.getBoolean("dfs.permissions.audit.log", false);
+
+    // set soft and hard lease period
+    long hardLeaseLimit = conf.getLong(FSConstants.DFS_HARD_LEASE_KEY,
+        FSConstants.LEASE_HARDLIMIT_PERIOD);
+    long softLeaseLimit = conf.getLong(FSConstants.DFS_SOFT_LEASE_KEY,
+        FSConstants.LEASE_SOFTLIMIT_PERIOD);
+    this.leaseManager.setLeasePeriod(
+        Math.min(hardLeaseLimit, softLeaseLimit), hardLeaseLimit);
+  }
+  
+  /**
+   * Return the default path permission when upgrading from releases with no
+   * permissions (<=0.15) to releases with permissions (>=0.16)
+   */
+  protected PermissionStatus getUpgradePermission() {
+    return defaultPermission;
+  }
+
+  NamespaceInfo getNamespaceInfo() {
+    writeLock();
+    try {
+      return new NamespaceInfo(dir.fsImage.getNamespaceID(),
+        dir.fsImage.storage.getCTime(),
+        getDistributedUpgradeVersion());
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Retrieves a list of random files with some information.
+   * 
+   * @param percent
+   *          the percent of files to return
+   * @return the list of files
+   */
+  public List<FileStatusExtended> getRandomFiles(double percent) {
+    return dir.getRandomFileStats(percent);
+  }
+
+  public OpenFilesInfo getOpenFiles() throws IOException {
+    List <FileStatusExtended> openFiles = new ArrayList <FileStatusExtended>();
+    for (Lease lease : leaseManager.getSortedLeases()) {
+      for (String path : lease.getPaths()) {
+        FileStatusExtended stat = this.getFileInfoExtended(path,
+            lease.getHolder());
+        if (stat != null) {
+          openFiles.add(stat);
+        }
+      }
+    }
+    return new OpenFilesInfo(openFiles, this.getGenerationStamp());
+  }
+  
+  /**
+   * Stops lease monitor thread.
+   */
+  public void stopLeaseMonitor() throws InterruptedException {
+    if (lmmonitor != null) {
+      lmmonitor.stop();
+      InjectionHandler
+          .processEvent(InjectionEvent.FSNAMESYSTEM_STOP_LEASEMANAGER);
+    }
+    if (lmthread != null) {
+      lmthread.join();
+    }
+  }
+
+  /**
+   * Close down this file system manager.
+   * Causes heartbeat and lease daemons to stop; waits briefly for
+   * them to finish, but a short timeout returns control back to caller.
+   */
+  public void close() {
+    fsRunning = false;
+    try {
+      if (pendingReplications != null) {
+        pendingReplications.stop();
+      }
+      if (hbthread != null) {
+        hbthread.interrupt();
+      }
+      if (underreplthread != null) {
+        underreplthread.interrupt();
+      }
+      if (overreplthread != null) {
+        overreplthread.interrupt();
+      }
+      if (dnthread != null) {
+        dnthread.interrupt();
+      }
+      if (safeMode != null) {
+        safeMode.shutdown();
+      }
+    } catch (Exception e) {
+      LOG.warn("Exception shutting down FSNamesystem", e);
+    } finally {
+      // using finally to ensure we also wait for lease daemon
+      try {
+        stopLeaseMonitor();
+        if (InjectionHandler
+            .trueCondition(InjectionEvent.FSNAMESYSTEM_CLOSE_DIRECTORY)) {
+          if (dir != null) {
+            dir.close();
+          }
+        }
+      } catch (InterruptedException ie) {
+      } catch (IOException ie) {
+        LOG.error("Error closing FSDirectory", ie);
+        IOUtils.cleanup(LOG, dir);
+      }
+    }
+  }
+
+  /**
+   * Is this name system running?
+   */
+  boolean isRunning() {
+    return fsRunning;
+  }
+
+  /**
+   * Dump all metadata into specified file
+   */
+  void metaSave(String filename) throws IOException {
+    readLock();
+    try {
+      checkSuperuserPrivilege();
+      File file = new File(System.getProperty("hadoop.log.dir"),
+        filename);
+      PrintWriter out = new PrintWriter(new BufferedWriter(
+        new FileWriter(file, true)));
+
+
+      //
+      // Dump contents of neededReplication
+      //
+      synchronized (neededReplications) {
+        out.println("Metasave: Blocks waiting for replication: " +
+          neededReplications.size());
+        for (Block block : neededReplications) {
+          List<DatanodeDescriptor> containingNodes =
+            new ArrayList<DatanodeDescriptor>();
+          NumberReplicas numReplicas = new NumberReplicas();
+          // source node returned is not used
+          chooseSourceDatanode(block, containingNodes, numReplicas);
+          int usableReplicas = numReplicas.liveReplicas() +
+            numReplicas.decommissionedReplicas();
+          // l: == live:, d: == decommissioned c: == corrupt e: == excess
+          out.print(block + ((usableReplicas > 0) ? "" : " MISSING") +
+            " size: " + block.getNumBytes() + 
+            " (replicas:" +
+            " l: " + numReplicas.liveReplicas() +
+            " d: " + numReplicas.decommissionedReplicas() +
+            " c: " + numReplicas.corruptReplicas() +
+            " e: " + numReplicas.excessReplicas() + ") ");
+
+          Collection<DatanodeDescriptor> corruptNodes =
+            corruptReplicas.getNodes(block);
+
+          for (Iterator<DatanodeDescriptor> jt = blocksMap.nodeIterator(block);
+               jt.hasNext();) {
+            DatanodeDescriptor node = jt.next();
+            String state = "";
+            if (corruptNodes != null && corruptNodes.contains(node)) {
+              state = "(corrupt)";
+            } else if (node.isDecommissioned() ||
+              node.isDecommissionInProgress()) {
+              state = "(decommissioned)";
+            }
+            out.print(" " + node + state + " : ");
+          }
+          out.println("");
+        }
+      }
+
+      //
+      // Dump blocks from pendingReplication
+      //
+      pendingReplications.metaSave(out);
+
+      //
+      // Dump blocks that are waiting to be deleted
+      //
+      dumpRecentInvalidateSets(out);
+
+      //
+      // Dump all datanodes
+      //
+      datanodeDump(out);
+
+      out.flush();
+      out.close();
+    } finally {
+      readUnlock();
+    }
+  }
+
+  long getDefaultBlockSize() {
+    return defaultBlockSize;
+  }
+
+  long getAccessTimePrecision() {
+    return accessTimePrecision;
+  }
+
+  private boolean isAccessTimeSupported() {
+    return accessTimePrecision > 0;
+  }
+
+  /* get replication factor of a block */
+
+  private int getReplication(Block block) {
+    INodeFile fileINode = blocksMap.getINode(block);
+    if (fileINode == null) { // block does not belong to any file
+      return 0;
+    }
+    assert !fileINode.isDirectory() : "Block cannot belong to a directory.";
+    return fileINode.getReplication();
+  }
+
+  /* updates a block in under replication queue */
+
+  void updateNeededReplications(Block block,
+                                int curReplicasDelta, int expectedReplicasDelta) {
+    writeLock();
+    try {
+      NumberReplicas repl = countNodes(block);
+      int curExpectedReplicas = getReplication(block);
+      neededReplications.update(block,
+        repl.liveReplicas(),
+        repl.decommissionedReplicas(),
+        curExpectedReplicas,
+        curReplicasDelta, expectedReplicasDelta);
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /////////////////////////////////////////////////////////
+  //
+  // These methods are called by secondary namenodes
+  //
+  /////////////////////////////////////////////////////////
+
+  /**
+   * return a list of blocks & their locations on <code>datanode</code> whose
+   * total size is <code>size</code>
+   *
+   * @param datanode on which blocks are located
+   * @param size     total size of blocks
+   */
+  BlocksWithLocations getBlocks(DatanodeID datanode, long size)
+    throws IOException {
+    readLock();
+    try {
+      checkSuperuserPrivilege();
+
+      DatanodeDescriptor node = getDatanode(datanode);
+      if (node == null) {
+        NameNode.stateChangeLog.warn("BLOCK* NameSystem.getBlocks: "
+          + "Asking for blocks from an unrecorded node " + datanode.getName());
+        throw new IllegalArgumentException(
+          "Unexpected exception.  Got getBlocks message for datanode " +
+            datanode.getName() + ", but there is no info for it");
+      }
+
+      int numBlocks = node.numBlocks();
+      if (numBlocks == 0) {
+        return new BlocksWithLocations(new BlockWithLocations[0]);
+      }
+      Iterator<Block> iter = node.getBlockIterator();
+      int startBlock = r.nextInt(numBlocks); // starting from a random block
+      // skip blocks
+      for (int i = 0; i < startBlock; i++) {
+        iter.next();
+      }
+      List<BlockWithLocations> results = new ArrayList<BlockWithLocations>();
+      long totalSize = 0;
+      while (totalSize < size && iter.hasNext()) {
+        totalSize += addBlock(iter.next(), results);
+      }
+      if (totalSize < size) {
+        iter = node.getBlockIterator(); // start from the beginning
+        for (int i = 0; i < startBlock && totalSize < size; i++) {
+          totalSize += addBlock(iter.next(), results);
+        }
+      }
+
+      return new BlocksWithLocations(
+        results.toArray(new BlockWithLocations[results.size()]));
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Get all valid locations of the block & add the block to results
+   * return the length of the added block; 0 if the block is not added
+   */
+  private long addBlock(Block block, List<BlockWithLocations> results) {
+    ArrayList<String> machineSet =
+      new ArrayList<String>(blocksMap.numNodes(block));
+    for (Iterator<DatanodeDescriptor> it =
+      blocksMap.nodeIterator(block); it.hasNext();) {
+      String storageID = it.next().getStorageID();
+      // filter invalidate replicas
+      LightWeightHashSet<Block> blocks = recentInvalidateSets.get(storageID);
+      if (blocks == null || !blocks.contains(block)) {
+        machineSet.add(storageID);
+      }
+    }
+    if (machineSet.size() == 0) {
+      return 0;
+    } else {
+      results.add(new BlockWithLocations(block,
+        machineSet.toArray(new String[machineSet.size()])));
+      return block.getNumBytes();
+    }
+  }
+
+  /////////////////////////////////////////////////////////
+  //
+  // These methods are called by HadoopFS clients
+  //
+  /////////////////////////////////////////////////////////
+
+  /**
+   * Set permissions for an existing file.
+   *
+   * @throws IOException
+   */
+  public void setPermission(String src, FsPermission permission
+  ) throws IOException {
+    INode[] inodes = null;
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot set permission for " + src, safeMode);
+      }
+      inodes = dir.getExistingPathINodes(src);
+      checkOwner(src, inodes);
+      dir.setPermission(src, permission);
+    } finally {
+      writeUnlock();
+    }
+    getEditLog().logSync(false);
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "setPermission", src, null, getLastINode(inodes));
+    }
+  }
+
+  /**
+   * Set owner for an existing file.
+   *
+   * @throws IOException
+   */
+  public void setOwner(String src, String username, String group
+  ) throws IOException {
+    INode[] inodes = null;
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot set permission for " + src, safeMode);
+      }
+      inodes = dir.getExistingPathINodes(src);
+      FSPermissionChecker pc = checkOwner(src, inodes);
+      if (!pc.isSuper) {
+        if (username != null && !pc.user.equals(username)) {
+          throw new AccessControlException("Non-super user cannot change owner.");
+        }
+        if (group != null && !pc.containsGroup(group)) {
+          throw new AccessControlException("User does not belong to " + group
+            + " .");
+        }
+      }
+      dir.setOwner(src, username, group);
+    } finally {
+      writeUnlock();
+    }
+    getEditLog().logSync(false);
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "setOwner", src, null, getLastINode(inodes));
+    }
+  }
+
+  enum BlockMetaInfoType {
+    NONE,                   // no meta info
+    VERSION,                // data transfer version#
+    VERSION_AND_NAMESPACEID // namespaceid + data transfer version#
+  }
+
+  /**
+   * Updates DatanodeInfo for each LocatedBlock in locatedBlocks.
+   */
+  LocatedBlocksWithMetaInfo updateDatanodeInfo(LocatedBlocks locatedBlocks)
+      throws IOException {
+    if (locatedBlocks.getLocatedBlocks().size() == 0)
+      return new LocatedBlocksWithMetaInfo(locatedBlocks.getFileLength(),
+          locatedBlocks.getLocatedBlocks(), false,
+          DataTransferProtocol.DATA_TRANSFER_VERSION, getNamespaceId(),
+          this.nameNode.getClientProtocolMethodsFingerprint());
+    List<LocatedBlock> newBlocks = new ArrayList<LocatedBlock>();
+
+    readLock();
+    try {
+      for (LocatedBlock locBlock: locatedBlocks.getLocatedBlocks()) {
+        Block block = locBlock.getBlock();
+        int numNodes = blocksMap.numNodes(block);
+        int numCorruptNodes = countNodes(block).corruptReplicas();
+        int numCorruptReplicas = corruptReplicas.numCorruptReplicas(block); 
+
+        if (numCorruptNodes != numCorruptReplicas) {
+          LOG.warn("Inconsistent number of corrupt replicas for " + 
+                   block + "blockMap has " + numCorruptNodes + 
+                   " but corrupt replicas map has " + numCorruptReplicas);
+        }
+
+        boolean blockCorrupt = numCorruptNodes == numNodes;
+        int numMachineSet = blockCorrupt ? numNodes : (numNodes - numCorruptNodes);
+        DatanodeDescriptor[] machineSet = new DatanodeDescriptor[numMachineSet];
+
+        if (numMachineSet > 0) {
+          numNodes = 0;
+          for(Iterator<DatanodeDescriptor> it = blocksMap.nodeIterator(block); 
+              it.hasNext();) {
+            DatanodeDescriptor dn = it.next();
+            boolean replicaCorrupt = corruptReplicas.isReplicaCorrupt(block, dn);
+            if (blockCorrupt || (!blockCorrupt && !replicaCorrupt))
+              machineSet[numNodes++] = dn;
+          }
+        }
+
+  LocatedBlock newBlock = new LocatedBlock(block, machineSet, 0, blockCorrupt);
+  newBlocks.add(newBlock);
+      }
+    } finally {
+      readUnlock();
+    }
+
+    return new LocatedBlocksWithMetaInfo(locatedBlocks.getFileLength(),
+        newBlocks, false, DataTransferProtocol.DATA_TRANSFER_VERSION,
+        getNamespaceId(), this.nameNode.getClientProtocolMethodsFingerprint());
+  }
+
+  /**
+   * Get block locations within the specified range.
+   *
+   * @see #getBlockLocations(String, long, long)
+   */
+  LocatedBlocks getBlockLocations(String clientMachine, String src,
+                                  long offset, long length,
+                                  BlockMetaInfoType type) throws IOException {
+    INode[] inodes = dir.getExistingPathINodes(src);
+    if (isPermissionEnabled) {
+      checkPathAccess(src, inodes, FsAction.READ);
+    }
+
+    LocatedBlocks blocks = getBlockLocations(src, inodes[inodes.length-1],
+        offset, length, false, type);
+    if (blocks != null) {
+      //sort the blocks
+      DatanodeDescriptor client = host2DataNodeMap.getDatanodeByHost(
+        clientMachine);
+      for (LocatedBlock b : blocks.getLocatedBlocks()) {
+        clusterMap.pseudoSortByDistance(client, b.getLocations());
+        // Move decommissioned datanodes to the bottom
+        Arrays.sort(b.getLocations(), DFSUtil.DECOM_COMPARATOR);
+      }
+    }
+    return blocks;
+  }
+
+  /**
+   * Get block locations within the specified range.
+   *
+   * @see ClientProtocol#getBlockLocations(String, long, long)
+   */
+  public LocatedBlocks getBlockLocations(String src, long offset, long length) throws IOException {
+    INode[] inodes = dir.getExistingPathINodes(src);
+    return getBlockLocations(src, inodes[inodes.length-1],
+        offset, length, false, BlockMetaInfoType.NONE);
+  }
+
+  /**
+   * Get block locations within the specified range.
+   *
+   * @see ClientProtocol#getBlockLocations(String, long, long)
+   */
+  public LocatedBlocks getBlockLocations(String src, INode inode, long offset, long length,
+                                         boolean doAccessTime, BlockMetaInfoType type)
+    throws IOException {
+    if (offset < 0) {
+      throw new IOException("Negative offset is not supported. File: " + src);
+    }
+    if (length < 0) {
+      throw new IOException("Negative length is not supported. File: " + src);
+    }
+    final LocatedBlocks ret = getBlockLocationsInternal(src, inode,
+      offset, length, Integer.MAX_VALUE, doAccessTime, type);
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "open", src, null, null);
+    }
+    return ret;
+  }
+
+  private LocatedBlocks getBlockLocationsInternal(String src,
+                                                  INode inode,
+                                                  long offset,
+                                                  long length,
+                                                  int nrBlocksToReturn,
+                                                  boolean doAccessTime,
+                                                  BlockMetaInfoType type)
+    throws IOException {
+    boolean doneSetTimes = false;
+
+    for (int attempt = 0; attempt < 2; attempt++) {
+      if (attempt == 0) { // first attempt is with readlock
+        readLock();
+      }  else { // second attempt is with  write lock
+        writeLock(); // writelock is needed to set accesstime
+        // We need to refetch the node in case it was deleted
+        // while the lock was not held
+        INode[] inodes = dir.getExistingPathINodes(src);
+        inode = inodes[inodes.length - 1];
+      }
+
+      // if the namenode is in safemode, then do not update access time
+      if (isInSafeMode()) {
+        doAccessTime = false;
+      }
+      try {
+        long now = now();
+        if (inode == null || inode.isDirectory()) {
+          return null;
+        }
+        INodeFile fileInode = (INodeFile)inode;
+        if (doAccessTime && isAccessTimeSupported()) {
+          if (now > inode.getAccessTime() + getAccessTimePrecision()) {
+            // if we have to set access time but we only have the readlock, then
+            // restart this entire operation with the writeLock.
+            if (attempt == 0) {
+              continue;
+            }
+            dir.setTimes(src, fileInode, -1, now, false);
+            doneSetTimes = true; // successful setTime call
+          }
+        }
+        return getBlockLocationsInternal(fileInode, offset, length,
+            nrBlocksToReturn, type);
+      } finally {
+        if (attempt == 0) {
+          readUnlock();
+        } else {
+          writeUnlock();
+        }
+        if (doneSetTimes) {
+          getEditLog().logSyncIfNeeded(); // sync if too many transactions in buffer
+        }
+      }
+    }
+    return null; // can never reach here
+  }
+
+  LocatedBlocks getBlockLocationsInternal(INodeFile inode,
+      long offset, long length,
+      int nrBlocksToReturn) throws IOException {
+    return getBlockLocationsInternal(inode, offset, length, 
+        nrBlocksToReturn, BlockMetaInfoType.NONE);
+  }
+
+  LocatedBlocks getBlockLocationsInternal(INodeFile inode,
+                                          long offset, long length,
+                                          int nrBlocksToReturn,
+                                          BlockMetaInfoType type)
+    throws IOException {
+    readLock();
+    try {
+      Block[] blocks = inode.getBlocks();
+      if (blocks == null) {
+        return null;
+      }
+      if (blocks.length == 0) {
+        return inode.createLocatedBlocks(
+            new ArrayList<LocatedBlock>(blocks.length), 
+            type, this.getFSImage().storage.namespaceID,
+            this.nameNode.getClientProtocolMethodsFingerprint());
+      }
+      List<LocatedBlock> results;
+      results = new ArrayList<LocatedBlock>(blocks.length);
+
+      int curBlk = 0;
+      long curPos = 0, blkSize = 0;
+      int nrBlocks = (blocks[0].getNumBytes() == 0) ? 0 : blocks.length;
+      for (curBlk = 0; curBlk < nrBlocks; curBlk++) {
+        blkSize = blocks[curBlk].getNumBytes();
+        assert blkSize > 0 : "Block of size 0";
+        if (curPos + blkSize > offset) {
+          break;
+        }
+        curPos += blkSize;
+      }
+
+      if (nrBlocks > 0 && curBlk == nrBlocks)   // offset >= end of file
+      {
+        return null;
+      }
+
+      long endOff = offset + length;
+
+      do {
+        // get block locations
+        int numNodes = blocksMap.numNodes(blocks[curBlk]);
+        int numCorruptNodes = countNodes(blocks[curBlk]).corruptReplicas();
+        int numCorruptReplicas = corruptReplicas.numCorruptReplicas(blocks[curBlk]);
+        if (numCorruptNodes != numCorruptReplicas) {
+          LOG.warn("Inconsistent number of corrupt replicas for " +
+            blocks[curBlk] + "blockMap has " + numCorruptNodes +
+            " but corrupt replicas map has " + numCorruptReplicas);
+        }
+        DatanodeDescriptor[] machineSet = null;
+        boolean blockCorrupt = false;
+        if (inode.isUnderConstruction() && curBlk == blocks.length - 1
+            && blocksMap.numNodes(blocks[curBlk]) == 0) {
+          // get unfinished block locations
+          INodeFileUnderConstruction cons = (INodeFileUnderConstruction)inode;
+          machineSet = cons.getTargets();
+          blockCorrupt = false;
+        } else {
+          blockCorrupt = (numCorruptNodes == numNodes);
+          int numMachineSet = blockCorrupt ? numNodes : 
+                              (numNodes - numCorruptNodes);
+          machineSet = new DatanodeDescriptor[numMachineSet];
+          if (numMachineSet > 0) {
+            numNodes = 0;
+            for(Iterator<DatanodeDescriptor> it = 
+                blocksMap.nodeIterator(blocks[curBlk]); it.hasNext();) {
+              DatanodeDescriptor dn = it.next();
+              boolean replicaCorrupt = corruptReplicas.isReplicaCorrupt(blocks[curBlk], dn);
+              if (blockCorrupt || (!blockCorrupt && !replicaCorrupt))
+                machineSet[numNodes++] = dn;
+            }
+          }
+        }
+        results.add(new LocatedBlock(blocks[curBlk], machineSet, curPos,
+          blockCorrupt));
+        curPos += blocks[curBlk].getNumBytes();
+        curBlk++;
+      } while (curPos < endOff
+        && curBlk < blocks.length
+        && results.size() < nrBlocksToReturn);
+
+      return inode.createLocatedBlocks(results, type,
+          this.getFSImage().storage.namespaceID, this.nameNode
+              .getClientProtocolMethodsFingerprint());
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Moves all the blocks from srcs and appends them to trg
+   * To avoid rollbacks we will verify validitity of ALL of the args
+   * before we start actual move.
+   * @param target
+   * @param srcs
+   * @param restricted - true if equal block sizes are to be enforced, 
+   *        false otherwise
+   * @throws IOException
+   */
+  public void concat(String target, String [] srcs, boolean restricted)
+    throws IOException {
+    if(FSNamesystem.LOG.isDebugEnabled()) {
+      FSNamesystem.LOG.debug("concat " + Arrays.toString(srcs) +
+          " to " + target);
+    }
+    // check safe mode
+    if (isInSafeMode()) {
+      throw new SafeModeException("concat: cannot concat " + target, safeMode);
+    }
+
+    // verify args
+    if(target.isEmpty()) {
+      throw new IllegalArgumentException("concat: trg file name is empty");
+    }
+    if(srcs == null || srcs.length == 0) {
+      throw new IllegalArgumentException("concat: srcs list is empty or null");
+    }
+
+    // currently we require all the files to be in the same dir
+    String trgParent =
+      target.substring(0, target.lastIndexOf(Path.SEPARATOR_CHAR));
+    for(String s : srcs) {
+      String srcParent = s.substring(0, s.lastIndexOf(Path.SEPARATOR_CHAR));
+      if(! srcParent.equals(trgParent)) {
+        throw new IllegalArgumentException
+           ("concat:  srcs and target shoould be in same dir");
+      }
+    }
+
+    INode[] targetInodes = null;
+    writeLock();
+    try {
+      // write permission for the target
+      if (isPermissionEnabled) {
+        targetInodes = dir.getExistingPathINodes(target);
+        checkPathAccess(target, targetInodes, FsAction.WRITE);
+
+        // and srcs
+        for(String aSrc: srcs) {
+          INode[] srcNodes = dir.getExistingPathINodes(aSrc);
+          checkPathAccess(aSrc, srcNodes, FsAction.READ); // read the file
+          checkParentAccess(aSrc, srcNodes, FsAction.WRITE); // for delete
+        }
+      }
+
+
+      // to make sure no two files are the same
+      Set<INode> si = new HashSet<INode>();
+
+      // we put the following prerequisite for the operation
+      // replication and blocks sizes should be the same for ALL the blocks
+      // check the target
+      INode inode = dir.getInode(target);
+
+      if(inode == null) {
+        throw new IllegalArgumentException("concat: trg file doesn't exist");
+      }
+      if(inode.isUnderConstruction()) {
+        throw new IllegalArgumentException("concat: trg file is uner construction");
+      }
+
+      INodeFile trgInode = (INodeFile) inode;
+
+      // per design trg shouldn't be empty and all the blocks same size
+      if(trgInode.blocks.length == 0) {
+        throw new IllegalArgumentException("concat: "+ target + " file is empty");
+      }
+
+      long blockSize = trgInode.getPreferredBlockSize();
+
+      // check the end block to be full
+      if(restricted && blockSize != trgInode.blocks[trgInode.blocks.length-1].getNumBytes()) {
+        throw new IllegalArgumentException(target
+            + " file: last block should be full. " + " PreferredBlockSize is "
+            + blockSize + " block size is: "
+            + trgInode.blocks[trgInode.blocks.length - 1].getNumBytes());
+      }
+
+      si.add(trgInode);
+      short repl = trgInode.getReplication();
+
+      // now check the srcs
+      boolean endSrc = false; // final src file doesn't have to have full end block
+      for(int i=0; i<srcs.length; i++) {
+        String src = srcs[i];
+        if(i==srcs.length-1)    
+          endSrc=true;
+        
+        INodeFile srcInode = dir.getFileINode(src);
+
+        if(src.isEmpty()
+            || srcInode == null
+            || srcInode.isUnderConstruction()
+            || srcInode.blocks.length == 0) {
+          throw new IllegalArgumentException("concat: file " + src +
+          " is invalid or empty or underConstruction");
+        }
+
+        // check replication and blocks size
+        if(repl != srcInode.getReplication()) {
+          throw new IllegalArgumentException(src + " and " + target + " " +
+              "should have same replication: "
+              + repl + " vs. " + srcInode.getReplication());
+        }
+
+        // verify that all the blocks are of the same length as target
+        // should be enough to check the end blocks
+        if (restricted) {
+          int idx = srcInode.blocks.length-1; 
+          if(endSrc)    
+            idx = srcInode.blocks.length-2; // end block of endSrc is OK not to be full   
+          if(idx >= 0 && srcInode.blocks[idx].getNumBytes() != blockSize) {
+            throw new IllegalArgumentException("concat: blocks sizes of " +
+                src + " and " + target + " should all be the same");
+          }
+        }
+
+        si.add(srcInode);
+      }
+
+      // make sure no two files are the same
+      if(si.size() < srcs.length+1) { // trg + srcs
+        // it means at least two files are the same
+        throw new IllegalArgumentException("at least two files are the same");
+      }
+
+      if(NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("DIR* NameSystem.concat: " +
+            Arrays.toString(srcs) + " to " + target);
+      }
+
+      dir.concatInternal(target,srcs);
+    } finally {
+      writeUnlock();
+    }
+    getEditLog().logSync();
+
+
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+                    Server.getRemoteIp(),
+                    "concat", Arrays.toString(srcs), target, 
+                    getLastINode(targetInodes));
+    }
+
+  }
+
+  /**
+   * stores the modification and access time for this inode.
+   * The access time is precise upto an hour. The transaction, if needed, is
+   * written to the edits log but is not flushed.
+   */
+  public void setTimes(String src, long mtime, long atime) throws IOException {
+    if ( !accessTimeTouchable && atime != -1) {
+      throw new AccessTimeException("setTimes is not allowed for accessTime");
+	}    
+    setTimesInternal(src, mtime, atime);
+    getEditLog().logSync(false);
+  }
+
+  private void setTimesInternal(String src, long mtime, long atime)
+    throws IOException {
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot set accesstimes  for " + src, safeMode);
+      }
+      //
+      // The caller needs to have write access to set access & modification times.
+      if (isPermissionEnabled) {
+        INode[] inodes = dir.getExistingPathINodes(src);
+        checkPathAccess(src, inodes, FsAction.WRITE);
+      }
+      INodeFile inode = dir.getFileINode(src);
+      if (inode != null) {
+        dir.setTimes(src, inode, mtime, atime, true);
+        if (auditLog.isInfoEnabled()) {
+          logAuditEvent(getCurrentUGI(),
+            Server.getRemoteIp(),
+            "setTimes", src, null, inode);
+        }
+      } else {
+        throw new FileNotFoundException("File " + src + " does not exist.");
+      }
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Set replication for an existing file.
+   * <p/>
+   * The NameNode sets new replication and schedules either replication of
+   * under-replicated data blocks or removal of the eccessive block copies
+   * if the blocks are over-replicated.
+   *
+   * @param src         file name
+   * @param replication new replication
+   * @return true if successful;
+   *         false if file does not exist or is a directory
+   * @see ClientProtocol#setReplication(String, short)
+   */
+  public boolean setReplication(String src, short replication)
+    throws IOException {
+    boolean status = setReplicationInternal(src, replication);
+    getEditLog().logSync(false);
+    if (status && auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "setReplication", src, null, null);
+    }
+    return status;
+  }
+
+  private boolean setReplicationInternal(String src,
+                                         short replication
+  ) throws IOException {
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot set replication for " + src, safeMode);
+      }
+      verifyReplication(src, replication, null);
+      if (isPermissionEnabled) {
+        INode[] inodes = dir.getExistingPathINodes(src);
+        checkPathAccess(src, inodes, FsAction.WRITE);
+      }
+
+      int[] oldReplication = new int[1];
+      Block[] fileBlocks;
+      fileBlocks = dir.setReplication(src, replication, oldReplication);
+      if (fileBlocks == null)  // file not found or is a directory
+      {
+        return false;
+      }
+      int oldRepl = oldReplication[0];
+      if (oldRepl == replication) // the same replication
+      {
+        return true;
+      }
+
+      // update needReplication priority queues
+      for (int idx = 0; idx < fileBlocks.length; idx++) {
+        updateNeededReplications(fileBlocks[idx], 0, replication - oldRepl);
+      }
+
+      if (oldRepl > replication) {
+        // old replication > the new one; need to remove copies
+        LOG.info("Reducing replication for file " + src
+          + ". New replication is " + replication);
+        for (int idx = 0; idx < fileBlocks.length; idx++) {
+          overReplicatedBlocks.add(fileBlocks[idx]);
+        }
+      } else { // replication factor is increased
+        LOG.info("Increasing replication for file " + src
+          + ". New replication is " + replication);
+      }
+      return true;
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  long getPreferredBlockSize(String filename) throws IOException {
+    if (isPermissionEnabled) {
+      INode[] inodes = dir.getExistingPathINodes(filename);
+      checkTraverse(filename, inodes);
+    }
+    return dir.getPreferredBlockSize(filename);
+  }
+
+  /**
+   * Check whether the replication parameter is within the range
+   * determined by system configuration.
+   */
+  private void verifyReplication(String src,
+                                 short replication,
+                                 String clientName
+  ) throws IOException {
+    String text = "file " + src
+      + ((clientName != null) ? " on client " + clientName : "")
+      + ".\n"
+      + "Requested replication " + replication;
+
+    if (replication > maxReplication) {
+      throw new IOException(text + " exceeds maximum " + maxReplication);
+    }
+
+    if (replication < minReplication) {
+      throw new IOException(
+        text + " is less than the required minimum " + minReplication);
+    }
+  }
+
+  /*
+   * Verify that parent dir exists
+   */
+  private void verifyParentDir(String src) throws FileAlreadyExistsException,
+      FileNotFoundException {
+    Path parent = new Path(src).getParent();
+    if (parent != null) {
+      INode[] pathINodes = dir.getExistingPathINodes(parent.toString());
+      if (pathINodes[pathINodes.length - 1] == null) {
+        throw new FileNotFoundException("Parent directory doesn't exist: "
+            + parent.toString());
+      } else if (!pathINodes[pathINodes.length - 1].isDirectory()) {
+        throw new FileAlreadyExistsException("Parent path is not a directory: "
+            + parent.toString());
+      }
+    }
+  }
+
+  /**
+   * Create a new file entry in the namespace.
+   *
+   * @throws IOException if file name is invalid
+   *                     {@link FSDirectory#isValidToCreate(String)}.
+   * @see ClientProtocol#create(String, FsPermission, String, boolean, short, long)
+   */
+  void startFile(String src, PermissionStatus permissions,
+                 String holder, String clientMachine,
+                 boolean overwrite, boolean createParent, short replication, long blockSize
+  ) throws IOException {
+    INodeFileUnderConstruction file =
+      startFileInternal(src, permissions, holder, clientMachine, overwrite, false,
+      createParent, replication, blockSize);
+    getEditLog().logSync(false);
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "create", src, null, file);
+    }
+  }
+
+  private INodeFileUnderConstruction startFileInternal(String src,
+                                 PermissionStatus permissions,
+                                 String holder,
+                                 String clientMachine,
+                                 boolean overwrite,
+                                 boolean append,
+                                 boolean createParent,
+                                 short replication,
+                                 long blockSize
+  ) throws IOException {
+    // tokenize the filename into components
+    String[] names = INodeDirectory.getPathNames(src);
+    if (!pathValidator.isValidName(src, names)) {
+      numInvalidFilePathOperations++;
+      throw new IOException("Invalid file name: " + src);
+    }
+
+    // convert names to array of bytes w/o holding lock
+    byte[][] components = INodeDirectory.getPathComponents(names);
+    
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug("DIR* NameSystem.startFile: src=" + src
+        + ", holder=" + holder
+        + ", clientMachine=" + clientMachine
+        + ", createParent=" + createParent
+        + ", replication=" + replication
+        + ", overwrite=" + overwrite
+        + ", append=" + append);
+    }
+    
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot create file" + src, safeMode);
+      }
+      INode[] inodes = new INode[components.length];
+      dir.rootDir.getExistingPathINodes(components, inodes);
+      INode inode = inodes[inodes.length-1];
+      boolean pathExists = inode != null &&
+          (inode.isDirectory() || ((INodeFile)inode).getBlocks() != null);
+      if (pathExists && inode.isDirectory()) {
+        throw new IOException("Cannot create file " + src + "; already exists as a directory.");
+      }
+
+      if (isPermissionEnabled) {
+        if (append || (overwrite && pathExists)) {
+          checkPathAccess(src, inodes, FsAction.WRITE);
+        } else {
+          checkAncestorAccess(src, inodes, FsAction.WRITE);
+        }
+      }
+
+      if (!createParent) {
+        verifyParentDir(src);
+      }
+
+      try {
+        INode myFile = (INodeFile) inode;
+        recoverLeaseInternal(myFile, src, holder, clientMachine, false, false);
+        long oldAccessTime = -1;
+        
+        try {
+          verifyReplication(src, replication, clientMachine);
+        } catch (IOException e) {
+          throw new IOException("failed to create " + e.getMessage());
+        }
+        if (append) {
+          if (myFile == null) {
+            throw new FileNotFoundException("failed to append to non-existent file "
+              + src + " on client " + clientMachine);
+          } else if (myFile.isDirectory()) {
+            throw new IOException("failed to append to directory " + src
+              + " on client " + clientMachine);
+          }
+        } else if (myFile != null) {
+          if (overwrite) {
+        	// if the accessTime is not changable, keep the previous time
+            if (!isAccessTimeSupported() && (inodes.length > 0)) {
+              oldAccessTime = inodes[inodes.length - 1].getAccessTime();
+            }
+            deleteInternal(src, inodes, false, true);
+          } else {
+            throw new IOException("failed to create file " + src
+              + " on client " + clientMachine
+              + " either because the filename is invalid or the file exists");
+          }
+        }
+
+        DatanodeDescriptor clientNode =
+          host2DataNodeMap.getDatanodeByHost(clientMachine);
+
+        if (append) {
+          //
+          // Replace current node with a INodeUnderConstruction.
+          // Recreate in-memory lease record.
+          //
+          INodeFile node = (INodeFile) myFile;
+          // cannot append the hard linked file if its reference cnt is more than 1 
+          if (node instanceof INodeHardLinkFile) { 
+            throw new IOException("failed to append file " + src  
+                + " on client " + clientMachine 
+                + " because the file is hard linked !");  
+          }
+          
+          INodeFileUnderConstruction cons = new INodeFileUnderConstruction(
+            node.getLocalNameBytes(),
+            node.getReplication(),
+            node.getModificationTime(),
+            isAccessTimeSupported() ? node.getModificationTime() : node.getAccessTime(),
+            node.getPreferredBlockSize(),
+            node.getBlocks(),
+            node.getPermissionStatus(),
+            holder,
+            clientMachine,
+            clientNode);
+          dir.replaceNode(src, inodes, node, cons, true);
+          leaseManager.addLease(cons.clientName, src,
+                                cons.getModificationTime());
+          return cons;
+        } else {
+          // Now we can add the name to the filesystem. This file has no
+          // blocks associated with it.
+          //
+          checkFsObjectLimit();
+
+          // increment global generation stamp
+          long genstamp = nextGenerationStamp();
+          INodeFileUnderConstruction newNode = dir.addFile(
+            src, names, components, inodes, permissions,
+            replication, blockSize, holder, clientMachine, clientNode, genstamp, oldAccessTime);
+          if (newNode == null) {
+            throw new IOException("DIR* NameSystem.startFile: " +
+              "Unable to add file to namespace.");
+          }
+          leaseManager.addLease(newNode.clientName, src,
+                                newNode.getModificationTime());
+          if (NameNode.stateChangeLog.isDebugEnabled()) {
+            NameNode.stateChangeLog.debug("DIR* NameSystem.startFile: "
+              + "add " + src + " to namespace for " + holder);
+          }
+          return newNode;
+        }
+      } catch (IOException ie) {
+        NameNode.stateChangeLog.warn("DIR* NameSystem.startFile: "
+          + ie.getMessage());
+        throw ie;
+      }
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Recover lease;
+   * Immediately revoke the lease of the current lease holder and start lease
+   * recovery so that the file can be forced to be closed.
+   *
+   * @param src the path of the file to start lease recovery
+   * @param holder the lease holder's name
+   * @param clientMachine the client machine's name
+   * @param discardLastBlock if true, then drop last block if hsync not
+   *                         yet invoked on last block
+   * @return if the lease recovery completes or not
+   * @throws IOException
+   */
+  boolean recoverLease(String src, String holder, String clientMachine,
+                       boolean discardLastBlock) throws IOException {
+    
+    // convert names to array of bytes w/o holding lock
+    byte[][] components = INodeDirectory.getPathComponents(src);
+    
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException(
+            "Cannot recover the lease of " + src, safeMode);
+      }
+      INode inode = dir.getFileINode(components);
+      if (inode == null) {
+        throw new FileNotFoundException("File not found " + src);
+      }
+
+      if (!inode.isUnderConstruction()) {
+        return true;
+      }
+
+      if (isPermissionEnabled) {
+        INode[] inodes = dir.getExistingPathINodes(src);
+        checkPathAccess(src, inodes, FsAction.WRITE);
+      }
+
+      return recoverLeaseInternal(inode, src, holder, clientMachine,
+                           true, discardLastBlock);
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  private boolean recoverLeaseInternal(INode fileInode,
+      String src, String holder, String clientMachine, boolean force,
+      boolean discardLastBlock)
+  throws IOException {
+    if (fileInode != null && fileInode.isUnderConstruction()) {
+      INodeFileUnderConstruction pendingFile = (INodeFileUnderConstruction) fileInode;
+      //
+      // If the file is under construction , then it must be in our
+      // leases. Find the appropriate lease record.
+      //
+      Lease lease = leaseManager.getLease(holder);
+      //
+      // We found the lease for this file. And surprisingly the original
+      // holder is trying to recreate this file. This should never occur.
+      //
+      if (!force && lease != null) {
+        Lease leaseFile = leaseManager.getLeaseByPath(src);
+        if (leaseFile != null && leaseFile.equals(lease)) {
+          throw new AlreadyBeingCreatedException(
+                    "failed to create file " + src + " for " + holder +
+                    " on client " + clientMachine +
+                    " because current leaseholder is trying to recreate file.");
+        }
+      }
+      //
+      // Find the original holder.
+      //
+      lease = leaseManager.getLease(pendingFile.clientName);
+      if (lease == null) {
+        throw new AlreadyBeingCreatedException(
+                    "failed to create file " + src + " for " + holder +
+                    " on client " + clientMachine +
+                    " because pendingCreates is non-null but no leases found.");
+      }
+      if (force) {
+        // close now: no need to wait for soft lease expiration and
+        // close only the file src
+        LOG.info("recoverLease: recover lease " + lease + ", src=" + src +
+                 " from client " + pendingFile.clientName +
+                 " discardLastBloc = " + discardLastBlock);
+        // We have to tell the client that the lease recovery has succeeded e.g. in case the file
+        // has no blocks. Otherwise, the client will get stuck in an infinite loop.
+        return internalReleaseLeaseOne(lease, src, pendingFile, discardLastBlock);
+      } else {
+        //
+        // If the original holder has not renewed in the last SOFTLIMIT
+        // period, then start lease recovery.
+        //
+        if (lease.expiredSoftLimit()) {
+          LOG.info("startFile: recover lease " + lease + ", src=" + src +
+              " from client " + pendingFile.clientName);
+          internalReleaseLease(lease, src, pendingFile);
+        }
+        throw new AlreadyBeingCreatedException(
+            "failed to create file " + src + " for " + holder +
+            " on client " + clientMachine +
+            ", because this file is already being created by " +
+            pendingFile.getClientName() +
+            " on " + pendingFile.getClientMachine());
+      }
+    }
+    // This does not necessarily mean lease recovery has failed, but we will
+    // have the client retry.
+    return false;
+  }
+
+  /** 
+   * Append to an existing file in the namespace.
+   */
+  public LocatedBlock appendFile(String src, String holder, String clientMachine
+      ) throws IOException {
+    return appendFile(src, holder, clientMachine, BlockMetaInfoType.NONE);
+  }
+  /**
+   * Append to an existing file in the namespace.
+   */
+  public LocatedBlock appendFile(String src, String holder, String clientMachine,
+      BlockMetaInfoType type) throws IOException {
+    if (supportAppends == false) {
+      throw new IOException("Append to hdfs not supported." +
+        " Please refer to dfs.support.append configuration parameter.");
+    }
+    startFileInternal(src, null, holder, clientMachine, false, true,
+      false, (short) maxReplication, (long) 0);
+    getEditLog().logSync();
+
+    //
+    // Create a LocatedBlock object for the last block of the file
+    // to be returned to the client. Return null if the file does not
+    // have a partial block at the end.
+    //
+    LocatedBlock lb = null;
+    writeLock();
+    try {
+      // Need to re-check existence here, since the file may have been deleted
+      // in between the synchronized blocks
+      INodeFileUnderConstruction file = checkLease(src, holder);
+
+      Block[] blocks = file.getBlocks();
+      if (blocks != null && blocks.length > 0) {
+        Block last = blocks[blocks.length - 1];
+        BlockInfo storedBlock = blocksMap.getStoredBlock(last);
+        if (file.getPreferredBlockSize() > storedBlock.getNumBytes()) {
+          long fileLength = file.computeContentSummary().getLength();          
+          DatanodeDescriptor[] targets = new DatanodeDescriptor[blocksMap.numNodes(last)];
+          Iterator<DatanodeDescriptor> it = blocksMap.nodeIterator(last);
+          for (int i = 0; it != null && it.hasNext(); i++) {
+            targets[i] = it.next();
+          }
+          // remove the replica locations of this block from the blocksMap
+          for (int i = 0; i < targets.length; i++) {
+            targets[i].removeBlock(storedBlock);
+          }
+          // set the locations of the last block in the lease record
+          file.setLastBlock(storedBlock, targets);
+
+          lb = createLocatedBlock(last, targets, fileLength - storedBlock.getNumBytes(),
+              DataTransferProtocol.DATA_TRANSFER_VERSION, type);
+
+          // Remove block from replication queue.
+          neededReplications.remove(last, -1);
+
+          // remove this block from the list of pending blocks to be deleted.
+          // This reduces the possibility of triggering HADOOP-1349.
+          //
+          for (DatanodeDescriptor dd : targets) {
+            String datanodeId = dd.getStorageID();
+            LightWeightHashSet<Block> v = recentInvalidateSets.get(datanodeId);
+            if (v != null && v.remove(last)) {
+              if (v.isEmpty()) {
+                recentInvalidateSets.remove(datanodeId);
+              }
+              pendingDeletionBlocksCount--;
+            }
+          }
+        }
+      }
+    } finally {
+      writeUnlock();
+    }
+    if (lb != null) {
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("DIR* NameSystem.appendFile: file "
+          + src + " for " + holder + " at " + clientMachine
+          + " block " + lb.getBlock()
+          + " block size " + lb.getBlock().getNumBytes());
+      }
+    }
+
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "append", src, null, null);
+    }
+    return lb;
+  }
+
+  /**
+   * Stub for old callers pre-HDFS-630
+   */
+  public LocatedBlock getAdditionalBlock(String src,
+                                         String clientName
+                                         ) throws IOException {
+    return getAdditionalBlock(src, clientName, null);
+  }
+
+  /**
+   * Given information about a datanode, returns the DatanodeDescriptor for the
+   * same, or if it doesn't find the datanode, it looks for a machine local and
+   * then rack local datanode, if a rack local datanode is not possible either,
+   * it returns the DatanodeDescriptor of any random node in the cluster.
+   *
+   * @param info
+   *          the datanode to look for
+   * @return the best match for the given datanode
+   * @throws IOException
+   */
+  private DatanodeDescriptor findBestDatanodeInCluster(DatanodeInfo info)
+      throws IOException {
+    DatanodeDescriptor node = getDatanode(info);
+
+    if (node == null) {
+      node = host2DataNodeMap.getDatanodeByName(info.getName());
+    }
+    if (node == null) {
+      node = host2DataNodeMap.getDatanodeByHost(info.getHostName());
+    }
+
+    if (node == null) {
+      if (info.getNetworkLocation() == null
+          || info.getNetworkLocation().equals(NetworkTopology.DEFAULT_RACK)) {
+        resolveNetworkLocation(info);
+      }
+      // If the current cluster doesn't contain the node, fallback to
+      // something machine local and then rack local.
+      List<Node> rackNodes = clusterMap.getDatanodesInRack(info
+          .getNetworkLocation());
+      if (rackNodes != null) {
+        // Try something machine local.
+        for (Node rackNode : rackNodes) {
+          if (((DatanodeDescriptor) rackNode).getHost().equals(info.getHost())) {
+            node = (DatanodeDescriptor) rackNode;
+            break;
+          }
+        }
+
+        // Try something rack local.
+        if (node == null && !rackNodes.isEmpty()) {
+          node = (DatanodeDescriptor) (rackNodes
+              .get(r.nextInt(rackNodes.size())));
+        }
+      }
+
+      // If we can't even choose rack local, just choose any node in the
+      // cluster.
+      if (node == null) {
+        node = (DatanodeDescriptor) clusterMap.chooseRandom(NodeBase.ROOT);
+      }
+    }
+
+    if (node == null) {
+      throw new IOException("Could not find any node in the cluster for : "
+          + info);
+    }
+    return node;
+  }
+
+  public DatanodeDescriptor[] computeTargets(String src, int replication,
+      DatanodeDescriptor clientNode, List<Node> excludedNodes, long blockSize,
+      List<DatanodeInfo> favoredNodes) throws IOException {
+    DatanodeDescriptor targets[];
+
+    // If excluded nodes null, then instantiate for future use in this method.
+    if (excludedNodes == null) {
+      excludedNodes = new ArrayList<Node>();
+    }
+
+    if (favoredNodes == null) {
+      // Favored nodes not specified, fall back to regular block placement.
+      targets = replicator.chooseTarget(src, replication, clientNode,
+          new ArrayList<DatanodeDescriptor>(), excludedNodes, blockSize);
+    } else {
+      // If favored nodes are specified choose a target for each.
+      List<DatanodeDescriptor> results = new ArrayList<DatanodeDescriptor>();
+      for (int i = 0; i < Math.min(favoredNodes.size(), replication); i++) {
+        DatanodeDescriptor favoredNode = findBestDatanodeInCluster(favoredNodes
+            .get(i));
+
+        // Choose a single node which is local to favoredNode.
+        DatanodeDescriptor[] locations = replicator.chooseTarget(src, 1,
+            favoredNode, new ArrayList<DatanodeDescriptor>(),
+            excludedNodes, blockSize);
+        if (locations.length != 1) {
+          LOG.warn("Could not find a target for file " + src
+              + " with favored node " + favoredNode);
+          continue;
+        }
+        DatanodeDescriptor target = locations[0];
+        results.add(target);
+        excludedNodes.add(target);
+      }
+
+      // Not enough nodes computed, place the remaining replicas.
+      if (results.size() < replication) {
+        // Not enough favored nodes, use replicator to choose other nodes.
+        replication -= results.size();
+        DatanodeDescriptor[] remainingTargets = replicator.chooseTarget(src,
+            replication, clientNode,
+            results, excludedNodes, blockSize);
+        for (int i = 0; i < remainingTargets.length; i++) {
+          results.add(remainingTargets[i]);
+        }
+      }
+      targets = new DatanodeDescriptor[results.size()];
+      results.toArray(targets);
+      clusterMap.getPipeline(clientNode, targets);
+    }
+    return targets;
+  }
+
+  /**
+   * The client would like to obtain an additional block for the indicated
+   * filename (which is being written-to).  Return an array that consists
+   * of the block, plus a set of machines.  The first on this list should
+   * be where the client writes data.  Subsequent items in the list must
+   * be provided in the connection to the first datanode.
+   * <p/>
+   * Make sure the previous blocks have been reported by datanodes and
+   * are replicated.  Will return an empty 2-elt array if we want the
+   * client to "try again later".
+   */
+  public LocatedBlock getAdditionalBlock(String src,
+                                                     String clientName,
+                                                     List<Node> excludedNodes)
+  throws IOException {
+    return getAdditionalBlock(src, clientName, excludedNodes, null,
+        -1, null, BlockMetaInfoType.NONE);
+  }
+  
+  public LocatedBlock getAdditionalBlock(String src,
+                                         String clientName,
+                                         List<Node> excludedNodes,
+                                         List<DatanodeInfo> favoredNodes,                                         
+                                         long startPos,
+                                         Block lastBlock,
+                                         BlockMetaInfoType type)
+  throws IOException {
+    long fileLength = -1, blockSize = -1;
+    int replication = 0;
+    DatanodeDescriptor clientNode = null;
+    Block newBlock = null;
+    DatanodeDescriptor[] targets = null;
+
+    // convert path string into an array of bytes w/o holding lock
+    byte[][] components = INodeDirectory.getPathComponents(src);
+    INode[] pathINodes = new INode[components.length];
+
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug("BLOCK* NameSystem.getAdditionalBlock: file "
+        + src + " for " + clientName);
+    }
+
+    boolean returnLastBlock = false;
+    INodeFileUnderConstruction pendingFile;
+    readLock();
+    try {
+      // have we exceeded the configured limit of fs objects.
+      checkFsObjectLimit();
+
+      dir.rootDir.getExistingPathINodes(components, pathINodes);
+      pendingFile =
+         checkLease(src, clientName, pathINodes[pathINodes.length - 1]);
+
+      fileLength = pendingFile.computeContentSummary().getLength();
+      int numExistingBlocks = pendingFile.getBlocks().length;
+      if (startPos != numExistingBlocks * pendingFile.getPreferredBlockSize()
+          && startPos != -1) {
+        // If the file size from client size matches the the size
+        // before the last block, there is a possible that it is a
+        // duplicated RPC from client, when the previous operation
+        // succeeded but the client failed to receive the suceess
+        // ack. If the last block is empty from namenode's knowlege
+        // and last block the client knows is the second last one,
+        // name-node will just return the last block. 
+        //
+        if (lastBlock != null
+            && startPos == (numExistingBlocks - 1)
+                * pendingFile.getPreferredBlockSize()
+            && pendingFile.getLastBlock().getNumBytes() == 0
+            && numExistingBlocks > 1
+            && pendingFile.getBlocks()[numExistingBlocks - 2]
+                .equals(lastBlock)) {
+          returnLastBlock = true;
+          newBlock = pendingFile.getLastBlock();
+          targets = pendingFile.getTargets();
+          if (getPersistBlocks()) {
+            dir.persistBlocks(src, pendingFile);
+          }
+        } else {
+          throw new IOException(
+              "File size from client side doesn't match name-node. Pos: "
+                  + startPos + " #block: " + numExistingBlocks
+                  + " block size: " + pendingFile.getPreferredBlockSize());
+        }
+      } else {
+        if (!checkFileProgress(pendingFile, false)) {
+          throw new NotReplicatedYetException("Not replicated yet:" + src);
+        }
+
+        blockSize = pendingFile.getPreferredBlockSize();
+        clientNode = pendingFile.getClientNode();
+        replication = (int) pendingFile.getReplication();
+      }
+    } finally {
+      readUnlock();
+    }
+    if (returnLastBlock) {
+      if (getPersistBlocks()) {
+        if (syncAddBlock) {
+          getEditLog().logSync(); // sync every block.
+        } else {
+          getEditLog().logSyncIfNeeded(); // sync if too many transactions in buffer
+        }
+      }
+      return createLocatedBlock(newBlock,
+          targets, fileLength,
+          DataTransferProtocol.DATA_TRANSFER_VERSION, type);
+    }
+    
+    targets = computeTargets(src, replication, clientNode,
+        excludedNodes, blockSize, favoredNodes);
+
+    if (targets.length < this.minReplication) {
+      throw new IOException("File " + src + " could only be replicated to " +
+        targets.length + " nodes, instead of " +
+        minReplication);
+    }
+
+    // Allocate a new block and record it in the INode.
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot add block to " + src, safeMode);
+      }
+      Arrays.fill((Object[])pathINodes, null);
+      dir.rootDir.getExistingPathINodes(components, pathINodes);
+      pendingFile =
+        checkLease(src, clientName, pathINodes[pathINodes.length - 1]);
+
+
+      if (!checkFileProgress(pendingFile, false)) {
+        throw new NotReplicatedYetException("Not replicated yet:" + src);
+      }
+
+      // set current last (soon to be second to last) block's 
+      // size to be the file's default block size
+      setLastBlockSize(pendingFile);
+      
+      // replicate current last (soon to be second to last) block
+      // if under-replicated
+      replicateLastBlock(src, pendingFile);
+      
+      // allocate new block record block locations in INode.
+      newBlock = allocateBlock(src, pathINodes);
+      pendingFile.setTargets(targets);
+
+      for (DatanodeDescriptor dn : targets) {
+        dn.incBlocksScheduled();
+      }
+      if (getPersistBlocks()) {
+        dir.persistBlocks(src, pendingFile);
+      }
+    } finally {
+      writeUnlock();
+    }
+
+    if (getPersistBlocks()) {
+      if (syncAddBlock) {
+        getEditLog().logSync(); // sync every block.
+      } else {
+        getEditLog().logSyncIfNeeded(); // sync if too many transactions in buffer
+      }
+    }
+
+    // log the newly created block
+    StringBuilder msg = new StringBuilder();
+    msg.append("BLOCK* NameSystem.allocateBlock: " + src + ". "
+        + newBlock + " allocated to " + targets.length + " datanodes:");
+    for (DatanodeDescriptor dn : targets) {
+      msg.append(" " + dn);
+    }
+    NameNode.stateChangeLog.info(msg.toString());
+
+    // Create next block
+    return createLocatedBlock(newBlock, targets, fileLength,
+        DataTransferProtocol.DATA_TRANSFER_VERSION, type);
+  }
+
+  private LocatedBlock createLocatedBlock(Block block,
+      DatanodeDescriptor[] targets,
+      long fileLen, int transferProtocolVersion, BlockMetaInfoType type) {
+    switch (type) {
+    case VERSION_AND_NAMESPACEID:
+      return new LocatedBlockWithMetaInfo(block, targets, fileLen,
+          transferProtocolVersion, this.getFSImage().storage.namespaceID, this.nameNode
+              .getClientProtocolMethodsFingerprint());
+    case VERSION:
+      return new VersionedLocatedBlock(block, targets, fileLen,
+          transferProtocolVersion);
+    default:
+      return new LocatedBlock(block, targets, fileLen);
+    }
+  }
+
+  /**
+   * Set last block's block size to be the file's default block size
+   * @param file file inode under construction
+   */
+  private void setLastBlockSize(INodeFileUnderConstruction pendingFile) {
+    Block block = pendingFile.getLastBlock();
+    if (block != null) {
+      block.setNumBytes(pendingFile.getPreferredBlockSize());
+    }
+  }
+  
+  /** 
+   * Check last block of the file under construction
+   * Replicate it if it is under replicated
+   * @param src the file name
+   * @param file the file's inode
+   */
+  private void replicateLastBlock(String src, INodeFileUnderConstruction file) {
+    if (file.blocks == null || file.blocks.length == 0)
+      return;
+    BlockInfo block = file.blocks[file.blocks.length-1];
+    DatanodeDescriptor[] targets = file.getTargets();
+    final int numOfTargets = targets == null ? 0 : targets.length;
+    NumberReplicas status = countNodes(block);
+    int totalReplicas = status.getTotal();
+    if (numOfTargets > totalReplicas) {
+      pendingReplications.add(block, numOfTargets-totalReplicas);
+    }
+    int expectedReplicas = file.getReplication();
+    if (numOfTargets < expectedReplicas || 
+        status.decommissionedReplicas != 0 ||
+        status.corruptReplicas != 0) {
+      LOG.info("Add " + block + " of " + src + " to needReplication queue: " + 
+          " numOfTargets = " + numOfTargets +
+          " decomissionedReplicas = " + status.decommissionedReplicas +
+          " corruptReplicas = " + status.corruptReplicas);
+      neededReplications.add(block, status.liveReplicas, 
+          status.decommissionedReplicas, expectedReplicas);
+    }
+    // update metrics
+    if (numOfTargets < expectedReplicas) {
+      if (numOfTargets == 1) {
+        myFSMetrics.numNewBlocksWithOneReplica.inc();
+      }
+    } else {
+      myFSMetrics.numNewBlocksWithoutFailure.inc();
+    }
+    myFSMetrics.numNewBlocks.inc();
+  }
+  
+  /**
+   * The client would like to let go of the given block
+   */
+  public boolean abandonBlock(Block b, String src, String holder
+  ) throws IOException {
+    writeLock();
+    try {
+      //
+      // Remove the block from the pending creates list
+      //
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("BLOCK* NameSystem.abandonBlock: "
+          + b + "of file " + src);
+      }
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot abandon block " + b +
+          " for fle" + src, safeMode);
+      }
+      INodeFileUnderConstruction file = checkLease(src, holder);
+      dir.removeBlock(src, file, b);
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("BLOCK* NameSystem.abandonBlock: "
+          + b
+          + " is removed from pendingCreates");
+      }
+      return true;
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+ *    * The client would like to let go of a given file
+ *       */
+  public boolean abandonFile(String src, String holder
+      ) throws IOException {
+    writeLock();
+    try {
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("FILE* NameSystem.abandonFile: " + src);
+      }
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot abandon file " + src, safeMode);
+      }
+      checkLease(src, holder);
+      internalReleaseLeaseOne(leaseManager.getLease(holder), src);
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("FILE* NameSystem.abandonFile: "
+                                        + " has been scheduled for lease recovery");
+      }
+      return true;
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  // make sure that we still have the lease on this file.
+
+  private INodeFileUnderConstruction checkLease(String src, String holder)
+    throws IOException {
+    INodeFile file = dir.getFileINode(src);
+    return checkLease(src, holder, file);
+  }
+
+  private INodeFileUnderConstruction checkLease(String src, String holder, INode file)
+    throws IOException {
+
+    if (file == null || file.isDirectory()) {
+      Lease lease = leaseManager.getLease(holder);
+      throw new LeaseExpiredException("No lease on " + src +
+        " File does not exist. " +
+        (lease != null ? lease.toString() :
+          "Holder " + holder +
+            " does not have any open files."));
+    }
+    if (!file.isUnderConstruction()) {
+      Lease lease = leaseManager.getLease(holder);
+      throw new LeaseExpiredException("No lease on " + src +
+        " File is not open for writing. " +
+        (lease != null ? lease.toString() :
+          "Holder " + holder +
+            " does not have any open files."));
+    }
+    INodeFileUnderConstruction pendingFile = (INodeFileUnderConstruction) file;
+    if (holder != null && !pendingFile.getClientName().equals(holder)) {
+      throw new LeaseExpiredException("Lease mismatch on " + src + " owned by "
+        + pendingFile.getClientName() + " but is accessed by " + holder);
+    }
+    return pendingFile;
+  }
+
+  /**
+   * The FSNamesystem will already know the blocks that make up the file.
+   * Before we return, we make sure that all the file's blocks have
+   * been reported by datanodes and are replicated correctly.
+   */
+
+  enum CompleteFileStatus {
+    OPERATION_FAILED,
+    STILL_WAITING,
+    COMPLETE_SUCCESS
+  }
+
+  public CompleteFileStatus completeFile(String src, String holder,
+      long fileLen, Block lastBlock) throws IOException {
+    CompleteFileStatus status = completeFileInternal(src, holder, fileLen,
+        lastBlock);
+    getEditLog().logSync();
+    return status;
+  }
+
+  private void checkFilePath(String src, INode[] inodes) throws IOException {
+    if (inodes.length == 0 || inodes.length == 1) {
+      throw new IOException("Illegal file path: " + src +
+            "! Must start from root.");
+    }
+    for (int i=0; i<inodes.length-1; i++) {
+      if (inodes[i]==null || !inodes[i].isDirectory()) {
+        throw new IOException("Path doesn't exist: " + src);
+      }
+    }
+  }
+  
+  private CompleteFileStatus completeFileInternal(String src,
+                                                  String holder,
+                                                  long fileLen,
+                                                  Block lastBlock)
+    throws IOException {
+    // convert path string into an array of bytes w/o holding lock
+    byte[][] components = INodeDirectory.getPathComponents(src);
+
+    writeLock();
+    try {
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("DIR* NameSystem.completeFile: " + src
+            + " for " + holder
+            + ((fileLen != -1) ? (" file length " + fileLen) : "")
+            + ((lastBlock != null) ? (" last block: " + lastBlock) : ""));
+      }
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot complete file " + src, safeMode);
+      }
+      INode[] inodes = new INode[components.length];
+      dir.rootDir.getExistingPathINodes(components, inodes);
+      checkFilePath(src, inodes);
+      
+      INode inode = inodes[inodes.length-1];
+      if (inode != null && !inode.isUnderConstruction() && !inode.isDirectory()
+          && fileLen != -1 && lastBlock != null && inode instanceof INodeFile) {
+        // We assume it is a duplicate call if the file is not under
+        // construction. In that case, we'll compare file size and
+        // the last block ID that the client knows, instead of checking
+        // leases. Then it'll just recommit the edit log and return
+        // success. If client doesn't send the last block metadata
+        // (most likely because it uses older protocol), we'll simply
+        // fail the call.
+        //
+        INodeFile inf = (INodeFile) inode;
+
+        long sumBlockLen = 0;
+        for (Block blk : inf.getBlocks()) {
+          sumBlockLen += blk.getNumBytes();
+        }
+        if (sumBlockLen != fileLen) {
+          throw new IOException(
+              "Try close a closed file: file size in client side "
+                  + "doesn't match name-node. client: " + fileLen
+                  + " name-node: " + sumBlockLen);
+        }
+        
+        if (!inf.getLastBlock().equals(lastBlock)) {
+          throw new IOException(
+              "Try close a closed file: last block from client side "
+                  + "doesn't match name-node. client: " + lastBlock
+                  + " name-node: " + inf.getLastBlock());          
+        }
+
+        // we need to write logs again in case the log was not synced
+        // for the previous request.
+        dir.closeFile(src, inf);
+        NameNode.stateChangeLog
+            .info("DIR* NameSystem.completeFile: process duplicate request: file "
+                + src
+                + " is closed by "
+                + holder
+                + ((fileLen != -1) ? (" file length " + fileLen) : "")
+                + ((lastBlock != null) ? (" last block: " + lastBlock) : ""));
+        return CompleteFileStatus.COMPLETE_SUCCESS;
+      }
+      
+      INodeFileUnderConstruction pendingFile = checkLease(
+          src, holder, inode);
+      Block[] fileBlocks = pendingFile.getBlocks();
+      if (fileBlocks == null) {
+        NameNode.stateChangeLog.warn("DIR* NameSystem.completeFile: "
+          + "failed to complete " + src
+          + " because dir.getFileBlocks() is null " +
+          " and pendingFile is " +
+          ((pendingFile == null) ? "null" :
+            ("from " + pendingFile.getClientMachine()))
+        );
+        return CompleteFileStatus.OPERATION_FAILED;
+      } else if (!checkFileProgress(pendingFile, true)) {
+        return CompleteFileStatus.STILL_WAITING;
+      }
+      
+      if (fileLen != -1) {
+        long sumBlockLen = 0;
+        for (Block blk : fileBlocks) {
+          sumBlockLen += blk.getNumBytes();
+        }
+        if (sumBlockLen != fileLen) {
+          throw new IOException(
+              "file size in client side doesn't match the closed file. client: "
+                  + fileLen + " name-node: " + sumBlockLen);
+        }
+      }
+      
+      finalizeINodeFileUnderConstruction(src, inodes, pendingFile);
+      
+    } finally {
+      writeUnlock();
+    }
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.info("DIR* NameSystem.completeFile: file " + src
+          + " is closed by " + holder
+          + ((fileLen != -1) ? (" file length " + fileLen) : "")
+          + ((lastBlock != null) ? (" last block: " + lastBlock) : ""));
+    } else {
+      NameNode.stateChangeLog.info("DIR* NameSystem.completeFile: file " + src
+          + " is closed by " + holder + " - lease removed");
+    }
+
+    return CompleteFileStatus.COMPLETE_SUCCESS;
+  }
+
+  static Random randBlockId = new Random();
+
+  /**
+   * Allocate a block at the given pending filename
+   *
+   * @param src    path to the file
+   * @param inodes INode representing each of the components of src.
+   *               <code>inodes[inodes.length-1]</code> is the INode for the file.
+   */
+  private Block allocateBlock(String src, INode[] inodes) throws IOException {
+    Block b = new Block(FSNamesystem.randBlockId.nextLong(), 0, 0);
+    while (isValidBlock(b)) {
+      b.setBlockId(FSNamesystem.randBlockId.nextLong());
+    }
+    b.setGenerationStamp(getGenerationStamp());
+    b = dir.addBlock(src, inodes, b);
+    return b;
+  }
+
+  /**
+   * Check that the indicated file's blocks are present and
+   * replicated.  If not, return false. If checkall is true, then check
+   * all blocks, otherwise check only penultimate block.
+   */
+  boolean checkFileProgress(INodeFile v, boolean checkall) {
+    if (checkall) {
+      //
+      // check all blocks of the file.
+      //
+      int closeFileReplicationMin =
+        Math.min(v.getReplication(), this.minCloseReplication);
+      for (Block block : v.getBlocks()) {
+        int numNodes = blocksMap.numNodes(block);
+        if (numNodes < closeFileReplicationMin) {
+          LOG.info(
+            "Closing INodeFile " + v + " block " + block + " has replication " +
+            numNodes + " and requires " + closeFileReplicationMin
+          );
+
+          return false;
+        }
+      }
+    } else {
+      //
+      // check the penultimate block of this file
+      //
+      Block b = v.getPenultimateBlock();
+      if (b != null) {
+        int numNodes = blocksMap.numNodes(b);
+        if (numNodes < this.minReplication) {
+          LOG.info(
+            "INodeFile " + v + " block " + b + " has replication " +
+              numNodes + " and requires " + this.minReplication
+          );
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Remove a datanode from the invalidatesSet
+   *
+   * @param n datanode
+   */
+  void removeFromInvalidates(String storageID) {
+    LightWeightHashSet<Block> blocks = recentInvalidateSets.remove(storageID);
+    if (blocks != null) {
+      pendingDeletionBlocksCount -= blocks.size();
+    }
+  }
+
+  /**
+   * Adds block to list of blocks which will be invalidated on
+   * specified datanode and log the move
+   *
+   * @param b block
+   * @param n datanode
+   */
+  void addToInvalidates(Block b, DatanodeInfo n, boolean ackRequired) {
+    addToInvalidatesNoLog(b, n, ackRequired);
+    if (isInitialized && !isInSafeMode()) {
+      // do not log in startup phase
+      NameNode.stateChangeLog.info("BLOCK* NameSystem.addToInvalidates: "
+        + b.getBlockName() + " is added to invalidSet of " + n.getName());
+    }
+  }
+
+  /**
+   * Adds block to list of blocks which will be invalidated on
+   * specified datanode
+   *
+   * @param b block
+   * @param n datanode
+   */
+  void addToInvalidatesNoLog(Block b, DatanodeInfo n, boolean ackRequired) {
+    // We are the standby avatar and we don't want to add blocks to the
+    // invalidates list.
+    if (this.getNameNode().shouldRetryAbsentBlocks()) {
+      return;
+    }
+
+    LightWeightHashSet<Block> invalidateSet = recentInvalidateSets.get(n
+        .getStorageID());
+    if (invalidateSet == null) {
+      invalidateSet = new LightWeightHashSet<Block>();
+      recentInvalidateSets.put(n.getStorageID(), invalidateSet);
+    }
+    if(!ackRequired){
+      b.setNumBytes(BlockFlags.NO_ACK);
+    }
+    if (invalidateSet.add(b)) {
+      pendingDeletionBlocksCount++;
+    }
+  }
+
+  /**
+   * Adds block to list of blocks which will be invalidated on
+   * all its datanodes.
+   */
+  private void addToInvalidates(Block b, boolean ackRequired) {
+    StringBuilder sb = new StringBuilder();
+    for (Iterator<DatanodeDescriptor> it =
+      blocksMap.nodeIterator(b); it.hasNext();) {
+      DatanodeDescriptor node = it.next();
+      addToInvalidatesNoLog(b, node, ackRequired);
+      sb.append(node.getName());
+      sb.append(' ');
+    }
+    if (isInitialized && !isInSafeMode()) {
+      // do not log in startup phase
+      NameNode.stateChangeLog.info("BLOCK* NameSystem.addToInvalidates: "
+              + b.getBlockName() + " is added to invalidSet of " + sb);
+    }
+  }
+
+  /**
+   * dumps the contents of recentInvalidateSets
+   */
+  private void dumpRecentInvalidateSets(PrintWriter out) {
+    int size = recentInvalidateSets.values().size();
+    out.println("Metasave: Blocks " + pendingDeletionBlocksCount
+      + " waiting deletion from " + size + " datanodes.");
+    if (size == 0) {
+      return;
+    }
+    for (Map.Entry<String, LightWeightHashSet<Block>> entry : recentInvalidateSets
+        .entrySet()) {
+      LightWeightHashSet<Block> blocks = entry.getValue();
+      if (blocks.size() > 0) {
+        out.println(datanodeMap.get(entry.getKey()).getName() + blocks);
+      }
+    }
+  }
+
+  /**
+   * Mark the block belonging to datanode as corrupt
+   *
+   * @param blk Block to be marked as corrupt
+   * @param dn  Datanode which holds the corrupt replica
+   */
+  public void markBlockAsCorrupt(Block blk, DatanodeInfo dn)
+    throws IOException {
+    writeLock();
+    try {
+      DatanodeDescriptor node = getDatanode(dn);
+      if (node == null) {
+        throw new IOException("Cannot mark block" + blk.getBlockName() +
+          " as corrupt because datanode " + dn.getName() +
+          " does not exist. ");
+      }
+
+      final BlockInfo storedBlockInfo = blocksMap.getStoredBlock(blk);
+      if (storedBlockInfo == null) {
+        // Check if the replica is in the blockMap, if not
+        // ignore the request for now. This could happen when BlockScanner
+        // thread of Datanode reports bad block before Block reports are sent
+        // by the Datanode on startup
+        NameNode.stateChangeLog.info("BLOCK NameSystem.markBlockAsCorrupt: " +
+          "block " + blk + " could not be marked " +
+          "as corrupt as it does not exists in " +
+          "blocksMap");
+      } else {
+        INodeFile inode = storedBlockInfo.getINode();
+        if (inode == null) {
+          NameNode.stateChangeLog.info("BLOCK NameSystem.markBlockAsCorrupt: " +
+            "block " + blk + " could not be marked " +
+            "as corrupt as it does not belong to " +
+            "any file");
+          addToInvalidates(storedBlockInfo, node, false);
+          return;
+        }
+        // Add this replica to corruptReplicas Map
+        if (!corruptReplicas.addToCorruptReplicasMap(storedBlockInfo, node)) {
+          return;
+        }
+        NumberReplicas num = countNodes(storedBlockInfo);
+        if (num.liveReplicas() > inode.getReplication()) {
+          // the block is over-replicated so invalidate the replicas immediately
+          invalidateBlock(storedBlockInfo, node, true);
+        } else if (isPopulatingReplQueues()) {
+          // add the block to neededReplication
+          int numCurrentReplicas = num.liveReplicas() +
+            pendingReplications.getNumReplicas(storedBlockInfo);
+          updateNeededReplicationQueue(storedBlockInfo, -1, numCurrentReplicas,
+              num.decommissionedReplicas, node, inode.getReplication());
+        }
+      }
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Invalidates the given block on the given datanode.
+   */
+  private void invalidateBlock(Block blk, DatanodeInfo dn, boolean ackRequired)
+    throws IOException {
+    assert (hasWriteLock());
+    NameNode.stateChangeLog.info("DIR* NameSystem.invalidateBlock: "
+      + blk + " on "
+      + dn.getName());
+    DatanodeDescriptor node = getDatanode(dn);
+    if (node == null) {
+      throw new IOException("Cannot invalidate block " + blk +
+        " because datanode " + dn.getName() +
+        " does not exist.");
+    }
+
+    // Check how many copies we have of the block.  If we have at least one
+    // copy on a live node, then we can delete it.
+    int count = countNodes(blk).liveReplicas();
+    if (count > 1) {
+      // delete with ACK
+      addToInvalidates(blk, dn, ackRequired);
+      removeStoredBlock(blk, node);
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("BLOCK* NameSystem.invalidateBlocks: "
+          + blk + " on "
+          + dn.getName() + " listed for deletion.");
+      }
+    } else {
+      NameNode.stateChangeLog.info("BLOCK* NameSystem.invalidateBlocks: "
+        + blk + " on "
+        + dn.getName() + " is the only copy and was not deleted.");
+    }
+  }
+
+  ////////////////////////////////////////////////////////////////
+  // Here's how to handle block-copy failure during client write:
+  // -- As usual, the client's write should result in a streaming
+  // backup write to a k-machine sequence.
+  // -- If one of the backup machines fails, no worries.  Fail silently.
+  // -- Before client is allowed to close and finalize file, make sure
+  // that the blocks are backed up.  Namenode may have to issue specific backup
+  // commands to make up for earlier datanode failures.  Once all copies
+  // are made, edit namespace and return to client.
+  ////////////////////////////////////////////////////////////////
+
+  /**
+   * See {@link ClientProtocol#getHardLinkedFiles(String)}.
+   */
+  public String[] getHardLinkedFiles(String src) throws IOException {
+    return dir.getHardLinkedFiles(src);
+  }
+
+  /** 
+   * Create the hard link from src file to the dest file. 
+   */ 
+  public boolean hardLinkTo(String src, String dst) throws IOException {  
+    INode dstNode = hardLinkToInternal(src, dst); 
+    getEditLog().logSync(false);  
+    if (dstNode != null && auditLog.isInfoEnabled()) {  
+			logAuditEvent(getCurrentUGI(), Server.getRemoteIp(),
+        "hardlink", src, dst, dstNode);
+    } 
+    return dstNode != null; 
+  } 
+    
+  private INode hardLinkToInternal(String src, String dst) throws IOException {
+    // Check the dst name 
+    String[] dstNames = INode.getPathNames(dst);  
+    if (!pathValidator.isValidName(dst, dstNames)) {  
+      numInvalidFilePathOperations++; 
+      throw new IOException("Invalid name: " + dst);  
+    } 
+      
+    // Get the src and dst components 
+    String[] srcNames = INode.getPathNames(src);  
+    byte[][] srcComponents = INode.getPathComponents(srcNames); 
+    byte[][] dstComponents = INode.getPathComponents(dstNames); 
+      
+    if (NameNode.stateChangeLog.isDebugEnabled()) { 
+      NameNode.stateChangeLog.debug("DIR* NameSystem.hardLinkTo: src: " + src + " dst: " + dst);  
+    } 
+      
+    writeLock();  
+    try { 
+      if (isInSafeMode()) { 
+        throw new SafeModeException("Cannot hard link to src: " + src, safeMode); 
+      } 
+      INode[] srcInodes = new INode[srcComponents.length];  
+      dir.rootDir.getExistingPathINodes(srcComponents, srcInodes);  
+      INode[] dstInodes = new INode[dstComponents.length];  
+      dir.rootDir.getExistingPathINodes(dstComponents, dstInodes);  
+  
+      // Check permission 
+      if (isPermissionEnabled) {  
+        checkParentAccess(src, srcInodes, FsAction.EXECUTE); 
+        checkParentAccess(dst, dstInodes, FsAction.WRITE_EXECUTE);  
+      } 
+        
+      // Create the hard link 
+      if (dir.hardLinkTo(src, srcNames, srcComponents, srcInodes,  
+                         dst, dstNames, dstComponents, dstInodes)) {  
+        return dstInodes[dstInodes.length-1]; 
+      } 
+      return null;  
+    } finally { 
+      writeUnlock();  
+    } 
+  }
+  
+  /**
+   * Change the indicated filename.
+   */
+  public boolean renameTo(String src, String dst) throws IOException {
+    INode dstNode = renameToInternal(src, dst);
+    getEditLog().logSync(false);
+    if (dstNode != null && auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "rename", src, dst, dstNode);
+    }
+    return dstNode != null;
+  }
+
+  private INode renameToInternal(String src, String dst
+  ) throws IOException {
+  
+    String[] dstNames = INode.getPathNames(dst);
+    if (!pathValidator.isValidName(dst, dstNames)) {
+      numInvalidFilePathOperations++;
+      throw new IOException("Invalid name: " + dst);
+    }
+    
+    String[] srcNames = INode.getPathNames(src);
+    byte[][] srcComponents = INode.getPathComponents(srcNames);
+    byte[][] dstComponents = INode.getPathComponents(dstNames);
+    
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug("DIR* NameSystem.renameTo: " + src + " to " + dst);
+    }
+    
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot rename " + src, safeMode);
+      }
+      INode[] srcInodes = new INode[srcComponents.length];
+      dir.rootDir.getExistingPathINodes(srcComponents, srcInodes);
+      INode[] dstInodes = new INode[dstComponents.length];
+      dir.rootDir.getExistingPathINodes(dstComponents, dstInodes);
+      INode dstNode = dstInodes[dstInodes.length-1];
+      String actualDst = dst;
+      byte[] lastDstComponent = dstComponents[dstComponents.length-1];
+      if (isPermissionEnabled) {
+        //We should not be doing this.  This is move() not renameTo().
+        //but for now,
+        checkParentAccess(src, srcInodes, FsAction.WRITE);
+
+        INode[] actualDstInodes = dstInodes;
+        if (dstNode != null && dstNode.isDirectory()) {
+          actualDst = dst + Path.SEPARATOR + srcNames[srcNames.length-1];
+          actualDstInodes = Arrays.copyOf(dstInodes, dstInodes.length+1);
+          lastDstComponent = srcComponents[srcComponents.length-1];
+          actualDstInodes[actualDstInodes.length-1] = ((INodeDirectory)dstNode).
+                       getChildINode(lastDstComponent);
+        }
+        checkAncestorAccess(actualDst, actualDstInodes, FsAction.WRITE);
+      }
+      if (neverDeletePaths.contains(src)) {
+        NameNode.stateChangeLog.warn("DIR* NameSystem.delete: " +
+          " Trying to rename a whitelisted path " + src +
+          " by user " + getCurrentUGI() +
+          " from server " + Server.getRemoteIp());
+        throw new IOException("Rename a whitelisted directory is not allowed " + src);
+      }
+
+      HdfsFileStatus dinfo = dstNode==null ? null : FSDirectory.getHdfsFileInfo(dstNode);
+      if (dir.renameTo(src, srcNames[srcNames.length-1],
+                       srcComponents[srcComponents.length-1], srcInodes,
+                       dst, dstInodes, lastDstComponent)) {
+        changeLease(src, dst, dinfo);     // update lease with new filename
+        return dstInodes[dstInodes.length-1];
+      }
+      return null;
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Remove the indicated filename from namespace. If the filename
+   * is a directory (non empty) and recursive is set to false then throw exception.
+   */
+  public boolean delete(String src, boolean recursive) throws IOException {
+    boolean status = deleteInternal(src, null, recursive, true);
+    getEditLog().logSync(false);
+    if (status && auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "delete", src, null, null);
+    }
+    return status;
+  }
+
+  static void incrDeletedFileCount(FSNamesystem fsnamesystem, int count) {
+    if (fsnamesystem != null && NameNode.getNameNodeMetrics() != null)
+      NameNode.getNameNodeMetrics().numFilesDeleted.inc(count);
+  }
+    
+  /**
+   * Remove the indicated filename from the namespace.  This may
+   * invalidate some blocks that make up the file.
+   */
+  boolean deleteInternal(String src, INode[] inodes, boolean recursive,
+                         boolean enforcePermission) throws IOException {
+    ArrayList<Block> collectedBlocks = new ArrayList<Block>();
+    INode targetNode = null;
+
+    byte[][] components = inodes == null ?
+      INodeDirectory.getPathComponents(src) : null;
+
+    writeLock();
+    try {
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("DIR* NameSystem.delete: " + src);
+      }
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot delete " + src, safeMode);
+      }
+      if (inodes == null) {
+        inodes = new INode[components.length];
+        dir.rootDir.getExistingPathINodes(components, inodes);
+      }
+      if (enforcePermission && isPermissionEnabled) {
+        checkPermission(src, inodes, false, null, FsAction.WRITE, null, FsAction.ALL);
+      }
+      if (neverDeletePaths.contains(src)) {
+        NameNode.stateChangeLog.warn("DIR* NameSystem.delete: " +
+          " Trying to delete a whitelisted path " + src +
+          " by user " + getCurrentUGI() +
+          " from server " + Server.getRemoteIp());
+        throw new IOException("Deleting a whitelisted directory is not allowed. " + src);
+      }
+
+      if ((!recursive) && (!dir.isDirEmpty(inodes[inodes.length-1]))) {
+        throw new IOException(src + " is non empty");
+      }
+
+      targetNode = dir.delete(src, inodes, collectedBlocks,
+          BLOCK_DELETION_INCREMENT);
+      if (targetNode == null) {
+        return false;
+      }
+    } finally {
+      writeUnlock();
+    }
+    while (targetNode.parent != null) {
+      // Interatively Remove blocks
+      collectedBlocks.clear();
+      // sleep to make sure that the lock can be grabbed by another thread
+      try {
+        Thread.sleep(1);
+      } catch (InterruptedException e) {
+        throw new InterruptedIOException(e.getMessage());
+      }
+      writeLock();
+      try {
+        int filesRemoved = targetNode.collectSubtreeBlocksAndClear(
+            collectedBlocks, BLOCK_DELETION_INCREMENT);
+        incrDeletedFileCount(this, filesRemoved);
+        removeBlocks(collectedBlocks);
+      } finally {
+        writeUnlock();
+      }   
+    }
+
+    return true;
+  }
+                   
+  /**
+   * From the given list, incrementally remove the blocks. Add the blocks
+   * to invalidates, and set a flag that explicit ACK from DataNode is not
+   * required. This function should be used only for deleting entire files.
+   */
+  private void removeBlocks(List<Block> blocks) {
+    if (blocks == null) {
+      return;
+    }
+    for (Block b : blocks) {
+      removeFromExcessReplicateMap(b);
+      neededReplications.remove(b, -1);
+      corruptReplicas.removeFromCorruptReplicasMap(b);
+      if (pendingReplications != null) {
+        int replicas = pendingReplications.getNumReplicas(b);
+        for (int i = 0; i < replicas; i++) {
+          pendingReplications.remove(b);
+        }    
+      }    
+      addToInvalidates(b, false);
+      blocksMap.removeBlock(b);
+    }
+  }
+
+  /**
+   * Remove the blocks from the given list. Also, remove the path. Add the
+   * blocks to invalidates, and set a flag that explicit ACK from DataNode is
+   * not required. This function should be used only for deleting entire files.
+   */
+  void removePathAndBlocks(String src, List<Block> blocks) throws IOException {
+    // No need for lock until we start accepting requests from clients.
+    assert (!nameNode.isRpcServerRunning() || hasWriteLock());
+    leaseManager.removeLeaseWithPrefixPath(src);
+    removeBlocks(blocks);
+  }
+
+  /**
+   * Get the file info for a specific file.
+   *
+   * @param src The string representation of the path to the file
+   * @return object containing information regarding the file
+   *         or null if file not found
+   * @throws IOException if permission to access file is denied by the system
+   */
+  FileStatus getFileInfo(String src) throws IOException {
+    src = dir.normalizePath(src);
+    INode[] inodes = dir.getExistingPathINodes(src);
+
+    if (isPermissionEnabled) {
+      checkTraverse(src, inodes);
+    }
+    return dir.getFileInfo(src, inodes[inodes.length-1]);
+  }
+
+  public FileStatusExtended getFileInfoExtended(String src) throws IOException {
+    Lease lease = leaseManager.getLeaseByPath(src);
+    String leaseHolder = (lease == null) ? "" : lease.getHolder();
+    return getFileInfoExtended(src, leaseHolder);
+  }
+
+  /**
+   * Get the extended file info for a specific file.
+   * 
+   * @param src
+   *          The string representation of the path to the file
+   * @return object containing information regarding the file or null if file
+   *         not found
+   * @throws IOException
+   *           if permission to access file is denied by the system
+   */
+  FileStatusExtended getFileInfoExtended(String src, String leaseHolder)
+      throws IOException {
+    src = dir.normalizePath(src);
+    INode[] inodes = dir.getExistingPathINodes(src);
+    return dir.getFileInfoExtended(src, inodes[inodes.length - 1], leaseHolder);
+  }
+
+  /**
+   * Get the file info for a specific file.
+   *
+   * @param src The string representation of the path to the file
+   * @return object containing information regarding the file
+   *         or null if file not found
+   * @throws IOException if permission to access file is denied by the system
+   */
+  HdfsFileStatus getHdfsFileInfo(String src) throws IOException {
+    if (isPermissionEnabled) {
+      INode[] inodes = dir.getExistingPathINodes(src);
+      checkTraverse(src, inodes);
+    }
+    return dir.getHdfsFileInfo(src);
+  }
+
+  /** Get the block info for a specific block id.
+   * @param id The id of the block for which info is requested
+   * @return object containing information regarding the block
+   * or null if block not found
+   */
+  BlockInfo getBlockInfo(Block b) {
+    return blocksMap.getBlockInfo(b);
+  }
+
+  /**
+   * Fetch the list of files that have been open longer than a
+   * specified amount of time.
+   * @param prefix path prefix specifying subset of files to examine
+   * @param millis select files that have been open longer that this
+   * @param where to start searching, or null
+   * @return array of OpenFileInfo objects
+   * @throw IOException
+   */
+  public OpenFileInfo[] iterativeGetOpenFiles(
+    String prefix, int millis, String start) {
+    return leaseManager.iterativeGetOpenFiles(prefix, millis, start);
+  }
+
+  /**
+   * Create all the necessary directories
+   */
+  public boolean mkdirs(String src, PermissionStatus permissions
+  ) throws IOException {
+    INode newNode = mkdirsInternal(src, permissions);
+    getEditLog().logSync(false);
+    if (newNode != null && auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "mkdirs", src, null, newNode);
+    }
+    return newNode != null;
+  }
+
+  /**
+   * Create all the necessary directories
+   */
+  private INode mkdirsInternal(String src,
+                                 PermissionStatus permissions)
+    throws IOException {
+    src = dir.normalizePath(src);
+    
+    // tokenize the src into components
+    String[] names = INodeDirectory.getPathNames(src);
+    
+    if (!pathValidator.isValidName(src, names)) {
+      numInvalidFilePathOperations++;
+      throw new IOException("Invalid directory name: " + src);
+    }
+    // convert the names into an array of bytes w/o holding lock
+    byte[][] components = INodeDirectory.getPathComponents(names);
+    INode[] inodes = new INode[components.length];
+
+    writeLock();
+    try {
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("DIR* NameSystem.mkdirs: " + src);
+      }
+      dir.rootDir.getExistingPathINodes(components, inodes);
+      if (isPermissionEnabled) {
+        checkTraverse(src, inodes);
+      }
+      INode lastINode = inodes[inodes.length-1];
+      if (lastINode !=null && lastINode.isDirectory()) {
+        // all the users of mkdirs() are used to expect 'true' even if
+        // a new directory is not created.
+        return lastINode;
+      }
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot create directory " + src, safeMode);
+      }
+      if (isPermissionEnabled) {
+        checkAncestorAccess(src, inodes, FsAction.WRITE);
+      }
+
+      // validate that we have enough inodes. This is, at best, a
+      // heuristic because the mkdirs() operation migth need to
+      // create multiple inodes.
+      checkFsObjectLimit();
+
+      if (!dir.mkdirs(src, names, components, inodes, inodes.length, permissions, false, now())) {
+        throw new IOException("Invalid directory name: " + src);
+      }
+      return inodes[inodes.length-1];
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  ContentSummary getContentSummary(String src) throws IOException {
+    INode[] inodes = dir.getExistingPathINodes(src);
+    if (isPermissionEnabled) {
+      checkPermission(src, inodes, false, null, null, null, FsAction.READ_EXECUTE);
+    }
+    readLock();
+    try {
+      if (auditLog.isInfoEnabled()) {
+        logAuditEvent(getCurrentUGI(),
+          Server.getRemoteIp(),
+          "getContentSummary", src, null, 
+          getLastINode(inodes));
+      }
+      return dir.getContentSummary(src);
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Set the namespace quota and diskspace quota for a directory.
+   * See {@link ClientProtocol#setQuota(String, long, long)} for the
+   * contract.
+   */
+  void setQuota(String path, long nsQuota, long dsQuota) throws IOException {
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot setQuota " + path, safeMode);
+      }
+      if (isPermissionEnabled) {
+        checkSuperuserPrivilege();
+      }
+
+      dir.setQuota(path, nsQuota, dsQuota);
+    } finally {
+      writeUnlock();
+    }
+    getEditLog().logSync(false);
+  }
+
+  /**
+   * Persist all metadata about this file.
+   *
+   * @param src        The string representation of the path
+   * @param clientName The string representation of the client
+   * @throws IOException if path does not exist
+   */
+  void fsync(String src, String clientName) throws IOException {
+
+    NameNode.stateChangeLog.info("BLOCK* NameSystem.fsync: file "
+      + src + " for " + clientName);
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot fsync file " + src, safeMode);
+      }
+      INodeFileUnderConstruction pendingFile = checkLease(src, clientName);
+
+      // If the block has a length of zero, set it to size 1 so 
+      // that lease recovery will not discard it.
+      Block last = pendingFile.getLastBlock();
+      if (last.getNumBytes() == 0) {
+        last.setNumBytes(1);
+      }
+      dir.persistBlocks(src, pendingFile);
+    } finally {
+      writeUnlock();
+    }
+    getEditLog().logSync();
+  }
+
+  /**
+   * This is invoked when a lease expires. On lease expiry, 
+   * all the files that were written from that dfsclient should be
+   * recovered.
+   */
+  void internalReleaseLease(Lease lease, String src,
+      INodeFileUnderConstruction pendingFile) throws IOException {
+    if (lease.hasPath()) {
+      // make a copy of the paths because internalReleaseLeaseOne removes
+      // pathnames from the lease record.
+      String[] leasePaths = new String[lease.getPaths().size()];
+      lease.getPaths().toArray(leasePaths);
+      LOG.info("Recovering lease: " + lease + " for paths "
+          + Arrays.toString(leasePaths));
+      for (String p: leasePaths) {
+        internalReleaseLeaseOne(lease, p);
+      }
+    } else {
+      internalReleaseLeaseOne(lease, src, pendingFile, false);
+    }
+  }
+
+  /**
+   * Move a file that is being written to be immutable.
+   *
+   * @param src   The filename
+   * @param lease The lease for the client creating the file
+   */
+  void internalReleaseLeaseOne(Lease lease, String src) throws IOException {
+    internalReleaseLeaseOne(lease, src, false);
+  }
+
+  void internalReleaseLeaseOne(Lease lease, String src,
+                                       boolean discardLastBlock) throws IOException {
+    assert hasWriteLock();
+
+    INodeFile iFile = dir.getFileINode(src);
+    if (iFile == null) {
+      final String message = "DIR* NameSystem.internalReleaseCreate: "
+        + "attempt to release a create lock on "
+        + src + " file does not exist.";
+      NameNode.stateChangeLog.warn(message);
+      throw new IOException(message);
+    }
+    if (!iFile.isUnderConstruction()) {
+      final String message = "DIR* NameSystem.internalReleaseCreate: "
+        + "attempt to release a create lock on "
+        + src + " but file is already closed.";
+      NameNode.stateChangeLog.warn(message);
+      throw new IOException(message);
+    }
+    internalReleaseLeaseOne(lease, src, (INodeFileUnderConstruction)iFile, discardLastBlock);
+  }
+
+  /**
+   * Move a file that is being written to be immutable.
+   *
+   * @param src   The filename
+   * @param lease The lease for the client creating the file
+   * @return true if lease recovery has completed, false if the client has to retry
+   */
+  boolean internalReleaseLeaseOne(Lease lease, String src,
+        INodeFileUnderConstruction pendingFile, boolean discardLastBlock) throws IOException {
+    // if it is safe to discard the last block, then do so
+    if (discardLastBlock && discardDone(pendingFile, src)) {
+      // Have client retry lease recovery.
+      return false;
+    }
+
+    // Initialize lease recovery for pendingFile. If there are no blocks
+    // associated with this file, then reap lease immediately. Otherwise
+    // renew the lease and trigger lease recovery.
+    if (pendingFile.getTargets() == null ||
+      pendingFile.getTargets().length == 0) {
+      if (pendingFile.getBlocks().length == 0) {
+        finalizeINodeFileUnderConstruction(src, pendingFile);
+        NameNode.stateChangeLog.warn("BLOCK*"
+          + " internalReleaseLease: No blocks found, lease removed for " +  src);
+        // Tell the client that lease recovery has succeeded.
+        return true;
+      }
+      // setup the Inode.targets for the last block from the blocksMap
+      //
+      Block[] blocks = pendingFile.getBlocks();
+      Block last = blocks[blocks.length - 1];
+      DatanodeDescriptor[] targets =
+        new DatanodeDescriptor[blocksMap.numNodes(last)];
+      Iterator<DatanodeDescriptor> it = blocksMap.nodeIterator(last);
+      for (int i = 0; it != null && it.hasNext(); i++) {
+        targets[i] = it.next();
+      }
+      pendingFile.setTargets(targets);
+    }
+    // start lease recovery of the last block for this file.
+    pendingFile.assignPrimaryDatanode();
+    Lease reassignedLease = reassignLease(
+      lease, src, HdfsConstants.NN_RECOVERY_LEASEHOLDER, pendingFile
+    );
+    getEditLog().logOpenFile(src, pendingFile);
+    leaseManager.renewLease(reassignedLease);
+    return false;  // Have the client retry lease recovery.
+  }
+
+  // If we are part of recoverLease call and no fsync has
+  // been called on the last block so far, then it is safe to drop
+  // the last block completely.
+  private boolean discardDone(INodeFileUnderConstruction pendingFile,
+                              String src) throws IOException {
+    Block[] blocks = pendingFile.getBlocks();
+    if (blocks == null || blocks.length == 0) {
+      return false;
+    }
+    Block last = blocks[blocks.length-1];
+    if (last.getNumBytes() == 0) {
+      dir.removeBlock(src, pendingFile, last);
+      finalizeINodeFileUnderConstruction(src, pendingFile);
+      NameNode.stateChangeLog.warn("BLOCK*" +
+          " internalReleaseLease: discarded last block " + last +
+          " , lease removed for " +  src);
+      return true;
+    }
+    return false;
+  }
+
+  Lease reassignLease(Lease lease, String src, String newHolder,
+                      INodeFileUnderConstruction pendingFile) {
+    if(newHolder == null)
+      return lease;
+    pendingFile.setClientName(newHolder);
+    return leaseManager.reassignLease(lease, src, newHolder);
+  }
+  
+  private void finalizeINodeFileUnderConstruction(String src,
+      INodeFileUnderConstruction pendingFile) throws IOException {
+    finalizeINodeFileUnderConstruction(src, null, pendingFile);
+  }
+
+  private void finalizeINodeFileUnderConstruction(String src,
+      INode[] inodes, INodeFileUnderConstruction pendingFile) throws IOException {
+    // Put last block in needed replication queue if uder replicated
+    replicateLastBlock(src, pendingFile);
+
+    leaseManager.removeLease(pendingFile.getClientName(), src);
+
+    DatanodeDescriptor[] descriptors = pendingFile.getTargets();
+
+    if (descriptors != null) {
+      for (DatanodeDescriptor node : descriptors) {
+        node.removeINode(pendingFile);
+      }
+    }
+
+    // The file is no longer pending.
+    // Create permanent INode, update blockmap
+    INodeFile newFile = pendingFile.convertToInodeFile(isAccessTimeSupported());
+    dir.replaceNode(src, inodes, pendingFile, newFile, true);
+
+    // close file and persist block allocations for this file
+    dir.closeFile(src, newFile);
+  }
+
+  /**
+   * corrupts a file by:
+   * 1. removing all targets of the last block
+   */
+  void corruptFileForTesting(String src) throws IOException {
+    INodeFile inode = dir.getFileINode(src);
+
+    if (inode.isUnderConstruction()) {
+      INodeFileUnderConstruction pendingFile =
+        (INodeFileUnderConstruction) inode;
+      BlockInfo[] blocks = pendingFile.getBlocks();
+      if (blocks != null && blocks.length >= 1) {
+        BlockInfo lastBlockInfo = blocks[blocks.length - 1];
+
+        pendingFile.setLastBlock(
+          lastBlockInfo,
+          new DatanodeDescriptor[0]
+        );
+      }
+    }
+  }
+
+  // public only for testing
+  public void commitBlockSynchronization(Block lastblock,
+                                  long newgenerationstamp, long newlength,
+                                  boolean closeFile, boolean deleteblock, DatanodeID[] newtargets
+  ) throws IOException {
+    LOG.info("commitBlockSynchronization(lastblock=" + lastblock
+      + ", newgenerationstamp=" + newgenerationstamp
+      + ", newlength=" + newlength
+      + ", newtargets=" + Arrays.asList(newtargets)
+      + ", closeFile=" + closeFile
+      + ", deleteBlock=" + deleteblock
+      + ")");
+    String src = null;
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot commitBlockSynchronization "
+          + lastblock, safeMode);
+      }
+      Block blockWithWildcardGenstamp = new Block(lastblock.getBlockId());
+      final BlockInfo oldblockinfo = blocksMap.getStoredBlock(blockWithWildcardGenstamp);
+      if (oldblockinfo == null) {
+        throw new IOException("Block (=" + lastblock + ") not found");
+      }
+      if (!deleteblock
+          && lastblock.getGenerationStamp() != oldblockinfo
+              .getGenerationStamp()
+          && oldblockinfo.getGenerationStamp() >= newgenerationstamp) {
+        throw new IOException("Try to update block " + oldblockinfo
+            + " to generation stamp " + newgenerationstamp);
+      }
+      INodeFile iFile = oldblockinfo.getINode();
+      if (!iFile.isUnderConstruction()) {
+        throw new IOException("Unexpected block (=" + lastblock
+          + ") since the file (=" + iFile.getLocalName()
+          + ") is not under construction");
+      }
+      INodeFileUnderConstruction pendingFile = (INodeFileUnderConstruction) iFile;
+
+
+      // Remove old block from blocks map. This always have to be done
+      // because the generation stamp of this block is changing.
+      blocksMap.removeBlock(oldblockinfo);
+
+      if (deleteblock) {
+        pendingFile.removeBlock(lastblock);
+      } else {
+        // update last block, construct newblockinfo and add it to the blocks map
+        lastblock.set(lastblock.getBlockId(), newlength, newgenerationstamp);
+        final BlockInfo newblockinfo = blocksMap.addINode(lastblock, pendingFile);
+
+        // find the DatanodeDescriptor objects
+        // There should be no locations in the blocksMap till now because the
+        // file is underConstruction
+        DatanodeDescriptor[] descriptors = null;
+        List<DatanodeDescriptor> descriptorsList =
+          new ArrayList<DatanodeDescriptor>(newtargets.length);
+        for(int i = 0; i < newtargets.length; i++) {
+          // We don't use getDatanode here since that method can
+          // throw. If we were to throw an exception during this commit
+          // process, we'd fall out of sync since DNs have already finalized
+          // the block with the new GS.
+          DatanodeDescriptor node =
+            datanodeMap.get(newtargets[i].getStorageID());
+          if (node != null) {
+          if (closeFile) {
+            // If we aren't closing the file, we shouldn't add it to the
+            // block list for the node, since the block is still under
+            // construction there. (in getAdditionalBlock, for example
+            // we don't add to the block map for the targets)
+            node.addBlock(newblockinfo);
+          }
+            descriptorsList.add(node);
+          } else {
+          LOG.error("commitBlockSynchronization included a target DN " +
+            newtargets[i] + " which is not known to NN. Ignoring.");
+          }
+        }
+        if (!descriptorsList.isEmpty()) {
+          descriptors = descriptorsList.toArray(new DatanodeDescriptor[0]);
+        }
+        // add locations into the INodeUnderConstruction
+        pendingFile.setLastBlock(newblockinfo, descriptors);
+      }
+
+      // If this commit does not want to close the file, persist
+      // blocks only if append is supported and return
+      src = pendingFile.getFullPathName();
+      if (!closeFile) {
+        if (supportAppends) {
+          dir.persistBlocks(src, pendingFile);
+        }
+      } else {
+        //remove lease, close file
+        finalizeINodeFileUnderConstruction(src, pendingFile);
+      }
+    } finally {// end of synchronized section
+      writeUnlock();
+    }
+
+    if (closeFile || supportAppends) {
+      getEditLog().logSync();
+    }
+    LOG.info("commitBlockSynchronization(newblock=" + lastblock
+      + ", file=" + src + ") successful");
+  }
+
+
+  /**
+   * Renew the lease(s) held by the given client
+   */
+  void renewLease(String holder) throws IOException {
+    readLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot renew lease for " + holder, safeMode);
+      }
+
+      leaseManager.renewLease(holder);
+    } finally {
+      readUnlock();
+    }
+  }
+
+  private void getListingCheck(String src) throws IOException {
+    getListingCheck(src, dir.getExistingPathINodes(src));
+  }
+
+  private void getListingCheck(String src, INode[] inodes) throws IOException {
+    if (isPermissionEnabled) {
+      if (FSDirectory.isDir(inodes[inodes.length-1])) {
+        checkPathAccess(src, inodes, FsAction.READ_EXECUTE);
+      } else {
+        checkTraverse(src, inodes);
+      }
+    }
+  }
+
+  /**
+   * Get a listing of all files at 'src'.  The Object[] array
+   * exists so we can return file attributes (soon to be implemented)
+   */
+  public FileStatus[] getListing(String src) throws IOException {
+    getListingCheck(src);
+    FileStatus[] stats =  dir.getListing(src);
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "listStatus", src, null, null);
+    }
+    return stats;
+  }
+
+  /**
+   * Get a listing of all files at 'src'.  The Object[] array
+   * exists so we can return file attributes (soon to be implemented)
+   */
+  public HdfsFileStatus[] getHdfsListing(String src) throws IOException {
+    getListingCheck(src);
+    HdfsFileStatus[] stats = dir.getHdfsListing(src);
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "listStatus", src, null, null);
+    }
+    return stats;
+  }
+
+  /**
+   * Get a partial listing of the indicated directory
+   *
+   * @param src          the directory name
+   * @param startAfter   the name to start after
+   * @param needLocation if blockLocations need to be returned
+   * @return a partial listing starting after startAfter
+   */
+  public DirectoryListing getPartialListing(String src, byte[] startAfter,
+                                            boolean needLocation)
+    throws IOException {
+    DirectoryListing stats;
+    src = dir.normalizePath(src);
+    byte[][] names = INode.getPathComponents(src);
+    INode[] inodes = new INode[names.length];
+    readLock();
+    try {
+      dir.rootDir.getExistingPathINodes(names, inodes);
+      getListingCheck(src, inodes);
+      stats = dir.getPartialListing(src, inodes[inodes.length-1],
+          startAfter, needLocation);
+    } finally {
+      readUnlock();
+    }
+    if (auditLog.isInfoEnabled()) {
+      logAuditEvent(getCurrentUGI(),
+        Server.getRemoteIp(),
+        "listStatus", src, null, null);
+    }
+    return stats;
+  }
+
+  /////////////////////////////////////////////////////////
+  //
+  // These methods are called by datanodes
+  //
+  /////////////////////////////////////////////////////////
+
+  /**
+   * Register Datanode.
+   * <p/>
+   * The purpose of registration is to identify whether the new datanode
+   * serves a new data storage, and will report new data block copies,
+   * which the namenode was not aware of; or the datanode is a replacement
+   * node for the data storage that was previously served by a different
+   * or the same (in terms of host:port) datanode.
+   * The data storages are distinguished by their storageIDs. When a new
+   * data storage is reported the namenode issues a new unique storageID.
+   * <p/>
+   * Finally, the namenode returns its namespaceID as the registrationID
+   * for the datanodes.
+   * namespaceID is a persistent attribute of the name space.
+   * The registrationID is checked every time the datanode is communicating
+   * with the namenode.
+   * Datanodes with inappropriate registrationID are rejected.
+   * If the namenode stops, and then restarts it can restore its
+   * namespaceID and will continue serving the datanodes that has previously
+   * registered with the namenode without restarting the whole cluster.
+   *
+   * @see org.apache.hadoop.hdfs.server.datanode.DataNode#register()
+   */
+  public void registerDatanode(DatanodeRegistration nodeReg
+  ) throws IOException {
+    writeLock();
+    try {
+      String dnAddress = Server.getRemoteAddress();
+      if (dnAddress == null) {
+        // Mostly called inside an RPC.
+        // But if not, use address passed by the data-node.
+        dnAddress = nodeReg.getHost();
+      }
+
+      // check if the datanode is allowed to be connect to the namenode
+      if (!verifyNodeRegistration(nodeReg, dnAddress)) {
+        throw new DisallowedDatanodeException(nodeReg);
+      }
+
+      String hostName = nodeReg.getHost();
+
+      // update the datanode's name with ip:port
+      DatanodeID dnReg = new DatanodeID(dnAddress + ":" + nodeReg.getPort(),
+        nodeReg.getStorageID(),
+        nodeReg.getInfoPort(),
+        nodeReg.getIpcPort());
+      nodeReg.updateRegInfo(dnReg);
+
+      NameNode.stateChangeLog.info(
+        "BLOCK* NameSystem.registerDatanode: "
+          + "node registration from " + nodeReg.getName()
+          + " storage " + nodeReg.getStorageID());
+
+      DatanodeDescriptor nodeS = datanodeMap.get(nodeReg.getStorageID());
+      DatanodeDescriptor nodeN = host2DataNodeMap.getDatanodeByName(nodeReg.getName());
+
+      if (nodeN != null && nodeN != nodeS) {
+        NameNode.LOG.info("BLOCK* NameSystem.registerDatanode: "
+          + "node from name: " + nodeN.getName());
+        // nodeN previously served a different data storage,
+        // which is not served by anybody anymore.
+        removeDatanode(nodeN);
+        // physically remove node from datanodeMap
+        wipeDatanode(nodeN);
+        nodeN = null;
+      }
+
+      if (nodeS != null) {
+        if (nodeN == nodeS) {
+          // The same datanode has been just restarted to serve the same data
+          // storage. We do not need to remove old data blocks, the delta will
+          // be calculated on the next block report from the datanode
+          if (NameNode.stateChangeLog.isDebugEnabled()) {
+            NameNode.stateChangeLog.debug("BLOCK* NameSystem.registerDatanode: "
+              + "node restarted.");
+          }
+        } else {
+          // nodeS is found
+          /* The registering datanode is a replacement node for the existing
+             data storage, which from now on will be served by a new node.
+             If this message repeats, both nodes might have same storageID
+             by (insanely rare) random chance. User needs to restart one of the
+             nodes with its data cleared (or user can just remove the StorageID
+             value in "VERSION" file under the data directory of the datanode,
+             but this is might not work if VERSION file format has changed
+          */
+          NameNode.stateChangeLog.info("BLOCK* NameSystem.registerDatanode: "
+            + "node " + nodeS.getName()
+            + " is replaced by " + nodeReg.getName() +
+            " with the same storageID " +
+            nodeReg.getStorageID());
+        }
+        // update cluster map
+        clusterMap.remove(nodeS);
+        nodeS.updateRegInfo(nodeReg);
+        nodeS.setHostName(hostName);
+        nodeS.setDisallowed(false); // Node is in the include list
+
+        // resolve network location
+        resolveNetworkLocation(nodeS);
+        clusterMap.add(nodeS);
+
+        // also treat the registration message as a heartbeat
+        synchronized (heartbeats) {
+          if (!heartbeats.contains(nodeS)) {
+            heartbeats.add(nodeS);
+            //update its timestamp
+            nodeS.updateHeartbeat(0L, 0L, 0L, 0L, 0);
+            nodeS.isAlive = true;
+          }
+        }
+        checkDecommissioning(nodeS, dnAddress);
+        return;
+      }
+
+      // this is a new datanode serving a new data storage
+      if (nodeReg.getStorageID().equals("")) {
+        // this data storage has never been registered
+        // it is either empty or was created by pre-storageID version of DFS
+        nodeReg.storageID = newStorageID();
+        if (NameNode.stateChangeLog.isDebugEnabled()) {
+          NameNode.stateChangeLog.debug(
+            "BLOCK* NameSystem.registerDatanode: "
+              + "new storageID " + nodeReg.getStorageID() + " assigned.");
+        }
+      }
+      // register new datanode
+      DatanodeDescriptor nodeDescr
+        = new DatanodeDescriptor(nodeReg, NetworkTopology.DEFAULT_RACK, hostName);
+      resolveNetworkLocation(nodeDescr);
+      unprotectedAddDatanode(nodeDescr);
+      clusterMap.add(nodeDescr);
+      checkDecommissioning(nodeDescr, dnAddress);
+
+      // also treat the registration message as a heartbeat
+      synchronized (heartbeats) {
+        heartbeats.add(nodeDescr);
+        nodeDescr.isAlive = true;
+        // no need to update its timestamp
+        // because its is done when the descriptor is created
+      }
+      return;
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /* Resolve a node's network location */
+
+  void resolveNetworkLocation(DatanodeInfo node) {
+    List<String> names = new ArrayList<String>(1);
+    if (dnsToSwitchMapping instanceof CachedDNSToSwitchMapping) {
+      // get the node's IP address
+      names.add(node.getHost());
+    } else {
+      // get the node's host name
+      String hostName = node.getHostName();
+      int colon = hostName.indexOf(":");
+      hostName = (colon == -1) ? hostName : hostName.substring(0, colon);
+      names.add(hostName);
+    }
+
+    // resolve its network location
+    List<String> rName = dnsToSwitchMapping.resolve(names);
+    String networkLocation;
+    if (rName == null) {
+      LOG.error("The resolve call returned null! Using " +
+        NetworkTopology.DEFAULT_RACK + " for host " + names);
+      networkLocation = NetworkTopology.DEFAULT_RACK;
+    } else {
+      networkLocation = rName.get(0);
+    }
+    node.setNetworkLocation(networkLocation);
+  }
+
+  /**
+   * Get registrationID for datanodes based on the namespaceID.
+   *
+   * @return registration ID
+   * @see #registerDatanode(DatanodeRegistration)
+   * @see FSImage#newNamespaceID()
+   */
+  public String getRegistrationID() {
+    return Storage.getRegistrationID(dir.fsImage.storage);
+  }
+
+  /**
+   * Generate new storage ID.
+   *
+   * @return unique storage ID
+   *         <p/>
+   *         Note: that collisions are still possible if somebody will try
+   *         to bring in a data storage from a different cluster.
+   */
+  private String newStorageID() {
+    String newID = null;
+    while (newID == null) {
+      newID = "DS" + Integer.toString(r.nextInt());
+      if (datanodeMap.get(newID) != null) {
+        newID = null;
+      }
+    }
+    return newID;
+  }
+
+  boolean isDatanodeDead(DatanodeDescriptor node) {
+    return (node.getLastUpdate() <
+      (now() - heartbeatExpireInterval));
+  }
+
+  public void setDatanodeDead(DatanodeDescriptor node) throws IOException {
+    node.setLastUpdate(0);
+  }
+
+  /**
+   * The given node has reported in.  This method should:
+   * 1) Record the heartbeat, so the datanode isn't timed out
+   * 2) Adjust usage stats for future block allocation
+   * <p/>
+   * If a substantial amount of time passed since the last datanode
+   * heartbeat then request an immediate block report.
+   *
+   * @return an array of datanode commands
+   * @throws IOException
+   */
+  DatanodeCommand[] handleHeartbeat(DatanodeRegistration nodeReg,
+                                    long capacity, long dfsUsed, long remaining, long namespaceUsed,
+                                    int xceiverCount, int xmitsInProgress)
+    throws IOException {
+    DatanodeCommand cmd = null;
+    synchronized (heartbeats) {
+      synchronized (datanodeMap) {
+        DatanodeDescriptor nodeinfo = null;
+        try {
+          nodeinfo = getDatanode(nodeReg);
+        } catch (UnregisteredDatanodeException e) {
+          return new DatanodeCommand[]{DatanodeCommand.REGISTER};
+        }
+
+        // Check if this datanode should actually be shutdown instead.
+        if (nodeinfo != null && nodeinfo.isDisallowed()) {
+          setDatanodeDead(nodeinfo);
+          throw new DisallowedDatanodeException(nodeinfo);
+        }
+
+        if (nodeinfo == null || !nodeinfo.isAlive) {
+          return new DatanodeCommand[]{DatanodeCommand.REGISTER};
+        }
+
+        updateStats(nodeinfo, false);
+        nodeinfo.updateHeartbeat(capacity, dfsUsed, remaining, namespaceUsed, xceiverCount);
+        updateStats(nodeinfo, true);
+
+        //check lease recovery
+        cmd = nodeinfo.getLeaseRecoveryCommand(Integer.MAX_VALUE);
+        if (cmd != null) {
+          return new DatanodeCommand[]{cmd};
+        }
+
+        ArrayList<DatanodeCommand> cmds = new ArrayList<DatanodeCommand>(2);
+        //check pending replication
+        cmd = nodeinfo.getReplicationCommand(maxReplicationStreams -
+                                             xmitsInProgress);
+        if (cmd != null) {
+          cmds.add(cmd);
+        }
+        //check block invalidation
+        cmd = nodeinfo.getInvalidateBlocks(blockInvalidateLimit);
+        if (cmd != null) {
+          cmds.add(cmd);
+        }
+        if (!cmds.isEmpty()) {
+          return cmds.toArray(new DatanodeCommand[cmds.size()]);
+        }
+      }
+    }
+
+    //check distributed upgrade
+    cmd = getDistributedUpgradeCommand();
+    if (cmd != null) {
+      return new DatanodeCommand[]{cmd};
+    }
+    return null;
+  }
+
+  void handleKeepAlive(DatanodeRegistration nodeReg) throws IOException {
+    synchronized (heartbeats) {
+      synchronized (datanodeMap) {
+        DatanodeDescriptor nodeinfo = null;
+        try {
+          nodeinfo = getDatanode(nodeReg);
+        } catch (UnregisteredDatanodeException e) {
+          return;
+        }
+        if (nodeinfo == null || !nodeinfo.isAlive) {
+          return;
+        }
+        nodeinfo.updateLastHeard();
+      }
+    }
+  }
+
+  private void updateStats(DatanodeDescriptor node, boolean isAdded) {
+    //
+    // The statistics are protected by the heartbeat lock
+    // For decommissioning/decommissioned nodes, only used capacity
+    // is counted.
+    //
+    assert (Thread.holdsLock(heartbeats));
+    if (isAdded) {
+      capacityUsed += node.getDfsUsed();
+      capacityNamespaceUsed += node.getNamespaceUsed();
+      totalLoad += node.getXceiverCount();
+      if (!(node.isDecommissionInProgress() || node.isDecommissioned())) {
+        capacityTotal += node.getCapacity();
+        capacityRemaining += node.getRemaining();
+      } else {
+        capacityTotal += node.getDfsUsed();
+      }
+    } else {
+      capacityUsed -= node.getDfsUsed();
+      capacityNamespaceUsed -= node.getNamespaceUsed();
+      totalLoad -= node.getXceiverCount();
+      if (!(node.isDecommissionInProgress() || node.isDecommissioned())) {
+        capacityTotal -= node.getCapacity();
+        capacityRemaining -= node.getRemaining();
+      } else {
+        capacityTotal -= node.getDfsUsed();
+      }
+    }
+  }
+
+  /**
+   * Periodically calls heartbeatCheck() and updateSuspectStatus().
+   */
+  class HeartbeatMonitor implements Runnable {
+    private long reevaluateSuspectFailNodesIntervalMs;
+    private long suspectFailUponHeartBeatMissTimeoutMs;
+    private int maxSuspectNodesAllowed;
+
+    public HeartbeatMonitor(Configuration conf) {
+      suspectFailUponHeartBeatMissTimeoutMs = conf.getLong(
+          "dfs.heartbeat.timeout.millis", 120000); // 2 min, default
+      reevaluateSuspectFailNodesIntervalMs = 
+          suspectFailUponHeartBeatMissTimeoutMs / 2; // 1 min, default
+      maxSuspectNodesAllowed = conf.getInt( "dfs.heartbeat.timeout.suspect-fail.max", 
+          25); // more than 1 rack. but less than 2.
+    }
+
+    /**
+     */
+    public void run() {
+      long now = now();
+      long nextHeartBeatCheckTime = now + heartbeatRecheckInterval;
+      long nextUpdateSuspectTime = now + reevaluateSuspectFailNodesIntervalMs;
+      long sleepTime;
+      
+      while (fsRunning) {
+        try {
+          // 5 mins too slow for suspect?
+          sleepTime = Math.min(nextUpdateSuspectTime, nextHeartBeatCheckTime) - now;
+          Thread.sleep(sleepTime);
+        } catch (InterruptedException ie) {
+        }
+        
+        now = now();
+        
+        if (now > nextUpdateSuspectTime) {
+          updateSuspectStatus(now);
+          nextUpdateSuspectTime = now + reevaluateSuspectFailNodesIntervalMs;
+        }
+        
+        if (now > nextHeartBeatCheckTime) {
+          try {
+            heartbeatCheck();
+            nextHeartBeatCheckTime = now + heartbeatRecheckInterval;
+          } catch (Exception e) {
+            FSNamesystem.LOG.error("Error in heartbeatCheck: ", e);
+          }
+        }
+      }
+    }
+
+    boolean isDatanodeSuspectFail(long now, DatanodeDescriptor node) {
+      return (node.getLastUpdate() <
+        (now - suspectFailUponHeartBeatMissTimeoutMs));
+    }
+    
+    void updateSuspectStatus(long now) {
+      int numSuspectNodes = 0;
+      synchronized (heartbeats) {
+        for (Iterator<DatanodeDescriptor> it = heartbeats.iterator();
+             it.hasNext();) {
+          DatanodeDescriptor nodeInfo = it.next();
+          if (isDatanodeSuspectFail(now, nodeInfo)) {
+            nodeInfo.setSuspectFail(true);
+            if (++numSuspectNodes > maxSuspectNodesAllowed) {
+              break;
+            }
+          } else {
+            nodeInfo.setSuspectFail(false);
+          }
+        }
+        
+        if (numSuspectNodes <= maxSuspectNodesAllowed) {
+          DatanodeInfo.enableSuspectNodes();
+        } else { // Too many suspects. Disable failure detection
+          DatanodeInfo.disableSuspectNodes();
+        }
+      }
+    }
+  }
+
+  /**
+   * Periodically calls computeDatanodeWork().
+   */
+  class UnderReplicationMonitor implements Runnable {
+    static final int INVALIDATE_WORK_PCT_PER_ITERATION = 32;
+    static final float REPLICATION_WORK_MULTIPLIER_PER_ITERATION = 2;
+
+    public void run() {
+      while (fsRunning) {
+        try {
+          computeDatanodeWork();
+          processPendingReplications();
+          Thread.sleep(underReplicationRecheckInterval);
+        } catch (InterruptedException ie) {
+          LOG.warn("UnderReplicationMonitor thread received InterruptedException.", ie);
+          break;
+        } catch (IOException ie) {
+          LOG.warn("UnderReplicationMonitor thread received exception. ", ie);
+        } catch (Throwable t) {
+          LOG.warn("UnderReplicationMonitor thread received Runtime exception. ", t);
+          Runtime.getRuntime().exit(-1);
+        }
+      }
+    }
+  }
+  
+  class OverReplicatedBlock extends Block {
+    public DatanodeDescriptor addedNode;
+    public DatanodeDescriptor delNodeHint;
+    OverReplicatedBlock(Block b, DatanodeDescriptor newAddedNode,
+        DatanodeDescriptor newDelNodeHint) {
+      super(b);
+      this.addedNode = newAddedNode;
+      this.delNodeHint = newDelNodeHint;
+    }
+  }
+
+  /**
+   * Periodically calls processOverReplicatedBlocksAsync().
+   */
+  class OverReplicationMonitor implements Runnable {
+
+    public void run() {
+      while (fsRunning) {
+        try {
+          processOverReplicatedBlocksAsync();
+          configManager.reloadConfigIfNecessary();
+          Thread.sleep(overReplicationRecheckInterval);
+        } catch (InterruptedException ie) {
+          LOG.warn("OverReplicationMonitor thread received InterruptedException." + ie);
+          break;
+        } catch (Throwable t) {
+          LOG.warn("OverReplicationMonitor thread received Runtime exception. " + t);
+          Runtime.getRuntime().exit(-1);
+        }
+      }
+    }
+  }
+
+  /////////////////////////////////////////////////////////
+  //
+  // These methods are called by the Namenode system, to see
+  // if there is any work for registered datanodes.
+  //
+  /////////////////////////////////////////////////////////
+
+  /**
+   * Compute block replication and block invalidation work
+   * that can be scheduled on data-nodes.
+   * The datanode will be informed of this work at the next heartbeat.
+   *
+   * @return number of blocks scheduled for replication or removal.
+   */
+  public int computeDatanodeWork() throws IOException {
+    int workFound = 0;
+    int blocksToProcess = 0;
+    int nodesToProcess = 0;
+    // blocks should not be replicated or removed if safe mode is on
+    if (isInSafeMode()) {
+      updateReplicationCounts(workFound);
+      return workFound;
+    }
+    synchronized (heartbeats) {
+      blocksToProcess = (int) (heartbeats.size()
+        * this.replicationWorkMultiplier);
+      nodesToProcess = (int) Math.ceil((double) heartbeats.size()
+        * UnderReplicationMonitor.INVALIDATE_WORK_PCT_PER_ITERATION / 100);
+    }
+
+    workFound = computeReplicationWork(blocksToProcess);
+
+    // Update FSNamesystemMetrics counters
+    updateReplicationCounts(workFound);
+
+    workFound += computeInvalidateWork(nodesToProcess);
+    return workFound;
+  }
+  
+  private void updateReplicationCounts(int workFound) {
+    writeLock();
+    try {
+      pendingReplicationBlocksCount = pendingReplications.size();
+      underReplicatedBlocksCount = neededReplications.size();
+      scheduledReplicationBlocksCount = workFound;
+      corruptReplicaBlocksCount = corruptReplicas.size();
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Schedule blocks for deletion at datanodes
+   *
+   * @param nodesToProcess number of datanodes to schedule deletion work
+   * @return total number of block for deletion
+   */
+  int computeInvalidateWork(int nodesToProcess) {
+    int numOfNodes = 0;
+    ArrayList<String> keyArray = null;
+
+    readLock();
+    try {
+      numOfNodes = recentInvalidateSets.size();
+      // get an array of the keys
+      keyArray = new ArrayList<String>(recentInvalidateSets.keySet());
+    } finally {
+      readUnlock();
+    }
+
+    nodesToProcess = Math.min(numOfNodes, nodesToProcess);
+
+    // randomly pick up <i>nodesToProcess</i> nodes
+    // and put them at [0, nodesToProcess)
+    int remainingNodes = numOfNodes - nodesToProcess;
+    if (nodesToProcess < remainingNodes) {
+      for (int i = 0; i < nodesToProcess; i++) {
+        int keyIndex = r.nextInt(numOfNodes - i) + i;
+        Collections.swap(keyArray, keyIndex, i); // swap to front
+      }
+    } else {
+      for (int i = 0; i < remainingNodes; i++) {
+        int keyIndex = r.nextInt(numOfNodes - i);
+        Collections.swap(keyArray, keyIndex, numOfNodes - i - 1); // swap to end
+      }
+    }
+
+    int blockCnt = 0;
+    for (int nodeCnt = 0; nodeCnt < nodesToProcess; nodeCnt++) {
+      blockCnt += invalidateWorkForOneNode(keyArray.get(nodeCnt));
+    }
+    return blockCnt;
+  }
+
+  /**
+   * Scan blocks in {@link #neededReplications} and assign replication
+   * work to data-nodes they belong to.
+   * <p/>
+   * The number of process blocks equals either twice the number of live
+   * data-nodes or the number of under-replicated blocks whichever is less.
+   *
+   * @return number of blocks scheduled for replication during this iteration.
+   */
+  private int computeReplicationWork(
+    int blocksToProcess) throws IOException {
+    // stall only useful for unit tests (see TestFileAppend4.java)
+    if (stallReplicationWork)  {
+      return 0;
+    }
+
+    // Choose the blocks to be replicated
+    List<List<Block>> blocksToReplicate =
+      chooseUnderReplicatedBlocks(blocksToProcess);
+
+    // replicate blocks
+    return computeReplicationWorkForBlocks(blocksToReplicate);
+  }
+
+  /** Decide the number of blocks to replicate on for this priority.
+   * The heuristic is that allocate at most 20% the quota for 
+   * lower priority blocks
+   * 
+   * @param totalQuota max number of blocks can be replicated
+   * @param blocksForThisPriority
+   *                   number of needed replication blocks for this priority
+   * @param blocksForLowerPriorities
+   *                   number of lower priority needed replication blocks
+   * @return the number blocks
+   */
+  private int getQuotaForThisPriority(int totalQuota, int blocksForThisPriority,
+      int blocksForLowerPriorities) {
+    // reserve at most 20% for lower priority blocks
+    int quotaForLowerPriorities = 
+                     Math.min(totalQuota/5, blocksForLowerPriorities);
+    return Math.min( blocksForThisPriority,
+                     totalQuota-quotaForLowerPriorities);
+  }
+  
+  /**
+   * Get a list of block lists to be replicated
+   * The index of block lists represents the
+   *
+   * @param blocksToProcess
+   * @return Return a list of block lists to be replicated.
+   *         The block list index represents its replication priority.
+   */
+  List<List<Block>> chooseUnderReplicatedBlocks(int blocksToProcess) {
+    // initialize data structure for the return value
+    List<List<Block>> blocksToReplicate =
+      new ArrayList<List<Block>>(UnderReplicatedBlocks.LEVEL);
+    for (int i = 0; i < UnderReplicatedBlocks.LEVEL; i++) {
+      blocksToReplicate.add(new ArrayList<Block>());
+    }
+
+    writeLock();
+    try {
+      synchronized (neededReplications) {
+        if (neededReplications.size() == 0) {
+          return blocksToReplicate;
+        }
+
+        for (int priority = 0; priority<UnderReplicatedBlocks.LEVEL; priority++) {
+        // Go through all blocks that need replications of priority
+        BlockIterator neededReplicationsIterator = neededReplications.iterator(priority);
+        int numBlocks = neededReplications.size(priority);
+        if (replIndex[priority] > numBlocks) {
+          replIndex[priority] = 0;
+        }
+        // skip to the first unprocessed block, which is at replIndex
+        for (int i = 0; i < replIndex[priority] && neededReplicationsIterator.hasNext(); i++) {
+          neededReplicationsIterator.next();
+        }
+        // # of blocks to process for this priority
+        int blocksToProcessIter = getQuotaForThisPriority(blocksToProcess,
+            numBlocks, neededReplications.getSize(priority+1));
+        blocksToProcess -= blocksToProcessIter;
+
+        for (int blkCnt = 0; blkCnt < blocksToProcessIter; blkCnt++, replIndex[priority]++) {
+          if (!neededReplicationsIterator.hasNext()) {
+            // start from the beginning
+            replIndex[priority] = 0;
+            neededReplicationsIterator = neededReplications.iterator(priority);
+            assert neededReplicationsIterator.hasNext() :
+              "neededReplications should not be empty.";
+          }
+
+          Block block = neededReplicationsIterator.next();
+          blocksToReplicate.get(priority).add(block);
+        } // end for
+        }
+      } // end try
+      return blocksToReplicate;
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Replicate a set of blocks
+   *
+   * @param blocksToReplicate blocks to be replicated, for each priority
+   * @return the number of blocks scheduled for replication
+   */
+  int computeReplicationWorkForBlocks(List<List<Block>> blocksToReplicate) {
+    int requiredReplication, numEffectiveReplicas, priority;
+    List<DatanodeDescriptor> containingNodes;
+    DatanodeDescriptor srcNode;
+    INodeFile fileINode = null;
+
+    int scheduledWork = 0;
+    List<ReplicationWork> work = new LinkedList<ReplicationWork>();
+
+    writeLock();
+    try {
+      synchronized (neededReplications) {
+        for (priority = 0; priority < blocksToReplicate.size(); priority++) {
+          for (Block block : blocksToReplicate.get(priority)) {
+            // block should belong to a file
+            fileINode = blocksMap.getINode(block);
+            // abandoned block not belong to a file
+            if (fileINode == null ) {
+              neededReplications.remove(block, priority); // remove from neededReplications
+              replIndex[priority]--;
+              continue;
+            }
+            requiredReplication = fileINode.getReplication();
+
+            // get a source data-node
+            containingNodes = new ArrayList<DatanodeDescriptor>();
+            NumberReplicas numReplicas = new NumberReplicas();
+            srcNode = chooseSourceDatanode(block, containingNodes, numReplicas);
+            if (srcNode == null) // block can not be replicated from any node
+            {
+              continue;
+            }
+
+            // do not schedule more if enough replicas is already pending
+            numEffectiveReplicas = numReplicas.liveReplicas() +
+              pendingReplications.getNumReplicas(block);
+            if (numEffectiveReplicas >= requiredReplication) {
+              neededReplications.remove(block, priority); // remove from neededReplications
+              replIndex[priority]--;
+              continue;
+            }
+            work.add(new ReplicationWork(block, fileINode, requiredReplication
+                - numEffectiveReplicas, srcNode, containingNodes, priority));
+          }
+        }
+      }
+    } finally {
+      writeUnlock();
+    }
+
+    // choose replication targets: NOT HODING THE GLOBAL LOCK
+    for(ReplicationWork rw : work){
+      DatanodeDescriptor targets[] = chooseTarget(rw);
+      rw.targets = targets;
+    }
+
+    writeLock();
+    try {
+      for(ReplicationWork rw : work){
+        DatanodeDescriptor[] targets = rw.targets;
+        if(targets == null || targets.length == 0){
+          rw.targets = null;
+          continue;
+        }
+        if (targets.length == 1 && 
+            !clusterMap.isOnSameRack(rw.srcNode, targets[0])) {
+          // in case src & target are not on the same rack
+          // see if there is an alternate valid source in the same rack 
+          // as the target that we can use instead.
+          for (DatanodeDescriptor node : rw.containingNodes) {
+            if (node != rw.srcNode && 
+                clusterMap.isOnSameRack(node, targets[0]) &&
+                isGoodReplica(node, rw.block)) {
+              rw.srcNode = node;
+              break;
+            }
+          }
+        }
+        synchronized (neededReplications) {
+          Block block = rw.block;
+          priority = rw.priority;
+          // Recheck since global lock was released
+          // block should belong to a file
+          fileINode = blocksMap.getINode(block);
+          // abandoned block not belong to a file
+          if (fileINode == null ) {
+            neededReplications.remove(block, priority); // remove from neededReplications
+            rw.targets = null;
+            replIndex[priority]--;
+            continue;
+          }
+          requiredReplication = fileINode.getReplication();
+
+          // do not schedule more if enough replicas is already pending
+          NumberReplicas numReplicas = countNodes(block);
+          numEffectiveReplicas = numReplicas.liveReplicas() +
+            pendingReplications.getNumReplicas(block);
+          if (numEffectiveReplicas >= requiredReplication) {
+            neededReplications.remove(block, priority); // remove from neededReplications
+            replIndex[priority]--;
+            rw.targets = null;
+            continue;
+          }
+
+          // Add block to the to be replicated list
+          rw.srcNode.addBlockToBeReplicated(block, targets);
+          
+          scheduledWork++;
+
+          for (DatanodeDescriptor dn : targets) {
+            dn.incBlocksScheduled();
+          }
+
+          // Move the block-replication into a "pending" state.
+          // The reason we use 'pending' is so we can retry
+          // replications that fail after an appropriate amount of time.
+          pendingReplications.add(block, targets.length);
+          if (NameNode.stateChangeLog.isDebugEnabled()) {
+            NameNode.stateChangeLog.debug(
+              "BLOCK* block " + block
+                + " is moved from neededReplications to pendingReplications");
+          }
+
+          // remove from neededReplications
+          if (numEffectiveReplicas + targets.length >= requiredReplication) {
+            neededReplications.remove(block, priority); // remove from neededReplications
+            replIndex[priority]--;
+          }
+        }
+      }
+    } finally {
+      writeUnlock();
+    }
+
+    // update metrics
+    updateReplicationMetrics(work);
+    
+    // print debug information
+    if(NameNode.stateChangeLog.isInfoEnabled()){
+      // log which blocks have been scheduled for replication
+      for(ReplicationWork rw : work){
+        // report scheduled blocks
+        DatanodeDescriptor[] targets = rw.targets;
+        if (targets != null && targets.length != 0) {
+          StringBuffer targetList = new StringBuffer("datanode(s)");
+          for (int k = 0; k < targets.length; k++) {
+            targetList.append(' ');
+            targetList.append(targets[k].getName());
+          }
+          NameNode.stateChangeLog.info(
+            "BLOCK* ask "
+              + rw.srcNode.getName() + " to replicate "
+              + rw.block + " to " + targetList);
+        }
+      }
+    }
+
+    // log once per call
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug("BLOCK* neededReplications = "
+          + neededReplications.size() + " pendingReplications = "
+          + pendingReplications.size());
+    }
+    return scheduledWork;
+  }
+
+  /**
+   * Update replication metrics
+   * 
+   * @param work record for all scheduled replication
+   */
+  private void updateReplicationMetrics(List<ReplicationWork> work) {
+    for(ReplicationWork rw : work){
+      DatanodeDescriptor[] targets = rw.targets;
+      if (targets == null) continue;
+      for (DatanodeDescriptor target : targets) {
+        if (clusterMap.isOnSameRack(rw.srcNode, target)) {
+          myFSMetrics.numLocalRackReplications.inc();
+        } else {
+          myFSMetrics.numAcrossRackReplications.inc();
+        }
+      }
+    }
+  }
+  /**
+   * Wrapper function for choosing targets for replication.
+   */
+  private DatanodeDescriptor[] chooseTarget(ReplicationWork work) {
+    if (!neededReplications.contains(work.block)) {
+      return null;
+    }
+    if (work.blockSize == BlockFlags.NO_ACK) {
+      LOG.warn("Block " + work.block.getBlockId() + 
+          " of the file " + work.fileINode.getFullPathName() + 
+          " is invalidated and cannot be replicated.");
+      return null;
+    }
+    if (work.blockSize == BlockFlags.DELETED) {
+      LOG.warn("Block " + work.block.getBlockId() + 
+          " of the file " + work.fileINode.getFullPathName() + 
+          " is a deleted block and cannot be replicated.");
+      return null;
+    }
+    return replicator.chooseTarget(work.fileINode,
+        work.numOfReplicas, work.srcNode,
+        work.containingNodes, null, work.blockSize);
+  }
+
+  /**
+   * Parse the data-nodes the block belongs to and choose one,
+   * which will be the replication source.
+   * <p/>
+   * We prefer nodes that are in DECOMMISSION_INPROGRESS state to other nodes
+   * since the former do not have write traffic and hence are less busy.
+   * We do not use already decommissioned nodes as a source.
+   * Otherwise we choose a random node among those that did not reach their
+   * replication limit.
+   * <p/>
+   * In addition form a list of all nodes containing the block
+   * and calculate its replication numbers.
+   */
+  private DatanodeDescriptor chooseSourceDatanode(
+    Block block,
+    List<DatanodeDescriptor> containingNodes,
+    NumberReplicas numReplicas) {
+    containingNodes.clear();
+    DatanodeDescriptor srcNode = null;
+    int live = 0;
+    int decommissioned = 0;
+    int corrupt = 0;
+    int excess = 0;
+    Iterator<DatanodeDescriptor> it = blocksMap.nodeIterator(block);
+    Collection<DatanodeDescriptor> nodesCorrupt = corruptReplicas.getNodes(block);
+    DatanodeDescriptor excessReplica = null;
+    while (it.hasNext()) {
+      DatanodeDescriptor node = it.next();
+      Collection<Block> excessBlocks =
+        excessReplicateMap.get(node.getStorageID());
+      if ((nodesCorrupt != null) && (nodesCorrupt.contains(node))) {
+        corrupt++;
+      } else if (node.isDecommissionInProgress() || node.isDecommissioned()) {
+        decommissioned++;
+      } else if (excessBlocks != null && excessBlocks.contains(block)) {
+        excess++;
+      } else {
+        live++;
+      }
+      containingNodes.add(node);
+      // Check if this replica is corrupt
+      // If so, do not select the node as src node
+      if ((nodesCorrupt != null) && nodesCorrupt.contains(node)) {
+        continue;
+      }
+      if (node.getNumberOfBlocksToBeReplicated() >= maxReplicationStreams) {
+        continue;
+      } // already reached replication limit
+      // the block must not be scheduled for removal on srcNode
+      if (excessBlocks != null && excessBlocks.contains(block)) {
+        excessReplica = node;
+        continue;
+      }
+      // never use already decommissioned nodes
+      if (node.isDecommissioned()) {
+        continue;
+      }
+      // we prefer nodes that are in DECOMMISSION_INPROGRESS state
+      if (node.isDecommissionInProgress() || srcNode == null) {
+        srcNode = node;
+        continue;
+      }
+      if (srcNode.isDecommissionInProgress()) {
+        continue;
+      }
+      // switch to a different node randomly
+      // this to prevent from deterministically selecting the same node even
+      // if the node failed to replicate the block on previous iterations
+      if (r.nextBoolean()) {
+        srcNode = node;
+      }
+    }
+    if (numReplicas != null) {
+      numReplicas.initialize(live, decommissioned, corrupt, excess);
+    }
+    if (srcNode == null && live == 0 && excessReplica != null) {
+      // try excessReplica if there is no other choice
+      srcNode = excessReplica;
+    }
+    return srcNode;
+  }
+
+  /**
+   * Decide if a replica is valid
+   * @param node datanode the block is located
+   * @param block a block
+   * @return true if a replica is valid
+   */
+  private boolean isGoodReplica(DatanodeDescriptor node, Block block) {
+    Collection<Block> excessBlocks =
+      excessReplicateMap.get(node.getStorageID());
+    Collection<DatanodeDescriptor> nodesCorrupt = corruptReplicas.getNodes(block);
+    return (nodesCorrupt == null || !nodesCorrupt.contains(node)) // not corrupt
+        // not over scheduling for replication
+        && (node.getNumberOfBlocksToBeReplicated() < maxReplicationStreams)
+        // not alredy scheduled for removal
+        && (excessBlocks == null || !excessBlocks.contains(block))
+        && !node.isDecommissioned(); // not decommissioned
+  }
+  
+  /**
+   * Get blocks to invalidate for <i>nodeId</i>
+   * in {@link #recentInvalidateSets}.
+   *
+   * @return number of blocks scheduled for removal during this iteration.
+   */
+  private int invalidateWorkForOneNode(String nodeId) {
+    List<Block> blocksToInvalidate = null;
+    DatanodeDescriptor dn = null;
+    writeLock();
+    try {
+      // blocks should not be replicated or removed if safe mode is on
+      if (isInSafeMode()) {
+        return 0;
+      }
+      // get blocks to invalidate for the nodeId
+      assert nodeId != null;
+      dn = datanodeMap.get(nodeId);
+      if (dn == null) {
+        recentInvalidateSets.remove(nodeId);
+        return 0;
+      }
+
+      LightWeightHashSet<Block> invalidateSet = recentInvalidateSets
+          .get(nodeId);
+      if (invalidateSet == null) {
+        return 0;
+      }
+      // # blocks that can be sent in one message is limited
+      blocksToInvalidate = invalidateSet.pollN(blockInvalidateLimit);
+
+      // If we send everything in this message, remove this node entry
+      if (invalidateSet.isEmpty()) {
+        recentInvalidateSets.remove(nodeId);
+      }
+
+      dn.addBlocksToBeInvalidated(blocksToInvalidate);
+      pendingDeletionBlocksCount -= blocksToInvalidate.size();
+    } finally {
+      writeUnlock();
+      if (NameNode.stateChangeLog.isInfoEnabled() && blocksToInvalidate != null
+          && blocksToInvalidate.size() != 0) {
+        StringBuffer blockList = new StringBuffer();
+        for (Block blk : blocksToInvalidate) {
+          blockList.append(' ');
+          blockList.append(blk);
+        }
+        NameNode.stateChangeLog.info("BLOCK* ask "
+          + dn.getName() + " to delete " + blockList);
+      }
+    }
+    return blocksToInvalidate.size();
+  }
+
+  public void setNodeReplicationLimit(int limit) {
+    this.maxReplicationStreams = limit;
+  }
+
+  /**
+   * If there were any replication requests that timed out, reap them
+   * and put them back into the neededReplication queue
+   */
+  void processPendingReplications() {
+    Block[] timedOutItems = pendingReplications.getTimedOutBlocks();
+    if (timedOutItems != null) {
+      writeLock();
+      try {
+        for (int i = 0; i < timedOutItems.length; i++) {
+          NumberReplicas num = countNodes(timedOutItems[i]);
+          neededReplications.add(timedOutItems[i],
+            num.liveReplicas(),
+            num.decommissionedReplicas(),
+            getReplication(timedOutItems[i]));
+        }
+      } finally {
+        writeUnlock();
+      }
+      /* If we know the target datanodes where the replication timedout,
+       * we could invoke decBlocksScheduled() on it. Its ok for now.
+       */
+    }
+  }
+
+  /**
+   * remove a datanode descriptor
+   *
+   * @param nodeID datanode ID
+   */
+  public void removeDatanode(DatanodeID nodeID)
+    throws IOException {
+    writeLock();
+    try {
+      DatanodeDescriptor nodeInfo = getDatanode(nodeID);
+      if (nodeInfo != null) {
+        removeDatanode(nodeInfo);
+      } else {
+        NameNode.stateChangeLog.warn("BLOCK* NameSystem.removeDatanode: "
+          + nodeID.getName() + " does not exist");
+      }
+    } finally {
+      writeUnlock();
+    }
+  }
+  
+  /**
+   * Clear replication queues. This is used by standby avatar to reclaim memory.
+   */
+  void clearReplicationQueues() {
+    writeLock();
+    try {
+      synchronized (neededReplications) {
+        neededReplications.clear();
+      }
+      underReplicatedBlocksCount = 0;
+
+      corruptReplicas.clear();
+      corruptReplicaBlocksCount = 0;
+
+      overReplicatedBlocks.clear();
+
+      excessReplicateMap = new HashMap<String, LightWeightHashSet<Block>>();
+      excessBlocksCount = 0;
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * remove a datanode descriptor
+   *
+   * @param nodeInfo datanode descriptor
+   */
+  private void removeDatanode(DatanodeDescriptor nodeInfo) {
+    synchronized (heartbeats) {
+      if (nodeInfo.isAlive) {
+        updateStats(nodeInfo, false);
+        heartbeats.remove(nodeInfo);
+        nodeInfo.isAlive = false;
+      }
+    }
+
+    for (Iterator<Block> it = nodeInfo.getBlockIterator(); it.hasNext();) {
+      removeStoredBlock(it.next(), nodeInfo);
+    }
+    unprotectedRemoveDatanode(nodeInfo);
+    clusterMap.remove(nodeInfo);
+
+    // remove this datanode from any INodeFileUnderConstruction so
+    // concurrent readers don't get down datanodes
+    // (we need a copy of the Set since removeTargets may modify it)
+    Set<INodeFileUnderConstruction> iNodeFileSet =
+      new HashSet<INodeFileUnderConstruction>(nodeInfo.getOpenINodes());
+    for (INodeFileUnderConstruction iNodeFile : iNodeFileSet) {
+      iNodeFile.removeTarget(nodeInfo);
+    }
+  }
+
+  void unprotectedRemoveDatanode(DatanodeDescriptor nodeDescr) {
+    nodeDescr.resetBlocks();
+    removeFromInvalidates(nodeDescr.getStorageID());
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug(
+        "BLOCK* NameSystem.unprotectedRemoveDatanode: "
+          + nodeDescr.getName() + " is out of service now.");
+    }
+  }
+
+  void unprotectedAddDatanode(DatanodeDescriptor nodeDescr) {
+    /* To keep host2DataNodeMap consistent with datanodeMap,
+       remove  from host2DataNodeMap the datanodeDescriptor removed
+       from datanodeMap before adding nodeDescr to host2DataNodeMap.
+    */
+    host2DataNodeMap.remove(
+      datanodeMap.put(nodeDescr.getStorageID(), nodeDescr));
+    host2DataNodeMap.add(nodeDescr);
+
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug(
+        "BLOCK* NameSystem.unprotectedAddDatanode: "
+          + "node " + nodeDescr.getName() + " is added to datanodeMap.");
+    }
+  }
+
+  /**
+   * Physically remove node from datanodeMap.
+   *
+   * @param nodeID node
+   */
+  void wipeDatanode(DatanodeID nodeID) throws IOException {
+    String key = nodeID.getStorageID();
+    host2DataNodeMap.remove(datanodeMap.remove(key));
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug(
+        "BLOCK* NameSystem.wipeDatanode: "
+          + nodeID.getName() + " storage " + key
+          + " is removed from datanodeMap.");
+    }
+  }
+
+  FSImage getFSImage() {
+    return dir.fsImage;
+  }
+
+  public FSEditLog getEditLog() {
+    return getFSImage().getEditLog();
+  }
+
+  /**
+   * Check if there are any expired heartbeats, and if so,
+   * whether any blocks have to be re-replicated.
+   * While removing dead datanodes, make sure that only one datanode is marked
+   * dead at a time within the synchronized section. Otherwise, a cascading
+   * effect causes more datanodes to be declared dead.
+   */
+  void heartbeatCheck() {
+    if (!getNameNode().shouldCheckHeartbeat()) {
+      // not to check dead nodes.
+      return;
+    }
+    boolean allAlive = false;
+    while (!allAlive) {
+      boolean foundDead = false;
+      DatanodeID nodeID = null;
+
+      // locate the first dead node.
+      synchronized (heartbeats) {
+        for (Iterator<DatanodeDescriptor> it = heartbeats.iterator();
+             it.hasNext();) {
+          DatanodeDescriptor nodeInfo = it.next();
+          if (isDatanodeDead(nodeInfo)) {
+            foundDead = true;
+            nodeID = nodeInfo;
+            break;
+          }
+        }
+      }
+
+      // acquire the fsnamesystem lock, and then remove the dead node.
+      if (foundDead) {
+        writeLock();
+        try {
+          synchronized (heartbeats) {
+            synchronized (datanodeMap) {
+              DatanodeDescriptor nodeInfo = null;
+              try {
+                nodeInfo = getDatanode(nodeID);
+              } catch (IOException e) {
+                nodeInfo = null;
+              }
+              if (nodeInfo != null && isDatanodeDead(nodeInfo)) {
+                NameNode.stateChangeLog.info("BLOCK* NameSystem.heartbeatCheck: "
+                  + "lost heartbeat from " + nodeInfo.getName());
+                removeDatanode(nodeInfo);
+                nodeInfo.setStartTime(now());
+              }
+            }
+          }
+        } finally {
+          writeUnlock();
+        }
+      }
+      allAlive = !foundDead;
+    }
+  }
+  
+  public void processBlocksBeingWrittenReport(DatanodeID nodeID, 
+      BlockListAsLongs blocksBeingWritten) 
+  throws IOException {
+    writeLock();
+    try {
+      DatanodeDescriptor dataNode = getDatanode(nodeID);
+      if (dataNode == null) {
+        throw new IOException("ProcessReport from unregisterted node: "
+            + nodeID.getName());
+      }
+      
+      Block block = new Block();
+
+      for (int i = 0; i < blocksBeingWritten.getNumberOfBlocks(); i ++) {
+        block.set(blocksBeingWritten.getBlockId(i), 
+            blocksBeingWritten.getBlockLen(i), 
+            blocksBeingWritten.getBlockGenStamp(i));
+
+        BlockInfo storedBlock = blocksMap.getStoredBlockWithoutMatchingGS(block);
+
+        if (storedBlock == null) {
+          rejectAddStoredBlock(
+              new Block(block), dataNode,
+              "Block not in blockMap with any generation stamp",
+              true);
+          continue;
+        }
+
+        INodeFile inode = storedBlock.getINode();
+        if (inode == null) {
+          rejectAddStoredBlock(
+              new Block(block), dataNode,
+              "Block does not correspond to any file",
+              true);
+          continue;
+        }
+
+        boolean underConstruction = inode.isUnderConstruction();
+        boolean isLastBlock = inode.getLastBlock() != null &&
+                   inode.getLastBlock().getBlockId() == block.getBlockId();
+
+        // Must be the last block of a file under construction,
+        if (!underConstruction) {
+          rejectAddStoredBlock(
+              new Block(block), dataNode,
+              "Reported as block being written but is a block of closed file.",
+              true);
+          continue;
+        }
+
+        if (!isLastBlock) {
+          rejectAddStoredBlock(
+              new Block(block), dataNode,
+              "Reported as block being written but not the last block of " +
+              "an under-construction file.",
+              true);
+          continue;
+        }
+
+        INodeFileUnderConstruction pendingFile = 
+                            (INodeFileUnderConstruction)inode;
+        boolean added = pendingFile.addTarget(dataNode);
+        if (!dataNode.isDecommissioned()
+            && !dataNode.isDecommissionInProgress() && added) {
+          // Increment only once for each datanode.
+          incrementSafeBlockCount(pendingFile.getTargets().length, true);
+        }
+      }
+    } finally {
+      writeUnlock();
+      checkSafeMode();
+    }
+  }
+  
+  /**
+   * The given node is reporting all its blocks.  Use this info to
+   * update the (machine-->blocklist) and (block-->machinelist) tables.
+   */
+  public Collection<Block> processReport(DatanodeID nodeID,
+      BlockListAsLongs newReport
+  ) throws IOException {
+    // To minimize startup time, we discard any second (or later) block reports
+    // that we receive while still in startup phase.
+    // Checking this without holding fsnamesystem so that duplicate 
+    // block reports won't wait for too long time thus getting into old gen
+    if (isInStartupSafeMode()) {
+      synchronized (datanodeMap) {
+        DatanodeDescriptor node = getDatanode(nodeID);
+        if (node != null && node.numBlocks() != 0 ) {
+          NameNode.stateChangeLog.info("BLOCK* NameSystem.processReport: "
+              + "discarded non-initial block report from " + nodeID.getName()
+              + " because namenode still in startup phase");
+          return new LinkedList<Block>();
+        }
+      }
+    }
+
+    int processTime;
+    Collection<Block> toAdd = null, toRemove = null, toInvalidate = null, toRetry = null;
+    boolean firstReport = false;
+    writeLock();
+    try {
+      long startTime = now();
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+         NameNode.stateChangeLog.debug("BLOCK* NameSystem.processReport: "
+          + "from " + nodeID.getName() + " " +
+          newReport.getNumberOfBlocks() + " blocks");
+      }
+      DatanodeDescriptor node = getDatanode(nodeID);
+      if (node == null || !node.isAlive) {
+        throw new IOException("ProcessReport from dead or unregistered node: "
+          + nodeID.getName());
+      }
+      
+      if (this.getNameNode().shouldRetryAbsentBlocks()) {
+        toRetry = new LinkedList<Block>();
+      }
+
+      // check the case when the NN does not know of any replicas on this
+      // datanode. This typically happens when the NN restarts and the first
+      // report from this datanode is being processed. Short-circuit the
+      // processing in this case: just add all these replicas to this
+      // datanode. This helps NN restart times tremendously.
+      firstReport = node.numBlocks() == 0;
+      if (firstReport) {      
+        Block iblk = new Block(); // a fixed new'ed block to be reused with index i
+        for (int i = 0; i < newReport.getNumberOfBlocks(); ++i) {
+          iblk.set(newReport.getBlockId(i), newReport.getBlockLen(i),
+            newReport.getBlockGenStamp(i));
+          if (!addStoredBlockInternal(iblk, node, null, true)
+              && this.getNameNode().shouldRetryAbsentBlock(iblk)) {
+            toRetry.add(new Block(iblk));
+          }
+        }
+        dnReporting++;
+      } else {
+
+        //
+        // Modify the (block-->datanode) map, according to the difference
+        // between the old and new block report.
+        //
+        toAdd = new LinkedList<Block>();
+        toRemove = new LinkedList<Block>();
+        toInvalidate = new LinkedList<Block>();
+        node.reportDiff(blocksMap, newReport, toAdd, toRemove, toInvalidate,
+            toRetry, this);
+
+        for (Block b : toRemove) {
+          removeStoredBlock(b, node);
+        }
+        for (Block b : toAdd) {
+          addStoredBlock(b, node, null);
+        }
+        for (Block b : toInvalidate) {
+          addToInvalidatesNoLog(b, node, false);
+        }
+      }
+      processTime = (int)(now() - startTime);
+      NameNode.getNameNodeMetrics().blockReport.inc(processTime);
+    } finally {
+      writeUnlock();
+      checkSafeMode();
+    }
+    if (toInvalidate != null) {
+      for (Block b : toInvalidate) {
+        NameNode.stateChangeLog.info("BLOCK* NameSystem.processReport: block "
+          + b + " on " + nodeID.getName() + " size " + b.getNumBytes()
+          + " does not belong to any file.");
+      }
+    }
+    String shortCircuit = firstReport ? " (shortCircuit first report)" : "";
+    NameNode.stateChangeLog.info("BLOCK* NameSystem.processReport"+ shortCircuit 
+        + ": from " + nodeID.getName() + " with " + newReport.getNumberOfBlocks()
+        + " blocks took " + processTime + "ms"
+        + (toAdd == null ? "." : (": #toAdd = " + toAdd.size() +
+                                 " #toRemove = " + toRemove.size() +
+                                 " #toInvalidate = " + toInvalidate.size() +
+                                 ".")));
+    if(firstReport && isInSafeMode()) {
+      LOG.info("BLOCK* NameSystem.processReport: " + dnReporting +
+          " data nodes reporting, " +
+          getSafeBlocks() + "/" + getBlocksTotal() +
+          " blocks safe (" + getSafeBlockRatio() + ")");
+    }
+    return toRetry;
+  }
+
+  /**
+   * Return true if the block size number is valid
+   */
+  private boolean checkBlockSize(Block block, INodeFile inode) {
+    if (block.getNumBytes() < 0) {
+      return false;
+    }
+    BlockInfo[] blocks = inode.getBlocks();
+    if (blocks.length == 0) {
+      return false;
+    }
+    return block.getNumBytes() <= inode.getPreferredBlockSize();
+  }
+  
+  /**
+   * Modify (block-->datanode) map. Remove block from set of needed replications
+   * if this takes care of the problem.
+   * 
+   * @return whether or not the block was stored.
+   */
+  private boolean addStoredBlock(Block block,
+                               DatanodeDescriptor node,
+                               DatanodeDescriptor delNodeHint) {
+    return addStoredBlockInternal(block, node, delNodeHint, false);
+  }
+
+  /**
+   * Modify (block-->datanode) map.  Remove block from set of
+   * needed replications if this takes care of the problem.
+   *
+   * @return the block that is stored in blockMap.
+   */
+  private boolean addStoredBlockInternal(Block block,
+                               DatanodeDescriptor node,
+                               DatanodeDescriptor delNodeHint,
+                               boolean initialBlockReport) {
+    assert (hasWriteLock());
+    BlockInfo storedBlock = blocksMap.getStoredBlock(block);
+    if (storedBlock == null) {
+      // then we need to do some special processing.
+      storedBlock = blocksMap.getStoredBlockWithoutMatchingGS(block);
+
+      if (storedBlock == null) {
+        rejectAddStoredBlock(
+          new Block(block), node,
+          "Block not in blockMap with any generation stamp",
+          initialBlockReport);
+        return false;
+      }
+
+      INodeFile inode = storedBlock.getINode();
+      if (inode == null) {
+        rejectAddStoredBlock(
+          new Block(block), node,
+          "Block does not correspond to any file",
+          initialBlockReport);
+        return false;
+      }
+
+      boolean reportedOldGS = block.getGenerationStamp() < storedBlock.getGenerationStamp();
+      boolean reportedNewGS = block.getGenerationStamp() > storedBlock.getGenerationStamp();
+      boolean underConstruction = inode.isUnderConstruction();
+      boolean isLastBlock = inode.getLastBlock() != null &&
+        inode.getLastBlock().getBlockId() == block.getBlockId();
+
+      // Don't add blocks to the DN when they're part of the in-progress last block
+      // and have an inconsistent generation stamp. Instead just add them to targets
+      // for recovery purposes. They will get added to the node when
+      // commitBlockSynchronization runs
+      if (reportedOldGS || reportedNewGS) {  // mismatched generation stamp
+        if (underConstruction && isLastBlock) {
+          NameNode.stateChangeLog.info(
+              "BLOCK* NameSystem.addStoredBlock: "
+              + "Targets updated: block " + block + " on " + node.getName() +
+              " is added as a target for block " + storedBlock + " with size " +
+              block.getNumBytes());
+          ((INodeFileUnderConstruction)inode).addTarget(node);
+        } else {
+          rejectAddStoredBlock(
+              new Block(block), node,
+              "Reported block has mismatched generation stamp " +
+              "but is not the last block of " +
+              "an under-construction file. (current generation is " +
+              storedBlock.getGenerationStamp() + ")",
+              initialBlockReport);
+        }
+        return false;
+      }
+    }
+
+    INodeFile fileINode = storedBlock.getINode();
+    if (fileINode == null) {
+      rejectAddStoredBlock(
+          new Block(block), node,
+          "Block does not correspond to any file",
+          initialBlockReport);
+      return false;
+    }
+
+    assert storedBlock != null : "Block must be stored by now";
+
+    // add block to the data-node
+    boolean added = node.addBlock(storedBlock);
+    
+    // Is the block being reported the last block of an underconstruction file?
+    boolean blockUnderConstruction = false;
+    
+    if (fileINode.isUnderConstruction()) {
+      Block last = fileINode.getLastBlock();
+      if (last == null) {
+        // This should never happen, but better to handle it properly than to throw
+        // an NPE below.
+        LOG.error("Null blocks for reported block=" + block + " stored=" + storedBlock +
+          " inode=" + fileINode);
+        return false;
+      }
+      blockUnderConstruction = last.equals(storedBlock);
+    }
+
+    // block == storedBlock when this addStoredBlock is the result of a block report
+    if (block.getNumBytes() != storedBlock.getNumBytes()) {
+      if (!checkBlockSize(block, storedBlock.getINode())) {
+        try {
+          // New replica has an invalid block size. Mark it as corrupted.
+          LOG.warn("Mark new replica " + block + " from " + node.getName() +
+            "as corrupt because its length " + block.getNumBytes() +
+            " is not valid");
+          markBlockAsCorrupt(block, node);
+        } catch (IOException e) {
+          LOG.warn("Error in deleting bad block " + block + e);
+        }
+      } else {
+        long cursize = storedBlock.getNumBytes();
+        INodeFile file = storedBlock.getINode();
+        if (cursize == 0) {
+          storedBlock.setNumBytes(block.getNumBytes());
+        } else if (cursize != block.getNumBytes()) {
+          String logMsg = "Inconsistent size for block " + block + 
+            " reported from " + node.getName() +
+            " current size is " + cursize +
+            " reported size is " + block.getNumBytes();
+          // If the block is still under construction this isn't likely
+          // to be a problem, so just log at INFO level.
+          if (blockUnderConstruction) {
+            if (cursize != 1) { // cursize == 1 implies block was fsynced
+              LOG.info(logMsg);
+            }
+          } else {
+            LOG.warn(logMsg);
+          }
+
+          try {
+            if (cursize > block.getNumBytes() && !blockUnderConstruction) {
+              // new replica is smaller in size than existing block.
+              // Mark the new replica as corrupt.
+              LOG.warn("Mark new replica " + block + " from " + node.getName() +
+                "as corrupt because its length is shorter than existing ones");
+              markBlockAsCorrupt(block, node);
+            } else {
+              // new replica is larger in size than existing block.
+              if (!blockUnderConstruction) {
+                // Mark pre-existing replicas as corrupt.
+                int numNodes = blocksMap.numNodes(block);
+                int count = 0;
+                DatanodeDescriptor nodes[] = new DatanodeDescriptor[numNodes];
+                Iterator<DatanodeDescriptor> it = blocksMap.nodeIterator(block);
+                for (; it != null && it.hasNext(); ) {
+                  DatanodeDescriptor dd = it.next();
+                  if (!dd.equals(node)) {
+                    nodes[count++] = dd;
+                  }
+                }
+                for (int j = 0; j < count; j++) {
+                  LOG.warn("Mark existing replica " + block + " from " + node.getName() +
+                  " as corrupt because its length is shorter than the new one");
+                  markBlockAsCorrupt(block, nodes[j]);
+                }
+              }
+              //
+              // change the size of block in blocksMap
+              //
+              storedBlock.setNumBytes(block.getNumBytes());
+            }
+          } catch (IOException e) {
+            LOG.warn("Error in deleting bad block " + block + e);
+          }
+        }
+      }
+      block = storedBlock;
+    } else {
+      block = storedBlock;
+    }
+    assert storedBlock == block : "Block must be stored by now";
+
+    int curReplicaDelta = 0;
+
+    if (added) {
+      curReplicaDelta = 1;
+    } else {
+      NameNode.stateChangeLog.info("BLOCK* NameSystem.addStoredBlock: "
+        + "Redundant addStoredBlock request received for "
+        + block + " on " + node.getName()
+        + " size " + block.getNumBytes());
+    }
+
+    // filter out containingNodes that are marked for decommission.
+    NumberReplicas num = null;
+    int numCurrentReplica = 0;
+    int numLiveReplicas = 0;
+
+    boolean popReplQueuesBefore = isPopulatingReplQueues();
+
+    if (!popReplQueuesBefore) {
+      // if we haven't populated the replication queues
+      // then use a cheaper method to count
+      // only live replicas, that's all we need.
+      numLiveReplicas = countLiveNodes(storedBlock);
+      numCurrentReplica = numLiveReplicas;
+    } else {
+      // count live & decommissioned replicas
+      num = countNodes(storedBlock);
+      numLiveReplicas = num.liveReplicas();
+      numCurrentReplica = numLiveReplicas + pendingReplications.getNumReplicas(block);
+    }
+
+    // check whether safe replication is reached for the block. Do not increment
+    // safe block count if this block has already been reported by the same
+    // datanode before. We used the check for 'added' to achieve this.
+    if (!node.isDecommissionInProgress() && !node.isDecommissioned() && added) {
+      incrementSafeBlockCount(numCurrentReplica, initialBlockReport);
+    }
+
+    if (!popReplQueuesBefore && isPopulatingReplQueues()) {
+      // we have just initialized the repl queues
+      // must recompute num
+      num = countNodes(storedBlock);
+      numLiveReplicas = num.liveReplicas();
+      numCurrentReplica = numLiveReplicas +
+        pendingReplications.getNumReplicas(block);
+    }
+
+    //
+    // if file is being actively written to and it is the last block, 
+    // then do not check replication-factor here.
+    //
+    if (blockUnderConstruction && fileINode.isLastBlock(storedBlock)) {
+      INodeFileUnderConstruction cons = (INodeFileUnderConstruction)fileINode;
+      cons.addTarget(node);
+      return true;
+    }
+
+    // do not handle mis-replicated blocks during start up
+    if (!isPopulatingReplQueues()) {
+      return true;
+    }
+
+    if (curReplicaDelta == 0) {
+      return true;
+    }
+    
+    // handle underReplication
+    short fileReplication = fileINode.getReplication();
+    updateNeededReplicationQueue(block, curReplicaDelta, numCurrentReplica,
+        num.decommissionedReplicas, node, fileReplication);
+    // handle over-replication
+    if (numCurrentReplica > fileReplication) {
+      // Put block into a queue and handle excess block asyncly
+      if (delNodeHint == null || node == delNodeHint) {
+        overReplicatedBlocks.add(block);
+      } else {
+        overReplicatedBlocks.add(new OverReplicatedBlock(block, node, delNodeHint));
+      }
+    }
+    // If the file replication has reached desired value
+    // we can remove any corrupt replicas the block may have
+    int corruptReplicasCount = corruptReplicas.numCorruptReplicas(block);
+    int numCorruptNodes = num.corruptReplicas();
+    if (numCorruptNodes != corruptReplicasCount) {
+      LOG.warn("Inconsistent number of corrupt replicas for " +
+        block + "blockMap has " + numCorruptNodes +
+        " but corrupt replicas map has " + corruptReplicasCount);
+    }
+    if ((corruptReplicasCount > 0) && (numLiveReplicas >= fileReplication)) {
+      invalidateCorruptReplicas(block);
+    }
+    return true;
+  }
+
+  /**
+   * Log a rejection of an addStoredBlock RPC, invalidate the reported block
+   */
+  private void rejectAddStoredBlock(Block block,
+                                     DatanodeDescriptor node,
+                                     String msg,
+                                     boolean ignoreInfoLogs) {
+      if ((!isInSafeMode()) && (!ignoreInfoLogs)) {
+        NameNode.stateChangeLog.info("BLOCK* NameSystem.addStoredBlock: "
+                                     + "addStoredBlock request received for "
+                                     + block + " size " + block.getNumBytes()
+                                     + " but was rejected and added to invalidSet of " 
+                                     + node.getName() + " : " + msg);
+      }
+      addToInvalidatesNoLog(block, node, false);
+  }
+
+  /**
+   * Invalidate corrupt replicas.
+   * <p/>
+   * This will remove the replicas from the block's location list,
+   * add them to {@link #recentInvalidateSets} so that they could be further
+   * deleted from the respective data-nodes,
+   * and remove the block from corruptReplicasMap.
+   * <p/>
+   * This method should be called when the block has sufficient
+   * number of live replicas.
+   *
+   * @param blk Block whose corrupt replicas need to be invalidated
+   */
+  void invalidateCorruptReplicas(Block blk) {
+    Collection<DatanodeDescriptor> nodes = corruptReplicas.getNodes(blk);
+    boolean gotException = false;
+    if (nodes == null) {
+      return;
+    }
+    // Make a copy of this list, since calling invalidateBlock will modify
+    // the original (avoid CME)
+    nodes = new ArrayList<DatanodeDescriptor>(nodes);
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug("NameNode.invalidateCorruptReplicas: " +
+          "invalidating corrupt replicas on " + nodes.size() + "nodes");
+    }
+    for (Iterator<DatanodeDescriptor> it = nodes.iterator(); it.hasNext();) {
+      DatanodeDescriptor node = it.next();
+      try {
+        invalidateBlock(blk, node, true);
+      } catch (IOException e) {
+        NameNode.stateChangeLog.info("NameNode.invalidateCorruptReplicas " +
+          "error in deleting bad block " + blk +
+          " on " + node + e);
+        gotException = true;
+      }
+    }
+    // Remove the block from corruptReplicasMap
+    if (!gotException) {
+      corruptReplicas.removeFromCorruptReplicasMap(blk);
+    }
+  }
+
+  /**
+   * For each block in the name-node verify whether it belongs to any file,
+   * over or under replicated. Place it into the respective queue.
+   */
+  protected void processMisReplicatedBlocks() {
+    writeLock();
+    try {
+      if (this.initializedReplQueues) {
+        return;
+      }
+      String logPrefix = "Processing mis-replicated blocks: ";
+      long nrInvalid = 0, nrOverReplicated = 0, nrUnderReplicated = 0;
+      neededReplications.clear();
+      int totalBlocks = blocksMap.size();
+      long currentBlock = 0;
+      LOG.info(logPrefix + "Starting");
+      for (BlocksMap.BlockInfo block : blocksMap.getBlocks()) {
+        currentBlock++;
+        if ((currentBlock % 1000000) == 0) {
+          LOG.info(logPrefix + "Percent completed: " +
+              (currentBlock * 100 / totalBlocks) );
+        }
+
+        INodeFile fileINode = block.getINode();
+        if (fileINode == null) {
+          // block does not belong to any file
+          nrInvalid++;
+          addToInvalidates(block, false);
+          continue;
+        }
+        // If this is a last block of a file under construction ignore it.
+        if (block.equals(fileINode.getLastBlock())
+            && fileINode.isUnderConstruction()) {
+          continue;
+        }
+
+        // calculate current replication
+        short expectedReplication = fileINode.getReplication();
+        NumberReplicas num = countNodes(block);
+        int numCurrentReplica = num.liveReplicas();
+        // add to under-replicated queue if need to be
+        if (neededReplications.add(block,
+          numCurrentReplica,
+          num.decommissionedReplicas(),
+          expectedReplication)) {
+          nrUnderReplicated++;
+        }
+
+        if (numCurrentReplica > expectedReplication) {
+          // over-replicated block
+          nrOverReplicated++;
+          overReplicatedBlocks.add(block);
+        }
+      }
+      this.initializedReplQueues = true;
+      LOG.info(logPrefix + "Total number of blocks = " + blocksMap.size());
+      LOG.info(logPrefix + "Number of invalid blocks = " + nrInvalid);
+      LOG.info(logPrefix + "Number of under-replicated blocks = " +
+          nrUnderReplicated);
+      LOG.info(logPrefix + "Number of  over-replicated blocks = " +
+          nrOverReplicated);
+      LOG.info(logPrefix + "Finished");
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * This is called from the ReplicationMonitor to process over
+   * replicated blocks.
+   */
+  private void processOverReplicatedBlocksAsync() {
+
+    // blocks should not be scheduled for deletion during safemode
+    if (isInSafeMode()) {
+      return;
+    }
+    List<Block> blocksToProcess = new LinkedList<Block>();
+    writeLock();
+    try {
+      int size = Math.min(overReplicatedBlocks.size(), 1000);
+      NameNode.getNameNodeMetrics().numOverReplicatedBlocks.set(overReplicatedBlocks.size());
+      blocksToProcess = overReplicatedBlocks.pollN(size);
+    } finally {
+      writeUnlock();
+    }
+
+    for (Block block : blocksToProcess) {
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog
+            .debug("BLOCK* NameSystem.processOverReplicatedBlocksAsync: " + block);
+      }
+      if (block instanceof OverReplicatedBlock) {
+        OverReplicatedBlock opb = (OverReplicatedBlock)block;
+        processOverReplicatedBlock(block, (short) -1, opb.addedNode, opb.delNodeHint);
+      } else {
+        processOverReplicatedBlock(block, (short) -1, null, null);
+      }
+        
+    }
+  }
+
+  /**
+   * Find how many of the containing nodes are "extra", if any.
+   * If there are any extras, call findOverReplicatedReplicas() to
+   * insert them into excessReplicateTmp.
+   */
+  private void processOverReplicatedBlock(Block block, short replication,
+                                          DatanodeDescriptor addedNode, DatanodeDescriptor delNodeHint) {
+
+    List<DatanodeID> excessReplicateTmp = new ArrayList<DatanodeID>();
+    List<DatanodeID> originalDatanodes = new ArrayList<DatanodeID>();
+
+    // find all replicas that can possibly be deleted.
+    // The results are returned in excessReplicateTmp.
+    findOverReplicatedReplicas(block, replication,
+      addedNode, delNodeHint,
+      excessReplicateTmp, originalDatanodes);
+    if (excessReplicateTmp.size() <= 0) {
+      return;
+    }
+
+    writeLock();                     // acquire write lock,
+    try {
+
+      INodeFile inode = blocksMap.getINode(block);
+      if (inode == null) {
+        return; // file has been deleted already, nothing to do.
+      }
+
+      //
+      // if the state of replicas of this block has changed since the time
+      // when we released and reacquired the lock, then all the decisions
+      // that we have made so far might not be correct. Do not delete excess
+      // replicas in this case.
+
+      int live = 0;
+      Collection<DatanodeDescriptor> nodesCorrupt = corruptReplicas.getNodes(block);
+      for (Iterator<DatanodeDescriptor> it = blocksMap.nodeIterator(block);
+           it.hasNext();) {
+        DatanodeDescriptor node = it.next();
+        if (((nodesCorrupt != null) && (nodesCorrupt.contains(node))) ||
+          node.isDecommissionInProgress() || node.isDecommissioned()) {
+          // do nothing
+        } else {
+          live++;            // number of live nodes
+          originalDatanodes.remove(node);
+        }
+      }
+
+      if (originalDatanodes.size() > 0) {
+        NameNode.stateChangeLog.info("Unable to delete excess replicas for block " +
+          block +
+          " because the state of the original replicas have changed." +
+          " Will retry later.");
+        overReplicatedBlocks.add(block);
+        return;
+      }
+
+      // loop through datanodes that have excess-replicas of this block
+      for (ListIterator<DatanodeID> iter = excessReplicateTmp.listIterator();
+           iter.hasNext();) {
+        DatanodeID datanodeId = iter.next();
+
+        // re-check that block still has excess replicas.
+        // If not, then there is nothing more to do.
+        if (live <= inode.getReplication()) {
+          break;
+        }
+
+        // find the DatanodeDescriptor for this datanode
+        DatanodeDescriptor datanode = null;
+        try {
+          datanode = getDatanode(datanodeId);
+        } catch (IOException e) {
+        }
+        if (datanode == null) {
+          NameNode.stateChangeLog.info("No datanode found while processing " +
+            "overreplicated block " + block);
+          continue;              // dead datanode?
+        }
+
+        // insert into excessReplicateMap
+        Collection<Block> excessBlocks = excessReplicateMap.get(datanodeId.getStorageID());
+        if (excessBlocks == null) {
+          excessBlocks = new TreeSet<Block>();
+          excessReplicateMap.put(datanodeId.getStorageID(), excessBlocks);
+        }
+
+        if (excessBlocks.add(block)) {
+          excessBlocksCount++;
+          if (NameNode.stateChangeLog.isDebugEnabled()) {
+            NameNode.stateChangeLog.debug("BLOCK* NameSystem.chooseExcessReplicates: "
+              + "(" + datanodeId.getName() + ", " + block
+              + ") is added to excessReplicateMap");
+          }
+        }
+        //
+        // The 'excessblocks' tracks blocks until we get confirmation
+        // that the datanode has deleted them; the only way we remove them
+        // is when we get a "removeBlock" message.
+        //
+        // The 'invalidate' list is used to inform the datanode the block
+        // should be deleted.  Items are removed from the invalidate list
+        // upon giving instructions to the namenode.
+        //
+        addToInvalidatesNoLog(block, datanode, true);
+        live--;
+        if (NameNode.stateChangeLog.isDebugEnabled()) {
+          NameNode.stateChangeLog.debug("BLOCK* NameSystem.chooseExcessReplicates: "
+            + "(" + datanode.getName() + ", " + block + ") is added to recentInvalidateSets");
+        }
+      }
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Find how many of the containing nodes are "extra", if any.
+   * If there are any extras, call chooseExcessReplicates() to
+   * mark them in the excessReplicateMap.
+   *
+   * @param excessReplicateMapTmp replicas that can possibly be in excess
+   * @param originalDatanodes     all currently valid replicas of this block
+   */
+  private void findOverReplicatedReplicas(Block block, short replication,
+                                          DatanodeDescriptor addedNode, DatanodeDescriptor delNodeHint,
+                                          List<DatanodeID> excessReplicateMapTmp,
+                                          List<DatanodeID> originalDatanodes) {
+
+    Collection<DatanodeDescriptor> nonExcess;
+    INodeFile inode;
+
+    readLock();
+    try {
+      inode = blocksMap.getINode(block);
+      if (inode == null) {
+        return; // file has been deleted already, nothing to do.
+      }
+
+      // if the caller did not specify what the target replication factor
+      // of the file, then fetch it from the inode. This happens when invoked
+      // by the ReplicationMonitor thread.
+      if (replication < 0) {
+        replication = inode.getReplication();
+      }
+
+      if (addedNode == delNodeHint) {
+        delNodeHint = null;
+      }
+      nonExcess = new ArrayList<DatanodeDescriptor>();
+      Collection<DatanodeDescriptor> corruptNodes = corruptReplicas.getNodes(block);
+      for (Iterator<DatanodeDescriptor> it = blocksMap.nodeIterator(block);
+           it.hasNext();) {
+        DatanodeDescriptor cur = it.next();
+        Collection<Block> excessBlocks = excessReplicateMap.get(cur.getStorageID());
+        if (excessBlocks == null || !excessBlocks.contains(block)) {
+          if (!cur.isDecommissionInProgress() && !cur.isDecommissioned()) {
+            // exclude corrupt replicas
+            if (corruptNodes == null || !corruptNodes.contains(cur)) {
+              nonExcess.add(cur);
+              originalDatanodes.add(cur);
+            }
+          }
+        }
+      }
+    } finally {
+      readUnlock();
+    }
+
+    // this can be called without the FSnamesystem lock because it does not
+    // use any global data structures. Also, the inode is passed as it is to
+    // the Pluggable blockplacement policy.
+    chooseExcessReplicates(nonExcess, block, replication,
+      addedNode, delNodeHint, inode, excessReplicateMapTmp);
+  }
+
+  /**
+   * We want "replication" replicates for the block, but we now have too many.
+   * In this method, copy enough nodes from 'srcNodes' into 'dstNodes' such that:
+   * <p/>
+   * srcNodes.size() - dstNodes.size() == replication
+   * <p/>
+   * We pick node that make sure that replicas are spread across racks and
+   * also try hard to pick one with least free space.
+   * The algorithm is first to pick a node with least free space from nodes
+   * that are on a rack holding more than one replicas of the block.
+   * So removing such a replica won't remove a rack.
+   * If no such a node is available,
+   * then pick a node with least free space
+   */
+  void chooseExcessReplicates(Collection<DatanodeDescriptor> nonExcess,
+                              Block b, short replication,
+                              DatanodeDescriptor addedNode,
+                              DatanodeDescriptor delNodeHint,
+                              INodeFile inode,
+                              List<DatanodeID> excessReplicateMapTmp) {
+    // first form a rack to datanodes map and
+    HashMap<String, ArrayList<DatanodeDescriptor>> rackMap =
+      new HashMap<String, ArrayList<DatanodeDescriptor>>();
+    for (Iterator<DatanodeDescriptor> iter = nonExcess.iterator();
+         iter.hasNext();) {
+      DatanodeDescriptor node = iter.next();
+      String rackName = node.getNetworkLocation();
+      ArrayList<DatanodeDescriptor> datanodeList = rackMap.get(rackName);
+      if (datanodeList == null) {
+        datanodeList = new ArrayList<DatanodeDescriptor>();
+      }
+      datanodeList.add(node);
+      rackMap.put(rackName, datanodeList);
+    }
+
+    // split nodes into two sets
+    // priSet contains nodes on rack with more than one replica
+    // remains contains the remaining nodes
+    ArrayList<DatanodeDescriptor> priSet = new ArrayList<DatanodeDescriptor>();
+    ArrayList<DatanodeDescriptor> remains = new ArrayList<DatanodeDescriptor>();
+    for (Iterator<Entry<String, ArrayList<DatanodeDescriptor>>> iter =
+      rackMap.entrySet().iterator(); iter.hasNext();) {
+      Entry<String, ArrayList<DatanodeDescriptor>> rackEntry = iter.next();
+      ArrayList<DatanodeDescriptor> datanodeList = rackEntry.getValue();
+      if (datanodeList.size() == 1) {
+        remains.add(datanodeList.get(0));
+      } else {
+        priSet.addAll(datanodeList);
+      }
+    }
+
+    // pick one node to delete that favors the delete hint
+    // otherwise pick one with least space from priSet if it is not empty
+    // otherwise one node with least space from remains
+    boolean firstOne = true;
+    while (nonExcess.size() - replication > 0) {
+      DatanodeInfo cur = null;
+      long minSpace = Long.MAX_VALUE;
+
+      // check if we can del delNodeHint
+      if (firstOne && delNodeHint != null && nonExcess.contains(delNodeHint) &&
+        (priSet.contains(delNodeHint) || (addedNode != null && !priSet.contains(addedNode)))) {
+        cur = delNodeHint;
+      } else { // regular excessive replica removal
+        cur = replicator.chooseReplicaToDelete(inode, b, replication, priSet, remains);
+      }
+
+      firstOne = false;
+      // adjust rackmap, priSet, and remains
+      String rack = cur.getNetworkLocation();
+      ArrayList<DatanodeDescriptor> datanodes = rackMap.get(rack);
+      datanodes.remove(cur);
+      if (datanodes.isEmpty()) {
+        rackMap.remove(rack);
+      }
+      if (priSet.remove(cur)) {
+        if (datanodes.size() == 1) {
+          priSet.remove(datanodes.get(0));
+          remains.add(datanodes.get(0));
+        }
+      } else {
+        remains.remove(cur);
+      }
+      nonExcess.remove(cur);
+
+      excessReplicateMapTmp.add(cur);
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("BLOCK* NameSystem.chooseExcessReplicates: "
+          + "(" + cur.getName() + ", " + b
+          + ") is added to excessReplicateMapTmp");
+      }
+    }
+  }
+
+  public void blockReceivedAndDeleted(DatanodeRegistration nodeReg,
+      Block receivedAndDeletedBlocks[]) throws IOException {
+  int received = 0;
+  int deleted = 0;
+  int processTime = 0;
+  writeLock();
+  long startTime = now();
+    try {
+      DatanodeDescriptor node = getDatanode(nodeReg);
+      if (node == null || !node.isAlive) {
+        NameNode.stateChangeLog.warn("BLOCK* NameSystem.blockReceivedDeleted" +
+          " is received from dead or unregistered node " + nodeReg.getName());
+        throw new IOException(
+          "Got blockReceivedDeleted message from unregistered or dead node " + nodeReg.getName());
+      }
+
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("BLOCK* NameSystem.blockReceivedDeleted"
+           + " is received from " + nodeReg.getName());
+      }
+
+      for (int i = 0; i < receivedAndDeletedBlocks.length; i++) {
+        //avatar datanode mighs send nulls in the array
+        if (receivedAndDeletedBlocks[i] == null) {
+          continue;
+        }
+        if (DFSUtil.isDeleted(receivedAndDeletedBlocks[i])) {
+          removeStoredBlock(receivedAndDeletedBlocks[i], node);
+          // only leave received block in the array
+          receivedAndDeletedBlocks[i] = null; 
+          deleted++;
+        } else {
+          if(!blockReceived(receivedAndDeletedBlocks[i],
+              receivedAndDeletedBlocks[i].getDelHints(),node)) {
+            // block was rejected
+            receivedAndDeletedBlocks[i] = null;
+            continue;
+          }
+          received++;
+        }
+      }
+    } finally {
+      processTime = (int)(now() - startTime);
+      writeUnlock();
+      if (received + deleted > 10) {
+        // Only log for bigger incremental block reports.
+        // This will cut a lot of logging.
+        NameNode.stateChangeLog.info("*BLOCK* NameNode.blockReceivedAndDeleted: "
+          + "from " + nodeReg.getName() + " took " + processTime
+          + "ms: (#received = " + received + ", "
+          + " #deleted = " + deleted + ")");
+      }
+      if(!isInStartupSafeMode()){
+        int count = 0;
+        // At startup time, because too many new blocks come in
+        // they take up lots of space in the log file.
+        // So, we log only when namenode is out of safemode.
+        // We log only blockReceived messages.
+        for (int i = 0; i < receivedAndDeletedBlocks.length; i++) {
+          // log only the ones that have been processed
+          if (count > received) {
+            break;
+          }
+          Block blk = receivedAndDeletedBlocks[i];
+          if (blk == null) 
+              continue;
+          ++count;
+          if (blk.getNumBytes() != BlockFlags.NO_ACK) {       
+            NameNode.stateChangeLog.info("BLOCK* NameSystem.blockReceived: "
+                + "blockMap updated: " + nodeReg.getName() + " is added to "
+                + receivedAndDeletedBlocks[i] + " size "
+                + receivedAndDeletedBlocks[i].getNumBytes());
+          } 
+        }
+      }
+    }
+  }
+
+  public void blockReceivedAndDeleted(DatanodeRegistration nodeReg,
+      IncrementalBlockReport receivedAndDeletedBlocks)
+      throws IOException {
+    int received = 0;
+    int deleted = 0;
+    int processTime = 0;
+    
+    Block blk = new Block(); 
+    int numberOfAcks = receivedAndDeletedBlocks.getLength();
+    
+    writeLock();
+    long startTime = now();
+    try {
+      DatanodeDescriptor node = getDatanode(nodeReg);
+      if (node == null || !node.isAlive) {
+        NameNode.stateChangeLog.warn("BLOCK* NameSystem.blockReceivedDeleted" +
+          " is received from dead or unregistered node " + nodeReg.getName());
+        throw new IOException(
+          "Got blockReceivedDeleted message from unregistered or dead node " + nodeReg.getName());
+      }
+
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("BLOCK* NameSystem.blockReceivedDeleted"
+           + " is received from " + nodeReg.getName());
+      }
+
+      receivedAndDeletedBlocks.resetIterator();
+      for (int currentBlock = 0; currentBlock < numberOfAcks; currentBlock++) {
+        String hint = receivedAndDeletedBlocks.getNext(blk);
+        //avatar datanode mighs send nulls in the array
+        if (blk.getNumBytes() == BlockFlags.IGNORE) {
+          continue;
+        }
+
+        if (DFSUtil.isDeleted(blk)) {
+          removeStoredBlock(blk, node); 
+          deleted++;
+        } else {
+          if(!blockReceived(blk, hint, node)) {
+            // block was rejected, and deleted
+            blk.setNumBytes(BlockFlags.DELETED);
+            receivedAndDeletedBlocks.setBlock(blk, currentBlock);
+            continue;
+          }
+          received++;
+        }
+      }
+    } finally {
+      processTime = (int)(now() - startTime);
+      writeUnlock();
+      if (received + deleted > 10) {
+        // Only log for bigger incremental block reports.
+        // This will cut a lot of logging.
+        NameNode.stateChangeLog.info("*BLOCK* NameNode.blockReceivedAndDeleted: "
+          + "from " + nodeReg.getName() + " took " + processTime
+          + "ms: (#received = " + received + ", "
+          + " #deleted = " + deleted + ")");
+      }
+      if(!isInStartupSafeMode()){
+        int count = 0;
+        // At startup time, because too many new blocks come in
+        // they take up lots of space in the log file.
+        // So, we log only when namenode is out of safemode.
+        // We log only blockReceived messages.
+        receivedAndDeletedBlocks.resetIterator();
+        while(receivedAndDeletedBlocks.hasNext()) {
+          receivedAndDeletedBlocks.getNext(blk);
+          if (count > received) {
+            break;
+          }
+          if (DFSUtil.isDeleted(blk) || blk.getNumBytes() == BlockFlags.IGNORE)
+            continue;
+          ++count;
+          if (blk.getNumBytes() != BlockFlags.NO_ACK) {       
+            NameNode.stateChangeLog.info("BLOCK* NameSystem.blockReceived: "
+                + "blockMap updated: " + nodeReg.getName() + " is added to "
+                + blk + " size "
+                + blk.getNumBytes());
+          } 
+        }
+      }
+    }
+  }
+  
+  /**
+   * Modify (block-->datanode) map.  Possibly generate
+   * replication tasks, if the removed block is still valid.
+   */
+  private void removeStoredBlock(Block block, DatanodeDescriptor node) {
+    assert (hasWriteLock());
+    if (NameNode.stateChangeLog.isDebugEnabled()) {
+      NameNode.stateChangeLog.debug("BLOCK* NameSystem.removeStoredBlock: "
+        + block + " from " + node.getName());
+    }
+    if (!blocksMap.removeNode(block, node)) {
+      if (NameNode.stateChangeLog.isDebugEnabled()) {
+        NameNode.stateChangeLog.debug("BLOCK* NameSystem.removeStoredBlock: "
+          + block + " has already been removed from node " + node);
+      }
+      return;
+    }
+
+    //
+    // if file is being actively written to and it is the last block, 
+    // then do not check replication-factor here.
+    //
+    BlockInfo storedBlock = blocksMap.getStoredBlock(block);
+    INodeFile fileINode = storedBlock == null ? null : storedBlock.getINode();
+    if (fileINode != null && 
+        fileINode.isUnderConstruction() && fileINode.isLastBlock(storedBlock)
+        && !node.isDecommissionInProgress() && !node.isDecommissioned()) {          
+      decrementSafeBlockCount(block);
+      return;
+    }      
+
+    //
+    // It's possible that the block was removed because of a datanode
+    // failure.  If the block is still valid, check if replication is
+    // necessary.  In that case, put block on a possibly-will-
+    // be-replicated list.
+    //
+    if (fileINode != null) {
+      decrementSafeBlockCount(block);
+      // handle under replication
+      // Use storedBlock here because block maybe a deleted block with size DELETED
+      if (isPopulatingReplQueues()) {
+        NumberReplicas num = countNodes(storedBlock);
+        int numCurrentReplicas = num.liveReplicas()
+            +
+        pendingReplications.getNumReplicas(storedBlock);
+        updateNeededReplicationQueue(storedBlock, -1, numCurrentReplicas,
+            num.decommissionedReplicas, node, fileINode.getReplication());
+      }
+    }
+
+    //
+    // We've removed a block from a node, so it's definitely no longer
+    // in "excess" there.
+    //
+    removeFromExcessReplicateMap(block, node);
+
+    // Remove the replica from corruptReplicas
+    corruptReplicas.removeFromCorruptReplicasMap(block, node);
+  }
+  
+  /**
+   * Update a block's priority queue in neededReplicaiton queues
+   * 
+   * @param block block
+   * @param delta the change of number of replicas
+   * @param numCurrentReplicas current number of replicas
+   * @param numCurrentDecommissionedReplicas current number of decommissioed replicas
+   * @param node the node where the replica resides
+   * @param fileReplication expected number of replicas
+   */
+  private void updateNeededReplicationQueue(Block block, int delta,
+      int numCurrentReplicas, int numCurrentDecommissionedReplicas,
+       DatanodeDescriptor node, short fileReplication) {
+     int numOldReplicas = numCurrentReplicas;
+     int numOldDecommissionedReplicas = numCurrentDecommissionedReplicas;
+     if (node.isDecommissioned() || node.isDecommissionInProgress()) {
+       numOldDecommissionedReplicas -= delta;
+     } else {
+       numOldReplicas -= delta;
+     }   
+     if (fileReplication > numOldReplicas) {
+       neededReplications.remove(block, numOldReplicas,
+           numOldDecommissionedReplicas, fileReplication);
+     }
+     if (fileReplication > numCurrentReplicas) {
+       neededReplications.add(block, numCurrentReplicas,
+           numCurrentDecommissionedReplicas, fileReplication); 
+     }   
+   }   
+
+  private void removeFromExcessReplicateMap(Block block, DatanodeDescriptor node){
+    // No need for lock until we start accepting requests from clients.
+    assert (!nameNode.isRpcServerRunning() || hasWriteLock());
+    Collection<Block> excessBlocks = excessReplicateMap.get(node.getStorageID());
+    if (excessBlocks != null) {
+      if (excessBlocks.remove(block)) {
+        excessBlocksCount--;
+        if (NameNode.stateChangeLog.isDebugEnabled()) {
+          NameNode.stateChangeLog.debug("BLOCK* NameSystem.removeFromExcessReplicateMap: "
+            + block + " is removed from excessBlocks");
+        }
+        if (excessBlocks.size() == 0) {
+          excessReplicateMap.remove(node.getStorageID());
+        }
+      }
+    }
+  }
+  
+  private void removeFromExcessReplicateMap(Block block){
+    // No need for lock until we start accepting requests from clients.
+    assert (!nameNode.isRpcServerRunning() || hasWriteLock());
+    for (Iterator<DatanodeDescriptor> it =
+      blocksMap.nodeIterator(block); it.hasNext();) {
+      DatanodeDescriptor node = it.next();
+      removeFromExcessReplicateMap(block, node);
+    }
+  }
+
+  /**
+   * The given node is reporting that it received a certain block.
+   */
+  private boolean blockReceived(Block block,
+                            String delHint,
+                            DatanodeDescriptor node) throws IOException {
+    assert (hasWriteLock());
+
+    // decrement number of blocks scheduled to this datanode.
+    node.decBlocksScheduled();
+
+    // get the deletion hint node
+    DatanodeDescriptor delHintNode = null;
+    if (delHint != null && delHint.length() != 0) {
+      delHintNode = datanodeMap.get(delHint);
+      if (delHintNode == null) {
+        NameNode.stateChangeLog.warn("BLOCK* NameSystem.blockReceived: "
+          + block
+          + " is expected to be removed from an unrecorded node "
+          + delHint);
+      }
+    }
+    //
+    // Modify the blocks->datanode map and node's map.
+    //
+    pendingReplications.remove(block);
+    return addStoredBlock(block, node, delHintNode);
+  }
+
+  public long getMissingBlocksCount() {
+    // not locking
+    return neededReplications.getCorruptBlocksCount();
+  }
+  
+  public String getRaidHttpUrl() {
+    return this.getConf().get(
+        FSConstants.DFS_RAIDNODE_HTTP_ADDRESS_KEY, null);
+  }
+
+  long[] getStats() throws IOException {
+    checkSuperuserPrivilege();
+    synchronized (heartbeats) {
+      return new long[]{this.capacityTotal, this.capacityUsed,
+        this.capacityRemaining,
+        this.underReplicatedBlocksCount,
+        this.corruptReplicaBlocksCount,
+        getMissingBlocksCount(),
+        this.capacityNamespaceUsed};
+    }
+  }
+
+  /**
+   * Total raw bytes including non-dfs used space.
+   */
+  public long getCapacityTotal() {
+    synchronized (heartbeats) {
+      return this.capacityTotal;
+    }
+  }
+
+  /**
+   * Total used space by data nodes
+   */
+  public long getCapacityUsed() {
+    synchronized (heartbeats) {
+      return this.capacityUsed;
+    }
+  }
+
+  /**
+   * Total used space by data nodes as percentage of total capacity
+   */
+  public float getCapacityUsedPercent() {
+    synchronized (heartbeats) {
+      if (capacityTotal <= 0) {
+        return 100;
+      }
+
+      return ((float) capacityUsed * 100.0f) / (float) capacityTotal;
+    }
+  }
+  
+  /**
+   * Total namespace used space by data nodes
+   */
+  public long getCapacityNamespaceUsed() {
+    synchronized (heartbeats) {
+      return this.capacityNamespaceUsed;
+    }
+  }
+
+  /**
+   * Total used space by data nodes as percentage of total capacity
+   */
+  public float getCapacityNamespaceUsedPercent() {
+    synchronized (heartbeats) {
+      if (capacityTotal <= 0) {
+        return 100;
+      }
+
+      return ((float) capacityNamespaceUsed * 100.0f) / (float) capacityTotal;
+    }
+  }
+
+  /**
+   * Total used space by data nodes for non DFS purposes such
+   * as storing temporary files on the local file system
+   */
+  public long getCapacityUsedNonDFS() {
+    long nonDFSUsed = 0;
+    synchronized (heartbeats) {
+      nonDFSUsed = capacityTotal - capacityRemaining - capacityUsed;
+    }
+    return nonDFSUsed < 0 ? 0 : nonDFSUsed;
+  }
+
+  /**
+   * Total non-used raw bytes.
+   */
+  public long getCapacityRemaining() {
+    synchronized (heartbeats) {
+      return this.capacityRemaining;
+    }
+  }
+
+  /**
+   * Total remaining space by data nodes as percentage of total capacity
+   */
+  public float getCapacityRemainingPercent() {
+    synchronized (heartbeats) {
+      if (capacityTotal <= 0) {
+        return 0;
+      }
+
+      return ((float) capacityRemaining * 100.0f) / (float) capacityTotal;
+    }
+  }
+
+  /**
+   * Total number of connections.
+   */
+  public int getTotalLoad() {
+    synchronized (heartbeats) {
+      return this.totalLoad;
+    }
+  }
+
+  int getNumberOfDatanodes(DatanodeReportType type) {
+    return getDatanodeListForReport(type).size();
+  }
+ 
+  ArrayList<DatanodeDescriptor> getDatanodeListForReport(
+    DatanodeReportType type) {
+    readLock();
+    try {
+
+      boolean listLiveNodes = type == DatanodeReportType.ALL ||
+        type == DatanodeReportType.LIVE;
+      boolean listDeadNodes = type == DatanodeReportType.ALL ||
+        type == DatanodeReportType.DEAD;
+
+      HashSet<String> mustList = new HashSet<String>();
+
+      if (listDeadNodes) {
+        //first load all the nodes listed in include and exclude files.
+        for (Iterator<String> it = hostsReader.getHosts().iterator();
+             it.hasNext();) {
+          mustList.add(it.next());
+        }
+        for (Iterator<String> it = hostsReader.getExcludedHosts().iterator();
+             it.hasNext();) {
+          mustList.add(it.next());
+        }
+      }
+
+      ArrayList<DatanodeDescriptor> nodes = null;
+
+      synchronized (datanodeMap) {
+        nodes = new ArrayList<DatanodeDescriptor>(datanodeMap.size() +
+          mustList.size());
+
+        for (Iterator<DatanodeDescriptor> it = datanodeMap.values().iterator();
+             it.hasNext();) {
+          DatanodeDescriptor dn = it.next();
+          boolean isDead = isDatanodeDead(dn);
+          //Remove any form of the this datanode in include/exclude lists.
+          mustList.remove(dn.getName());
+          mustList.remove(dn.getHost());
+          mustList.remove(dn.getHostName());
+          mustList.remove(dn.getHostName() + ":" + dn.getPort());
+          if (!isDead && listLiveNodes && this.inHostsList(dn, null)) {
+            nodes.add(dn);
+          } else if (isDead && listDeadNodes &&
+              (inHostsList(dn, null) || inExcludedHostsList(dn, null))) {
+            nodes.add(dn);
+          }
+        }
+      }
+
+      if (listDeadNodes) {
+        for (Iterator<String> it = mustList.iterator(); it.hasNext();) {
+          DatanodeDescriptor dn =
+            new DatanodeDescriptor(new DatanodeID(it.next()));
+          //This node has never been alive, set starttime to the 0
+          dn.setStartTime(0);
+          dn.setLastUpdate(0);
+          nodes.add(dn);
+        }
+      }
+
+      return nodes;
+    } finally {
+      readUnlock();
+    }
+  }
+
+  public DatanodeInfo[] datanodeReport(DatanodeReportType type
+  ) throws AccessControlException {
+    readLock();
+    try {
+      checkSuperuserPrivilege();
+
+      ArrayList<DatanodeDescriptor> results = getDatanodeListForReport(type);
+      DatanodeInfo[] arr = new DatanodeInfo[results.size()];
+      for (int i = 0; i < arr.length; i++) {
+        arr[i] = new DatanodeInfo(results.get(i));
+      }
+      return arr;
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Save namespace image.
+   * This will save current namespace into fsimage file and empty edits file.
+   * Requires superuser privilege and safe mode.
+   *
+   * @param force if true, then the namenode need not already be in safemode.
+   * @throws AccessControlException if superuser privilege is violated.
+   * @throws IOException            if
+   */
+  void saveNamespace(boolean force, boolean uncompressed) throws AccessControlException, IOException {
+    writeLock();
+    try {
+      checkSuperuserPrivilege();
+      if(!force && !isInSafeMode()) {
+        throw new IOException("Safe mode should be turned ON " +
+          "in order to create namespace image.");
+      }
+      getFSImage().saveNamespace(uncompressed);
+      LOG.info("New namespace image has been created.");
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   */
+  public void DFSNodesStatus(ArrayList<DatanodeDescriptor> live,
+                                          ArrayList<DatanodeDescriptor> dead) {
+    readLock();
+    try {
+      ArrayList<DatanodeDescriptor> results =
+        getDatanodeListForReport(DatanodeReportType.ALL);
+      for (Iterator<DatanodeDescriptor> it = results.iterator(); it.hasNext();) {
+        DatanodeDescriptor node = it.next();
+        if (isDatanodeDead(node)) {
+          dead.add(node);
+        } else {
+          live.add(node);
+        }
+      }
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Prints information about all datanodes.
+   */
+  private void datanodeDump(PrintWriter out) {
+    readLock();
+    try {
+      synchronized (datanodeMap) {
+        out.println("Metasave: Number of datanodes: " + datanodeMap.size());
+        for (Iterator<DatanodeDescriptor> it = datanodeMap.values().iterator(); it.hasNext();) {
+          DatanodeDescriptor node = it.next();
+          out.println(node.dumpDatanode());
+        }
+      }
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Start decommissioning the specified datanode.
+   */
+  private void startDecommission(DatanodeDescriptor node)
+    throws IOException {
+    if (!node.isDecommissionInProgress() && !node.isDecommissioned()) {
+      LOG.info("Start Decommissioning node " + node.getName() + " with " + 
+          node.numBlocks() +  " blocks.");
+      synchronized (heartbeats) {
+        updateStats(node, false);
+        node.startDecommission();
+        updateStats(node, true);
+      }
+      if (((Monitor) dnthread.getRunnable()).startDecommision(node)) {
+        node.setStartTime(now());
+      }
+    } else if (node.isDecommissionInProgress()) {
+      if (((Monitor) dnthread.getRunnable()).startDecommision(node)) {
+        node.setStartTime(now());
+      }
+    }
+  }
+  
+  /**
+   * Stop decommissioning the specified datanodes.
+   */
+  private void stopDecommission(DatanodeDescriptor node)
+    throws IOException {
+    if ((node.isDecommissionInProgress() &&
+      ((Monitor) dnthread.getRunnable()).stopDecommission(node)) ||
+      node.isDecommissioned()) {
+      LOG.info("Stop Decommissioning node " + node.getName());
+      synchronized (heartbeats) {
+        updateStats(node, false);
+        node.stopDecommission();
+        updateStats(node, true);
+      }
+    }
+  }
+
+  /**
+   */
+  public DatanodeInfo getDataNodeInfo(String name) {
+    return datanodeMap.get(name);
+  }
+
+  /**
+   * returns the namenode object that was used to initialize this namesystem
+   */
+  public NameNode getNameNode() {
+    return this.nameNode;
+  }
+
+  /**
+   * Whether or not we should fail on a txid mismatch.
+   */
+  public boolean failOnTxIdMismatch() {
+    return this.nameNode.failOnTxIdMismatch();
+  }
+
+  /**
+   * @deprecated use {@link NameNode#getNameNodeAddress()} instead.
+   */
+  @Deprecated
+  public InetSocketAddress getDFSNameNodeAddress() {
+    return nameNodeAddress;
+  }
+
+  /**
+   */
+  public Date getStartTime() {
+    return new Date(systemStart);
+  }
+
+  short getMaxReplication() {
+    return (short) maxReplication;
+  }
+
+  short getMinReplication() {
+    return (short) minReplication;
+  }
+
+  short getDefaultReplication() {
+    return (short) defaultReplication;
+  }
+
+  public void stallReplicationWork() {
+    stallReplicationWork = true;
+  }
+
+  public void restartReplicationWork() {
+    stallReplicationWork = false;
+  }
+
+  /**
+   * A immutable object that stores the number of live replicas and
+   * the number of decommissined Replicas.
+   */
+  static class NumberReplicas {
+    private int liveReplicas;
+    private int decommissionedReplicas;
+    private int corruptReplicas;
+    private int excessReplicas;
+
+    NumberReplicas() {
+      initialize(0, 0, 0, 0);
+    }
+
+    NumberReplicas(int live, int decommissioned, int corrupt, int excess) {
+      initialize(live, decommissioned, corrupt, excess);
+    }
+
+    void initialize(int live, int decommissioned, int corrupt, int excess) {
+      liveReplicas = live;
+      decommissionedReplicas = decommissioned;
+      corruptReplicas = corrupt;
+      excessReplicas = excess;
+    }
+
+    int liveReplicas() {
+      return liveReplicas;
+    }
+
+    int decommissionedReplicas() {
+      return decommissionedReplicas;
+    }
+
+    int corruptReplicas() {
+      return corruptReplicas;
+    }
+
+    int excessReplicas() {
+      return excessReplicas;
+    }
+    
+    int getTotal() {
+      return liveReplicas + decommissionedReplicas + 
+             corruptReplicas + excessReplicas;
+    }
+  }
+
+  /**
+   * Counts the number of nodes in the given list into active and
+   * decommissioned counters.
+   */
+  private NumberReplicas countNodes(Block b,
+                                    Iterator<DatanodeDescriptor> nodeIter) {
+    int count = 0;
+    int live = 0;
+    int corrupt = 0;
+    int excess = 0;
+    Collection<DatanodeDescriptor> nodesCorrupt = corruptReplicas.getNodes(b);
+    while (nodeIter.hasNext()) {
+      DatanodeDescriptor node = nodeIter.next();
+      if ((nodesCorrupt != null) && (nodesCorrupt.contains(node))) {
+        corrupt++;
+      } else if (node.isDecommissionInProgress() || node.isDecommissioned()) {
+        count++;
+      } else {
+        Collection<Block> blocksExcess =
+          excessReplicateMap.get(node.getStorageID());
+        if (blocksExcess != null && blocksExcess.contains(b)) {
+          excess++;
+        } else {
+          live++;
+        }
+      }
+    }
+    return new NumberReplicas(live, count, corrupt, excess);
+  }
+
+  /**
+   * Counts the number of live nodes in the given list
+   */
+  private int countLiveNodes(Block b, Iterator<DatanodeDescriptor> nodeIter) {
+    int live = 0;
+    Collection<DatanodeDescriptor> nodesCorrupt = null;
+    if (corruptReplicas.size() != 0) {
+      nodesCorrupt = corruptReplicas.getNodes(b);
+    }
+    while (nodeIter.hasNext()) {
+      DatanodeDescriptor node = nodeIter.next();
+      if (((nodesCorrupt != null) && (nodesCorrupt.contains(node))) ||
+        node.isDecommissionInProgress() || node.isDecommissioned()) {
+        // do nothing
+      } else {
+        live++;
+      }
+    }
+    return live;
+  }
+
+  /**
+   * Return the number of nodes that are live
+   */
+  int countLiveNodes(Block b) {
+    return countLiveNodes(b, blocksMap.nodeIterator(b));
+  }
+
+  /**
+   * Return the number of nodes that are live and decommissioned.
+   */
+  NumberReplicas countNodes(Block b) {
+    return countNodes(b, blocksMap.nodeIterator(b));
+  }
+
+  private void logBlockReplicationInfo(Block block, DatanodeDescriptor srcNode,
+                                       NumberReplicas num) {
+    int curReplicas = num.liveReplicas();
+    int curExpectedReplicas = getReplication(block);
+    INode fileINode = blocksMap.getINode(block);
+    Iterator<DatanodeDescriptor> nodeIter = blocksMap.nodeIterator(block);
+    StringBuffer nodeList = new StringBuffer();
+    while (nodeIter.hasNext()) {
+      DatanodeDescriptor node = nodeIter.next();
+      nodeList.append(node.name);
+      nodeList.append(" ");
+    }
+    FSNamesystem.LOG.info("Block: " + block + ", Expected Replicas: "
+      + curExpectedReplicas + ", live replicas: " + curReplicas
+      + ", corrupt replicas: " + num.corruptReplicas()
+      + ", decommissioned replicas: " + num.decommissionedReplicas()
+      + ", excess replicas: " + num.excessReplicas() + ", Is Open File: "
+      + fileINode.isUnderConstruction() + ", Datanodes having this block: "
+      + nodeList + ", Current Datanode: " + srcNode.name
+      + ", Is current datanode decommissioning: "
+      + srcNode.isDecommissionInProgress());
+  }
+
+  /**
+   * Check if a block on srcNode has reached its replication factor or not
+   *
+   *@param status decomission status to update; null means no update
+   * @param srcNode a datanode
+   * @param block   a block
+   * @param addToNeeded if the block needs to add to needReplication queue
+   * @return block if not addToNeeded and the block needes to added later
+   */
+  Block isReplicationInProgress(final DecommissioningStatus status,
+      final DatanodeDescriptor srcNode, final Block block,
+      boolean addToNeeded) {
+    INode fileINode = blocksMap.getINode(block);
+    if (fileINode == null) {
+      return null;
+    }
+    NumberReplicas num = countNodes(block);
+    int curReplicas = num.liveReplicas();
+    int curExpectedReplicas = getReplication(block);
+    if (curExpectedReplicas > curReplicas) {
+      if (status!= null) {
+        //Log info about one block for this node which needs replication
+        if (status.underReplicatedBlocks == 0) {
+          logBlockReplicationInfo(block, srcNode, num);
+        }
+        status.underReplicatedBlocks++;
+        if ((curReplicas == 0) && (num.decommissionedReplicas() > 0)) {
+          status.decommissionOnlyReplicas++;
+        }
+        if (fileINode.isUnderConstruction()) {
+          status.underReplicatedInOpenFiles++;
+        }
+      }
+      if (!neededReplications.contains(block) &&
+        pendingReplications.getNumReplicas(block) == 0) {
+        //
+        // These blocks have been reported from the datanode
+        // after the startDecommission method has been executed. These
+        // blocks were in flight when the decommissioning was started.
+        //
+        if (addToNeeded) {
+          neededReplications.add(block,
+              curReplicas,
+              num.decommissionedReplicas(),
+              curExpectedReplicas);
+        } else {
+          return block;
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Keeps track of which datanodes/ipaddress are allowed to connect to the namenode.
+   */
+  private boolean inHostsList(DatanodeID node, String ipAddr) {
+    Set<String> hostsList = hostsReader.getHosts();
+    return (hostsList.isEmpty() ||
+      (ipAddr != null && hostsList.contains(ipAddr)) ||
+      hostsList.contains(node.getHost()) ||
+      hostsList.contains(node.getName()) ||
+      ((node instanceof DatanodeInfo) && (
+        hostsList.contains(((DatanodeInfo) node).getHostName()) ||
+        hostsList.contains(((DatanodeInfo) node).getHostName() + ":" + node.getPort()))))
+      ;
+  }
+
+  public boolean inExcludedHostsList(DatanodeID node, String ipAddr) {
+    Set<String> excludeList = hostsReader.getExcludedHosts();
+    return ((ipAddr != null && excludeList.contains(ipAddr)) ||
+      excludeList.contains(node.getHost()) ||
+      excludeList.contains(node.getName()) ||
+      ((node instanceof DatanodeInfo) &&
+        excludeList.contains(((DatanodeInfo) node).getHostName())));
+  }
+
+  /**
+   * Rereads the config to get hosts and exclude list file names.
+   * Rereads the files to update the hosts and exclude lists.  It
+   * checks if any of the hosts have changed states:
+   * 1. Added to hosts  --> no further work needed here.
+   * 2. Removed from hosts --> mark AdminState as decommissioned.
+   * 3. Added to exclude --> start decommission.
+   * 4. Removed from exclude --> stop decommission.
+   */
+  public void refreshNodes(Configuration conf) throws IOException {
+    checkSuperuserPrivilege();
+    // Reread the config to get dfs.hosts and dfs.hosts.exclude filenames.
+    // Update the file names and refresh internal includes and excludes list
+    if (conf == null) {
+      conf = new Configuration();
+    }
+    hostsReader.updateFileNames(conf.get("dfs.hosts", ""),
+      conf.get("dfs.hosts.exclude", ""), true);
+    Set<String> includes = hostsReader.getNewIncludes();
+    Set<String> excludes = hostsReader.getNewExcludes();
+    Set<String> prevIncludes = hostsReader.getHosts();
+    Set<String> prevExcludes = hostsReader.getExcludedHosts();
+    // We need to syncrhonize on hostsReader here so that no thread reads from
+    // hostsReader between the two updates to hostsReader in this function.
+    synchronized (hostsReader) {
+      hostsReader.switchFiles(includes, excludes);
+      try {
+        replicator.hostsUpdated();
+      } catch (DefaultRackException e) {
+      // We want to update the includes and excludes files only if hostsUpdated,
+      // doesn't throw an exception. This avoids inconsitency between the
+      // replicator and the fnamesystem especially for
+      // BlockPlacementPolicyConfigurable.
+        hostsReader.switchFiles(prevIncludes, prevExcludes);
+        throw e;
+      }
+    }
+    writeLock();
+    try {
+      for (Iterator<DatanodeDescriptor> it = datanodeMap.values().iterator();
+           it.hasNext();) {
+        DatanodeDescriptor node = it.next();
+        // Check if not include.
+        if (!inHostsList(node, null)) {
+          node.setDisallowed(true);  // case 2.
+        } else {
+          if (inExcludedHostsList(node, null)) {
+            startDecommission(node);   // case 3.
+          } else {
+            stopDecommission(node);   // case 4.
+          }
+        }
+      }
+    } finally {
+      writeUnlock();
+    }
+
+  }
+
+  void finalizeUpgrade() throws IOException {
+    checkSuperuserPrivilege();
+    getFSImage().finalizeUpgrade();
+  }
+
+  /**
+   * Checks if the node is not on the hosts list.  If it is not, then
+   * it will be disallowed from registering.  
+   */
+  private boolean verifyNodeRegistration(DatanodeRegistration nodeReg, String ipAddr)
+    throws IOException {
+    assert (hasWriteLock());
+    return inHostsList(nodeReg, ipAddr);
+  }
+
+  /**
+   * Decommission the node if it is in exclude list.
+   */
+  private void checkDecommissioning(DatanodeDescriptor nodeReg, String ipAddr) 
+    throws IOException {
+    // If the registered node is in exclude list, then decommission it
+    if (inExcludedHostsList(nodeReg, ipAddr)) {
+      startDecommission(nodeReg);
+    }
+  }
+
+  /**
+   * Get data node by storage ID.
+   *
+   * @param nodeID
+   * @return DatanodeDescriptor or null if the node is not found.
+   * @throws IOException
+   */
+  public DatanodeDescriptor getDatanode(DatanodeID nodeID) throws IOException {
+    UnregisteredDatanodeException e = null;
+    DatanodeDescriptor node = datanodeMap.get(nodeID.getStorageID());
+    if (node == null) {
+      return null;
+    }
+    if (!node.getName().equals(nodeID.getName())) {
+      e = new UnregisteredDatanodeException(nodeID, node);
+      NameNode.stateChangeLog.fatal("BLOCK* NameSystem.getDatanode: "
+        + e.getLocalizedMessage());
+      throw e;
+    }
+    return node;
+  }
+
+  /**
+   * Stop at and return the datanode at index (used for content browsing)
+   */
+  @Deprecated
+  private DatanodeDescriptor getDatanodeByIndex(int index) {
+    int i = 0;
+    for (DatanodeDescriptor node : datanodeMap.values()) {
+      if (i == index) {
+        return node;
+      }
+      i++;
+    }
+    return null;
+  }
+
+  @Deprecated
+  public String randomDataNode() {
+    int size = datanodeMap.size();
+    int index = 0;
+    if (size != 0) {
+      index = r.nextInt(size);
+      for (int i = 0; i < size; i++) {
+        DatanodeDescriptor d = getDatanodeByIndex(index);
+        if (d != null && !d.isDecommissioned() && !isDatanodeDead(d) &&
+          !d.isDecommissionInProgress()) {
+          return d.getHost() + ":" + d.getInfoPort();
+        }
+        index = (index + 1) % size;
+      }
+    }
+    return null;
+  }
+
+  public DatanodeDescriptor getRandomDatanode() {
+    return replicator.chooseTarget("", 1, null,
+      new ArrayList<DatanodeDescriptor>(), 0)[0];
+  }
+
+  /**
+   * Current system time.
+   *
+   * @return current time in msec.
+   */
+  static long now() {
+    return System.currentTimeMillis();
+  }
+
+  boolean setSafeMode(SafeModeAction action) throws IOException {
+    if (action != SafeModeAction.SAFEMODE_GET) {
+      checkSuperuserPrivilege();
+      switch (action) {
+        case SAFEMODE_LEAVE: // leave safe mode
+          if (!manualOverrideSafeMode) {
+            leaveSafeMode(false);
+          } else {
+            LOG.warn("Leaving safemode is not allowed. " + manualOverrideSafeMode);
+          }
+          break;
+        case SAFEMODE_ENTER: // enter safe mode
+          enterSafeMode();
+          break;
+      }
+    }
+    return isInSafeMode();
+  }
+
+  /**
+   * Allow the ability to let an external API manually override exiting safemode
+   */
+  void setSafeModeManualOverride(boolean flag) {
+    this.manualOverrideSafeMode = flag;
+  }
+
+  /**
+   * Check whether the name node is in safe mode.
+   *
+   * @return true if safe mode is ON, false otherwise
+   */
+  public boolean isInSafeMode() {
+    readLock();
+    try {
+      return safeMode != null && safeMode.isOn();
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Check whether replication queues are populated.
+   */
+  boolean isPopulatingReplQueues() {
+    readLock();
+    try {
+      return (!isInSafeMode() || initializedReplQueues);
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Check whether the name node is in startup mode.
+   */
+  boolean isInStartupSafeMode() {
+    readLock();
+    try {
+      return safeMode != null && safeMode.isOn() && !safeMode.isManual();
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Increment number of blocks that reached minimal replication.
+   *
+   * @param replication current replication
+   * @param skipCheck if true the safemode will not be checked -
+   *        used for processing initial block reports to skip the 
+   *        check for every block - at the end checkSafeMode() must be called
+   */
+  void incrementSafeBlockCount(int replication, boolean skipCheck) {
+    if (safeMode != null && safeMode.isOn()) {
+      if ((int) replication == minReplication) {
+        this.blocksSafe++;
+        if(!skipCheck) {
+          safeMode.checkMode();
+        }
+      }
+    }
+  }
+  
+  /**
+   * Check the safemode. Used after processing a batch of blocks
+   * to avoid multiple check() calls.
+   */
+  void checkSafeMode() {
+    writeLock();
+    try {
+      if (safeMode != null && safeMode.isOn()) {
+        safeMode.checkMode();
+      }
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * This method is invoked just before removing a block from the
+   * {@link #blocksMap}. It is used to correctly update the safe block count
+   * when a block is removed from the {@link #blocksMap}. If the current
+   * replication for the block is greater than {@link #minReplication} this
+   * means that the safe block count has not already been decremented for this
+   * block and hence we should decrement the safe block count.
+   * 
+   * @param b
+   *          the block that has to be removed.
+   */
+  void decrementSafeBlockCountForBlockRemoval(Block b) {
+    if (safeMode != null && safeMode.isOn()) {
+      int replication = (short) countNodes(b).liveReplicas();
+      if (replication >= minReplication) {
+        this.blocksSafe--;
+        safeMode.checkMode();
+      }
+    }
+  }
+
+  /**
+   * Decrement number of blocks that reached minimal replication.
+   */
+  void decrementSafeBlockCount(Block b) {
+    if (safeMode != null && safeMode.isOn()) {
+      int replication = (short) countNodes(b).liveReplicas();
+      if (replication == minReplication - 1) {
+        this.blocksSafe--;
+        safeMode.checkMode();
+      }
+    }
+  }
+
+  /**
+   * Retrieve the total number of safe blocks in the file system.
+   * 
+   * @return a long denoting the total number of safe blocks
+   */
+  public long getSafeBlocks() {
+    return this.blocksSafe;
+  }
+
+  public SafeModeInfo getSafeModeInstance() {
+    return this.safeMode;
+  }
+
+  /**
+   * Ratio of the number of safe blocks to the total number of blocks.
+   */
+  public double getSafeBlockRatio() {
+    long blockTotal = getBlocksTotal();
+    return (blockTotal == this.blocksSafe ? 1 : (double) this.blocksSafe
+        / (double) blockTotal);
+  }
+
+  /**
+   * Get the total number of blocks in the system.
+   */
+  public long getBlocksTotal() {
+    return blocksMap.size();
+  }
+
+  /**
+   * Enter safe mode manually.
+   *
+   * @throws IOException
+   */
+  void enterSafeMode() throws IOException {
+    writeLock();
+    try {
+      // Ensure that any concurrent operations have been fully synced
+      // before entering safe mode. This ensures that the FSImage
+      // is entirely stable on disk as soon as we're in safe mode.
+      getEditLog().logSyncAll();
+      if (!isInSafeMode()) {
+        safeMode = SafeModeUtil.getInstance(this);
+        safeMode.setManual();
+        return;
+      }
+      safeMode.setManual();
+      getEditLog().logSyncAll();
+      NameNode.stateChangeLog.info("STATE* Safe mode is ON. "
+        + safeMode.getTurnOffTip());
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * Leave safe mode.
+   *
+   * @throws IOException
+   */
+  void leaveSafeMode(boolean checkForUpgrades) throws SafeModeException {
+    writeLock();
+    try {
+      if (!isInSafeMode()) {
+        NameNode.stateChangeLog.info("STATE* Safe mode is already OFF.");
+        return;
+      }
+      if (getDistributedUpgradeState()) {
+        throw new SafeModeException("Distributed upgrade is in progress",
+          safeMode);
+      }
+      safeMode.leave(checkForUpgrades);
+      safeMode = null;
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  String getSafeModeTip() {
+    if (!isInSafeMode()) {
+      return "";
+    }
+    return safeMode.getTurnOffTip();
+  }
+
+  /**
+   * @return The most recent transaction ID that has been synced to
+   * persistent storage.
+   * @throws IOException
+   */
+  public long getTransactionID() throws IOException {
+    return getEditLog().getLastSyncedTxId();
+  }
+
+  CheckpointSignature rollEditLog() throws IOException {
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Checkpoint not created",
+          safeMode);
+      }
+      LOG.info("Roll Edit Log from " + Server.getRemoteAddress() +
+        " starting stransaction id " + getFSImage().getEditLog().getCurSegmentTxId() +
+        " ending transaction id: " + (getFSImage().getEditLog().getLastWrittenTxId() + 1));
+      return getFSImage().rollEditLog();
+    } finally {
+      writeUnlock();
+    }
+  }
+  
+  CheckpointSignature getCheckpointSignature() throws IOException {
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException(
+            "Safemode is ON. Cannot obtain checkpoint signature", safeMode);
+      }
+      return new CheckpointSignature(getFSImage());
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  /**
+   * @param newImageSignature the signature of the new image
+   */
+  void rollFSImage(CheckpointSignature newImageSignature) throws IOException {
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Checkpoint not created",
+          safeMode);
+      }
+      LOG.info("Roll FSImage from " + Server.getRemoteAddress());
+      getFSImage().rollFSImage(newImageSignature);
+    } finally {
+      writeUnlock();
+    }
+    // Now that we have a new checkpoint, we might be able to
+    // remove some old ones.          
+    getFSImage().purgeOldStorage();
+  }
+
+  /**
+   * Returns whether the given block is one pointed-to by a file.
+   */
+  private boolean isValidBlock(Block b) {
+    return (blocksMap.getINode(b) != null);
+  }
+
+  // Distributed upgrade manager
+  final UpgradeManagerNamenode upgradeManager = new UpgradeManagerNamenode(this);
+
+  UpgradeStatusReport distributedUpgradeProgress(UpgradeAction action
+  ) throws IOException {
+    return upgradeManager.distributedUpgradeProgress(action);
+  }
+
+  UpgradeCommand processDistributedUpgradeCommand(UpgradeCommand comm)
+    throws IOException {
+    return upgradeManager.processUpgradeCommand(comm);
+  }
+
+  int getDistributedUpgradeVersion() {
+    return upgradeManager.getUpgradeVersion();
+  }
+
+  UpgradeCommand getDistributedUpgradeCommand() throws IOException {
+    return upgradeManager.getBroadcastCommand();
+  }
+
+  boolean getDistributedUpgradeState() {
+    return upgradeManager.getUpgradeState();
+  }
+
+  short getDistributedUpgradeStatus() {
+    return upgradeManager.getUpgradeStatus();
+  }
+
+  boolean startDistributedUpgradeIfNeeded() throws IOException {
+    return upgradeManager.startUpgrade();
+  }
+
+  PermissionStatus createFsOwnerPermissions(FsPermission permission) {
+    return new PermissionStatus(fsOwner.getUserName(), supergroup, permission);
+  }
+
+  private FSPermissionChecker checkOwner(String path, INode[] inodes)
+    throws AccessControlException {
+    return checkPermission(path, inodes, true, null, null, null, null);
+  }
+
+  private FSPermissionChecker checkPathAccess(String path, INode[] inodes, FsAction access
+  ) throws AccessControlException {
+    return checkPermission(path, inodes, false, null, null, access, null);
+  }
+
+  private FSPermissionChecker checkParentAccess(String path, INode[] inodes, FsAction access
+  ) throws AccessControlException {
+    return checkPermission(path, inodes, false, null, access, null, null);
+  }
+
+  private FSPermissionChecker checkAncestorAccess(String path, INode[] inodes, FsAction access
+  ) throws AccessControlException {
+    return checkPermission(path, inodes, false, access, null, null, null);
+  }
+
+  private FSPermissionChecker checkTraverse(String path, INode[] inodes
+  ) throws AccessControlException {
+    return checkPermission(path, inodes, false, null, null, null, null);
+  }
+
+  private void checkSuperuserPrivilege() throws AccessControlException {
+    if (isPermissionEnabled) {
+      try {
+        PermissionChecker.checkSuperuserPrivilege(fsOwner, supergroup);
+      } catch (AccessControlException e) {
+        if (this.permissionAuditOnly) {
+          // do not throw the exception, we would like to only log.
+          LOG.warn("PermissionAudit superuser failed for user: " + fsOwner +
+            " group:" + supergroup);
+        } else {
+          throw e;
+        }
+      }
+    }
+  }
+
+  /**
+   * Check whether current user have permissions to access the path.
+   * For more details of the parameters, see
+   * {@link FSPermissionChecker#checkPermission(String, INodeDirectory, boolean, FsAction, FsAction, FsAction, FsAction)}.
+   */
+  private FSPermissionChecker checkPermission(String path, INode[] inodes, boolean doCheckOwner,
+                                              FsAction ancestorAccess, FsAction parentAccess, FsAction access,
+                                              FsAction subAccess)
+    throws AccessControlException {
+    boolean permissionCheckFailed = false;
+    FSPermissionChecker pc = new FSPermissionChecker(
+      fsOwner.getUserName(), supergroup);
+    if (!pc.isSuper) {
+      dir.waitForReady();
+      readLock();
+      try {
+        pc.checkPermission(path, inodes, doCheckOwner,
+          ancestorAccess, parentAccess, access, subAccess);
+      } catch (AccessControlException e) {
+        if (!this.permissionAuditOnly) {
+          throw e;
+        }
+        permissionCheckFailed = true;
+      } finally {
+        readUnlock();
+      }
+    }
+    if (permissionCheckFailed) {
+      // do not throw the exception, we would like to only log.
+      LOG.warn("PermissionAudit failed on " + path +
+        " checkOwner:" + doCheckOwner +
+        " ancestor:" + ancestorAccess +
+        " parent:" + parentAccess +
+        " access:" + access +
+        " subaccess:" + subAccess);
+    }
+    return pc;
+  }
+
+  /**
+   * Check to see if we have exceeded the limit on the number
+   * of inodes.
+   */
+  void checkFsObjectLimit() throws IOException {
+    if (maxFsObjects != 0 &&
+      maxFsObjects <= dir.totalInodes() + getBlocksTotal()) {
+      throw new IOException("Exceeded the configured number of objects " +
+        maxFsObjects + " in the filesystem.");
+    }
+  }
+
+  /**
+   * Get the total number of objects in the system.
+   */
+  long getMaxObjects() {
+    return maxFsObjects;
+  }
+
+  public long getFilesAndDirectoriesTotal() {
+    return this.dir.totalInodes();
+  }
+
+  public long getDiskSpaceTotal() {
+    return this.dir.totalDiskSpace();
+  }
+  
+  public long getPendingReplicationBlocks() {
+    return pendingReplicationBlocksCount;
+  }
+
+  public long getUnderReplicatedBlocks() {
+    return underReplicatedBlocksCount;
+  }
+
+  /**
+   * Return number of under-replicatedBlocks excluding missing/corrupt blocks
+   */
+  public long getNonCorruptUnderReplicatedBlocks() {
+    return neededReplications.getNonCorruptUnderReplicatedBlocksCount();
+  }
+
+  /**
+   * Returns number of blocks with corrupt replicas
+   */
+  public long getCorruptReplicaBlocks() {
+    return corruptReplicaBlocksCount;
+  }
+
+  public long getScheduledReplicationBlocks() {
+    return scheduledReplicationBlocksCount;
+  }
+
+  public long getPendingDeletionBlocks() {
+    return pendingDeletionBlocksCount;
+  }
+
+  public long getExcessBlocks() {
+    return excessBlocksCount;
+  }
+
+  public int getBlockCapacity() {
+    readLock();
+    try {
+      return blocksMap.getCapacity();
+    } finally {
+      readUnlock();
+    }
+  }
+
+  public long getNumInvalidFilePathOperations() {
+    return numInvalidFilePathOperations;
+  }
+
+  public String getFSState() {
+    return isInSafeMode() ? "safeMode" : "Operational";
+  }
+
+  private ObjectName mbeanName;
+  private ObjectName versionBeanName;
+  private ObjectName namenodeMXBeanName;
+
+  /**
+   * Register the FSNamesystem MBean using the name
+   * "hadoop:service=NameNode,name=FSNamesystemState"
+   */
+  void registerMBean(Configuration conf) {
+    // We wrap to bypass standard mbean naming convention.
+    // This wraping can be removed in java 6 as it is more flexible in
+    // package naming for mbeans and their impl.
+    StandardMBean bean;
+    try {
+      versionBeanName = VersionInfo.registerJMX("NameNode");
+      myFSMetrics = new FSNamesystemMetrics(conf, this);
+      bean = new StandardMBean(this, FSNamesystemMBean.class);
+      mbeanName = MBeanUtil.registerMBean("NameNode", "FSNamesystemState", bean);
+    } catch (NotCompliantMBeanException e) {
+      e.printStackTrace();
+    }
+
+    LOG.info("Registered FSNamesystemStatusMBean");
+  }
+
+  /**
+   * get FSNamesystemMetrics
+   */
+  final public FSNamesystemMetrics getFSNamesystemMetrics() {
+    return myFSMetrics;
+  }
+
+  /**
+   * shutdown FSNamesystem
+   */
+  public void shutdown() {
+    if (mbeanName != null) {
+      MBeanUtil.unregisterMBean(mbeanName);
+    }
+    if (versionBeanName != null) {
+      MBeanUtil.unregisterMBean(versionBeanName);
+    }
+    if (namenodeMXBeanName != null) {
+      MBeanUtil.unregisterMBean(namenodeMXBeanName);
+    }
+  }
+
+
+  /**
+   * Number of live data nodes
+   *
+   * @return Number of live data nodes
+   */
+  public int getNumLiveDataNodes() {
+    return getDatanodeListForReport(DatanodeReportType.LIVE).size();
+  }
+
+
+  /**
+   * Number of dead data nodes
+   *
+   * @return Number of dead data nodes
+   */
+  public int getNumDeadDataNodes() {
+    return getDatanodeListForReport(DatanodeReportType.DEAD).size();
+  }
+
+  /**
+   * Sets the generation stamp for this filesystem
+   */
+  public void setGenerationStamp(long stamp) {
+    generationStamp.setStamp(stamp);
+  }
+
+  /**
+   * Gets the generation stamp for this filesystem
+   */
+  public long getGenerationStamp() {
+    return generationStamp.getStamp();
+  }
+
+  /**
+   * Increments, logs and then returns the stamp. This is used only for testing.
+   */
+  public long nextGenerationStampForTesting() {
+    return nextGenerationStamp();
+  }
+
+  /**
+   * Increments, logs and then returns the stamp
+   */
+  private long nextGenerationStamp() {
+    long gs = generationStamp.nextStamp();
+    getEditLog().logGenerationStamp(gs);
+    return gs;
+  }
+
+  /**
+   * Verifies that the block is associated with a file that has a lease.
+   * Increments, logs and then returns the stamp
+   *
+   * @param block block
+   * @param fromNN if it is for lease recovery initiated by NameNode
+   * @return a new generation stamp
+   */
+  public long nextGenerationStampForBlock(Block block, boolean fromNN) throws IOException {
+    writeLock();
+    try {
+      if (isInSafeMode()) {
+        throw new SafeModeException("Cannot get nextGenStamp for " + block, safeMode);
+      }
+      Block blockWithWildcardGenstamp = new Block(block.getBlockId());
+      BlockInfo storedBlock = blocksMap.getStoredBlock(blockWithWildcardGenstamp);
+      if (storedBlock == null) {
+        String msg = block + " is already commited, storedBlock == null.";
+        LOG.info(msg);
+        throw new BlockAlreadyCommittedException(msg);
+      }
+      INodeFile fileINode = storedBlock.getINode();
+      if (!fileINode.isUnderConstruction()) {
+        String msg = block + " is already commited, !fileINode.isUnderConstruction().";
+        LOG.info(msg);
+        throw new BlockAlreadyCommittedException(msg);
+      }
+      // Disallow client-initiated recovery once
+      // NameNode initiated lease recovery starts
+      if (!fromNN && HdfsConstants.NN_RECOVERY_LEASEHOLDER.equals(
+          leaseManager.getLeaseByPath(fileINode.getFullPathName()).getHolder())) {
+        String msg = block +
+          "is being recovered by NameNode, ignoring the request from a client";
+        LOG.info(msg);
+        throw new IOException(msg);
+      }
+      if (!((INodeFileUnderConstruction) fileINode).setLastRecoveryTime(now())) {
+        String msg = block + " is being recovered, ignoring this request.";
+        LOG.info(msg);
+        throw new IOException(msg);
+      }
+      return nextGenerationStamp();
+    } finally {
+      writeUnlock();
+    }
+  }
+
+  // rename was successful. If any part of the renamed subtree had
+  // files that were being written to, update with new filename.
+  //
+
+  void changeLease(String src, String dst, HdfsFileStatus dinfo)
+    throws IOException {
+    String overwrite;
+    String replaceBy;
+
+    boolean destinationExisted = true;
+    if (dinfo == null) {
+      destinationExisted = false;
+    }
+
+    if (destinationExisted && dinfo.isDir()) {
+      Path spath = new Path(src);
+      String srcParent = spath.getParent().toString();
+      overwrite = Path.SEPARATOR.equals(srcParent) ? srcParent 
+                                                   : srcParent + Path.SEPARATOR;
+      replaceBy = dst + Path.SEPARATOR;
+    } else {
+      overwrite = src;
+      replaceBy = dst;
+    }
+
+    leaseManager.changeLease(src, dst, overwrite, replaceBy);
+  }
+
+  /**
+   * Serializes leases.
+   */
+  void saveFilesUnderConstruction(SaveNamespaceContext ctx, DataOutputStream out) throws IOException {
+    synchronized (leaseManager) {
+      out.writeInt(leaseManager.countPath()); // write the size
+
+      LightWeightLinkedSet<Lease> sortedLeases = leaseManager.getSortedLeases();
+      Iterator<Lease> itr = sortedLeases.iterator();
+      while (itr.hasNext()) {
+        ctx.checkCancelled();
+        Lease lease = itr.next();
+        for (String path : lease.getPaths()) {
+          // verify that path exists in namespace
+          INode node = dir.getFileINode(path);
+          if (node == null) {
+            throw new IOException("saveLeases found path " + path +
+              " but no matching entry in namespace.");
+          }
+          if (!node.isUnderConstruction()) {
+            throw new IOException("saveLeases found path " + path +
+              " but is not under construction.");
+          }
+          INodeFileUnderConstruction cons = (INodeFileUnderConstruction) node;
+          FSImageSerialization.writeINodeUnderConstruction(out, cons, path);
+        }
+      }
+    }
+  }
+
+  /*
+   * @return list of datanodes where decommissioning is in progress 
+   */
+  public ArrayList<DatanodeDescriptor> getDecommissioningNodes() {
+    readLock();
+    try {
+      ArrayList<DatanodeDescriptor> decommissioningNodes = new ArrayList<DatanodeDescriptor>();
+      ArrayList<DatanodeDescriptor> results = getDatanodeListForReport(DatanodeReportType.LIVE);
+      for (Iterator<DatanodeDescriptor> it = results.iterator(); it.hasNext();) {
+        DatanodeDescriptor node = it.next();
+        if (node.isDecommissionInProgress()) {
+          decommissioningNodes.add(node);
+        }
+      }
+      return decommissioningNodes;
+    } finally {
+      readUnlock();
+    }
+  }
+
+  /**
+   * Return an iterator over the set of blocks for which there are no replicas.
+   */
+  BlockIterator getCorruptReplicaBlockIterator() {
+    return neededReplications
+      .iterator(UnderReplicatedBlocks.QUEUE_WITH_CORRUPT_BLOCKS);
+  }
+
+  public static class CorruptFileBlockInfo {
+    String path;
+    Block block;
+
+    public CorruptFileBlockInfo(String p, Block b) {
+      path = p;
+      block = b;
+    }
+
+    public String toString() {
+      return block.getBlockName() + "\t" + path;
+    }
+
+    public String getPath() {
+      return path;
+    }
+  }
+  
+  /**
+   * @return Minutes in upgrade time
+   */
+  public int getUpgradeTime() {
+    if (0 == upgradeStartTime) {
+      return 0;
+    }
+
+    long curTime = now();
+    if (curTime <= upgradeStartTime) {
+      return 0;
+    }
+
+    return (int) ((curTime - upgradeStartTime) / (1000 * 60));
+  }
+
+  public void setUpgradeStartTime(final long startTime) {
+    upgradeStartTime = startTime;
+  }
+
+  /**
+   * @param path Restrict corrupt files to this portion of namespace.
+   * @param startBlockAfter Support for continuation; the set of files we return
+   *  back is ordered by blockid; startBlockAfter tells where to start from
+   * @return a list in which each entry describes a corrupt file/block
+   * @throws AccessControlException
+   * @throws IOException
+   */
+  Collection<CorruptFileBlockInfo>
+    listCorruptFileBlocks(String path,
+                          String[] cookieTab)
+    throws IOException {
+    return listCorruptFileBlocks(path, cookieTab, false);
+  }
+
+  /**
+   * @param path Restrict corrupt files to this portion of namespace.
+   * @param startBlockAfter Support for continuation; the set of files we return
+   *  back is ordered by blockid; startBlockAfter tells where to start from
+   * @param decommissioningOnly if set the blocks returned will be the ones that
+   *  only have replicas on the nodes that are being decommissioned
+   * @return a list in which each entry describes a corrupt file/block
+   * @throws AccessControlException
+   * @throws IOException
+   */
+  Collection<CorruptFileBlockInfo>
+    listCorruptFileBlocks(String path,
+                          String[] cookieTab,
+                          boolean decommissioningOnly) 
+    throws IOException {
+    readLock();
+    synchronized (neededReplications) {
+      try {
+        if (!isPopulatingReplQueues()) {
+          throw new IOException("Cannot run listCorruptFileBlocks because "
+              + "replication queues have not been initialized.");
+        }
+
+        checkSuperuserPrivilege();
+        // print a limited # of corrupt files per call
+        int count = 0;
+        ArrayList<CorruptFileBlockInfo> corruptFiles = 
+          new ArrayList<CorruptFileBlockInfo>();
+
+        BlockIterator blkIterator = null;
+        if (decommissioningOnly) {
+          blkIterator = neededReplications.iterator(0);
+        } else {
+          blkIterator = getCorruptReplicaBlockIterator();
+        }
+        
+        if (cookieTab == null) {
+          cookieTab = new String[] { null };
+        }
+        int skip = getIntCookie(cookieTab[0]);
+        for(int i = 0; i < skip && blkIterator.hasNext(); i++) {
+          blkIterator.next();
+        }
+        
+        while (blkIterator.hasNext()) {
+          Block blk = blkIterator.next();
+          INode inode = blocksMap.getINode(blk);
+          skip++;
+          if (inode != null) {
+            String src = FSDirectory.getFullPathName(inode);
+            if (src.startsWith(path)) {
+              NumberReplicas num = countNodes(blk);
+              if (num.liveReplicas == 0) {
+                if (decommissioningOnly && num.decommissionedReplicas > 0 ||
+                    !decommissioningOnly && num.decommissionedReplicas == 0) {
+                  corruptFiles.add(new CorruptFileBlockInfo(src, blk));
+                  count++;
+                  if (count >= maxCorruptFilesReturned)
+                    break;
+                }
+              }
+            }
+          }
+        }
+        cookieTab[0] = String.valueOf(skip);
+        LOG.info("list corrupt file blocks under " + path  + ": " + count);
+        return corruptFiles;
+      } finally {
+        readUnlock();
+      }
+    }
+  }
+  
+  public static int getIntCookie(String cookie){
+    int c;
+    if(cookie == null){
+      c = 0;
+    } else {
+      try{
+        c = Integer.parseInt(cookie);
+      }catch (NumberFormatException e) {
+        c = 0;
+      }
+    }
+    c = Math.max(0, c);
+    return c;
+  }
+
+  void setPersistBlocks(boolean persistBlocks) {
+    this.persistBlocks = persistBlocks;
+  }
+
+  boolean getPersistBlocks() {
+    return persistBlocks;
+  }
+
+  void setPermissionAuditLog(boolean permissionAuditOnly) {
+    this.permissionAuditOnly = permissionAuditOnly;
+  }
+
+  boolean getPermissionAuditLog() {
+    return permissionAuditOnly;
+  }
+
+  /**
+   * for debugging
+   */
+  String getBlockPlacementPolicyClassName() {
+    String name = replicator.getClass().getCanonicalName();
+    return name;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void reconfigurePropertyImpl(String property, String newVal)
+    throws ReconfigurationException {
+    if (property.equals("dfs.block.replicator.classname")) {
+      try {
+        writeLock();
+        Configuration replConf = new Configuration(getConf());
+        if (newVal == null) {
+          replConf.unset(property);
+        } else {
+          replConf.set(property, newVal);
+        }
+        replicator =
+          BlockPlacementPolicy.getInstance(replConf, this, clusterMap,
+                               hostsReader, dnsToSwitchMapping, this);
+      } finally {
+        writeUnlock();
+      }
+      LOG.info("RECONFIGURE* changed block placement policy to " +
+               getBlockPlacementPolicyClassName());
+    } else if (property.equals("dfs.persist.blocks")) {
+      try {
+        writeLock();
+        if (newVal == null) {
+          // set to default
+          setPersistBlocks(false);
+        } else if (newVal.equals("true")) {
+          setPersistBlocks(true);
+        } else if (newVal.equals("false")) {
+          setPersistBlocks(false);
+        } else {
+          throw new ReconfigurationException(property, newVal,
+                                             getConf().get(property));
+        }
+        LOG.info("RECONFIGURE* changed persist blocks to " +
+                 getPersistBlocks());
+      } finally {
+        writeUnlock();
+      }
+    } else if (property.equals("dfs.permissions.audit.log")) {
+      try {
+        writeLock();
+        if (newVal == null) {
+          // set to default
+          setPermissionAuditLog(false);
+        } else if (newVal.equals("true")) {
+          setPermissionAuditLog(true);
+        } else if (newVal.equals("false")) {
+          setPermissionAuditLog(false);
+        } else {
+          throw new ReconfigurationException(property, newVal,
+                                             getConf().get(property));
+        }
+        LOG.info("RECONFIGURE* changed permission audit log to " +
+                 getPermissionAuditLog());
+      } finally {
+        writeUnlock();
+      }
+    } else if (property.equals("dfs.heartbeat.interval")) {
+      writeLock();
+      try {
+        if (newVal == null) {
+          // set to default
+          setHeartbeatInterval(3L * 1000L, this.heartbeatRecheckInterval);
+        } else {
+          setHeartbeatInterval(Long.valueOf(newVal) * 1000L,
+                               this.heartbeatRecheckInterval);
+        }
+      } catch (NumberFormatException e) {
+        throw new ReconfigurationException(property, newVal,
+                                           getConf().get(property));
+      } finally {
+        writeUnlock();
+      }
+      LOG.info("RECONFIGURE* changed heartbeatInterval to " +
+               this.heartbeatInterval);
+    } else if (property.equals("heartbeat.recheck.interval")) {
+      try {
+        writeLock();
+        if (newVal == null) {
+          // set to default
+          setHeartbeatInterval(this.heartbeatInterval, 5 * 60 * 1000);
+        } else {
+          setHeartbeatInterval(this.heartbeatInterval, Integer.valueOf(newVal));
+        }
+      } catch (NumberFormatException e) {
+        throw new ReconfigurationException(property, newVal,
+                                           getConf().get(property));
+      } finally {
+        writeUnlock();
+      }
+      LOG.info("RECONFIGURE* changed heartbeatRecheckInterval to " +
+               this.heartbeatRecheckInterval);
+    } else if (property.equals("dfs.access.time.precision")) {
+      try {
+        writeLock();
+        if (newVal == null) {
+          this.accessTimePrecision = 3600L;
+        } else {
+          this.accessTimePrecision = Long.parseLong(newVal);
+        }
+      } catch  (NumberFormatException e) {
+        throw new ReconfigurationException(property, newVal,
+            getConf().get(property));
+      } finally {
+        writeUnlock();
+      }
+      LOG.info("RECONFIGURE* changed access time precision to " +
+          this.accessTimePrecision);
+    } else if (property.equals("dfs.close.replication.min")) {
+      try {
+        writeLock();
+        if (newVal == null) {
+          this.minCloseReplication = this.minReplication;
+        } else {
+          int newCloseMinReplication = Integer.parseInt(newVal);
+          if (newCloseMinReplication < minReplication ||
+              newCloseMinReplication > maxReplication) {
+            throw new ReconfigurationException(
+                property, newVal, getConf().get(property));
+          }
+        }
+      } catch (NumberFormatException e) {
+        throw new ReconfigurationException(property, newVal,
+            getConf().get(property));
+      } finally {
+        writeUnlock();
+      }
+      LOG.info("RECONFIGURE* changed new close min replication to " +
+          this.minCloseReplication);
+    } else if (property.equals("dfs.max-repl-streams")) {
+      try {
+        writeLock();
+        if (newVal == null) {
+          this.maxReplicationStreams = 2;
+        } else {
+          this.maxReplicationStreams = Integer.parseInt(newVal);
+        }
+      } catch (NumberFormatException e) {
+        throw new ReconfigurationException(property, newVal,
+            getConf().get(property));
+      } finally {
+        writeUnlock();
+      }
+      LOG.info("RECONFIGURE* changed max replication streams to " +
+          this.maxReplicationStreams);
+    } else if (property.equals("dfs.replication.iteration.multiplier")) {
+      try {
+        writeLock();
+        if (newVal == null) {
+          this.replicationWorkMultiplier =
+              UnderReplicationMonitor.REPLICATION_WORK_MULTIPLIER_PER_ITERATION;
+        } else {
+          this.replicationWorkMultiplier = Float.parseFloat(newVal);
+        }
+      } catch (NumberFormatException e) {
+        throw new ReconfigurationException(property, newVal,
+            getConf().get(property));
+      } finally {
+        writeUnlock();
+      }
+      LOG.info("RECONFIGURE* changed replication work multiplier to " +
+          this.replicationWorkMultiplier);
+    } else {
+      throw new ReconfigurationException(property, newVal,
+                                         getConf().get(property));
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public List<String> getReconfigurableProperties() {
+    ArrayList<String> propertyList = new ArrayList<String>();
+    propertyList.add("dfs.block.replicator.classname");
+    propertyList.add("dfs.persist.blocks");
+    propertyList.add("dfs.permissions.audit.log");
+    propertyList.add("dfs.heartbeat.interval");
+    propertyList.add("heartbeat.recheck.interval");
+    propertyList.add("dfs.access.time.precision");
+    propertyList.add("dfs.close.replication.min");
+    propertyList.add("dfs.max-repl-streams");
+    propertyList.add("dfs.replication.iteration.multiplier");
+    return propertyList;
+  }
+
+  private static class ReplicationWork {
+
+    private Block block;
+    private long blockSize;
+    private INodeFile fileINode;
+
+    private int numOfReplicas;
+    private DatanodeDescriptor srcNode;
+    private List<DatanodeDescriptor> containingNodes;
+
+    private DatanodeDescriptor targets[];
+    private int priority;
+
+    public ReplicationWork(Block block,
+                            INodeFile fileINode,
+                            int numOfReplicas,
+                            DatanodeDescriptor srcNode,
+                            List<DatanodeDescriptor> containingNodes,
+                            int priority){
+      this.block = block;
+      this.blockSize = block.getNumBytes();
+      this.fileINode = fileINode;
+      this.numOfReplicas = numOfReplicas;
+      this.srcNode = srcNode;
+      this.containingNodes = containingNodes;
+      this.priority = priority;
+
+      this.targets = null;
+    }
+  }
+  /**
+   * Register NameNodeMXBean
+   */
+  private void registerMXBean() {
+    this.namenodeMXBeanName = MBeanUtil.registerMBean("NameNode", "NameNodeInfo", this);
+  }
+
+  /**
+   * Class representing Namenode information for JMX interfaces
+   */
+  @Override // NameNodeMXBean
+  public String getVersion() {
+    return VersionInfo.getVersion();
+  }
+
+  @Override // NameNodeMXBean
+  public long getUsed() {
+    return this.getCapacityUsed();
+  }
+
+  @Override // NameNodeMXBean
+  public long getFree() {
+    return this.getCapacityRemaining();
+  }
+
+  @Override // NameNodeMXBean
+  public long getTotal() {
+    return this.getCapacityTotal();
+  }
+
+  @Override // NameNodeMXBean
+  public String getSafemode() {
+    if (!this.isInSafeMode())
+      return "";
+    return "Safe mode is ON." + this.getSafeModeTip();
+  }
+
+  @Override // NameNodeMXBean
+  public boolean isUpgradeFinalized() {
+    return this.getFSImage().isUpgradeFinalized();
+  }
+
+  @Override // NameNodeMXBean
+  public long getNonDfsUsedSpace() {
+    return getCapacityUsedNonDFS();
+  }
+
+  @Override // NameNodeMXBean
+  public float getPercentUsed() {
+    return getCapacityUsedPercent();
+  }
+
+  @Override // NameNodeMXBean
+  public long getNamespaceUsed() {
+    return this.getCapacityNamespaceUsed();
+  }
+
+  @Override // NameNodeMXBean
+  public float getPercentNamespaceUsed() {
+    return this.getCapacityNamespaceUsedPercent();
+  }
+
+  @Override // NameNodeMXBean
+  public float getPercentRemaining() {
+    return getCapacityRemainingPercent();
+  }
+
+  @Override // NameNodeMXBean
+  public long getTotalBlocks() {
+    return getBlocksTotal();
+  }
+
+  @Override // NameNodeMXBean
+  public long getTotalFilesAndDirectories() {
+    return getFilesAndDirectoriesTotal();
+  }
+
+  @Override // NameNodeMXBean
+  public long getNumberOfMissingBlocks() {
+    return getMissingBlocksCount();
+  }
+  
+  @Override // NameNodeMXBean
+  public int getThreads() {
+    return ManagementFactory.getThreadMXBean().getThreadCount();
+  }
+
+  /**
+   * Returned information is a JSON representation of map with host name as the
+   * key and value is a map of live node attribute keys to its values
+   */
+  @Override // NameNodeMXBean
+  public String getLiveNodes() {
+    final Map<String, Map<String,Object>> info = 
+      new HashMap<String, Map<String,Object>>();
+    final ArrayList<DatanodeDescriptor> liveNodeList = 
+      new ArrayList<DatanodeDescriptor>();
+    final ArrayList<DatanodeDescriptor> deadNodeList =
+      new ArrayList<DatanodeDescriptor>();
+    DFSNodesStatus(liveNodeList, deadNodeList);
+    removeDecommissionedNodeFromList(liveNodeList);
+    for (DatanodeDescriptor node : liveNodeList) {
+      final Map<String, Object> innerinfo = new HashMap<String, Object>();
+      innerinfo.put("lastContact", getLastContact(node));
+      innerinfo.put("usedSpace", getDfsUsed(node));
+      innerinfo.put("adminState", node.getAdminState().toString());
+      innerinfo.put("excluded", this.inExcludedHostsList(node, null));
+      info.put(node.getHostName() + ":" + node.getPort(), innerinfo);
+    }
+    return JSON.toString(info);
+  }
+
+  /**
+   * Returned information is a JSON representation of map with host name as the
+   * key and value is a map of dead node attribute keys to its values
+   */
+  @Override // NameNodeMXBean
+  public String getDeadNodes() {
+    final Map<String, Map<String, Object>> info = 
+      new HashMap<String, Map<String, Object>>();
+    final ArrayList<DatanodeDescriptor> liveNodeList =
+    new ArrayList<DatanodeDescriptor>();
+    final ArrayList<DatanodeDescriptor> deadNodeList =
+    new ArrayList<DatanodeDescriptor>();
+    // we need to call DFSNodeStatus to filter out the dead data nodes
+    DFSNodesStatus(liveNodeList, deadNodeList);
+    removeDecommissionedNodeFromList(deadNodeList);
+    for (DatanodeDescriptor node : deadNodeList) {
+      final Map<String, Object> innerinfo = new HashMap<String, Object>();
+      innerinfo.put("lastContact", getLastContact(node));
+      innerinfo.put("decommissioned", node.isDecommissioned());
+      innerinfo.put("excluded", this.inExcludedHostsList(node, null));
+      info.put(node.getHostName() + ":" + node.getPort(), innerinfo);
+    }
+    return JSON.toString(info);
+  }
+
+  /**
+   * Returned information is a JSON representation of map with host name as the
+   * key and value is a map of decomisioning node attribute keys to its values
+   */
+  @Override // NameNodeMXBean
+  public String getDecomNodes() {
+    final Map<String, Map<String, Object>> info = 
+      new HashMap<String, Map<String, Object>>();
+    final ArrayList<DatanodeDescriptor> decomNodeList = 
+      this.getDecommissioningNodes();
+    for (DatanodeDescriptor node : decomNodeList) {
+      final Map<String, Object> innerinfo = new HashMap<String, Object>();
+      innerinfo.put("underReplicatedBlocks", node.decommissioningStatus
+          .getUnderReplicatedBlocks());
+      innerinfo.put("decommissionOnlyReplicas", node.decommissioningStatus
+          .getDecommissionOnlyReplicas());
+      innerinfo.put("underReplicateInOpenFiles", node.decommissioningStatus
+          .getUnderReplicatedInOpenFiles());
+      info.put(node.getHostName() + ":" + node.getPort(), innerinfo);
+    }
+    return JSON.toString(info);
+  }
+
+  private long getLastContact(DatanodeDescriptor alivenode) {
+    return (System.currentTimeMillis() - alivenode.getLastUpdate())/1000;
+  }
+
+  private long getDfsUsed(DatanodeDescriptor alivenode) {
+    return alivenode.getDfsUsed();
+  }
+  
+  @Override  // NameNodeMXBean
+  public int getNamespaceId() {
+    return getNamespaceInfo().getNamespaceID();
+  }
+  
+  @Override // NameNodeMXBean
+  public String getNameserviceId() {
+    return getNameNode().getNameserviceID();
+  }
+  
+  @Override //NameNodeMXBean
+  public String getSafeModeText() {
+    if (!this.isInSafeMode())
+      return "";
+    return "Safe mode is ON. <em>" + this.getSafeModeTip() + "</em><br>";
+  }
+  
+  @Override // NameNodeMXBean
+  public Map<NameNodeKey, String> getNNSpecificKeys() {
+    return getNameNode().getNameNodeSpecificKeys();
+  }
+  
+  public Map<String, String> getJsonFriendlyNNSpecificKeys() {
+    Map<String, String> clone = new HashMap<String, String>();
+    Map<NameNodeKey, String> original = this.getNNSpecificKeys();
+    for (NameNodeKey nnk : original.keySet()) {
+      clone.put(nnk.toString(), original.get(nnk));
+    }
+    return clone;
+  }
+  
+  @Override // NameNodeMXBean
+  public boolean getIsPrimary() {
+    return getNameNode().getIsPrimary();
+  }
+  
+  public String getNameNodeStatus() {
+    Map<String, Object> result = new HashMap<String, Object>();
+    result.put(ClusterJspHelper.TOTAL_FILES_AND_DIRECTORIES,
+        Long.toString(this.getTotalFilesAndDirectories()));
+    result.put(ClusterJspHelper.TOTAL, Long.toString(this.getTotal()));
+    result.put(ClusterJspHelper.FREE, Long.toString(this.getFree()));
+    result.put(ClusterJspHelper.NAMESPACE_USED,
+        Long.toString(this.getNamespaceUsed()));
+    result.put(ClusterJspHelper.NON_DFS_USEDSPACE,
+        Long.toString(this.getNonDfsUsedSpace()));
+    result.put(ClusterJspHelper.TOTAL_BLOCKS,
+        Long.toString(this.getTotalBlocks()));
+    result.put(ClusterJspHelper.NUMBER_MISSING_BLOCKS,
+        Long.toString(this.getNumberOfMissingBlocks()));
+    result.put(ClusterJspHelper.SAFE_MODE_TEXT, this.getSafeModeText());
+    result.put(ClusterJspHelper.LIVE_NODES, this.getLiveNodes());
+    result.put(ClusterJspHelper.DEAD_NODES, this.getDeadNodes());
+    result.put(ClusterJspHelper.DECOM_NODES, this.getDecomNodes());
+    result.put(ClusterJspHelper.NNSPECIFIC_KEYS,
+        JSON.toString(this.getJsonFriendlyNNSpecificKeys()));
+    result.put(ClusterJspHelper.IS_PRIMARY,
+        Boolean.toString(this.getIsPrimary()));
+    return JSON.toString(result);
+  }
+  
+  /**
+   * Remove an already decommissioned data node who is neither in include nor
+   * exclude hosts lists from the the list of live or dead nodes.  This is used
+   * to not display an already decommssioned data node to the operators.
+   * The operation procedure of making a already decommissioned data node not
+   * to be displayed is as following:
+   * <ol>
+   *   <li> 
+   *   Host must have been in the include hosts list and the include hosts list
+   *   must not be empty.
+   *   </li>
+   *   <li>
+   *   Host is decommissioned by remaining in the include hosts list and added
+   *   into the exclude hosts list. Name node is updated with the new 
+   *   information by issuing dfsadmin -refreshNodes command.
+   *   </li>
+   *   <li>
+   *   Host is removed from both include hosts and exclude hosts lists.  Name 
+   *   node is updated with the new informationby issuing dfsamin -refreshNodes 
+   *   command.
+   *   <li>
+   * </ol>
+   * 
+   * @param nodeList
+   *          , array list of live or dead nodes.
+   */
+  void removeDecommissionedNodeFromList(ArrayList<DatanodeDescriptor> nodeList) {
+    // If the include list is empty, any nodes are welcomed and it does not
+    // make sense to exclude any nodes from the cluster. Therefore, no remove.
+    if (hostsReader.getHosts().isEmpty()) {
+      return;
+    }
+    
+    for (Iterator<DatanodeDescriptor> it = nodeList.iterator(); it.hasNext();) {
+      DatanodeDescriptor node = it.next();
+      if ((!inHostsList(node, null)) && (!inExcludedHostsList(node, null))
+          && node.isDecommissioned()) {
+        // Include list is not empty, an existing datanode does not appear
+        // in both include or exclude lists and it has been decommissioned.
+        // Remove it from the node list.
+        it.remove();
+      }
+    }
+  }
+  
+  public void cancelSaveNamespace(String reason) {
+    this.dir.fsImage.cancelSaveNamespace(reason);
+  }
+  
+  public HostsFileReader getHostReader() {
+    return this.hostsReader;
+  }
+
+  public int getReportingNodes() {
+    return this.dnReporting;
+  }
+  
+  static final UserGroupInformation getCurrentUGI() {
+    UserGroupInformation ugi = Server.getCurrentUGI();
+    if (ugi == null)
+      ugi = UserGroupInformation.getCurrentUGI();
+    return ugi;
+  }
+  
+  private INode getLastINode(INode[] nodes) {
+    if (nodes == null || nodes.length == 0)
+      return null;
+    return nodes[nodes.length-1];
+  }
+  
+  /**
+   * Clamp the specified replication between the minimum and the maximum
+   * replication levels.
+   */
+  public short adjustReplication(short replication) {
+    short r = (short) (replication < minReplication? minReplication
+        : replication > maxReplication? maxReplication: replication);
+    return r;
+  }
+  
+  /** Re-populate the namespace and diskspace count of every node with quota */
+  void recount() {
+    writeLock();
+    try {
+      dir.updateCountForINodeWithQuota();
+    } finally {
+      writeUnlock();
+    }
+  }
+
+}
+
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java
index fb50c16a..74c04244 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java
@@ -76,6 +76,7 @@ private static DatanodeInfo[] pickSrcDatanode(FileStatus i,
    */
   public void doGet(HttpServletRequest request, HttpServletResponse response)
     throws IOException {
+    NameNode.getNameNodeMetrics().numFileDataServletDoGet.inc();
     final UnixUserGroupInformation ugi = getUGI(request);
     final ClientProtocol nnproxy = createNameNodeProxy(ugi);
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileJournalManager.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileJournalManager.java
new file mode 100644
index 00000000..1254dc8a
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileJournalManager.java
@@ -0,0 +1,445 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Comparator;
+import java.util.Collections;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogLoader.EditLogValidation;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
+import org.apache.hadoop.hdfs.server.namenode.NNStorageRetentionManager.StoragePurger;
+import org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
+
+import com.google.common.collect.ComparisonChain;
+
+/**
+ * Journal manager for the common case of edits files being written
+ * to a storage directory.
+ * 
+ * Note: this class is not thread-safe and should be externally
+ * synchronized.
+ */
+class FileJournalManager implements JournalManager {
+  private static final Log LOG = LogFactory.getLog(FileJournalManager.class);
+
+  private final StorageDirectory sd;
+  private NameNodeMetrics metrics;
+
+  public static final Pattern EDITS_REGEX = Pattern.compile(
+    NameNodeFile.EDITS.getName() + "_(\\d+)-(\\d+)");
+  public static final Pattern EDITS_INPROGRESS_REGEX = Pattern.compile(
+    NameNodeFile.EDITS_INPROGRESS.getName() + "_(\\d+)");
+
+  private File currentInProgress = null;
+  private long maxSeenTransaction = -1;
+
+  StoragePurger purger
+    = new NNStorageRetentionManager.DeletionStoragePurger();
+
+  public FileJournalManager(StorageDirectory sd) {
+    this.sd = sd;
+  }
+  
+  public FileJournalManager(StorageDirectory sd, NameNodeMetrics metrics){
+    this.sd = sd;
+    this.metrics = metrics;
+  }
+
+  @Override 
+  public void close() throws IOException {}
+
+  @Override
+  synchronized public EditLogOutputStream startLogSegment(long txid) 
+      throws IOException {
+    currentInProgress = NNStorage.getInProgressEditsFile(sd, txid);
+    EditLogOutputStream stm = new EditLogFileOutputStream(currentInProgress, metrics);
+    stm.create();
+    return stm;
+  }
+
+  @Override
+  synchronized public void finalizeLogSegment(long firstTxId, long lastTxId)
+      throws IOException {
+    File inprogressFile = NNStorage.getInProgressEditsFile(sd, firstTxId);
+
+    File dstFile = NNStorage.getFinalizedEditsFile(
+        sd, firstTxId, lastTxId);
+    LOG.info("Finalizing edits file " + inprogressFile + " -> " + dstFile);
+    
+    if(dstFile.exists()) {
+        throw new IllegalStateException("Can't finalize edits file " 
+            + inprogressFile + " since finalized file " + "already exists");
+    }
+    if (!inprogressFile.renameTo(dstFile)) {
+      throw new IOException("Unable to finalize edits file " + inprogressFile);
+    }
+    if (inprogressFile.equals(currentInProgress)) {
+      currentInProgress = null;
+    }
+  }
+
+  public StorageDirectory getStorageDirectory() {
+    return sd;
+  }
+
+  @Override
+  public void purgeLogsOlderThan(long minTxIdToKeep)
+      throws IOException {
+    File[] files = FileUtil.listFiles(sd.getCurrentDir());
+    List<EditLogFile> editLogs = 
+      FileJournalManager.matchEditLogs(files);
+    for (EditLogFile log : editLogs) {
+      if (log.getFirstTxId() < minTxIdToKeep &&
+          log.getLastTxId() < minTxIdToKeep) {
+        LOG.info("Purging log: " + log);
+        purger.purgeLog(log);
+      }
+    }
+  }
+
+  /**
+   * Find all editlog segments starting at or above the given txid.
+   * @param fromTxId the txnid which to start looking
+   * @return a list of remote edit logs
+   * @throws IOException if edit logs cannot be listed.
+   */
+  List<RemoteEditLog> getRemoteEditLogs(long firstTxId) throws IOException {
+    File currentDir = sd.getCurrentDir();
+    List<EditLogFile> allLogFiles = matchEditLogs(
+        FileUtil.listFiles(currentDir));
+    LOG.info(allLogFiles);
+    
+    List<RemoteEditLog> ret = new ArrayList<RemoteEditLog>(
+        allLogFiles.size());
+
+    for (EditLogFile elf : allLogFiles) {
+      //if (elf.isCorrupt() || elf.isInProgress()) continue;
+      if (elf.isCorrupt()) continue;   
+      if (elf.getFirstTxId() >= firstTxId) {
+        ret.add(new RemoteEditLog(elf.firstTxId, 
+            elf.lastTxId, 
+            elf.isInProgress));
+      } else if ((firstTxId > elf.getFirstTxId()) &&
+                 (firstTxId <= elf.getLastTxId())) {
+        throw new IOException("Asked for firstTxId " + firstTxId
+            + " which is in the middle of file " + elf.file);
+      }
+    }
+    
+    return ret;
+  }
+
+  static List<EditLogFile> matchEditLogs(File[] filesInStorage) {
+    List<EditLogFile> ret = new ArrayList<EditLogFile>();
+    for (File f : filesInStorage) {
+      String name = f.getName();
+      // Check for edits
+      Matcher editsMatch = EDITS_REGEX.matcher(name);
+      if (editsMatch.matches()) {
+        try {
+          long startTxId = Long.valueOf(editsMatch.group(1));
+          long endTxId = Long.valueOf(editsMatch.group(2));
+          ret.add(new EditLogFile(f, startTxId, endTxId));
+        } catch (NumberFormatException nfe) {
+          LOG.error("Edits file " + f + " has improperly formatted " +
+                    "transaction ID");
+          // skip
+        }          
+      }
+      
+      // Check for in-progress edits
+      Matcher inProgressEditsMatch = EDITS_INPROGRESS_REGEX.matcher(name);
+      if (inProgressEditsMatch.matches()) {
+        try {
+          long startTxId = Long.valueOf(inProgressEditsMatch.group(1));
+          ret.add(
+              new EditLogFile(f, startTxId, startTxId, true));
+        } catch (NumberFormatException nfe) {
+          LOG.error("In-progress edits file " + f + " has improperly " +
+                    "formatted transaction ID");
+          // skip
+        }
+      }
+    }
+    return ret;
+  }
+
+  @Override
+  synchronized public EditLogInputStream getInputStream(long fromTxId) 
+      throws IOException {
+    for (EditLogFile elf : getLogFiles(fromTxId)) {
+      if (elf.getFirstTxId() == fromTxId) {
+        if (elf.isInProgress()) {
+          elf.validateLog();
+        }
+        if (LOG.isTraceEnabled()) {
+          LOG.trace("Returning edit stream reading from " + elf);
+        }
+        return new EditLogFileInputStream(elf.getFile(), 
+            elf.getFirstTxId(), elf.getLastTxId());
+      }
+    }
+
+    throw new IOException("Cannot find editlog file with " + fromTxId
+        + " as first first txid");
+  }
+
+  @Override
+  public long getNumberOfTransactions(long fromTxId) 
+      throws IOException, CorruptionException {
+    long numTxns = 0L;
+    
+    for (EditLogFile elf : getLogFiles(fromTxId)) {
+      if (LOG.isTraceEnabled()) {
+        LOG.trace("Counting " + elf);
+      }
+      if (elf.getFirstTxId() > fromTxId) { // there must be a gap
+        LOG.warn("Gap in transactions in " + sd.getRoot() + ". Gap is "
+            + fromTxId + " - " + (elf.getFirstTxId() - 1));
+        break;
+      } else if (fromTxId == elf.getFirstTxId()) {
+        if (elf.isInProgress()) {
+          elf.validateLog();
+        } 
+
+        if (elf.isCorrupt()) {
+          break;
+        }
+        fromTxId = elf.getLastTxId() + 1;
+        numTxns += fromTxId - elf.getFirstTxId();
+        
+        if (elf.isInProgress()) {
+          break;
+        }
+      } // else skip
+    }
+
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Journal " + this + " has " + numTxns 
+                + " txns from " + fromTxId);
+    }
+
+    long max = findMaxTransaction();
+    // fromTxId should be greater than max, as it points to the next 
+    // transaction we should expect to find. If it is less than or equal
+    // to max, it means that a transaction with txid == max has not been found
+    if (numTxns == 0 && fromTxId <= max) { 
+      String error = String.format("Gap in transactions, max txnid is %d"
+                                   + ", 0 txns from %d", max, fromTxId);
+      LOG.error(error);
+      throw new CorruptionException(error);
+    }
+
+    return numTxns;
+  }
+
+  @Override
+  synchronized public void recoverUnfinalizedSegments() throws IOException {
+    File currentDir = sd.getCurrentDir();
+    List<EditLogFile> allLogFiles = matchEditLogs(currentDir.listFiles());
+    for(EditLogFile elf : allLogFiles) {
+      LOG.info("Found edit file: " + elf);
+    }   
+    // make sure journal is aware of max seen transaction before moving corrupt 
+    // files aside
+    findMaxTransaction();
+
+    for (EditLogFile elf : allLogFiles) {
+      if (elf.getFile().equals(currentInProgress)) {
+        continue;
+      }
+      if (elf.isInProgress()) {
+        elf.validateLog();
+        if (elf.isCorrupt()) {
+          elf.moveAsideCorruptFile();
+          continue;
+        }
+        finalizeLogSegment(elf.getFirstTxId(), elf.getLastTxId());
+      }
+    }
+  }
+
+  private List<EditLogFile> getLogFiles(long fromTxId) throws IOException {
+    File currentDir = sd.getCurrentDir();
+    List<EditLogFile> allLogFiles = matchEditLogs(currentDir.listFiles());
+    List<EditLogFile> logFiles = new ArrayList<EditLogFile>();
+    
+    for (EditLogFile elf : allLogFiles) {
+      if (fromTxId > elf.getFirstTxId()
+          && fromTxId <= elf.getLastTxId()) {
+        throw new IOException("Asked for fromTxId " + fromTxId
+            + " which is in middle of file " + elf.file);
+      }
+      if (fromTxId <= elf.getFirstTxId()) {
+        logFiles.add(elf);
+      }
+    }
+    
+    Collections.sort(logFiles, EditLogFile.COMPARE_BY_START_TXID);
+
+    return logFiles;
+  }
+
+  /** 
+   * Find the maximum transaction in the journal.
+   * This gets stored in a member variable, as corrupt edit logs
+   * will be moved aside, but we still need to remember their first
+   * tranaction id in the case that it was the maximum transaction in
+   * the journal.
+   */
+  private long findMaxTransaction()
+      throws IOException {
+    for (EditLogFile elf : getLogFiles(0)) {
+      if (elf.isInProgress()) {
+        maxSeenTransaction = Math.max(elf.getFirstTxId(), maxSeenTransaction);
+        elf.validateLog();
+      }
+      maxSeenTransaction = Math.max(elf.getLastTxId(), maxSeenTransaction);
+    }
+    return maxSeenTransaction;
+  }
+
+  @Override
+  public String toString() {
+    return String.format("file:/%s", sd.getRoot());
+  }
+
+  /**
+   * Record of an edit log that has been located and had its filename parsed.
+   */
+  static class EditLogFile {
+    private File file;
+    private final long firstTxId;
+    private long lastTxId;
+
+    private boolean isCorrupt = false;
+    private final boolean isInProgress;
+
+    final static Comparator<EditLogFile> COMPARE_BY_START_TXID 
+      = new Comparator<EditLogFile>() {
+      public int compare(EditLogFile a, EditLogFile b) {
+        return ComparisonChain.start()
+        .compare(a.getFirstTxId(), b.getFirstTxId())
+        .compare(a.getLastTxId(), b.getLastTxId())
+        .result();
+      }
+    };
+
+    EditLogFile(File file,
+        long firstTxId, long lastTxId) {
+      this(file, firstTxId, lastTxId, false);
+      assert (lastTxId != HdfsConstants.INVALID_TXID)
+        && (lastTxId >= firstTxId);
+    }
+    
+    EditLogFile(File file, long firstTxId, 
+                long lastTxId, boolean isInProgress) {
+      boolean checkTxIds = true;
+      checkTxIds &= ((lastTxId == HdfsConstants.INVALID_TXID && isInProgress)
+        || (lastTxId != HdfsConstants.INVALID_TXID && lastTxId >= firstTxId));
+      checkTxIds &= ((firstTxId > -1) || (firstTxId == HdfsConstants.INVALID_TXID));
+      if (!checkTxIds)
+        throw new IllegalArgumentException("Illegal transaction ids: "
+            + firstTxId + ", " + lastTxId + " in progress: " + isInProgress);
+      if(file == null)
+        throw new IllegalArgumentException("File can not be NULL");
+      
+      this.firstTxId = firstTxId;
+      this.lastTxId = lastTxId;
+      this.file = file;
+      this.isInProgress = isInProgress;
+    }
+    
+    long getFirstTxId() {
+      return firstTxId;
+    }
+    
+    long getLastTxId() {
+      return lastTxId;
+    }
+
+    /** 
+     * Count the number of valid transactions in a log.
+     * This will update the lastTxId of the EditLogFile or
+     * mark it as corrupt if it is.
+     */
+    void validateLog() throws IOException {
+      EditLogValidation val = EditLogFileInputStream.validateEditLog(file);
+      if (val.getNumTransactions() == 0) {
+        markCorrupt();
+      } else {
+        this.lastTxId = val.getEndTxId();
+      }
+    }
+
+    boolean isInProgress() {
+      return isInProgress;
+    }
+
+    File getFile() {
+      return file;
+    }
+    
+    void markCorrupt() {
+      isCorrupt = true;
+    }
+    
+    boolean isCorrupt() {
+      return isCorrupt;
+    }
+
+    void moveAsideCorruptFile() throws IOException {
+      assert isCorrupt;
+    
+      File src = file;
+      File dst = new File(src.getParent(), src.getName() + ".corrupt");
+      boolean success = src.renameTo(dst);
+      if (!success) {
+        throw new IOException(
+          "Couldn't rename corrupt log " + src + " to " + dst);
+      }
+      file = dst;
+    }
+    
+    @Override
+    public String toString() {
+      return String.format("EditLogFile(file=%s,first=%019d,last=%019d,"
+                           +"inProgress=%b,corrupt=%b)", file.toString(),
+                           firstTxId, lastTxId, isInProgress(), isCorrupt);
+    }
+  }
+
+  @Override
+  public boolean isSegmentInProgress(long startTxId) throws IOException {
+    return new File(sd.getCurrentDir(),
+        NNStorage.getInProgressEditsFileName(startTxId)).exists();
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java
index 2cd2672a..7843b260 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java
@@ -25,6 +25,16 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.server.common.StorageInfo;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
+import org.apache.hadoop.hdfs.util.DataTransferThrottler;
+import org.apache.hadoop.hdfs.util.MD5FileUtils;
+import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.util.StringUtils;
 
 /**
@@ -35,42 +45,85 @@
 public class GetImageServlet extends HttpServlet {
   private static final long serialVersionUID = -7669068179452648952L;
 
-  @SuppressWarnings("unchecked")
-  public void doGet(HttpServletRequest request,
-                    HttpServletResponse response
+  private static final Log LOG = LogFactory.getLog(GetImageServlet.class);
+
+  private static final String TXID_PARAM = "txid";
+  private static final String START_TXID_PARAM = "startTxId";
+  private static final String END_TXID_PARAM = "endTxId";
+  private static final String STORAGEINFO_PARAM = "storageInfo";
+  
+  private static Set<Long> currentlyDownloadingCheckpoints =
+    Collections.<Long>synchronizedSet(new HashSet<Long>());
+  
+  public void doGet(final HttpServletRequest request,
+                    final HttpServletResponse response
                     ) throws ServletException, IOException {
-    Map<String,String[]> pmap = request.getParameterMap();
     try {
       ServletContext context = getServletContext();
-      FSImage nnImage = (FSImage)context.getAttribute("name.system.image");
-      TransferFsImage ff = new TransferFsImage(pmap, request, response);
-      if (ff.getImage()) {
-        response.setHeader(TransferFsImage.CONTENT_LENGTH,
-          String.valueOf(nnImage.getFsImageName().length()));
+      final FSImage nnImage = (FSImage)context.getAttribute("name.system.image");
+      final GetImageParams parsedParams = new GetImageParams(request, response);
+      final Configuration conf = 
+        (Configuration)getServletContext().getAttribute("name.conf");
+      
+      String myStorageInfoString = nnImage.storage.toColonSeparatedString();
+      String theirStorageInfoString = parsedParams.getStorageInfoString();
+      if (theirStorageInfoString != null &&
+          !myStorageInfoString.equals(theirStorageInfoString)) {
+        response.sendError(HttpServletResponse.SC_FORBIDDEN,
+            "This namenode has storage info " + myStorageInfoString + 
+            " but the secondary expected " + theirStorageInfoString);
+        LOG.warn("Received an invalid request file transfer request " +
+            "from a secondary with storage info " + theirStorageInfoString);
+        return;
+      }
+      
+      if (parsedParams.isGetImage()) {
+        long txid = parsedParams.getTxId();
+        
+        File imageFile = nnImage.storage.getFsImageName(txid);
+        if (imageFile == null) {
+          throw new IOException("Could not find image with txid " + txid);
+        }
+        setVerificationHeaders(response, imageFile);
         // send fsImage
-        TransferFsImage.getFileServer(response.getOutputStream(),
-                                      nnImage.getFsImageName(),
-                                      nnImage.imageTransferThrottler); 
-      } else if (ff.getEdit()) {
-        response.setHeader(TransferFsImage.CONTENT_LENGTH,
-          String.valueOf(nnImage.getFsEditName().length()));
+        TransferFsImage.getFileServer(response.getOutputStream(), imageFile,
+            getThrottler(conf)); 
+      } else if (parsedParams.isGetEdit()) {
+        long startTxId = parsedParams.getStartTxId();
+        long endTxId = parsedParams.getEndTxId();
+        
+        File editFile = nnImage.storage
+            .findFinalizedEditsFile(startTxId, endTxId);
+        
+        setVerificationHeaders(response, editFile);
+        
         // send edits
-        TransferFsImage.getFileServer(response.getOutputStream(),
-                                      nnImage.getFsEditName(),
-                                      nnImage.imageTransferThrottler);
-      } else if (ff.getEditNew()) {
-        response.setHeader(TransferFsImage.CONTENT_LENGTH,
-          String.valueOf(nnImage.getFsEditNewName().length()));
-        // send edits
-        TransferFsImage.getFileServer(response.getOutputStream(),
-                                      nnImage.getFsEditNewName(),
-                                      nnImage.imageTransferThrottler);
-      } else if (ff.putImage()) {
-        // issue a HTTP get request to download the new fsimage 
-        nnImage.validateCheckpointUpload(ff.getToken());
-        nnImage.checkpointUploadDone(
-            TransferFsImage.getFileClient(ff.getInfoServer(), "getimage=1", 
-            nnImage.getFsImageNameCheckpoint(), true));
+        TransferFsImage.getFileServer(response.getOutputStream(), editFile,
+            getThrottler(conf));
+      } else if (parsedParams.isPutImage()) {
+        final long txid = parsedParams.getTxId();
+
+        if (! currentlyDownloadingCheckpoints.add(txid)) {
+          throw new IOException(
+              "Another checkpointer is already in the process of uploading a" +
+              " checkpoint made at transaction ID " + txid);
+        }
+
+        try {
+          if (nnImage.storage.findImageFile(txid) != null) {
+            throw new IOException(
+                "Another checkpointer already uploaded an checkpoint " +
+                "for txid " + txid);
+          }
+          
+          MD5Hash downloadImageDigest = TransferFsImage.downloadImageToStorage(
+                    parsedParams.getInfoServer(), txid,
+                    nnImage.storage, true);
+        
+          nnImage.checkpointUploadDone(txid, downloadImageDigest);
+        } finally {
+          currentlyDownloadingCheckpoints.remove(txid);
+        }
       }
     } catch (Exception ie) {
       String errMsg = "GetImage failed. " + StringUtils.stringifyException(ie);
@@ -80,4 +133,164 @@ public void doGet(HttpServletRequest request,
       response.getOutputStream().close();
     }
   }
+  
+  /**
+   * Construct a throttler from conf
+   * @param conf configuration
+   * @return a data transfer throttler
+   */
+  private final DataTransferThrottler getThrottler(Configuration conf) {
+    long transferBandwidth = 
+      conf.getLong(HdfsConstants.DFS_IMAGE_TRANSFER_RATE_KEY,
+          HdfsConstants.DFS_IMAGE_TRANSFER_RATE_DEFAULT);
+    DataTransferThrottler throttler = null;
+    if (transferBandwidth > 0) {
+      throttler = new DataTransferThrottler(transferBandwidth);
+    }
+    return throttler;
+  }
+  
+  /**
+   * Set headers for content length, and, if available, md5.
+   * @throws IOException 
+   */
+  private void setVerificationHeaders(HttpServletResponse response, File file)
+  throws IOException {
+    response.setHeader(TransferFsImage.CONTENT_LENGTH,
+        String.valueOf(file.length()));
+    MD5Hash hash = MD5FileUtils.readStoredMd5ForFile(file);
+    if (hash != null) {
+      response.setHeader(TransferFsImage.MD5_HEADER, hash.toString());
+    }
+  }
+
+  static String getParamStringForImage(long txid,
+      StorageInfo remoteStorageInfo) {
+    return "getimage=1&" + TXID_PARAM + "=" + txid
+      + "&" + STORAGEINFO_PARAM + "=" +
+      remoteStorageInfo.toColonSeparatedString();
+    
+  }
+
+  static String getParamStringForLog(RemoteEditLog log,
+      StorageInfo remoteStorageInfo) {
+    return "getedit" + "=1&" + START_TXID_PARAM + "=" + log.getStartTxId()
+        + "&" + END_TXID_PARAM + "=" + log.getEndTxId()
+        + "&" + STORAGEINFO_PARAM + "=" +
+          remoteStorageInfo.toColonSeparatedString();
+  }
+  
+  static String getParamStringToPutImage(long txid,
+      String machine, int port, NNStorage storage) {
+    
+    return "putimage=1" +
+      "&" + TXID_PARAM + "=" + txid +
+      "&port=" + port +
+      "&machine=" + machine
+      + "&" + STORAGEINFO_PARAM + "=" +
+      storage.toColonSeparatedString();
+  }
+
+  
+  static class GetImageParams {
+    private boolean isGetImage;
+    private boolean isGetEdit;
+    private boolean isPutImage;
+    private int remoteport;
+    private String machineName;
+    private long startTxId, endTxId, txId;
+    private String storageInfoString;
+
+    /**
+     * @param request the object from which this servlet reads the url contents
+     * @param response the object into which this servlet writes the url contents
+     * @throws IOException if the request is bad
+     */
+    public GetImageParams(HttpServletRequest request,
+                          HttpServletResponse response
+                           ) throws IOException {
+      @SuppressWarnings("unchecked")
+      Map<String, String[]> pmap = request.getParameterMap();
+      isGetImage = isGetEdit = isPutImage = false;
+      remoteport = 0;
+      machineName = null;
+
+      for (Map.Entry<String, String[]> entry : pmap.entrySet()) {
+        String key = entry.getKey();
+        String[] val = entry.getValue();
+        if (key.equals("getimage")) { 
+          isGetImage = true;
+          txId = parseLongParam(request, TXID_PARAM);
+        } else if (key.equals("getedit")) { 
+          isGetEdit = true;
+          startTxId = parseLongParam(request, START_TXID_PARAM);
+          endTxId = parseLongParam(request, END_TXID_PARAM);
+        } else if (key.equals("putimage")) { 
+          isPutImage = true;
+          txId = parseLongParam(request, TXID_PARAM);
+        } else if (key.equals("port")) { 
+          remoteport = new Integer(val[0]).intValue();
+        } else if (key.equals("machine")) { 
+          machineName = val[0];
+        } else if (key.equals(STORAGEINFO_PARAM)) {
+          storageInfoString = val[0];
+        }
+      }
+
+      int numGets = (isGetImage?1:0) + (isGetEdit?1:0);
+      if ((numGets > 1) || (numGets == 0) && !isPutImage) {
+        throw new IOException("Illegal parameters to TransferFsImage");
+      }
+    }
+
+    public String getStorageInfoString() {
+      return storageInfoString;
+    }
+
+    public long getTxId() {
+      assert isGetImage || isPutImage;
+      return txId;
+    }
+    
+    public long getStartTxId() {
+      assert isGetEdit;
+      return startTxId;
+    }
+    
+    public long getEndTxId() {
+      assert isGetEdit;
+      return endTxId;
+    }
+
+    boolean isGetEdit() {
+      return isGetEdit;
+    }
+
+    boolean isGetImage() {
+      return isGetImage;
+    }
+
+    boolean isPutImage() {
+      return isPutImage;
+    }
+    
+    String getInfoServer() throws IOException{
+      if (machineName == null || remoteport == 0) {
+        throw new IOException ("MachineName and port undefined");
+      }
+      return machineName + ":" + remoteport;
+    }
+    
+    private static long parseLongParam(HttpServletRequest request, String param)
+        throws IOException {
+      // Parse the 'txid' parameter which indicates which image is to be
+      // fetched.
+      String paramStr = request.getParameter(param);
+      if (paramStr == null) {
+        throw new IOException("Invalid request has no " + param + " parameter");
+      }
+      
+      return Long.valueOf(paramStr);
+    }
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/HardLinkFileInfo.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/HardLinkFileInfo.java
index 82338bc4..a550a238 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/HardLinkFileInfo.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/HardLinkFileInfo.java
@@ -17,12 +17,15 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.permission.PermissionStatus;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 
-
 /**
  * This HardLinkFileInfo represents the shared information across hard linked files.
  * The information includes the reference cnt and its hard link ID.
@@ -47,6 +50,18 @@ public int getReferenceCnt() {
     return this.linkedFiles.size();
   }
   
+  /**
+   * Return the i th of the hardlinked file
+   * @param i
+   * @return the i th of the hardlinked files and return null if i is out of the boundary.
+   */
+  public INodeHardLinkFile getHardLinkedFile(int i) {
+    if (i < this.linkedFiles.size()) {
+      return this.linkedFiles.get(i);
+    }
+    return null;
+  }
+  
   /**
    * Add an INodeHardLinkFile to the linkedFiles
    * This function is not thread-safe. The caller is supposed to have a writeLock.
@@ -92,4 +107,105 @@ public void removeLinkedFile(INodeHardLinkFile file) {
       }
     }
   }
+  
+  /**
+   * @return the set of the ancestor INodes for the linked INodes.
+   */
+  public Set<INode> getAncestorSet(INodeHardLinkFile excludedINode) {
+    Set<INode> ancestors = new HashSet<INode>();
+    INodeDirectory currentDirectory;
+    
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      if (linkedFile == excludedINode) {
+        continue;
+      }
+      currentDirectory = linkedFile.getParent();
+      assert(currentDirectory != null);
+      
+      do {
+        ancestors.add(currentDirectory);
+      } while((currentDirectory = currentDirectory.getParent()) != null);
+    }
+    return ancestors;
+   }
+  
+  /**
+   * Set the PermissionSatus for all the linked files
+   * @param ps
+   */
+  protected void setPermissionStatus(PermissionStatus ps) {
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      linkedFile.setPermissionStatus(ps, false);
+    }
+  }
+
+  /**
+   * Set the user name for all the linked files
+   * @param user
+   */
+  protected void setUser(String user) {
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      linkedFile.setUser(user, false);
+    }
+  }
+
+  /**
+   * Set the group name for all the linked files
+   * @param group
+   */
+  protected void setGroup(String group) {
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      linkedFile.setGroup(group, false);
+    }
+  }
+
+  /**
+   * Set the permission for all the linked files
+   * @param permission
+   */
+  protected void setPermission(FsPermission permission) {
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      linkedFile.setPermission(permission, false);
+    }
+  }
+  
+  /**
+   * Set the modtime for all the linked files
+   * @param modtime
+   */
+  protected void setModificationTime(long modtime) {
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      linkedFile.setModificationTime(modtime, false);
+    }
+  }
+  
+  /**
+  * Always set the last modification time of inode.
+  * @param modtime
+  */
+  protected void setModificationTimeForce(long modtime) {
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      linkedFile.setModificationTimeForce(modtime, false);
+    }
+  }
+  
+  /**
+   * Set the atime for all the linked files
+   * @param modtime
+   */
+  public void setAccessTime(long atime) {
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      linkedFile.setAccessTime(atime, false);
+    }
+  }
+  
+  /**
+   * Set the replication factor for all the linked files
+   * @param replication
+   */
+  public void setReplication(short replication) {
+    for (INodeHardLinkFile linkedFile : linkedFiles) {
+      linkedFile.setReplication(replication, false);
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java
index 658f182b..d6c2a980 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java
@@ -31,6 +31,7 @@
 import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
 import org.apache.hadoop.hdfs.protocol.VersionedLocatedBlocks;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
+import org.apache.hadoop.hdfs.server.namenode.FSImageFormat.FSImageLoadingContext;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem.BlockMetaInfoType;
 import org.apache.hadoop.util.StringUtils;
 
@@ -44,13 +45,12 @@ public abstract class INode implements Comparable<byte[]>, FSInodeInfo {
   protected INodeDirectory parent;
   protected long modificationTime;
   protected volatile long accessTime;
-
-  static final INodeType INODE_TYPE = INodeType.REGULAR_INODE;
-  static enum INodeType {
+  
+  public static enum INodeType {
     REGULAR_INODE((byte) 1),
     HARDLINKED_INODE((byte) 2);
     
-    final byte type;
+    public final byte type;
     INodeType(byte type) {
       this.type = type;
     }
@@ -340,6 +340,10 @@ void setAccessTime(long atime) {
   boolean isUnderConstruction() {
     return false;
   }
+  
+  public int getStartPosForQuoteUpdate() {
+    return 0;
+  }
 
   /**
    * Breaks file path into components.
@@ -351,6 +355,17 @@ static byte[][] getPathComponents(String path) {
     return DFSUtil.splitAndGetPathComponents(path);
   }
   
+  /**
+   * Breaks file path into components.
+   * @param path specified in byte[] format
+   * @param len length of the path
+   * @return array of byte arrays each of which represents 
+   * a single path component.
+   */
+  static byte[][] getPathComponents(byte[] path) {
+    return DFSUtil.bytes2byteArray(path, path.length, (byte) Path.SEPARATOR_CHAR);
+  }
+  
   /** Convert strings to byte arrays for path components. */
   static byte[][] getPathComponents(String[] strings) {
     if (strings.length == 0) {
@@ -454,6 +469,9 @@ LocatedBlocks createLocatedBlocks(List<LocatedBlock> blocks,
    * @param nsQuota namespace quota
    * @param dsQuota disk quota
    * @param preferredBlockSize block size
+   * @param inodeType The INode type
+   * @param hardLinkID The HardLinkID
+   * @param context The context when loading the fsImage
    * @return an inode
    */
   static INode newINode(PermissionStatus permissions,
@@ -463,17 +481,46 @@ static INode newINode(PermissionStatus permissions,
                         long atime,
                         long nsQuota,
                         long dsQuota,
-                        long preferredBlockSize) {
-    if (blocks == null) { // directory
-      if (nsQuota >= 0 || dsQuota >= 0) { // directory with quota
-        return new INodeDirectoryWithQuota(
-            permissions, modificationTime, nsQuota, dsQuota);
+                        long preferredBlockSize,
+                        byte inodeType,
+                        long hardLinkID,
+                        FSImageLoadingContext context) {
+    if (inodeType == INode.INodeType.REGULAR_INODE.type) {
+      // Process the regular INode file
+      if (blocks == null) { // directory
+        if (nsQuota >= 0 || dsQuota >= 0) { // directory with quota
+          return new INodeDirectoryWithQuota(
+              permissions, modificationTime, nsQuota, dsQuota);
+        }
+        // regular directory
+        return new INodeDirectory(permissions, modificationTime);
       }
-      // regular directory
-      return new INodeDirectory(permissions, modificationTime);
+      // file
+      return new INodeFile(permissions, blocks, replication,
+                                modificationTime, atime, preferredBlockSize);
+    } else if (inodeType == INode.INodeType.HARDLINKED_INODE.type) {
+      // Process the HardLink INode file
+      // create and register the hard link file info  
+      HardLinkFileInfo hardLinkFileInfo =   
+        INodeHardLinkFile.loadHardLinkFileInfo(hardLinkID, context); 
+      
+      // Reuse the same blocks for the hardlinked files
+      if (hardLinkFileInfo.getReferenceCnt() > 1) {
+        blocks = hardLinkFileInfo.getHardLinkedFile(0).getBlocks();
+      }
+      
+      // Create the INodeHardLinkFile and increment the reference cnt
+      INodeHardLinkFile hardLinkFile = new INodeHardLinkFile(permissions, 
+                                                            blocks, 
+                                                            replication,  
+                                                            modificationTime, 
+                                                            atime,  
+                                                            preferredBlockSize,   
+                                                            hardLinkFileInfo);
+      hardLinkFile.incReferenceCnt();
+      return hardLinkFile;
+    } else {
+      throw new IllegalArgumentException("Invalide inode type: " + inodeType);
     }
-    // file
-    return new INodeFile(permissions, blocks, replication,
-                              modificationTime, atime, preferredBlockSize);
   }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
index 1a1d78d4..7e60f585 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
@@ -20,7 +20,9 @@
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.fs.permission.FsAction;
@@ -130,6 +132,10 @@ INode getNode(byte[][] components) {
   INode getNode(String path) {
     return getNode(getPathComponents(path));
   }
+  
+  INode getNode(byte[] path) {
+    return getNode(getPathComponents(path));
+  }
 
   /**
    * Retrieve existing INodes from a path. If existing is big enough to store
@@ -378,24 +384,81 @@ <T extends INode> INodeDirectory addToParent(
 
   /** {@inheritDoc} */
   DirCounts spaceConsumedInTree(DirCounts counts) {
+    Set<Long> visitedCtx = new HashSet<Long>(); 
+    return spaceConsumedInTree(counts, visitedCtx);
+  }
+  
+  DirCounts spaceConsumedInTree(DirCounts counts, Set<Long> visitedCtx) {
     counts.nsCount += 1;
     if (children != null) {
       for (INode child : children) {
-        child.spaceConsumedInTree(counts);
+        if (child.isDirectory()) {
+          // Process the directory with the visited hard link context
+          ((INodeDirectory) child).spaceConsumedInTree(counts, visitedCtx);
+        } else {
+          // Process the file
+          if (child instanceof INodeHardLinkFile) {
+            // Get the current hard link ID
+            long hardLinkID = ((INodeHardLinkFile) child).getHardLinkID();
+
+            if (visitedCtx.contains(hardLinkID)) {
+              // The current hard link file has been visited, so skip processing
+              // But update the nsCount
+              counts.nsCount++;
+              continue;
+            } else {
+              // Add the current hard link file to the visited set
+              visitedCtx.add(hardLinkID);
+            }
+          }
+          // compute the current child
+          child.spaceConsumedInTree(counts);
+        }
       }
     }
-    return counts;    
+    return counts;
   }
 
-  /** {@inheritDoc} */
-  long[] computeContentSummary(long[] summary) {
-    if (children != null) {
+  /** {@inheritDoc} */  
+  long[] computeContentSummary(long[] summary) {  
+    Set<Long> visitedCtx = new HashSet<Long>(); 
+    return this.computeContentSummary(summary, visitedCtx); 
+  } 
+    
+  /** 
+   * Compute the content summary and skip calculating the visited hard link file. 
+   */ 
+  private long[] computeContentSummary(long[] summary, Set<Long> visitedCtx) {  
+    if (children != null) { 
       for (INode child : children) {
-        child.computeContentSummary(summary);
-      }
-    }
-    summary[2]++;
-    return summary;
+        if (child.isDirectory()) {
+          // Process the directory with the visited hard link context 
+          ((INodeDirectory)child).computeContentSummary(summary, visitedCtx); 
+        } else {  
+          // Process the file 
+          if (child instanceof INodeHardLinkFile) {
+            // Get the current hard link ID 
+            long hardLinkID = ((INodeHardLinkFile) child).getHardLinkID();  
+            if (visitedCtx.contains(hardLinkID)) {
+              // The current hard link file has been visited, so only increase the file count.
+              summary[1] ++;
+              continue; 
+            } else {
+              // Add the current hard link file to the visited set  
+              visitedCtx.add(hardLinkID);
+              // Compute the current hardlink file  
+              child.computeContentSummary(summary); 
+            } 
+          } else {
+            // compute the current child for non hard linked files
+            child.computeContentSummary(summary); 
+          }
+
+        } 
+      } 
+    } 
+    summary[2]++; 
+    return summary; 
   }
 
   /**
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java
index 9a6409a3..e6f45326 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java
@@ -25,7 +25,7 @@
 /**
  * Directory INode class that has a quota restriction
  */
-class INodeDirectoryWithQuota extends INodeDirectory {
+public class INodeDirectoryWithQuota extends INodeDirectory {
   private long nsQuota; /// NameSpace quota
   private long nsCount;
   private long dsQuota; /// disk space quota
@@ -108,7 +108,7 @@ long numItemsInTree() {
     return nsCount;
   }
   
-  long diskspaceConsumed() {
+  public long diskspaceConsumed() {
     return diskspace;
   }
   
@@ -121,16 +121,6 @@ void updateNumItemsInTree(long nsDelta, long dsDelta) {
     nsCount += nsDelta;
     diskspace += dsDelta;
   }
-
-  /** Update the size of the tree
-   * 
-   * @param nsDelta the change of the tree size
-   * @param dsDelta change to disk space occupied
-   **/
-  void unprotectedUpdateNumItemsInTree(long nsDelta, long dsDelta) {
-    nsCount = nsCount + nsDelta;
-    diskspace = diskspace + dsDelta;
-  }
   
   /** 
    * Sets namespace and diskspace take by the directory rooted 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
index 880115e4..1bc4b139 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
@@ -42,8 +42,20 @@ class INodeFileUnderConstruction extends INodeFile {
                              String clientName,
                              String clientMachine,
                              DatanodeDescriptor clientNode) {
-    super(permissions.applyUMask(UMASK), 0, replication, modTime, modTime,
-        preferredBlockSize);
+	this(permissions, replication, preferredBlockSize, modTime, modTime, 
+		 clientName, clientMachine, clientNode);
+  }
+  
+  INodeFileUnderConstruction(PermissionStatus permissions,
+                             short replication,
+                             long preferredBlockSize,
+                             long modTime,
+                             long accessTime,
+                             String clientName,
+                             String clientMachine,
+                             DatanodeDescriptor clientNode) {
+    super(permissions.applyUMask(UMASK), 0, replication, modTime, accessTime,
+          preferredBlockSize);
     this.clientName = clientName;
     this.clientMachine = clientMachine;
     this.clientNode = clientNode;
@@ -58,7 +70,21 @@ public INodeFileUnderConstruction(byte[] name,
                              String clientName,
                              String clientMachine,
                              DatanodeDescriptor clientNode) {
-    super(perm, blocks, blockReplication, modificationTime, modificationTime,
+    this(name, blockReplication, modificationTime, modificationTime,preferredBlockSize, 
+         blocks, perm, clientName, clientMachine,clientNode);
+  }
+  
+  public INodeFileUnderConstruction(byte[] name,
+                                    short blockReplication,
+                                    long modificationTime,
+                                    long accessTime,
+                                    long preferredBlockSize,
+                                    BlockInfo[] blocks,
+                                    PermissionStatus perm,
+                                    String clientName,
+                                    String clientMachine,
+                                    DatanodeDescriptor clientNode) {
+    super(perm, blocks, blockReplication, modificationTime, accessTime,
           preferredBlockSize);
     setLocalName(name);
     this.clientName = clientName;
@@ -118,9 +144,10 @@ void setTargets(DatanodeDescriptor[] targets) {
   }
 
   /**
-   * add this target if it does not already exists
+   * add this target if it does not already exists. Returns true if the target
+   * was added.
    */
-  void addTarget(DatanodeDescriptor node) {
+  boolean addTarget(DatanodeDescriptor node) {
 
     if (this.targets == null) {
       this.targets = new DatanodeDescriptor[0];
@@ -128,7 +155,7 @@ void addTarget(DatanodeDescriptor node) {
 
     for (int j = 0; j < this.targets.length; j++) {
       if (this.targets[j].equals(node)) {
-        return;  // target already exists
+        return false; // target already exists
       }
     }
     
@@ -144,6 +171,7 @@ void addTarget(DatanodeDescriptor node) {
     newt[targets.length] = node;
     this.targets = newt;
     this.primaryNodeIndex = -1;
+    return true;
   }
 
   void removeTarget(DatanodeDescriptor node) {
@@ -184,16 +212,20 @@ void removeTarget(DatanodeDescriptor node) {
   // converts a INodeFileUnderConstruction into a INodeFile
   // use the modification time as the access time
   //
-  INodeFile convertToInodeFile() {
+  INodeFile convertToInodeFile(boolean changeAccessTime) {
     INodeFile obj = new INodeFile(getPermissionStatus(),
                                   getBlocks(),
                                   getReplication(),
                                   getModificationTime(),
-                                  getModificationTime(),
+                                  changeAccessTime ? getModificationTime() : getAccessTime(),
                                   getPreferredBlockSize());
     return obj;
     
   }
+ 
+  INodeFile convertToInodeFile() {
+    return this.convertToInodeFile(true);
+  }
 
   /**
    * remove a block from the block list. This block should be
@@ -213,11 +245,14 @@ void removeBlock(Block oldblock) throws IOException {
     System.arraycopy(blocks, 0, newlist, 0, size_1);
     blocks = newlist;
 
-    for (DatanodeDescriptor datenode : targets) {
-      datenode.removeINode(this);
+    if (targets != null) {
+      for (DatanodeDescriptor datanode : targets) {
+        datanode.removeINode(this);
+      }
     }
+
     // Remove the block locations for the last block.
-     targets = null;
+    targets = null;
   }
 
   synchronized void setLastBlock(BlockInfo newblock, DatanodeDescriptor[] newtargets
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeHardLinkFile.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeHardLinkFile.java
index 82d365aa..f7a4285a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeHardLinkFile.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeHardLinkFile.java
@@ -19,40 +19,53 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.Set;
 
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.permission.PermissionStatus;
 import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
+import org.apache.hadoop.hdfs.server.namenode.FSImageFormat.FSImageLoadingContext;
 
 public class INodeHardLinkFile extends INodeFile{
-  static final INodeType INODE_TYPE = INodeType.HARDLINKED_INODE;
-  
-  /** Keeps track of the lastest hard link ID */
-  private static AtomicLong latestHardLinkID = new AtomicLong(0);
-  
   private final HardLinkFileInfo hardLinkFileInfo;
   
-  protected INodeHardLinkFile(INodeFile inodeFile) throws IOException {
+  protected INodeHardLinkFile(INodeFile inodeFile, long hardLinkID) throws IOException {
     super(inodeFile);
-    hardLinkFileInfo = new HardLinkFileInfo(latestHardLinkID.getAndIncrement());
+    hardLinkFileInfo = new HardLinkFileInfo(hardLinkID);
   }
-  
+
   protected INodeHardLinkFile(INodeHardLinkFile inodeHardLinkFile) {
     super(inodeHardLinkFile);
     this.hardLinkFileInfo = inodeHardLinkFile.getHardLinkFileInfo();
   }
   
+  protected INodeHardLinkFile(PermissionStatus permissions, BlockInfo[] blocks, 
+      short replication, long modificationTime,  
+      long atime, long preferredBlockSize,   
+      HardLinkFileInfo hardLinkFileInfo) { 
+     super(permissions,  
+         blocks, 
+         replication,  
+         modificationTime,   
+         atime,  
+         preferredBlockSize);  
+     this.hardLinkFileInfo = hardLinkFileInfo;
+     
+   }
+
   public HardLinkFileInfo getHardLinkFileInfo() {
     return hardLinkFileInfo;
   }
 
-  public void incReferenceCnt(){
+  public void incReferenceCnt() {
     this.hardLinkFileInfo.addLinkedFile(this);
   }
-  
-  public int getReferenceCnt(){
+
+  public int getReferenceCnt() {
     return this.hardLinkFileInfo.getReferenceCnt();
   }
-  
+
   public long getHardLinkID() {
     return this.hardLinkFileInfo.getHardLinkID();
   }
@@ -63,4 +76,176 @@ int collectSubtreeBlocksAndClear(List<Block> v, int blocksLimit) {
     this.hardLinkFileInfo.removeLinkedFile(this);
     return 1;
   }
+  
+  public Set<INode> getAncestorSet() {
+   return this.hardLinkFileInfo.getAncestorSet(null);
+  }
+  
+  private Set<INode> getAncestorSetWithoutCurrentINode() {
+    return this.hardLinkFileInfo.getAncestorSet(this);
+  }
+  
+  public int getStartPosForQuoteUpdate() {
+    int commonAncestorNum = 0;
+    INode current = this;
+    Set<INode> commonAncestorExclusiveSet = getAncestorSetWithoutCurrentINode();
+    while ((current = current.parent) != null) {
+      if (!commonAncestorExclusiveSet.contains(current)) {
+        commonAncestorNum ++;
+      }
+    }
+    
+    return commonAncestorNum;
+  }
+  
+  /**
+   * Set the PermissionSatus for all the linked files
+   * @param ps
+   */
+  @Override
+  protected void setPermissionStatus(PermissionStatus ps) {
+    setPermissionStatus(ps, true);
+  }
+  
+  protected void setPermissionStatus(PermissionStatus ps, boolean recursive) {
+    super.setPermissionStatus(ps);
+    if (this.hardLinkFileInfo != null && recursive) {
+      this.hardLinkFileInfo.setPermissionStatus(ps);
+    }
+  }
+
+  /**
+   * Set the user name for all the linked files
+   * @param user
+   */
+  @Override
+  protected void setUser(String user) {
+    this.setUser(user, true);
+  }
+  
+  protected void setUser(String user, boolean recursive) {
+    super.setUser(user);
+    if (this.hardLinkFileInfo != null && recursive) {
+      this.hardLinkFileInfo.setUser(user);
+    }
+  }
+
+  /**
+   * Set the group name for all the linked files
+   * @param group
+   */
+  @Override
+  protected void setGroup(String group) {
+    this.setGroup(group, true);
+  }
+  
+  protected void setGroup(String group, boolean recursive) {
+    super.setGroup(group);
+    if (this.hardLinkFileInfo != null && recursive) {
+      this.hardLinkFileInfo.setGroup(group);
+    }
+  }
+
+  /**
+   * Set the permission for all the linked files
+   * @param permission
+   */
+  @Override
+  protected void setPermission(FsPermission permission) {
+    this.setPermission(permission, true);
+  }
+  
+  protected void setPermission(FsPermission permission, boolean recursive) {
+    super.setPermission(permission);
+    if (this.hardLinkFileInfo != null && recursive) {
+      this.hardLinkFileInfo.setPermission(permission);
+    }
+  }
+  
+  /**
+   * Set the modtime for all the linked files
+   * @param modtime
+   */
+  @Override
+  protected void setModificationTime(long modtime) {
+    this.setModificationTime(modtime, true);
+  }
+  
+  protected void setModificationTime(long modtime, boolean recursive) {
+    super.setModificationTime(modtime);
+    if (this.hardLinkFileInfo != null && recursive) {
+      this.hardLinkFileInfo.setModificationTime(modtime);
+    }
+  }
+  
+  /**
+  * Always set the last modification time of inode.
+  * @param modtime
+  */
+  @Override
+  protected void setModificationTimeForce(long modtime) {
+    this.setModificationTimeForce(modtime, true);
+  }
+  
+  protected void setModificationTimeForce(long modtime, boolean recursive) {
+    super.setModificationTimeForce(modtime);
+    if (this.hardLinkFileInfo != null && recursive) {
+      this.hardLinkFileInfo.setModificationTimeForce(modtime);
+    }
+  }
+  
+  /**
+   * Set the atime for all the linked files
+   * @param modtime
+   */
+  @Override
+  protected void setAccessTime(long atime) {
+    this.setAccessTime(atime, true);
+  }
+  
+  protected void setAccessTime(long atime, boolean recursive) {
+    super.setAccessTime(atime);
+    if (this.hardLinkFileInfo != null && recursive) {
+      this.hardLinkFileInfo.setAccessTime(atime);
+    }
+  }
+  
+  /**
+   * Set the replication factor for all the linked files
+   * @param replication
+   */
+  @Override
+  public void setReplication(short replication) {
+    this.setReplication(replication, true);
+  }
+  
+  protected void setReplication(short replication, boolean recursive) {
+    super.setReplication(replication);
+    if (this.hardLinkFileInfo != null && recursive) {
+      this.hardLinkFileInfo.setReplication(replication);
+    }
+  }
+
+  /** 
+   * Create a HardLink file info if necessary and register to the hardLinkINodeIDToFileInfoMap  
+   * And return the hardLinkFileInfo which is registered in the hardLinkINodeIDToFileInfoMap  
+   *  
+   * This function is not thread safe.  
+   * @param inodeID
+   * @param context The context when loading the fsImage
+   * @return hardLinkFileInfo registered in the hardLinkINodeIDToFileInfoMap  
+   */ 
+  public static HardLinkFileInfo loadHardLinkFileInfo(long hardLinkID,
+      FSImageLoadingContext context) {  
+    // update the latest hard link ID 
+    context.getFSDirectory().resetLastHardLinkIDIfLarge(hardLinkID);
+  
+    // create the hard link file info if necessary  
+    HardLinkFileInfo fileInfo = context.getHardLinkFileInfo(hardLinkID);
+    if (fileInfo == null) { 
+      fileInfo = new HardLinkFileInfo(hardLinkID);
+      context.associateHardLinkIDWithFileInfo(hardLinkID, fileInfo);
+    }
+    return fileInfo;  
+  }
 }
\ No newline at end of file
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalManager.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalManager.java
new file mode 100644
index 00000000..22eb2715
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalManager.java
@@ -0,0 +1,103 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+/**
+ * A JournalManager is responsible for managing a single place of storing
+ * edit logs. It may correspond to multiple files, a backup node, etc.
+ * Even when the actual underlying storage is rolled, or failed and restored,
+ * each conceptual place of storage corresponds to exactly one instance of
+ * this class, which is created when the EditLog is first opened.
+ */
+public interface JournalManager extends Closeable {
+  /**
+   * Begin writing to a new segment of the log stream, which starts at
+   * the given transaction ID.
+   */
+  EditLogOutputStream startLogSegment(long txId) throws IOException;
+
+  /**
+   * Mark the log segment that spans from firstTxId to lastTxId
+   * as finalized and complete.
+   */
+  void finalizeLogSegment(long firstTxId, long lastTxId) throws IOException;
+
+   /**
+   * Get the input stream starting with fromTxnId from this journal manager
+   * @param fromTxnId the first transaction id we want to read
+   * @return the stream starting with transaction fromTxnId
+   * @throws IOException if a stream cannot be found.
+   */
+  EditLogInputStream getInputStream(long fromTxnId) throws IOException;
+
+  /**
+   * Get the number of transaction contiguously available from fromTxnId.
+   *
+   * @param fromTxnId Transaction id to count from
+   * @return The number of transactions available from fromTxnId
+   * @throws IOException if the journal cannot be read.
+   * @throws CorruptionException if there is a gap in the journal at fromTxnId.
+   */
+  long getNumberOfTransactions(long fromTxnId) 
+      throws IOException, CorruptionException;
+
+  /**
+   * The JournalManager may archive/purge any logs for transactions less than
+   * or equal to minImageTxId.
+   *
+   * @param minTxIdToKeep the earliest txid that must be retained after purging
+   *                      old logs
+   * @throws IOException if purging fails
+   */
+  void purgeLogsOlderThan(long minTxIdToKeep)
+    throws IOException;
+
+  /**
+   * Recover segments which have not been finalized.
+   */
+  void recoverUnfinalizedSegments() throws IOException;
+  
+  /**
+   * Checks if a segment starting at given txid is in progress.
+   * 
+   * @param startTxId start txid of the segment
+   */
+  boolean isSegmentInProgress(long startTxId) throws IOException;
+
+  /**
+   * Close the journal manager, freeing any resources it may hold.
+   */
+  void close() throws IOException;
+
+  /** 
+   * Indicate that a journal is cannot be used to load a certain range of 
+   * edits.
+   * This exception occurs in the case of a gap in the transactions, or a
+   * corrupt edit file.
+   */
+  public static class CorruptionException extends IOException {
+    static final long serialVersionUID = -4687802717006172702L;
+    
+    public CorruptionException(String reason) {
+      super(reason);
+    }
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalSet.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalSet.java
new file mode 100644
index 00000000..f8224b81
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalSet.java
@@ -0,0 +1,619 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.Multimaps;
+
+
+/**
+ * Manages a collection of Journals. None of the methods are synchronized, it is
+ * assumed that FSEditLog methods, that use this class, use proper
+ * synchronization.
+ */
+public class JournalSet implements JournalManager {
+
+  static final Log LOG = LogFactory.getLog(FSEditLog.class);
+  
+  private int minimumNumberOfJournals;
+  private NNStorage storage;
+  
+  /**
+   * Container for a JournalManager paired with its currently
+   * active stream.
+   * 
+   * If a Journal gets disabled due to an error writing to its
+   * stream, then the stream will be aborted and set to null.
+   */
+  public static class JournalAndStream {
+    private final JournalManager journal;
+    private boolean disabled = false;
+    private EditLogOutputStream stream;
+    private boolean required = false;
+    
+    public JournalAndStream(JournalManager manager, boolean required) {
+      this.journal = manager;
+      this.required = required;
+    }
+
+    public void startLogSegment(long txId) throws IOException {
+      if(stream != null) {
+        throw new IOException("Stream should not be initialized");
+      }
+      if (disabled) {
+        FSEditLog.LOG.info("Restoring journal " + this);
+      }
+      disabled = false;
+      InjectionHandler.processEventIO(
+          InjectionEvent.JOURNALANDSTREAM_STARTLOGSEGMENT, required);
+      stream = journal.startLogSegment(txId);
+    }
+
+    /**
+     * Closes the stream, also sets it to null.
+     */
+    public void closeStream() throws IOException {
+      if (stream == null) return;
+      stream.close();
+      stream = null;
+    }
+
+    /**
+     * Close the Journal and Stream
+     */
+    public void close() throws IOException {
+      closeStream();
+
+      journal.close();
+    }
+    
+    /**
+     * Aborts the stream, also sets it to null.
+     */
+    public void abort() {
+      if (stream == null) return;
+      try {
+        stream.abort();
+      } catch (IOException ioe) {
+        LOG.error("Unable to abort stream " + stream, ioe);
+      }
+      stream = null;
+    }
+
+    boolean isActive() {
+      return stream != null;
+    }
+    
+    /**
+     * Should be used outside JournalSet only for testing.
+     */
+    EditLogOutputStream getCurrentStream() {
+      return stream;
+    }
+    
+    @Override
+    public String toString() {
+      return "JournalAndStream(mgr=" + journal +
+        ", " + "stream=" + stream + ", required=" + required + ")";
+    }
+    
+    public String toStringShort() {
+      return journal.toString();
+    }
+
+    void setCurrentStreamForTests(EditLogOutputStream stream) {
+      this.stream = stream;
+    }
+    
+    JournalManager getManager() {
+      return journal;
+    }
+
+    private boolean isDisabled() {
+      return disabled;
+    }
+
+    private void setDisabled(boolean disabled) {
+      this.disabled = disabled;
+    }
+    
+    public boolean isResourceAvailable() {
+      return !isDisabled();
+    }
+    
+    public boolean isRequired() {
+      return required;
+    }
+  }
+  
+  private List<JournalAndStream> journals = new ArrayList<JournalAndStream>();
+  
+  private volatile boolean forceJournalCheck = false;
+
+  JournalSet(Configuration conf, NNStorage storage) {
+    minimumNumberOfJournals 
+      = conf.getInt("dfs.name.edits.dir.minimum", 1);
+    this.storage = storage;
+  }
+  
+  @Override
+  public EditLogOutputStream startLogSegment(final long txId) throws IOException {
+    mapJournalsAndReportErrors(new JournalClosure() {
+      @Override
+      public void apply(JournalAndStream jas) throws IOException {
+        jas.startLogSegment(txId);
+      }
+    }, "starting log segment " + txId);
+    return new JournalSetOutputStream();
+  }
+  
+  @Override
+  public void finalizeLogSegment(final long firstTxId, final long lastTxId)
+      throws IOException {
+    mapJournalsAndReportErrors(new JournalClosure() {
+      @Override
+      public void apply(JournalAndStream jas) throws IOException {
+        if (jas.isActive()) {
+          jas.closeStream();
+          jas.getManager().finalizeLogSegment(firstTxId, lastTxId);
+        }
+      }
+    }, "finalize log segment " + firstTxId + ", " + lastTxId);
+  }
+   
+  @Override
+  public void close() throws IOException {
+    mapJournalsAndReportErrors(new JournalClosure() {
+      @Override
+      public void apply(JournalAndStream jas) throws IOException {
+        jas.close();
+      }
+    }, "close journal");
+  }
+
+  
+  /**
+   * Find the best editlog input stream to read from txid.
+   * If a journal throws an CorruptionException while reading from a txn id,
+   * it means that it has more transactions, but can't find any from fromTxId. 
+   * If this is the case and no other journal has transactions, we should throw
+   * an exception as it means more transactions exist, we just can't load them.
+   *
+   * @param fromTxnId Transaction id to start from.
+   * @return A edit log input stream with tranactions fromTxId 
+   *         or null if no more exist
+   */
+  @Override
+  public EditLogInputStream getInputStream(long fromTxnId) throws IOException {
+    JournalManager bestjm = null;
+    long bestjmNumTxns = 0;
+    CorruptionException corruption = null;
+
+    for (JournalAndStream jas : journals) {
+      JournalManager candidate = jas.getManager();
+      long candidateNumTxns = 0;
+      try {
+        candidateNumTxns = candidate.getNumberOfTransactions(fromTxnId);
+      } catch (CorruptionException ce) {
+        corruption = ce;
+      } catch (IOException ioe) {
+        continue; // error reading disk, just skip
+      }
+      
+      if (candidateNumTxns > bestjmNumTxns) {
+        bestjm = candidate;
+        bestjmNumTxns = candidateNumTxns;
+      }
+    }
+    
+    if (bestjm == null) {
+      if (corruption != null) {
+        throw new IOException("No non-corrupt logs for txid " 
+                                        + fromTxnId, corruption);
+      } else {
+        return null;
+      }
+    }
+    return bestjm.getInputStream(fromTxnId);
+  }
+  
+  @Override
+  public long getNumberOfTransactions(long fromTxnId) throws IOException {
+    long num = 0;
+    for (JournalAndStream jas: journals) {
+      if (jas.isActive()) {
+        long newNum = jas.getManager().getNumberOfTransactions(fromTxnId);
+        if (newNum > num) {
+          num = newNum;
+        }
+      }
+    }
+    return num;
+  }
+
+  /**
+   * Returns true if there are no journals, all redundant journals are disabled,
+   * or any required journals are disabled.
+   * 
+   * @return True if there no journals, all redundant journals are disabled,
+   * or any required journals are disabled.
+   */
+  public boolean isEmpty() {
+    return journals.size() == 0;
+  }
+  
+  /**
+   * Called when some journals experience an error in some operation.
+   */
+  private void disableAndReportErrorOnJournals(
+      List<JournalAndStream> badJournals, String status) throws IOException {
+    if (badJournals == null || badJournals.isEmpty()) {
+      if (forceJournalCheck) {
+        // check status here, because maybe some other operation
+        // (e.g., rollEditLog failed and disabled journals) but this
+        // was missed by logSync() exit runtime
+        forceJournalCheck = false;
+        checkJournals(status);
+      }
+      return; // nothing to do
+    }
+ 
+    for (JournalAndStream j : badJournals) {
+      LOG.error("Disabling journal " + j);
+      j.abort();
+      j.setDisabled(true);
+      
+      // report errors on storage directories as well for FJMs
+      if (j.journal instanceof FileJournalManager) {
+        FileJournalManager fjm = (FileJournalManager) j.journal;
+        storage.reportErrorsOnDirectory(fjm.getStorageDirectory());
+      }
+    }
+    checkJournals(status);
+  }
+
+  /**
+   * Implementations of this interface encapsulate operations that can be
+   * iteratively applied on all the journals. For example see
+   * {@link JournalSet#mapJournalsAndReportErrors}.
+   */
+  private interface JournalClosure {
+    /**
+     * The operation on JournalAndStream.
+     * @param jas Object on which operations are performed.
+     * @throws IOException
+     */
+    public void apply(JournalAndStream jas) throws IOException;
+  }
+  
+  /**
+   * Apply the given operation across all of the journal managers, disabling
+   * any for which the closure throws an IOException.
+   * @param closure {@link JournalClosure} object encapsulating the operation.
+   * @param status message used for logging errors (e.g. "opening journal")
+   * @throws IOException If the operation fails on all the journals.
+   */
+  private void mapJournalsAndReportErrors(
+      JournalClosure closure, String status) throws IOException{
+    List<JournalAndStream> badJAS = null;
+    for (JournalAndStream jas : journals) {
+      try {
+        closure.apply(jas);
+      } catch (Throwable t) {
+        if (badJAS == null)
+          badJAS = new LinkedList<JournalAndStream>();
+        LOG.error("Error: " + status + " failed for (journal " + jas + ")", t);
+        badJAS.add(jas);
+      }
+    }
+    disableAndReportErrorOnJournals(badJAS, status);
+  }
+  
+  protected int checkJournals(String status) throws IOException {
+    boolean abort = false;
+    int journalsAvailable = 0;
+    for(JournalAndStream jas : journals) {
+      if(jas.isDisabled() && jas.isRequired()) {
+        abort = true;
+      } else if (jas.isResourceAvailable()) {
+        journalsAvailable++;
+      }
+    }
+    if (abort || journalsAvailable < minimumNumberOfJournals) {
+      forceJournalCheck = true;
+      String message = status + " failed for too many journals, minimum: "
+          + minimumNumberOfJournals + " current: " + journalsAvailable;
+      throw new IOException(message);
+    }
+    return journalsAvailable;
+  }
+  
+  /**
+   * An implementation of EditLogOutputStream that applies a requested method on
+   * all the journals that are currently active.
+   */
+  private class JournalSetOutputStream extends EditLogOutputStream {
+
+    JournalSetOutputStream() throws IOException {
+      super();
+    }
+
+    @Override
+    public void write(final FSEditLogOp op)
+        throws IOException {
+      mapJournalsAndReportErrors(new JournalClosure() {
+        @Override
+        public void apply(JournalAndStream jas) throws IOException {
+          if (jas.isActive()) {
+            jas.getCurrentStream().write(op);
+          }
+        }
+      }, "write op");
+    }
+
+    @Override
+    public void create() throws IOException {
+      mapJournalsAndReportErrors(new JournalClosure() {
+        @Override
+        public void apply(JournalAndStream jas) throws IOException {
+          if (jas.isActive()) {
+            jas.getCurrentStream().create();
+          }
+        }
+      }, "create");
+    }
+
+    @Override
+    public void close() throws IOException {
+      mapJournalsAndReportErrors(new JournalClosure() {
+        @Override
+        public void apply(JournalAndStream jas) throws IOException {
+          jas.closeStream();
+        }
+      }, "close");
+    }
+
+    @Override
+    public void abort() throws IOException {
+      mapJournalsAndReportErrors(new JournalClosure() {
+        @Override
+        public void apply(JournalAndStream jas) throws IOException {
+          jas.abort();
+        }
+      }, "abort");
+    }
+
+    @Override
+    public void setReadyToFlush() throws IOException {
+      mapJournalsAndReportErrors(new JournalClosure() {
+        @Override
+        public void apply(JournalAndStream jas) throws IOException {
+          if (jas.isActive()) {
+            jas.getCurrentStream().setReadyToFlush();
+          }
+        }
+      }, "setReadyToFlush");
+    }
+
+    @Override
+    protected void flushAndSync() throws IOException {
+      mapJournalsAndReportErrors(new JournalClosure() {
+        @Override
+        public void apply(JournalAndStream jas) throws IOException {
+          if (jas.isActive()) {
+            jas.getCurrentStream().flushAndSync();
+          }
+        }
+      }, "flushAndSync");
+    }
+    
+    @Override
+    public void flush() throws IOException {
+      mapJournalsAndReportErrors(new JournalClosure() {
+        @Override
+        public void apply(JournalAndStream jas) throws IOException {
+          if (jas.isActive()) {
+            jas.getCurrentStream().flush();
+          }
+        }
+      }, "flush");
+    }
+    
+    @Override
+    public boolean shouldForceSync() {
+      for (JournalAndStream js : journals) {
+        if (js.isActive() && js.getCurrentStream().shouldForceSync()) {
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    @Override
+    protected long getNumSync() {
+      for (JournalAndStream jas : journals) {
+        if (jas.isActive()) {
+          return jas.getCurrentStream().getNumSync();
+        }
+      }
+      return 0;
+    }
+
+    //TODO what is the name of the journalSet?
+    @Override
+    String getName() {
+      return "JournalSet: ";
+    }
+
+    @Override
+    long length() throws IOException {
+      // TODO Auto-generated method stub
+      return 0;
+    }
+  }
+  
+  List<JournalAndStream> getAllJournalStreams() {
+    return journals;
+  }
+
+  List<JournalManager> getJournalManagers() {
+    List<JournalManager> jList = new ArrayList<JournalManager>();
+    for (JournalAndStream j : journals) {
+      jList.add(j.getManager());
+    }
+    return jList;
+  }
+
+  void add(JournalManager j, boolean required) {
+    JournalAndStream jas = new JournalAndStream(j, required);
+    journals.add(jas);
+  }
+  
+  void remove(JournalManager j) {
+    JournalAndStream jasToRemove = null;
+    for (JournalAndStream jas: journals) {
+      if (jas.getManager().equals(j)) {
+        jasToRemove = jas;
+        break;
+      }
+    }
+    if (jasToRemove != null) {
+      jasToRemove.abort();
+      journals.remove(jasToRemove);
+    }
+  }
+
+  @Override
+  public void purgeLogsOlderThan(final long minTxIdToKeep) throws IOException {
+    mapJournalsAndReportErrors(new JournalClosure() {
+      @Override
+      public void apply(JournalAndStream jas) throws IOException {
+        jas.getManager().purgeLogsOlderThan(minTxIdToKeep);
+      }
+    }, "purgeLogsOlderThan " + minTxIdToKeep);
+  }
+
+  @Override
+  public void recoverUnfinalizedSegments() throws IOException {
+    mapJournalsAndReportErrors(new JournalClosure() {
+      @Override
+      public void apply(JournalAndStream jas) throws IOException {
+        jas.getManager().recoverUnfinalizedSegments();
+      }
+    }, "recoverUnfinalizedSegments");
+  }
+  
+  /**
+   * Return a manifest of what finalized edit logs are available. All available
+   * edit logs are returned starting from the transaction id passed.
+   * 
+   * @param fromTxId Starting transaction id to read the logs.
+   * @return RemoteEditLogManifest object.
+   */
+  public synchronized RemoteEditLogManifest getEditLogManifest(long fromTxId) {
+    // Collect RemoteEditLogs available from each FileJournalManager
+    List<RemoteEditLog> allLogs = new ArrayList<RemoteEditLog>();
+    for (JournalAndStream j : journals) {
+      if (j.getManager() instanceof FileJournalManager) {
+        FileJournalManager fjm = (FileJournalManager)j.getManager();
+        try {
+          allLogs.addAll(fjm.getRemoteEditLogs(fromTxId));
+        } catch (Throwable t) {
+          LOG.warn("Cannot list edit logs in " + fjm, t);
+        }
+      }
+    }
+    
+    // Group logs by their starting txid
+    ImmutableListMultimap<Long, RemoteEditLog> logsByStartTxId =
+      Multimaps.index(allLogs, RemoteEditLog.GET_START_TXID);
+    long curStartTxId = fromTxId;
+
+    List<RemoteEditLog> logs = new ArrayList<RemoteEditLog>();
+    while (true) {
+      ImmutableList<RemoteEditLog> logGroup = logsByStartTxId.get(curStartTxId);
+      if (logGroup.isEmpty()) {
+        // we have a gap in logs - for example because we recovered some old
+        // storage directory with ancient logs. Clear out any logs we've
+        // accumulated so far, and then skip to the next segment of logs
+        // after the gap.
+        SortedSet<Long> startTxIds = new TreeSet<Long>(logsByStartTxId.keySet());
+        startTxIds = startTxIds.tailSet(curStartTxId);
+        if (startTxIds.isEmpty()) {
+          break;
+        } else {
+          if (LOG.isDebugEnabled()) {
+            LOG.debug("Found gap in logs at " + curStartTxId + ": " +
+                "not returning previous logs in manifest.");
+          }
+          logs.clear();
+          curStartTxId = startTxIds.first();
+          continue;
+        }
+      }
+
+      // Find the one that extends the farthest forward
+      RemoteEditLog bestLog = Collections.max(logGroup);
+      logs.add(bestLog);
+      // And then start looking from after that point
+      curStartTxId = bestLog.getEndTxId() + 1;
+    }
+    RemoteEditLogManifest ret = new RemoteEditLogManifest(logs);
+    
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Generated manifest for logs since " + fromTxId + ":"
+          + ret);      
+    }
+    return ret;
+  }
+
+  /**
+   * Add sync times to the buffer.
+   */
+  String getSyncTimes() {
+    StringBuilder buf = new StringBuilder();
+    for (JournalAndStream jas : journals) {
+      if (jas.isActive()) {
+        buf.append(jas.getCurrentStream().getTotalSyncTime());
+        buf.append(" ");
+      }
+    }
+    return buf.toString();
+  }
+
+  @Override
+  public boolean isSegmentInProgress(long startTxId) throws IOException {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalStream.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalStream.java
new file mode 100644
index 00000000..6cf7b05f
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JournalStream.java
@@ -0,0 +1,56 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+
+/**
+ * A generic interface for journal input and output streams.
+ */
+public interface JournalStream {
+  /**
+   * Type of the underlying persistent storage type the stream is based upon.
+   * <ul>
+   * <li>{@link JournalType#FILE} - streams edits into a local file, see
+   * {@link FSEditLog.EditLogFileOutputStream} and 
+   * {@link FSEditLog.EditLogFileInputStream}</li>
+   * <li>{@link JournalType#EXTERNAL} - streams edits to external storage</li>
+   * </ul>
+   */
+  public static enum JournalType {
+    FILE,
+    EXTERNAL;
+    boolean isOfType(JournalType other) {
+      return other == null || this == other;
+    }
+  };
+
+  /**
+   * Get this stream name.
+   * 
+   * @return name of the stream
+   */
+  String getName();
+
+  /**
+   * Get the type of the stream.
+   * Determines the underlying persistent storage type.
+   * @see JournalType
+   * @return type
+   */
+  JournalType getType();
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java
index 6f0e19b0..7db7f3e8 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java
@@ -25,6 +25,8 @@
 import java.lang.management.MemoryUsage;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,6 +43,7 @@
 import javax.servlet.jsp.JspWriter;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.BlockReader;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
@@ -230,9 +233,8 @@ public void streamBlockInAscii(InetSocketAddress addr, int namespaceId,
       long amtToRead = Math.min(chunkSizeToView, blockSize - offsetIntoBlock);     
       
       // Use the block name for file name. 
-      DFSClient.BlockReader blockReader = 
-        DFSClient.BlockReader.newBlockReader(
-                                    DataTransferProtocol.DATA_TRANSFER_VERSION,
+      BlockReader blockReader = 
+        BlockReader.newBlockReader(DataTransferProtocol.DATA_TRANSFER_VERSION,
                                     namespaceId,
                                     s, addr.toString() + ":" + blockId,
                                     blockId, genStamp ,offsetIntoBlock, 
@@ -318,10 +320,18 @@ public static void generateWarningText(JspWriter out, FSNamesystem fsn) {
         if (raidHttpUrl != null) {
           try {
             HttpServer.LOG.info("Raidnode http address:" + raidHttpUrl);
-            out.print(fsn.getCorruptFileHTMLInfo(raidHttpUrl));
+            InetSocketAddress raidInfoSocAddr =
+                NetUtils.createSocketAddr(raidHttpUrl);
+            out.print(DFSUtil.getHTMLContent(
+                new URI("http", null, raidInfoSocAddr.getHostName(),
+                    raidInfoSocAddr.getPort(), "/corruptfilecounter", null,
+                    null)
+                ));
           } catch (IOException e) {
             HttpServer.LOG.error(e);
-          } 
+          } catch (URISyntaxException e) {
+            HttpServer.LOG.error(e);
+          }
         }
         out.print("<br></b>");
       }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
index 5c375319..e673efee 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
@@ -33,6 +33,8 @@
 import org.apache.hadoop.fs.OpenFileInfo;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.hdfs.util.LightWeightLinkedSet;
 
 /**
@@ -453,10 +455,16 @@ public void setLeasePeriod(long softLimit, long hardLimit) {
    ******************************************************/
   class Monitor implements Runnable {
     final String name = getClass().getSimpleName();
+    private volatile boolean running = true;
+    
+    public void stop() {
+      running = false;
+    }
 
     /** Check leases periodically. */
     public void run() {
-      for(; fsnamesystem.isRunning(); ) {
+      for(; running && fsnamesystem.isRunning(); ) {
+        InjectionHandler.processEvent(InjectionEvent.LEASEMANAGER_CHECKLEASES);
         fsnamesystem.writeLock();
         try {
           if (!fsnamesystem.isInSafeMode()) {
@@ -485,7 +493,7 @@ synchronized void checkLeases() {
       if (!oldest.expiredHardLimit()) {
         return;
       }
-
+      
       // internalReleaseLease() removes paths corresponding to empty files,
       // i.e. it needs to modify the collection being iterated over
       // causing ConcurrentModificationException
@@ -496,7 +504,7 @@ synchronized void checkLeases() {
           + Arrays.toString(leasePaths));
       for(String p : leasePaths) {
         if (++numPathsChecked > this.maxPathsPerCheck) {
-          break;
+          return;
         }
         try {
           fsnamesystem.getFSNamesystemMetrics().numLeaseRecoveries.inc();
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
index 35e00ddf..1e02e234 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
@@ -127,6 +127,7 @@ protected Map<String,String> buildRoot(HttpServletRequest request,
    */
   public void doGet(HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException {
+    NameNode.getNameNodeMetrics().numListPathsServletDoGet.inc();
     final UnixUserGroupInformation ugi = getUGI(request);
     final PrintWriter out = response.getWriter();
     final XMLOutputter doc = new XMLOutputter(out, "UTF-8");
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorage.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
new file mode 100644
index 00000000..31768983
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
@@ -0,0 +1,1039 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.protocol.LayoutVersion;
+import org.apache.hadoop.hdfs.protocol.LayoutVersion.Feature;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.common.Storage;
+import org.apache.hadoop.hdfs.server.common.StorageInfo;
+import org.apache.hadoop.hdfs.server.common.UpgradeManager;
+import org.apache.hadoop.hdfs.server.common.Util;
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
+import org.apache.hadoop.hdfs.util.AtomicFileOutputStream;
+
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.io.MD5Hash;
+
+/**
+ * NNStorage is responsible for management of the StorageDirectories used by
+ * the NameNode.
+ */
+public class NNStorage extends Storage implements Closeable {
+  private static final Log LOG = LogFactory.getLog(NNStorage.class.getName());
+
+  static final String MESSAGE_DIGEST_PROPERTY = "imageMD5Digest";
+  static final String LOCAL_URI_SCHEME = "file";
+
+  //
+  // The filenames used for storing the images
+  //
+  enum NameNodeFile {
+    IMAGE     ("fsimage"),
+    TIME      ("fstime"), // from "old" pre-HDFS-1073 format
+    SEEN_TXID ("seen_txid"),
+    EDITS     ("edits"),
+    IMAGE_NEW ("fsimage.ckpt"),
+    EDITS_NEW ("edits.new"), // from "old" pre-HDFS-1073 format
+    EDITS_INPROGRESS ("edits_inprogress");
+
+    private String fileName = null;
+    private NameNodeFile(String name) { this.fileName = name; }
+    String getName() { return fileName; }
+  }
+  
+
+  /**
+   * Implementation of StorageDirType specific to namenode storage
+   * A Storage directory could be of type IMAGE which stores only fsimage,
+   * or of type EDITS which stores edits or of type IMAGE_AND_EDITS which
+   * stores both fsimage and edits.
+   */
+  //tnykiel: moved from FSImage
+  static enum NameNodeDirType implements StorageDirType {
+    UNDEFINED,
+    IMAGE,
+    EDITS,
+    IMAGE_AND_EDITS;
+    
+    public StorageDirType getStorageDirType() {
+      return this;
+    }
+    
+    public boolean isOfType(StorageDirType type) {
+      if ((this == IMAGE_AND_EDITS) && (type == IMAGE || type == EDITS))
+        return true;
+      return this == type;
+    }
+  }
+  
+  private UpgradeManager upgradeManager = null;
+  
+  private Object restorationLock = new Object();
+  private boolean disablePreUpgradableLayoutCheck = false;
+
+
+  /**
+   * TxId of the last transaction that was included in the most
+   * recent fsimage file. This does not include any transactions
+   * that have since been written to the edit log.
+   */
+  private long mostRecentCheckpointTxId = HdfsConstants.INVALID_TXID;  
+  // used for webui
+  private long mostRecentCheckpointTime = 0;
+  
+  private final Map<Long, MD5Hash> checkpointImageDigests = new HashMap<Long,MD5Hash>();
+
+  /**
+   * list of failed (and thus removed) storages
+   */
+  final protected List<StorageDirectory> removedStorageDirs
+  = Collections.synchronizedList(new ArrayList<StorageDirectory>());
+
+  /**
+   * Properties from old layout versions that may be needed
+   * during upgrade only.
+   */
+  private HashMap<String, String> deprecatedProperties;
+  
+  private final Configuration conf;
+
+  /**
+   * Construct the NNStorage.
+   * @param conf Namenode configuration.
+   * @param imageDirs Directories the image can be stored in.
+   * @param editsDirs Directories the editlog can be stored in.
+   * @throws IOException if any directories are inaccessible.
+   */
+  public NNStorage(Configuration conf, Collection<URI> imageDirs, 
+      Collection<URI> editsDirs) 
+      throws IOException {
+    super(NodeType.NAME_NODE);
+
+    storageDirs = Collections.synchronizedList(new ArrayList<StorageDirectory>());
+    
+    // this may modify the editsDirs, so copy before passing in
+    setStorageDirectories(imageDirs, 
+                          new ArrayList<URI>(editsDirs));
+    this.conf = conf;
+  }
+  
+  public Collection<StorageDirectory> getStorageDirs() {
+    return storageDirs;
+  }
+  
+  void checkpointUploadDone(long txid, MD5Hash checkpointImageMd5)
+      throws IOException {
+    setCheckpointImageDigest(txid, checkpointImageMd5);
+  }
+  
+  /**
+   * For testing
+   * @param storageInfo
+   * @throws IOException
+   */
+  public NNStorage(StorageInfo storageInfo) throws IOException {
+    super(NodeType.NAME_NODE, storageInfo);
+    this.conf = new Configuration();
+  }
+
+  @Override // Storage
+  public boolean isConversionNeeded(StorageDirectory sd) throws IOException {
+    if (disablePreUpgradableLayoutCheck) {
+      return false;
+    }
+
+    File oldImageDir = new File(sd.getRoot(), "image");
+    if (!oldImageDir.exists()) {
+      return false;
+    }
+    // check the layout version inside the image file
+    File oldF = new File(oldImageDir, "fsimage");
+    RandomAccessFile oldFile = new RandomAccessFile(oldF, "rws");
+    try {
+      oldFile.seek(0);
+      int oldVersion = oldFile.readInt();
+      oldFile.close();
+      oldFile = null;
+      if (oldVersion < LAST_PRE_UPGRADE_LAYOUT_VERSION)
+        return false;
+    } finally {
+      IOUtils.cleanup(LOG, oldFile);
+    }
+    return true;
+  }
+
+  @Override // Closeable
+  public void close() throws IOException {
+    unlockAll();
+    storageDirs.clear();
+  }
+
+  /**
+   * See if any of removed storages is "writable" again, and can be returned
+   * into service.
+   */
+  void attemptRestoreRemovedStorage() {
+    // if directory is "alive" - copy the images there...
+    if(removedStorageDirs.size() == 0)
+      return; //nothing to restore
+
+    /* We don't want more than one thread trying to restore at a time */
+    synchronized (this.restorationLock) {
+      LOG.info("attemptRestoreRemovedStorage: check removed(failed) "+
+               "storage. removedStorages size = " + removedStorageDirs.size());
+      for(Iterator<StorageDirectory> it
+            = this.removedStorageDirs.iterator(); it.hasNext();) {
+        StorageDirectory sd = it.next();
+        File root = sd.getRoot();
+        LOG.info("attemptRestoreRemovedStorage: currently disabled dir "
+            + root.getAbsolutePath()
+            + "; type="
+            + sd.getStorageDirType()
+            + ";canwrite=" + root.canWrite());
+        try {
+          
+          if(root.exists() && root.canWrite()) { 
+            LOG.info("attemptRestoreRemovedStorage: restoring dir "
+                + sd.getRoot().getAbsolutePath());
+            this.addStorageDir(sd); // restore
+            it.remove();
+            sd.lock();
+          }
+        } catch(IOException e) {
+          LOG.warn("attemptRestoreRemovedStorage: failed to restore "
+              + sd.getRoot().getAbsolutePath(), e);
+        }
+      }
+    }
+  }
+
+  /**
+   * @return A list of storage directories which are in the errored state.
+   */
+  public List<StorageDirectory> getRemovedStorageDirs() {
+    return this.removedStorageDirs;
+  }
+
+  /**
+   * Set the storage directories which will be used. This should only ever be
+   * called from inside NNStorage. However, it needs to remain package private
+   * for testing, as StorageDirectories need to be reinitialised after using
+   * Mockito.spy() on this class, as Mockito doesn't work well with inner
+   * classes, such as StorageDirectory in this case.
+   *
+   * Synchronized due to initialization of storageDirs and removedStorageDirs.
+   *
+   * @param fsNameDirs Locations to store images.
+   * @param fsEditsDirs Locations to store edit logs.
+   * @throws IOException
+   */
+  public synchronized void setStorageDirectories(Collection<URI> fsNameDirs,
+                                          Collection<URI> fsEditsDirs)
+      throws IOException {
+    
+    this.storageDirs.clear();
+    this.removedStorageDirs.clear();
+
+    for (URI dirName : fsNameDirs) {
+      boolean isAlsoEdits = false;
+      for (URI editsDirName : fsEditsDirs) {
+        if (editsDirName.compareTo(dirName) == 0) {
+          isAlsoEdits = true;
+          fsEditsDirs.remove(editsDirName);
+          break;
+        }
+      }
+      NameNodeDirType dirType = (isAlsoEdits) ?
+                          NameNodeDirType.IMAGE_AND_EDITS :
+                          NameNodeDirType.IMAGE;
+      // Add to the list of storage directories, only if the
+      // URI is of type file://
+      if (dirName.getScheme().compareTo(JournalType.FILE.name().toLowerCase()) == 0) {
+        this.addStorageDir(new StorageDirectory(new File(dirName.getPath()),
+            dirType));
+      }
+    }
+    
+    // Add edits dirs if they are different from name dirs
+    for (URI dirName : fsEditsDirs) {
+      checkSchemeConsistency(dirName);
+      // Add to the list of storage directories, only if the
+      // URI is of type file://
+      if (dirName.getScheme().compareTo(JournalType.FILE.name().toLowerCase()) == 0)
+        this.addStorageDir(new StorageDirectory(new File(dirName.getPath()),
+            NameNodeDirType.EDITS));
+    }
+  }
+ 
+
+  /**
+   * Return the storage directory corresponding to the passed URI
+   * @param uri URI of a storage directory
+   * @return The matching storage directory or null if none found
+   */
+  StorageDirectory getStorageDirectory(URI uri) {
+    try {
+      uri = Util.fileAsURI(new File(uri));
+      Iterator<StorageDirectory> it = dirIterator();
+      for (; it.hasNext(); ) {
+        StorageDirectory sd = it.next();
+        if (Util.fileAsURI(sd.getRoot()).equals(uri)) {
+          return sd;
+        }
+      }
+    } catch (IOException ioe) {
+      LOG.warn("Error converting file to URI", ioe);
+    }
+    return null;
+  }
+
+  /**
+   * Checks the consistency of a URI, in particular if the scheme
+   * is specified 
+   * @param u URI whose consistency is being checked.
+   */
+  private static void checkSchemeConsistency(URI u) throws IOException {
+    String scheme = u.getScheme();
+    // the URI should have a proper scheme
+    if(scheme == null) {
+      throw new IOException("Undefined scheme for " + u);
+    }
+  }
+
+  /**
+   * Retrieve current directories of type IMAGE
+   * @return Collection of URI representing image directories
+   * @throws IOException in case of URI processing error
+   */
+  Collection<File> getImageDirectories() throws IOException {
+    return getDirectories(NameNodeDirType.IMAGE);
+  }
+
+  /**
+   * Retrieve current directories of type EDITS
+   * @return Collection of URI representing edits directories
+   * @throws IOException in case of URI processing error
+   */
+  Collection<File> getEditsDirectories() throws IOException {
+    return getDirectories(NameNodeDirType.EDITS);
+  }
+
+  /**
+   * Return number of storage directories of the given type.
+   * @param dirType directory type
+   * @return number of storage directories of type dirType
+   */
+  int getNumStorageDirs(NameNodeDirType dirType) {
+    if(dirType == null)
+      return getNumStorageDirs();
+    Iterator<StorageDirectory> it = dirIterator(dirType);
+    int numDirs = 0;
+    for(; it.hasNext(); it.next())
+      numDirs++;
+    return numDirs;
+  }
+
+  /**
+   * Return the list of locations being used for a specific purpose.
+   * i.e. Image or edit log storage.
+   *
+   * @param dirType Purpose of locations requested.
+   * @throws IOException
+   */
+  Collection<File> getDirectories(NameNodeDirType dirType)
+      throws IOException {
+    ArrayList<File> list = new ArrayList<File>();
+    Iterator<StorageDirectory> it = (dirType == null) ? dirIterator() :
+                                    dirIterator(dirType);
+    for ( ;it.hasNext(); ) {
+      StorageDirectory sd = it.next();
+      list.add(sd.getRoot());
+    }
+    return list;
+  }
+  
+  /**
+   * Determine the last transaction ID noted in this storage directory.
+   * This txid is stored in a special seen_txid file since it might not
+   * correspond to the latest image or edit log. For example, an image-only
+   * directory will have this txid incremented when edits logs roll, even
+   * though the edits logs are in a different directory.
+   *
+   * @param sd StorageDirectory to check
+   * @return If file exists and can be read, last recorded txid. If not, 0L.
+   * @throws IOException On errors processing file pointed to by sd
+   */
+  static long readTransactionIdFile(StorageDirectory sd) throws IOException {
+    File txidFile = getStorageFile(sd, NameNodeFile.SEEN_TXID);
+    long txid = 0L;
+    if (txidFile.exists() && txidFile.canRead()) {
+      BufferedReader br = new BufferedReader(new FileReader(txidFile));
+      try {
+        txid = Long.valueOf(br.readLine());
+        br.close();
+        br = null;
+      } finally {
+        IOUtils.cleanup(LOG, br);
+      }
+    }
+    return txid;
+  }
+  
+  /**
+   * Write last checkpoint time into a separate file.
+   *
+   * @param sd
+   * @throws IOException
+   */
+  void writeTransactionIdFile(StorageDirectory sd, long txid) throws IOException {
+    if (txid < -1) {
+      // -1 is valid when formatting
+      throw new IOException("Bad txid: " + txid);
+    }
+    File txIdFile = getStorageFile(sd, NameNodeFile.SEEN_TXID);
+    OutputStream fos = new AtomicFileOutputStream(txIdFile);
+    try {
+      fos.write(String.valueOf(txid).getBytes());
+      fos.write('\n');
+      fos.close();
+      fos = null;
+    } finally {
+      IOUtils.cleanup(LOG, fos);
+    }
+  }
+
+  /**
+   * Set the transaction ID of the last checkpoint
+   */
+  synchronized void setMostRecentCheckpointTxId(long txid) {
+    if(txid > mostRecentCheckpointTxId) {
+      this.mostRecentCheckpointTxId = txid;
+      this.mostRecentCheckpointTime = FSNamesystem.now();
+    }
+  }
+
+  /**
+   * Return the transaction ID of the last checkpoint.
+   */
+  public long getMostRecentCheckpointTxId() {
+    return mostRecentCheckpointTxId;
+  }
+  
+  /**
+   * Return the time of last successful checkpoint
+   */
+  public String getMostRecentCheckpointTime() {
+    return new Date(mostRecentCheckpointTime).toString();
+  }
+
+  /**
+   * Write a small file in all available storage directories that
+   * indicates that the namespace has reached some given transaction ID.
+   * 
+   * This is used when the image is loaded to avoid accidental rollbacks
+   * in the case where an edit log is fully deleted but there is no
+   * checkpoint. See TestNameEditsConfigs.testNameEditsConfigsFailure()
+   * @param txid the txid that has been reached
+   */
+  public void writeTransactionIdFileToStorage(long txid) throws IOException {
+    // Write txid marker in all storage directories
+    List<StorageDirectory> badSDs = new ArrayList<StorageDirectory>();
+    for (StorageDirectory sd : storageDirs) {
+      try {
+        writeTransactionIdFile(sd, txid);
+      } catch(IOException e) {
+        // Close any edits stream associated with this dir and remove directory
+        LOG.warn("writeTransactionIdToStorage failed on " + sd,
+            e);
+        badSDs.add(sd);
+      }
+    }
+    reportErrorsOnDirectories(badSDs);
+  }
+
+  /**
+   * Return the name of the image file that is uploaded by periodic
+   * checkpointing
+   *
+   * @return List of filenames to save checkpoints to.
+   */
+  public File[] getFsImageNameCheckpoint(long txid) {
+    ArrayList<File> list = new ArrayList<File>();
+    for (Iterator<StorageDirectory> it =
+                 dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
+      list.add(getStorageFile(it.next(), NameNodeFile.IMAGE_NEW, txid));
+    }
+    return list.toArray(new File[list.size()]);
+  }
+
+  /**
+   * Return the name of the image file.
+   * @return The name of the first image file.
+   */
+  public File getFsImageName(long txid) {
+    StorageDirectory sd = null;
+    for (Iterator<StorageDirectory> it =
+      dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
+      sd = it.next();
+      File fsImage = getStorageFile(sd, NameNodeFile.IMAGE, txid);
+      if(sd.getRoot().canRead() && fsImage.exists())
+        return fsImage;
+    }
+    return null;
+  }
+
+  /**
+   * Format all available storage directories.
+   */
+  public void format() throws IOException {
+    this.layoutVersion = FSConstants.LAYOUT_VERSION;
+    this.namespaceID = newNamespaceID();
+    this.cTime = 0L;
+    for (Iterator<StorageDirectory> it =
+                           dirIterator(); it.hasNext();) {
+      StorageDirectory sd = it.next();
+      format(sd);
+    }
+  }
+  
+  /** Create new dfs name directory.  Caution: this destroys all files
+   * in this filesystem. */
+  private void format(StorageDirectory sd) throws IOException {
+    sd.clearDirectory(); // create currrent dir
+    sd.write();
+    writeTransactionIdFile(sd, -1);
+
+    LOG.info("Storage directory " + sd.getRoot()
+             + " has been successfully formatted.");
+  }
+
+  /**
+   * Generate new namespaceID.
+   * 
+   * namespaceID is a persistent attribute of the namespace.
+   * It is generated when the namenode is formatted and remains the same
+   * during the life cycle of the namenode.
+   * When a datanodes register they receive it as the registrationID,
+   * which is checked every time the datanode is communicating with the 
+   * namenode. Datanodes that do not 'know' the namespaceID are rejected.
+   * 
+   * @return new namespaceID
+   */
+  static int newNamespaceID() {
+    Random r = new Random();
+    r.setSeed(FSNamesystem.now());
+    int newID = 0;
+    while(newID == 0)
+      newID = r.nextInt(0x7FFFFFFF);  // use 31 bits only
+    return newID;
+  }
+
+
+  @Override // Storage
+  protected void getFields(Properties props, StorageDirectory sd)
+      throws IOException {
+    super.getFields(props, sd);
+    if (layoutVersion == 0)
+      throw new IOException("NameNode directory " + sd.getRoot()
+          + " is not formatted.");
+    String sDUS, sDUV;
+    sDUS = props.getProperty("distributedUpgradeState");
+    sDUV = props.getProperty("distributedUpgradeVersion");
+    setDistributedUpgradeState(
+        sDUS == null ? false : Boolean.parseBoolean(sDUS),
+        sDUV == null ? getLayoutVersion() : Integer.parseInt(sDUV));
+    setDeprecatedPropertiesForUpgrade(props);
+  }
+  
+  /**
+   * Return a property that was stored in an earlier version of HDFS.
+   * 
+   * This should only be used during upgrades.
+   */
+  String getDeprecatedProperty(String prop) {
+    assert getLayoutVersion() > FSConstants.LAYOUT_VERSION :
+      "getDeprecatedProperty should only be done when loading " +
+      "storage from past versions during upgrade.";
+    return deprecatedProperties.get(prop);
+  }
+
+  /**
+   * Write version file into the storage directory.
+   *
+   * The version file should always be written last.
+   * Missing or corrupted version file indicates that
+   * the checkpoint is not valid.
+   *
+   * @param sd storage directory
+   * @throws IOException
+   */
+  @Override // Storage  
+  protected void setFields(Properties props, StorageDirectory sd)
+      throws IOException {
+    super.setFields(props, sd);
+    boolean uState = getDistributedUpgradeState();
+    int uVersion = getDistributedUpgradeVersion();
+    if (uState && uVersion != getLayoutVersion()) {
+      props.setProperty("distributedUpgradeState", Boolean.toString(uState));
+      props
+          .setProperty("distributedUpgradeVersion", Integer.toString(uVersion));
+    }
+  }
+  
+  /**
+   * Pull any properties out of the VERSION file that are from older
+   * versions of HDFS and only necessary during upgrade.
+   */
+  private void setDeprecatedPropertiesForUpgrade(Properties props) {
+    deprecatedProperties = new HashMap<String, String>();
+    String md5 = props.getProperty(MESSAGE_DIGEST_PROPERTY);
+    if (md5 != null) {
+      deprecatedProperties.put(MESSAGE_DIGEST_PROPERTY, md5);
+    }
+  }
+  
+  ////////////////////////////////////////////////////////////////////////
+  // names and files for images checkpoint images, edits, etc
+  ////////////////////////////////////////////////////////////////////////
+  
+  static File getStorageFile(StorageDirectory sd, NameNodeFile type, long imageTxId) {
+    return new File(sd.getCurrentDir(),
+                    String.format("%s_%019d", type.getName(), imageTxId));
+  }
+  
+  /**
+   * Get a storage file for one of the files that doesn't need a txid associated
+   * (e.g version, seen_txid)
+   */
+  static File getStorageFile(StorageDirectory sd, NameNodeFile type) {
+    return new File(sd.getCurrentDir(), type.getName());
+  }
+  
+  public static String getCheckpointImageFileName(long txid) {
+    return String.format("%s_%019d",
+                         NameNodeFile.IMAGE_NEW.getName(), txid);
+  }
+  
+  static File getCheckpointImageFile(StorageDirectory sd, long txid) {
+    return new File(sd.getCurrentDir(),
+        getCheckpointImageFileName(txid));
+  }
+
+  public static String getImageFileName(long txid) {
+    return String.format("%s_%019d",
+                         NameNodeFile.IMAGE.getName(), txid);
+  }
+  
+  static File getImageFile(StorageDirectory sd, long txid) {
+    return new File(sd.getCurrentDir(),
+        getImageFileName(txid));
+  }
+  
+  public static String getInProgressEditsFileName(long startTxId) {
+    return String.format("%s_%019d", NameNodeFile.EDITS_INPROGRESS.getName(),
+                         startTxId);
+  }
+  
+  static File getInProgressEditsFile(StorageDirectory sd, long startTxId) {
+    return new File(sd.getCurrentDir(), getInProgressEditsFileName(startTxId));
+  }
+  
+  static File getFinalizedEditsFile(StorageDirectory sd,
+      long startTxId, long endTxId) {
+    return new File(sd.getCurrentDir(),
+        getFinalizedEditsFileName(startTxId, endTxId));
+  }
+
+  public static String getFinalizedEditsFileName(long startTxId, long endTxId) {
+    return String.format("%s_%019d-%019d", NameNodeFile.EDITS.getName(),
+                         startTxId, endTxId);
+  }
+  
+  ////////////////////////////////////////////////////////////////////////
+  
+  /**
+   * Return the first readable finalized edits file for the given txid.
+   */
+  File findFinalizedEditsFile(long startTxId, long endTxId)
+  throws IOException {
+    File ret = findFile(NameNodeDirType.EDITS,
+        getFinalizedEditsFileName(startTxId, endTxId));
+    if (ret == null) {
+      throw new IOException(
+          "No edits file for txid " + startTxId + "-" + endTxId + " exists!");
+    }
+    return ret;
+  }
+  
+  /**
+   * Return the first readable inprogress edits file for the given txid.
+   */
+  File findInProgressEditsFile(long startTxId)
+  throws IOException {
+    File ret = findFile(NameNodeDirType.EDITS,
+        getInProgressEditsFileName(startTxId));
+    if (ret == null) {
+      throw new IOException(
+          "No edits file for txid " + startTxId + "-in progress");
+    }
+    return ret;
+  }
+    
+  /**
+   * Return the first readable image file for the given txid, or null
+   * if no such image can be found
+   */
+  File findImageFile(long txid) throws IOException {
+    return findFile(NameNodeDirType.IMAGE,
+        getImageFileName(txid));
+  }
+
+  /**
+   * Return the first readable storage file of the given name
+   * across any of the 'current' directories in SDs of the
+   * given type, or null if no such file exists.
+   */
+  private File findFile(NameNodeDirType dirType, String name) {
+    for (StorageDirectory sd : dirIterable(dirType)) {
+      File candidate = new File(sd.getCurrentDir(), name);
+      if (sd.getCurrentDir().canRead() &&
+          candidate.exists()) {
+        return candidate;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * @return A list of the given File in every available storage directory,
+   * regardless of whether it might exist.
+   */
+  File[] getFiles(NameNodeDirType dirType, String fileName) {
+    ArrayList<File> list = new ArrayList<File>();
+    Iterator<StorageDirectory> it =
+      (dirType == null) ? dirIterator() : dirIterator(dirType);
+    for ( ;it.hasNext(); ) {
+      list.add(new File(it.next().getCurrentDir(), fileName));
+    }
+    return list.toArray(new File[list.size()]);
+  }
+
+  /**
+   * Set the upgrade manager for use in a distributed upgrade.
+   * @param um The upgrade manager
+   */
+  void setUpgradeManager(UpgradeManager um) {
+    upgradeManager = um;
+  }
+
+  /**
+   * @return The current distribued upgrade state.
+   */
+  boolean getDistributedUpgradeState() {
+    return upgradeManager == null ? false : upgradeManager.getUpgradeState();
+  }
+
+  /**
+   * @return The current upgrade version.
+   */
+  int getDistributedUpgradeVersion() {
+    return upgradeManager == null ? 0 : upgradeManager.getUpgradeVersion();
+  }
+
+  /**
+   * Set the upgrade state and version.
+   * @param uState the new state.
+   * @param uVersion the new version.
+   */
+  private void setDistributedUpgradeState(boolean uState, int uVersion) {
+    if (upgradeManager != null) {
+      upgradeManager.setUpgradeState(uState, uVersion);
+    }
+  }
+
+  /**
+   * Verify that the distributed upgrade state is valid.
+   * @param startOpt the option the namenode was started with.
+   */
+  void verifyDistributedUpgradeProgress(StartupOption startOpt
+                                        ) throws IOException {
+    if(startOpt == StartupOption.ROLLBACK || startOpt == StartupOption.IMPORT)
+      return;
+
+    assert upgradeManager != null : "FSNameSystem.upgradeManager is null.";
+    if(startOpt != StartupOption.UPGRADE) {
+      if(upgradeManager.getUpgradeState())
+        throw new IOException(
+                    "\n   Previous distributed upgrade was not completed. "
+                  + "\n   Please restart NameNode with -upgrade option.");
+      if(upgradeManager.getDistributedUpgrades() != null)
+        throw new IOException("\n   Distributed upgrade for NameNode version "
+                              + upgradeManager.getUpgradeVersion()
+                              + " to current LV " + layoutVersion
+                              + " is required.\n   Please restart NameNode"
+                              + " with -upgrade option.");
+    }
+  }
+
+  /**
+   * Initialize a distributed upgrade.
+   */
+  void initializeDistributedUpgrade() throws IOException {
+    if(! upgradeManager.initializeUpgrade())
+      return;
+    // write new upgrade state into disk
+    writeAll();
+    LOG.info("\n   Distributed upgrade for NameNode version "
+             + upgradeManager.getUpgradeVersion() + " to current LV "
+             + layoutVersion + " is initialized.");
+  }
+
+  /**
+   * Disable the check for pre-upgradable layouts. Needed for BackupImage.
+   * @param val Whether to disable the preupgradeable layout check.
+   */
+  void setDisablePreUpgradableLayoutCheck(boolean val) {
+    disablePreUpgradableLayoutCheck = val;
+  }
+
+  /**
+   * Marks a list of directories as having experienced an error.
+   *
+   * @param sds A list of storage directories to mark as errored.
+   * @throws IOException
+   */
+  void reportErrorsOnDirectories(List<StorageDirectory> sds) 
+      throws IOException {
+    for (StorageDirectory sd : sds) {
+      reportErrorsOnDirectory(sd);
+    }
+    // only check if something was wrong
+    if(!sds.isEmpty()) {
+      if (this.getNumStorageDirs() == 0)  
+        throw new IOException("No more storage directories left");
+      
+      // check image directories, edits are checked withing FSEditLog.checkJournals
+      if (getNumStorageDirs(NameNodeDirType.IMAGE) == 0)
+        throw new IOException("No more image storage directories left");
+    }
+  }
+
+  /**
+   * Reports that a directory has experienced an error.
+   * Notifies listeners that the directory is no longer
+   * available.
+   *
+   * @param sd A storage directory to mark as errored.
+   * @throws IOException
+   */
+  void reportErrorsOnDirectory(StorageDirectory sd) {
+    String lsd = listStorageDirectories();
+    LOG.info("reportErrorsOnDirectory: Current list of storage dirs:" + lsd);
+    
+    LOG.error("reportErrorsOnDirectory: Error reported on storage directory "
+        + sd.getRoot());
+
+    if (this.storageDirs.remove(sd)) {
+      try {
+        sd.unlock();
+      } catch (Exception e) {
+        LOG.warn(
+            "reportErrorsOnDirectory: Unable to unlock bad storage directory: "
+                + sd.getRoot().getPath(), e);
+      }
+      this.removedStorageDirs.add(sd);
+    }
+    
+    lsd = listStorageDirectories();
+    LOG.info("reportErrorsOnDirectory: Current list of storage dirs:" + lsd);
+  }
+  
+  /**
+   * Report that an IOE has occurred on some file which may
+   * or may not be within one of the NN image storage directories.
+   */
+  void reportErrorOnFile(File f) {
+    // We use getAbsolutePath here instead of getCanonicalPath since we know
+    // that there is some IO problem on that drive.
+    // getCanonicalPath may need to call stat() or readlink() and it's likely
+    // those calls would fail due to the same underlying IO problem.
+    String absPath = f.getAbsolutePath();
+    for (StorageDirectory sd : storageDirs) {
+      String dirPath = sd.getRoot().getAbsolutePath();
+      if (!dirPath.endsWith("/")) {
+        dirPath += "/";
+      }
+      if (absPath.startsWith(dirPath)) {
+        reportErrorsOnDirectory(sd);
+        return;
+      }
+    }
+    
+  }
+
+  /**
+   * Iterate over all current storage directories, inspecting them
+   * with the given inspector.
+   */
+  void inspectStorageDirs(FSImageStorageInspector inspector)
+      throws IOException {
+
+    // Process each of the storage directories to find the pair of
+    // newest image file and edit file
+    for (Iterator<StorageDirectory> it = dirIterator(); it.hasNext();) {
+      StorageDirectory sd = it.next();
+      inspector.inspectDirectory(sd);
+    }
+  }
+
+  /**
+   * Iterate over all of the storage dirs, reading their contents to determine
+   * their layout versions. Returns an FSImageStorageInspector which has
+   * inspected each directory.
+   * 
+   * <b>Note:</b> this can mutate the storage info fields (ctime, version, etc).
+   * @throws IOException if no valid storage dirs are found
+   */
+  FSImageStorageInspector readAndInspectDirs()
+      throws IOException {
+    int minLayoutVersion = Integer.MAX_VALUE; // the newest
+    int maxLayoutVersion = Integer.MIN_VALUE; // the oldest
+    
+    // First determine what range of layout versions we're going to inspect
+    for (Iterator<StorageDirectory> it = dirIterator();
+         it.hasNext();) {
+      StorageDirectory sd = it.next();
+      if (!sd.getVersionFile().exists()) {
+        FSImage.LOG.warn("Storage directory " + sd + " contains no VERSION file. Skipping...");
+        continue;
+      }
+      sd.read(); // sets layoutVersion
+      minLayoutVersion = Math.min(minLayoutVersion, getLayoutVersion());
+      maxLayoutVersion = Math.max(maxLayoutVersion, getLayoutVersion());
+    }
+    
+    if (minLayoutVersion > maxLayoutVersion) {
+      throw new IOException("No storage directories contained VERSION information");
+    }
+    assert minLayoutVersion <= maxLayoutVersion;
+    
+    // If we have any storage directories with the new layout version
+    // (ie edits_<txnid>) then use the new inspector, which will ignore
+    // the old format dirs.
+    FSImageStorageInspector inspector;
+    if (LayoutVersion.supports(Feature.TXID_BASED_LAYOUT, minLayoutVersion)) {
+      inspector = new FSImageTransactionalStorageInspector();
+      if (!LayoutVersion.supports(Feature.TXID_BASED_LAYOUT, maxLayoutVersion)) {
+        FSImage.LOG.warn("Ignoring one or more storage directories with old layouts");
+      }
+    } else {
+      inspector = new FSImagePreTransactionalStorageInspector(conf);
+    }
+    
+    inspectStorageDirs(inspector);
+    return inspector;
+  }
+
+  @Override
+  protected void corruptPreUpgradeStorage(File rootDir) throws IOException {
+    File oldImageDir = new File(rootDir, "image");
+    if (!oldImageDir.exists())
+      if (!oldImageDir.mkdir())
+        throw new IOException("Cannot create directory " + oldImageDir);
+    File oldImage = new File(oldImageDir, "fsimage");
+    if (!oldImage.exists())
+      // recreate old image file to let pre-upgrade versions fail
+      if (!oldImage.createNewFile())
+        throw new IOException("Cannot create file " + oldImage);
+    RandomAccessFile oldFile = new RandomAccessFile(oldImage, "rws");
+    // write new version into old image file
+    try {
+      writeCorruptedData(oldFile);
+    } finally {
+      oldFile.close();
+    }
+  }
+  
+  synchronized void setCheckpointImageDigest(long txid, MD5Hash imageDigest) 
+      throws IOException{
+    if(checkpointImageDigests.containsKey(txid)) {
+      MD5Hash existing = checkpointImageDigests.get(txid);
+      if (!existing.equals(imageDigest)) {
+        throw new IOException(
+            "Trying to set checkpoint image digest for txid: " + txid + "="
+                + imageDigest + " existing " + existing);
+      }
+    } else {
+      checkpointImageDigests.put(txid, imageDigest);
+    }
+  }
+  
+  synchronized void clearCheckpointImageDigest(long txid) 
+      throws IOException{
+    checkpointImageDigests.remove(txid);
+  }
+  
+  synchronized MD5Hash getCheckpointImageDigest(long txid) throws IOException {
+    if (checkpointImageDigests.containsKey(txid)) {
+      return checkpointImageDigests.get(txid);
+    }
+    throw new IOException("Trying to get checkpoint image digest for txid: "
+        + txid + " but it's not stored");
+  }
+
+  synchronized void purgeOldStorage(long minImageTxId) {
+    // clear image digests
+    for (Iterator<Map.Entry<Long, MD5Hash>> it = checkpointImageDigests
+        .entrySet().iterator(); it.hasNext();) {
+      Map.Entry<Long, MD5Hash> entry = it.next();
+      if (entry.getKey() < minImageTxId) {
+        it.remove();
+      }
+    }
+  }
+  
+  Configuration getConf() {
+    return conf;
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorageConfiguration.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorageConfiguration.java
new file mode 100644
index 00000000..de00d6b8
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorageConfiguration.java
@@ -0,0 +1,122 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.common.Util;
+
+/**
+ * Set of functions for retrieving
+ * fs.checkpoint.dir
+ * fs.checkpoint.edits.dir
+ * dfs.name.dir
+ * dfs.name.edits.dir
+ */
+public class NNStorageConfiguration {
+  
+  private static final Log LOG = LogFactory.getLog(NNStorageConfiguration.class.getName());
+
+  static Collection<URI> getCheckpointDirs(Configuration conf,
+      String defaultName) {
+    Collection<String> dirNames = conf.getStringCollection("fs.checkpoint.dir");
+    if (dirNames.isEmpty() && defaultName != null) {
+      dirNames.add(defaultName);
+    }
+    return Util.stringCollectionAsURIs(dirNames);
+  }
+
+  static Collection<URI> getCheckpointEditsDirs(Configuration conf,
+      String defaultName) {
+    Collection<String> editsDirNames = conf
+        .getStringCollection("fs.checkpoint.edits.dir");
+    if (editsDirNames.isEmpty() && defaultName != null) {
+      editsDirNames.add(defaultName);
+    }
+    return Util.stringCollectionAsURIs(editsDirNames);
+  }
+  
+  public static Collection<URI> getNamespaceDirs(Configuration conf) {
+    return getNamespaceDirs(conf, "/tmp/hadoop/dfs/name");
+  }
+  
+  public static Collection<URI> getNamespaceDirs(Configuration conf, String def) {
+    Collection<String> dirNames = conf.getStringCollection("dfs.name.dir");
+    if (dirNames.isEmpty() && def != null) {
+      dirNames.add(def);
+    }
+    return Util.stringCollectionAsURIs(dirNames);
+  }
+  
+  public static Collection<URI> getNamespaceEditsDirs(Configuration conf) {
+    return getNamespaceEditsDirs(conf, "/tmp/hadoop/dfs/name");
+  }
+
+  public static Collection<URI> getNamespaceEditsDirs(Configuration conf, String def) {
+    Collection<String> editsDirNames =
+      conf.getStringCollection("dfs.name.edits.dir");
+    if (editsDirNames.isEmpty() && def != null) {
+      editsDirNames.add(def);
+    }
+    return Util.stringCollectionAsURIs(editsDirNames);
+  }
+  
+  public static Collection<URI> getRequiredNamespaceEditsDirs(Configuration conf) {
+    Collection<String> requiredDirNames =
+        conf.getStringCollection("dfs.name.edits.dir.required");
+    return Util.stringCollectionAsURIs(requiredDirNames);
+  }
+  
+  public static URI getURIKey(Configuration conf, String key)
+      throws IOException {
+    Collection<String> keys = conf.getStringCollection(key);
+    if (keys.size() > 1) {
+      LOG.info("Requested a single entry but the configuration contains multiple uris: "
+          + keys);
+      return null;
+    }
+    if (keys.size() == 0) {
+      LOG.info("No value specified for: " + key + " in the configuration");
+      return null;
+    }
+    return Util.stringAsURI(keys.iterator().next());
+  }
+  
+  /**
+   * Gets the checkpoint transaction count. If transaction count
+   * is not set, try to infer it from checkpoint size (for older
+   * configurations)
+   *
+   * @return the number of transactions after which a checkpoint
+   * is triggered.
+   */
+  static long getCheckpointTxnCount(Configuration conf) {
+    long defaultCount = 700000;
+    long bytesPerTxn = 100;
+
+    return conf.getLong("fs.checkpoint.txns",
+        conf.getLong("fs.checkpoint.size", defaultCount * bytesPerTxn)
+            / bytesPerTxn);
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorageRetentionManager.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorageRetentionManager.java
new file mode 100644
index 00000000..7e5312f9
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NNStorageRetentionManager.java
@@ -0,0 +1,160 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeSet;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.server.namenode.FSImageStorageInspector.FSImageFile;
+import org.apache.hadoop.hdfs.server.namenode.FileJournalManager.EditLogFile;
+import org.apache.hadoop.hdfs.util.MD5FileUtils;
+
+/**
+ * The NNStorageRetentionManager is responsible for inspecting the storage
+ * directories of the NN and enforcing a retention policy on checkpoints
+ * and edit logs.
+ * 
+ * It delegates the actual removal of files to a StoragePurger
+ * implementation, which might delete the files or instead copy them to
+ * a filer or HDFS for later analysis.
+ */
+public class NNStorageRetentionManager {
+  
+  private final int numCheckpointsToRetain;
+  private static final Log LOG = LogFactory.getLog(
+      NNStorageRetentionManager.class);
+  private final NNStorage storage;
+  private final StoragePurger purger;
+  private final FSEditLog editLog;
+  
+  public NNStorageRetentionManager(
+      Configuration conf,
+      NNStorage storage,
+      FSEditLog editLog,
+      StoragePurger purger) {
+    this.numCheckpointsToRetain = conf.getInt(
+        FSConstants.DFS_NAMENODE_NUM_CHECKPOINTS_RETAINED_KEY, 2);
+    this.storage = storage;
+    this.editLog = editLog;
+    this.purger = purger;
+  }
+  
+  public NNStorageRetentionManager(Configuration conf, NNStorage storage,
+      FSEditLog editLog) {
+    this(conf, storage, editLog, new DeletionStoragePurger());
+  }
+
+  public void purgeOldStorage() throws IOException {
+    FSImageTransactionalStorageInspector inspector =
+      new FSImageTransactionalStorageInspector();
+    storage.inspectStorageDirs(inspector);
+
+    long minImageTxId = getImageTxIdToRetain(inspector);
+    purgeCheckpointsOlderThan(inspector, minImageTxId);
+    // If fsimage_N is the image we want to keep, then we need to keep
+    // all txns > N. We can remove anything < N+1, since fsimage_N
+    // reflects the state up to and including N.
+    
+    editLog.purgeLogsOlderThan(minImageTxId + 1);
+    storage.purgeOldStorage(minImageTxId);
+  }
+  
+  private void purgeCheckpointsOlderThan(
+      FSImageTransactionalStorageInspector inspector,
+      long minTxId) {
+    
+    //purge fsimage_*
+    for (FSImageFile image : inspector.getFoundImages()) {
+      if (image.getCheckpointTxId() < minTxId) {
+        LOG.info("Purging old image " + image);
+        purger.purgeImage(image);
+      }
+    }
+    
+    //purge fsimage.ckpt_*
+    for (FSImageFile image : inspector.getFoundCkptImages()) {
+      if (image.getCheckpointTxId() < minTxId) {
+        LOG.info("Purging old ckpt image " + image);
+        purger.purgeImage(image);
+      }
+    }
+  }
+
+  /**
+   * @param inspector inspector that has already inspected all storage dirs
+   * @return the transaction ID corresponding to the oldest checkpoint
+   * that should be retained. 
+   */
+  private long getImageTxIdToRetain(FSImageTransactionalStorageInspector inspector) {
+      
+    List<FSImageFile> images = inspector.getFoundImages();
+    TreeSet<Long> imageTxIds = new TreeSet<Long>();
+    for (FSImageFile image : images) {
+      imageTxIds.add(image.getCheckpointTxId());
+    }
+    
+    List<Long> imageTxIdsList = new ArrayList<Long>(imageTxIds); 
+    if (imageTxIdsList.isEmpty()) {
+      return 0;
+    }
+    
+    Collections.reverse(imageTxIdsList);
+    int toRetain = Math.min(numCheckpointsToRetain, imageTxIdsList.size());    
+    long minTxId = imageTxIdsList.get(toRetain - 1);
+    LOG.info("Going to retain " + toRetain + " images with txid >= " +
+        minTxId);
+    return minTxId;
+  }
+  
+  /**
+   * Interface responsible for disposing of old checkpoints and edit logs.
+   */
+  static interface StoragePurger {
+    void purgeLog(EditLogFile log);
+    void purgeImage(FSImageFile image);
+  }
+  
+  static class DeletionStoragePurger implements StoragePurger {
+    @Override
+    public void purgeLog(EditLogFile log) {
+      deleteOrWarn(log.getFile());
+    }
+
+    @Override
+    public void purgeImage(FSImageFile image) {
+      deleteOrWarn(image.getFile());
+      deleteOrWarn(MD5FileUtils.getDigestFileForFile(image.getFile()));
+    }
+
+    private static void deleteOrWarn(File file) {
+      if (!file.delete()) {
+        // It's OK if we fail to delete something -- we'll catch it
+        // next time we swing through this directory.
+        LOG.warn("Could not delete " + file);
+      }      
+    }
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 98203629..5e1288cc 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -38,6 +38,7 @@
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem.CompleteFileStatus;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem.BlockMetaInfoType;
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
 import org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics;
 import org.apache.hadoop.hdfs.server.protocol.BlockReport;
 import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations;
@@ -47,8 +48,10 @@
 import org.apache.hadoop.hdfs.server.protocol.IncrementalBlockReport;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
 import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
-import org.apache.hadoop.hdfs.server.protocol.ReceivedDeletedBlockInfo;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
 import org.apache.hadoop.hdfs.server.protocol.UpgradeCommand;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.http.HttpServer;
 import org.apache.hadoop.ipc.*;
 import org.apache.hadoop.conf.*;
@@ -58,7 +61,6 @@
 import org.apache.hadoop.net.NetworkTopology;
 import org.apache.hadoop.net.Node;
 import org.apache.hadoop.security.SecurityUtil;
-import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authorize.AuthorizationException;
 import org.apache.hadoop.security.authorize.ConfiguredPolicy;
 import org.apache.hadoop.security.authorize.PolicyProvider;
@@ -183,7 +185,7 @@ public ProtocolSignature getProtocolSignature(String protocol,
   /** RPC server for datanodes address */
   private InetSocketAddress dnProtocolAddress = null;
   /** httpServer */
-  volatile private HttpServer httpServer;
+  volatile protected HttpServer httpServer;
   /** HTTP server address */
   private InetSocketAddress httpAddress = null;
   private Thread emptier;
@@ -218,7 +220,10 @@ public ProtocolSignature getProtocolSignature(String protocol,
     DATANODE_PROTOCOL_ADDRESS,
     DFS_NAMENODE_HTTP_ADDRESS_KEY,
     DFS_NAMENODE_SECONDARY_HTTP_ADDRESS_KEY,
-    DFS_RAIDNODE_HTTP_ADDRESS_KEY
+    DFS_RAIDNODE_HTTP_ADDRESS_KEY,
+    FS_NAMENODE_ALIASES,
+    DFS_NAMENODE_DN_ALIASES,
+    DFS_HTTP_ALIASES
   };
   
   /** Format a new filesystem.  Destroys any filesystem that may already
@@ -412,7 +417,7 @@ private void startHttpServer(Configuration conf) throws IOException {
           .getPort());
     }
     this.httpServer.setAttribute("name.node", this);
-    this.httpServer.setAttribute("name.node.address", getNameNodeAddress());
+    this.httpServer.setAttribute("name.node.address", this.serverAddress);
     this.httpServer.setAttribute("name.system.image", getFSImage());
     this.httpServer.setAttribute("name.conf", conf);
     this.httpServer.addInternalServlet("fsck", "/fsck", FsckServlet.class);
@@ -421,6 +426,8 @@ private void startHttpServer(Configuration conf) throws IOException {
     this.httpServer.addInternalServlet("data", "/data/*", FileDataServlet.class);
     this.httpServer.addInternalServlet("checksum", "/fileChecksum/*",
         FileChecksumServlets.RedirectServlet.class);
+    this.httpServer.addInternalServlet("namenodeMXBean", "/namenodeMXBean", 
+        NameNodeMXBeanServlet.class);
     httpServer.setAttribute(ReconfigurationServlet.
                             CONF_SERVLET_RECONFIGURABLE_PREFIX +
                             CONF_SERVLET_PATH, NameNode.this);
@@ -567,7 +574,7 @@ public void startServerForClientRequests() throws IOException {
       if (this.httpServer != null) {
         // This means the server is being started once out of safemode
         // and jetty is initialized already
-        this.httpServer.setAttribute("name.node.address", getNameNodeAddress());
+        this.httpServer.setAttribute("name.node.address", this.serverAddress);
       }
       LOG.info("Namenode up at: " + this.serverAddress);
       
@@ -609,22 +616,22 @@ public void startDNServer() throws IOException {
    */
   protected void stopRPC(boolean interruptClientHandlers) 
       throws IOException, InterruptedException {
-    // stop the emptier
-    if (emptier != null) {
-      emptier.interrupt();
-      emptier.join();
-    }
     // stop client handlers, 
     // waiting for the ongoing requests to complete
     if (server != null) {
+      LOG.info("stopRPC: Stopping client server");
       server.stop(interruptClientHandlers);
+      InjectionHandler.processEvent(InjectionEvent.NAMENODE_STOP_CLIENT_RPC);
       server.waitForHandlers();
+      server.stopResponder();
     }
     // stop datanode handlers, 
     // waiting for the ongoing requests to complete
     if (dnProtocolServer != null) {
+      LOG.info("stopRPC: Stopping datanode server");
       dnProtocolServer.stop(interruptClientHandlers);
       dnProtocolServer.waitForHandlers();
+      dnProtocolServer.stopResponder();
     }
   }
 
@@ -686,8 +693,8 @@ public long[] getBlockLengths(long[] blockIds) {
     return lengths;
   }
 
-  public CheckpointSignature getCheckpointSignature() {
-    return new CheckpointSignature(namesystem.dir.fsImage);
+  public CheckpointSignature getCheckpointSignature() throws IOException {
+    return namesystem.getCheckpointSignature();
   }
 
   public LocatedBlocksWithMetaInfo updateDatanodeInfo(
@@ -768,6 +775,7 @@ public void create(String src,
         new PermissionStatus(FSNamesystem.getCurrentUGI().getUserName(),
             null, masked),
         clientName, clientMachine, overwrite, createParent, replication, blockSize);
+    InjectionHandler.processEventIO(InjectionEvent.NAMENODE_AFTER_CREATE_FILE);
     myMetrics.numFilesCreated.inc();
     myMetrics.numCreateFileOps.inc();
   }
@@ -1064,7 +1072,7 @@ public void concat(String trg, String[] src, boolean restricted)
    */
   public boolean hardLink(String src, String dst) throws IOException {  
     if (stateChangeLog.isDebugEnabled()) {  
-      stateChangeLog.debug("*DIR* NameNode.hard: " + src + " to " + dst); 
+      stateChangeLog.debug("*DIR* NameNode.hardlink: " + src + " to " + dst); 
     } 
     if (!checkPathLength(dst)) {  
       throw new IOException("hardlink: Pathname too long.  Limit "  
@@ -1072,6 +1080,13 @@ public boolean hardLink(String src, String dst) throws IOException {
     } 
     return namesystem.hardLinkTo(src, dst);  
   }
+
+  /**
+   * {@inheritDoc}
+   */
+  public String[] getHardLinkedFiles(String src) throws IOException {
+    return namesystem.getHardLinkedFiles(src);
+  }
     
   /**
    */
@@ -1234,6 +1249,13 @@ public boolean setSafeMode(SafeModeAction action) throws IOException {
     return namesystem.setSafeMode(action);
   }
 
+  /**
+   * Determines whether or not we should check for heartbeats.
+   */
+  protected boolean shouldCheckHeartbeat() {
+    return !namesystem.isInSafeMode();
+  }
+
   /**
    * Is the cluster currently in safe mode?
    */
@@ -1266,10 +1288,12 @@ public void refreshNodes() throws IOException {
   }
 
   /**
-   * Returns the size of the current edit log.
+   * @return The most recent transaction ID that has been synced to
+   * persistent storage.
+   * @throws IOException
    */
-  public long getEditLogSize() throws IOException {
-    return namesystem.getEditLogSize();
+  public long getTransactionID() throws IOException {
+    return namesystem.getTransactionID();
   }
 
   /**
@@ -1278,11 +1302,17 @@ public long getEditLogSize() throws IOException {
   public CheckpointSignature rollEditLog() throws IOException {
     return namesystem.rollEditLog();
   }
+  
+  /**
+   * Roll the edit log manually.
+   */
+  public void rollEditLogAdmin() throws IOException {
+    rollEditLog();
+  }
 
   /**
    * Roll the image 
    */
-  @Override
   public void rollFsImage(CheckpointSignature newImageSignature) throws IOException {
     namesystem.rollFSImage(newImageSignature);
   }
@@ -1370,7 +1400,7 @@ public void fsync(String src, String clientName) throws IOException {
 
   /** @inheritDoc */
   public void setTimes(String src, long mtime, long atime) throws IOException {
-    namesystem.setTimes(src, mtime, atime);
+	namesystem.setTimes(src, mtime, atime);
     myMetrics.numSetTimes.inc();
   }
 
@@ -1384,8 +1414,7 @@ public DatanodeRegistration register(DatanodeRegistration nodeReg
                                        ) throws IOException {
     verifyVersion(nodeReg.getVersion(), LAYOUT_VERSION, "layout");
     namesystem.registerDatanode(nodeReg);
-    myMetrics.numRegister.inc();
-      
+    myMetrics.numRegister.inc(); 
     return nodeReg;
   }
 
@@ -1526,8 +1555,9 @@ public UpgradeCommand processUpgradeCommand(UpgradeCommand comm) throws IOExcept
    */
   public void verifyRequest(DatanodeRegistration nodeReg) throws IOException {
     verifyVersion(nodeReg.getVersion(), LAYOUT_VERSION, "layout");
-    if (!namesystem.getRegistrationID().equals(nodeReg.getRegistrationID()))
+    if (!namesystem.getRegistrationID().equals(nodeReg.getRegistrationID())) {
       throw new UnregisteredDatanodeException(nodeReg);
+    }
     myMetrics.numVersionRequest.inc();
   }
     
@@ -1574,38 +1604,13 @@ public long getLastWrittenTxId() {
    *          1.0]
    * @return the list of files
    */
-  public List<FileStatusExtended> getRandomFilesSample(float percentage) {
+  public List<FileStatusExtended> getRandomFilesSample(double percentage) {
     if (!(percentage > 0 && percentage <= 1.0)) {
       throw new IllegalArgumentException("Invalid percentage : " + percentage +
           " value should be between (0 - 1.0]");
     }
-    long totalFiles = this.namesystem.getFilesTotal();
-    long filesToSample = (long) (percentage * totalFiles);
-    if (filesToSample > Integer.MAX_VALUE) {
-      throw new IllegalArgumentException("Too many files to sample : "
-          + filesToSample + " total files : " + totalFiles);
-    }
-    LOG.info("Sampling : " + filesToSample + " out of " + totalFiles + " files");
-    return getRandomFiles((int) filesToSample);
-  }
-
-  /**
-   * Retrieves a list of random files with some information.
-   * 
-   * @param maxFiles
-   *          the maximum number of files to return
-   * @return the list of files
-   */
-  public List<FileStatusExtended> getRandomFiles(int maxFiles) {
-    return namesystem.getRandomFiles(maxFiles);
-  }
-
-  /**
-   * Returns the name of the fsImage file uploaded by periodic
-   * checkpointing
-   */
-  public File[] getFsImageNameCheckpoint() throws IOException {
-    return getFSImage().getFsImageNameCheckpoint();
+    LOG.info("Sampling : " + (percentage * 100) + " percent of files");
+    return namesystem.getRandomFiles(percentage);
   }
 
   /**
@@ -1660,7 +1665,7 @@ protected boolean isRpcServerRunning() {
    * @return true if formatting was aborted, false otherwise
    * @throws IOException
    */
-  private static boolean format(Configuration conf,
+  static boolean format(Configuration conf,
                                 boolean isConfirmationNeeded
                                 ) throws IOException {
     boolean allowFormat = conf.getBoolean("dfs.namenode.support.allowformat",
@@ -1672,12 +1677,15 @@ private static boolean format(Configuration conf,
                             + "dfs.namenode.support.allowformat parameter "
                             + "to true in order to format this filesystem");
     }
-    Collection<File> dirsToFormat = FSNamesystem.getNamespaceDirs(conf);
-    Collection<File> editDirsToFormat =
-                 FSNamesystem.getNamespaceEditsDirs(conf);
-    for(Iterator<File> it = dirsToFormat.iterator(); it.hasNext();) {
-      File curDir = it.next();
-      if (!curDir.exists())
+    Collection<URI> dirsToFormat = NNStorageConfiguration.getNamespaceDirs(conf);
+    Collection<URI> editDirsToFormat =
+        NNStorageConfiguration.getNamespaceEditsDirs(conf);
+    for(Iterator<URI> it = dirsToFormat.iterator(); it.hasNext();) {
+      URI curDir = it.next();
+      // handle only file storage
+      if (curDir.getScheme().compareTo(JournalType.FILE.name().toLowerCase()) != 0)
+        continue;
+      if (!new File(curDir.getPath()).exists())
         continue;
       if (isConfirmationNeeded) {
         System.err.print("Re-format filesystem in " + curDir +" ? (Y or N) ");
@@ -1689,19 +1697,19 @@ private static boolean format(Configuration conf,
       }
     }
 
-    FSNamesystem nsys = new FSNamesystem(new FSImage(dirsToFormat,
+    FSNamesystem nsys = new FSNamesystem(new FSImage(conf, dirsToFormat,
                                          editDirsToFormat), conf);
     nsys.dir.fsImage.format();
     return false;
   }
 
-  private static boolean finalize(Configuration conf,
+  static boolean finalize(Configuration conf,
                                boolean isConfirmationNeeded
                                ) throws IOException {
-    Collection<File> dirsToFormat = FSNamesystem.getNamespaceDirs(conf);
-    Collection<File> editDirsToFormat =
-                               FSNamesystem.getNamespaceEditsDirs(conf);
-    FSNamesystem nsys = new FSNamesystem(new FSImage(dirsToFormat,
+    Collection<URI> dirsToFormat = NNStorageConfiguration.getNamespaceDirs(conf);
+    Collection<URI> editDirsToFormat =
+        NNStorageConfiguration.getNamespaceEditsDirs(conf);
+    FSNamesystem nsys = new FSNamesystem(new FSImage(conf, dirsToFormat,
                                          editDirsToFormat), conf);
     System.err.print(
         "\"finalize\" will remove the previous state of the files system.\n"
@@ -1985,4 +1993,56 @@ public boolean shouldRetryAbsentBlocks() {
   public boolean shouldRetryAbsentBlock(Block b) {
     return false;
   }
+  
+  @Override
+  public RemoteEditLogManifest getEditLogManifest(long fromTxId)
+      throws IOException {
+    return this.namesystem.getEditLog().getEditLogManifest(fromTxId);
+  }
+
+  @Override
+  public void register() throws IOException {
+    InetAddress configuredRemoteAddress = getAddress(getConf().get(
+        "dfs.secondary.http.address")).getAddress();
+    validateCheckpointerAddress(configuredRemoteAddress);
+  }
+
+  /**
+   * Checks if the ip of the caller is equal to the given configured address.
+   * 
+   * @param configuredRemoteAddress
+   * @throws IOException
+   */
+  protected void validateCheckpointerAddress(InetAddress configuredRemoteAddress)
+      throws IOException {
+    InetAddress remoteAddress = Server.getRemoteIp();
+    InjectionHandler.processEvent(InjectionEvent.NAMENODE_REGISTER,
+        remoteAddress);
+    LOG.info("Register: Got registration from remote namenode: "
+        + remoteAddress);
+    
+    // if the remote address is not set then skip checking (sanity)
+    if (remoteAddress == null) {
+      LOG.info("Register: Skipping check since the remote address is NULL");
+      return;
+    }
+    
+    // if the address is not configured then skip checking
+    if (configuredRemoteAddress == null
+        || configuredRemoteAddress.equals(new InetSocketAddress("0.0.0.0", 0)
+            .getAddress())) {
+      LOG.info("Register: Skipping check since the configured address is: "
+          + configuredRemoteAddress);
+      return;
+    }
+
+    // compare addresses
+    if (!remoteAddress.equals(configuredRemoteAddress)) {
+      String msg = "Register: Configured standby is :"
+          + configuredRemoteAddress + ", not allowing: " + remoteAddress
+          + " to register";
+      LOG.warn(msg);
+      throw new IOException(msg);
+    }
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
index 4ff193d5..8d1f3094 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
@@ -109,13 +109,13 @@ public interface NameNodeMXBean {
    * @return the total number of blocks of the cluster
    */
   public long getTotalBlocks();
-  
+
   /**
-   * Gets the total number of files on the cluster
+   * Gets the total number of files and directories on the cluster
    * 
-   * @return the total number of files on the cluster
+   * @return the total number of files and directories on the cluster
    */
-  public long getTotalFiles();
+  public long getTotalFilesAndDirectories();
   
   /**
    * Gets the total number of missing blocks on the cluster
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBeanServlet.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBeanServlet.java
new file mode 100644
index 00000000..586d9ee8
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBeanServlet.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.*;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * This class is used by cluster management web ui to get some information from namenode 
+ */
+public class NameNodeMXBeanServlet extends HttpServlet {
+  @SuppressWarnings("unchecked")
+  public void doGet(HttpServletRequest request,
+                    HttpServletResponse response
+                    ) throws ServletException, IOException {
+    ServletContext context = getServletContext();
+    NameNode nn = (NameNode)getServletContext().getAttribute("name.node");
+    PrintWriter out = response.getWriter();
+    out.print(nn.getNamesystem().getNameNodeStatus());
+  }
+}
+
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeSafeModeInfo.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeSafeModeInfo.java
index 5fec98e0..06a0bd03 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeSafeModeInfo.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeSafeModeInfo.java
@@ -52,7 +52,7 @@ public class NameNodeSafeModeInfo implements SafeModeInfo {
    * -1 safe mode is off <br>
    * 0 safe mode is on, but threshold is not reached yet
    */
-  private long reached = -1;
+  volatile private long reached = -1;
 
   /**
    * time of the last status printout
@@ -91,16 +91,12 @@ public class NameNodeSafeModeInfo implements SafeModeInfo {
   }
 
   @Override
-    public synchronized boolean isOn() {
-      try {
-        assert isConsistent() : " SafeMode: Inconsistent filesystem state: "
+  public boolean isOn() {
+    assert isConsistent() : " SafeMode: Inconsistent filesystem state: "
                                   + "Total num of blocks, active blocks, or "
                                   + "total safe blocks don't match.";
-      } catch (IOException e) {
-        System.err.print(StringUtils.stringifyException(e));
-      }
-      return this.reached >= 0;
-    }
+    return this.reached >= 0;
+  }
 
 
   /**
@@ -144,6 +140,7 @@ protected void startPostSafeModeProcessing() {
     try {
       nameNode.startServerForClientRequests();
     } catch (IOException ex) {
+      LOG.fatal("Got exception when starting server for client requests: ", ex);
       nameNode.stop();
     }
     NameNode.stateChangeLog.info("STATE* Network topology has "
@@ -154,31 +151,32 @@ protected void startPostSafeModeProcessing() {
   }
 
   @Override
-  public synchronized void leave(boolean checkForUpgrades) {
-    if (needUpgrade(checkForUpgrades)) {
-      return;
-    }
+  public void leave(boolean checkForUpgrades) {
+    namesystem.writeLock();
+    try {
+      if (needUpgrade(checkForUpgrades)) {
+        return;
+      }
 
-    startPostSafeModeProcessing();
+      startPostSafeModeProcessing();
+    } finally {
+      namesystem.writeUnlock();
+    }
   }
 
   /**
    * Initialize replication queues.
    */
-  protected synchronized void initializeReplQueues() {
+  protected void initializeReplQueues() {
     LOG.info("initializing replication queues");
-    if (namesystem.isPopulatingReplQueues()) {
-      LOG.warn("Replication queues already initialized.");
-    }
     namesystem.processMisReplicatedBlocks();
-    namesystem.initializedReplQueues = true;
   }
 
   /**
    * Check whether we have reached the threshold for initializing replication
    * queues.
    */
-  private synchronized boolean canInitializeReplQueues() {
+  private boolean canInitializeReplQueues() {
     return namesystem.getSafeBlocks() >= getBlockReplQueueThreshold();
   }
 
@@ -189,7 +187,7 @@ private synchronized boolean canInitializeReplQueues() {
    * @return true if can leave or false otherwise.
    */
   @Override
-    public synchronized boolean canLeave() {
+    public boolean canLeave() {
       if (reached == 0) {
         return false;
       }
@@ -339,7 +337,10 @@ public String toString() {
    * Checks consistency of the class state. This is costly and currently called
    * only in assert.
    */
-  private boolean isConsistent() throws IOException {
+  private boolean isConsistent() {
+    if (this.reached < 0) {
+      return true; // Safemode is off.
+    }
     if (namesystem.getTotalBlocks() == -1 && namesystem.getSafeBlocks() == -1) {
       return true; // manual safe mode
     }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
index c0cb4c6c..6ca75b7a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
@@ -38,6 +38,7 @@
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.net.NodeBase;
 import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.hdfs.BlockReader;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DataTransferProtocol;
@@ -46,6 +47,8 @@
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.fs.permission.PermissionStatus;
 
 /**
@@ -156,12 +159,18 @@ else if (key.equals("startblockafterIndex")) {
    * @throws Exception
    */
   public void fsck() throws IOException {
+    NameNode.getNameNodeMetrics().numFsckOperations.inc();
+    InjectionHandler.processEvent(InjectionEvent.NAMENODE_FSCK_START);
+    
     try {
       FileStatus[] files = nn.namesystem.dir.getListing(path);
       FsckResult res = new FsckResult();
-      res.totalRacks = nn.getNetworkTopology().getNumOfRacks();
-      res.totalDatanodes = nn.namesystem.getNumberOfDatanodes(
-        DatanodeReportType.LIVE);
+      if (!this.showFiles && !this.showBlocks && !this.showLocations
+          && !this.showRacks) {
+        res.totalRacks = nn.getNetworkTopology().getNumOfRacks();
+        res.totalDatanodes = nn.namesystem
+            .getNumberOfDatanodes(DatanodeReportType.LIVE);
+      }
       res.setReplication((short) conf.getInt("dfs.replication", 3));
       if (files != null) {
         if (showCorruptFileBlocks && showOpenFiles) {
@@ -538,7 +547,7 @@ private void copyBlock(DFSClient dfs, LocatedBlock lblock,
     InetSocketAddress targetAddr = null;
     TreeSet<DatanodeInfo> deadNodes = new TreeSet<DatanodeInfo>();
     Socket s = null;
-    DFSClient.BlockReader blockReader = null; 
+    BlockReader blockReader = null; 
     Block block = lblock.getBlock(); 
 
     while (s == null) {
@@ -566,8 +575,8 @@ private void copyBlock(DFSClient dfs, LocatedBlock lblock,
         s.setSoTimeout(HdfsConstants.READ_TIMEOUT);
         
         blockReader = 
-          DFSClient.BlockReader.newBlockReader(DataTransferProtocol.DATA_TRANSFER_VERSION,
-                                               nn.getNamesystem().getFSImage().namespaceID,
+            BlockReader.newBlockReader(DataTransferProtocol.DATA_TRANSFER_VERSION,
+                                               nn.getNamesystem().getFSImage().storage.namespaceID,
                                                s, targetAddr.toString() + ":" + 
                                                block.getBlockId(), 
                                                block.getBlockId(), 
@@ -691,8 +700,8 @@ public static class FsckResult {
     private long totalSize = 0L;
     private long totalOpenFilesSize = 0L;
     private long totalReplicas = 0L;
-    private int totalDatanodes = 0;
-    private int totalRacks = 0;
+    private int totalDatanodes = -1;
+    private int totalRacks = -1;
     
     /**
      * DFS is considered healthy if there are no missing blocks.
@@ -865,8 +874,12 @@ public String toString() {
       res.append("\n Corrupt blocks:\t\t" + corruptBlocks);
       res.append("\n Missing replicas:\t\t" + missingReplicas);
       if (totalReplicas > 0)        res.append(" (" + ((float) (missingReplicas * 100) / (float) totalReplicas) + " %)");
-      res.append("\n Number of data-nodes:\t\t" + totalDatanodes);
-      res.append("\n Number of racks:\t\t" + totalRacks);
+      if (totalDatanodes >= 0) {
+        res.append("\n Number of data-nodes:\t\t" + totalDatanodes);
+      }
+      if (totalRacks >= 0) {
+        res.append("\n Number of racks:\t\t" + totalRacks);
+      }
       return res.toString();
     }
     
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java
index 8ac03da9..257bf6e6 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java
@@ -22,6 +22,7 @@
 import org.apache.hadoop.util.*;
 import java.io.*;
 import java.util.*;
+import java.util.Map.Entry;
 import java.sql.Time;
 
 /***************************************************
@@ -36,7 +37,8 @@
  *
  ***************************************************/
 class PendingReplicationBlocks {
-  private Map<Block, PendingBlockInfo> pendingReplications;
+  // order the map in insertion order
+  private LinkedHashMap<Block, PendingBlockInfo> pendingReplications;
   private ArrayList<Block> timedOutItems;
   Daemon timerThread = null;
   private volatile boolean fsRunning = true;
@@ -48,15 +50,23 @@ class PendingReplicationBlocks {
   //
   private long timeout = 5 * 60 * 1000;
   private long defaultRecheckInterval = 5 * 60 * 1000;
+  private int maxBlocksToCheck = 5000;
 
   PendingReplicationBlocks(long timeoutPeriod) {
     this(timeoutPeriod, null);
   }
   
   PendingReplicationBlocks(long timeoutPeriod, FSNamesystemMetrics metrics) {
+    this(timeoutPeriod, 0, null);
+  }
+  
+  PendingReplicationBlocks(long timeoutPeriod, int maxBlocksToCheck, FSNamesystemMetrics metrics) {
     if ( timeoutPeriod > 0 ) {
       this.timeout = timeoutPeriod;
     }
+    if ( maxBlocksToCheck > 0 ) {
+      this.maxBlocksToCheck = maxBlocksToCheck;
+    }
     fsnamesystemMetrics = metrics;
     init();
   }
@@ -66,7 +76,7 @@ class PendingReplicationBlocks {
   }
 
   void init() {
-    pendingReplications = new HashMap<Block, PendingBlockInfo>();
+    pendingReplications = new LinkedHashMap<Block, PendingBlockInfo>();
     timedOutItems = new ArrayList<Block>();
     this.timerThread = new Daemon(new PendingReplicationMonitor());
     timerThread.start();
@@ -96,7 +106,10 @@ void remove(Block block) {
     synchronized (pendingReplications) {
       PendingBlockInfo found = pendingReplications.get(block);
       if (found != null) {
-      	FSNamesystem.LOG.debug("Removing pending replication for block" + block);
+        if (FSNamesystem.LOG.isDebugEnabled()) {
+          FSNamesystem.LOG.debug(
+              "Removing pending replication for block" + block);
+        }
         found.decrementReplicas();
         if (found.getNumReplicas() <= 0) {
           pendingReplications.remove(block);
@@ -192,8 +205,9 @@ public void run() {
           pendingReplicationCheck();
           Thread.sleep(period);
         } catch (InterruptedException ie) {
-          FSNamesystem.LOG.debug(
+          FSNamesystem.LOG.info(
                 "PendingReplicationMonitor thread received exception. " + ie);
+          return;
         }
       }
     }
@@ -201,27 +215,73 @@ public void run() {
     /**
      * Iterate through all items and detect timed-out items
      */
-    void pendingReplicationCheck() {
-      synchronized (pendingReplications) {
-        Iterator iter = pendingReplications.entrySet().iterator();
-        long now = FSNamesystem.now();
-        FSNamesystem.LOG.debug("PendingReplicationMonitor checking Q");
-        while (iter.hasNext()) {
-          Map.Entry entry = (Map.Entry) iter.next();
-          PendingBlockInfo pendingBlock = (PendingBlockInfo) entry.getValue();
-          if (now > pendingBlock.getTimeStamp() + timeout) {
-            Block block = (Block) entry.getKey();
-            synchronized (timedOutItems) {
-              timedOutItems.add(block);
-            }
-            if (fsnamesystemMetrics != null) {
-              fsnamesystemMetrics.numTimedoutReplications.inc();
-            }
-            FSNamesystem.LOG.warn(
-                "PendingReplicationMonitor timed out block " + block);
+    void pendingReplicationCheck() throws InterruptedException {
+      FSNamesystem.LOG.info("PendingReplicationMonitor checking Q");
+      int totalPendingBlocks = 0;
+      synchronized (pendingReplications){
+        totalPendingBlocks = pendingReplications.size();
+      }
+      List<Map.Entry<Block, PendingBlockInfo>> blocksToCheck = 
+        new LinkedList<Map.Entry<Block, PendingBlockInfo>>();
+      while (totalPendingBlocks > 0) {
+        synchronized (pendingReplications) {
+          // At most maxBlocksToCheck items per iteration
+          int numBlocksToCheck = Math.min(
+              maxBlocksToCheck, pendingReplications.size());
+          if (numBlocksToCheck == 0) {
+            break;
+          }
+          numBlocksToCheck = Math.min(numBlocksToCheck, totalPendingBlocks);
+          totalPendingBlocks -= numBlocksToCheck;
+          
+          // remove the number of blocks from pendingReplications
+          Iterator<Entry<Block, PendingBlockInfo>> iter = 
+            pendingReplications.entrySet().iterator();
+          while (numBlocksToCheck-- > 0) {
+            blocksToCheck.add(iter.next());
             iter.remove();
           }
+          // adjust the pending block count in case it gets shorter
+          totalPendingBlocks = Math.min(
+              totalPendingBlocks, pendingReplications.size());
+          
+          // Check if timeout
+          long now = FSNamesystem.now();
+          for (iter = blocksToCheck.iterator(); iter.hasNext(); ) {
+            Entry<Block, PendingBlockInfo> entry = iter.next();
+            PendingBlockInfo pendingBlock = entry.getValue();
+            Block block = entry.getKey();
+            if (now < pendingBlock.getTimeStamp() + timeout) {
+              // not timeout; reinsert into end of pendingReplications 
+              // so it will be checked in future batches
+              iter.remove();
+              pendingReplications.put(block, pendingBlock); 
+            }
+          }
+        }
+        
+        if (blocksToCheck.isEmpty()) {
+          continue;
+        }
+        
+        // blocksToCheck has timeout blocks; handle timeout blocks
+        if (fsnamesystemMetrics != null) {
+          fsnamesystemMetrics.numTimedoutReplications.inc(blocksToCheck.size());
+        }
+        
+        StringBuilder logMsg = new StringBuilder(
+            "PendingReplicationMonitor timed out blocks");
+        while (!blocksToCheck.isEmpty()) {
+          Block timeoutBlock = blocksToCheck.remove(0).getKey();
+          logMsg.append(" ").append(timeoutBlock);
+          synchronized (timedOutItems) {
+            timedOutItems.add(timeoutBlock);
+          }
         }
+        FSNamesystem.LOG.warn(logMsg);
+        
+        // sleep 1 second in between two iterations
+        Thread.sleep(1000);
       }
     }
   }
@@ -246,11 +306,11 @@ void metaSave(PrintWriter out) {
     synchronized (pendingReplications) {
       out.println("Metasave: Blocks being replicated: " +
                   pendingReplications.size());
-      Iterator iter = pendingReplications.entrySet().iterator();
+      Iterator<Map.Entry<Block, PendingBlockInfo>> iter = pendingReplications.entrySet().iterator();
       while (iter.hasNext()) {
-        Map.Entry entry = (Map.Entry) iter.next();
-        PendingBlockInfo pendingBlock = (PendingBlockInfo) entry.getValue();
-        Block block = (Block) entry.getKey();
+        Map.Entry<Block, PendingBlockInfo> entry = iter.next();
+        PendingBlockInfo pendingBlock = entry.getValue();
+        Block block = entry.getKey();
         out.println(block + 
                     " StartTime: " + new Time(pendingBlock.timeStamp) +
                     " NumReplicaInProgress: " + 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SafeModeMonitor.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SafeModeMonitor.java
index 4d873705..db1e6e9c 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SafeModeMonitor.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SafeModeMonitor.java
@@ -40,6 +40,14 @@ public SafeModeMonitor(FSNamesystem namesystem, SafeModeInfo safeMode) {
   }
 
   public void run() {
+    try {
+      runMonitor();
+    } catch (Throwable e) {
+      LOG.error("SafeModeMonitor thread exited with exception : ", e);
+    }
+  }
+
+  private void runMonitor() {
     while (namesystem.isRunning() &&
         (safeMode != null && !safeMode.canLeave())) {
       try {
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SaveNamespaceContext.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SaveNamespaceContext.java
index 5d9b9872..dd84389f 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SaveNamespaceContext.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SaveNamespaceContext.java
@@ -27,6 +27,8 @@
 
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 
 /**
  * Context for an ongoing SaveNamespace operation. This class
@@ -78,6 +80,8 @@ void cancel(String reason) {
 
   void checkCancelled() throws SaveNamespaceCancelledException {
     if (cancelReason != null) {
+      InjectionHandler
+          .processEvent(InjectionEvent.SAVE_NAMESPACE_CONTEXT_EXCEPTION);
       throw new SaveNamespaceCancelledException(
           cancelReason);
     }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
index 86808287..306de9b8 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
@@ -21,9 +21,19 @@
 
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocol;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.InconsistentFSStateException;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageState;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.ipc.*;
 import org.apache.hadoop.conf.*;
 import org.apache.hadoop.util.StringUtils;
@@ -69,40 +79,10 @@ public class SecondaryNameNode implements Runnable {
   private int infoPort;
   private String infoBindAddress;
 
-  private Collection<File> checkpointDirs;
-  private Collection<File> checkpointEditsDirs;
+  private Collection<URI> checkpointDirs;
+  private Collection<URI> checkpointEditsDirs;
   private long checkpointPeriod;	// in seconds
-  private long checkpointSize;    // size (in MB) of current Edit Log
-
-  /**
-   * Utility class to facilitate junit test error simulation.
-   */
-  static class ErrorSimulator {
-    private static boolean[] simulation = null; // error simulation events
-    static void initializeErrorSimulationEvent(int numberOfEvents) {
-      simulation = new boolean[numberOfEvents]; 
-      for (int i = 0; i < numberOfEvents; i++) {
-        simulation[i] = false;
-      }
-    }
-    
-    static boolean getErrorSimulation(int index) {
-      if(simulation == null)
-        return false;
-      assert(index < simulation.length);
-      return simulation[index];
-    }
-    
-    static void setErrorSimulation(int index) {
-      assert(index < simulation.length);
-      simulation[index] = true;
-    }
-    
-    static void clearErrorSimulation(int index) {
-      assert(index < simulation.length);
-      simulation[index] = false;
-    }
-  }
+  private long checkpointTxnCount;
 
   FSImage getFSImage() {
     return checkpointImage;
@@ -120,6 +100,16 @@ public SecondaryNameNode(Configuration conf)  throws IOException {
     }
   }
 
+  private Collection<URI> getFileStorageDirs(Collection<URI> uris) {
+    ArrayList<URI> directories = new ArrayList<URI>();
+    for (URI uri : uris) {
+      if (uri.getScheme().compareTo(JournalType.FILE.name().toLowerCase()) == 0) {
+        directories.add(uri);
+      }
+    }
+    return directories;
+  }
+  
   /**
    * Initialize SecondaryNameNode.
    */
@@ -135,19 +125,20 @@ private void initialize(Configuration conf) throws IOException {
     this.namenode =
         (NamenodeProtocol) RPC.waitForProxy(NamenodeProtocol.class,
             NamenodeProtocol.versionID, nameNodeAddr, conf);
+    this.namenode.register();
 
     // initialize checkpoint directories
     fsName = getInfoServer();
-    checkpointDirs = FSImage.getCheckpointDirs(conf,
-                                  "/tmp/hadoop/dfs/namesecondary");
-    checkpointEditsDirs = FSImage.getCheckpointEditsDirs(conf, 
-                                  "/tmp/hadoop/dfs/namesecondary");    
+    checkpointDirs = getFileStorageDirs(NNStorageConfiguration
+        .getCheckpointDirs(conf, "/tmp/hadoop/dfs/namesecondary"));
+    checkpointEditsDirs = getFileStorageDirs(NNStorageConfiguration
+        .getCheckpointEditsDirs(conf, "/tmp/hadoop/dfs/namesecondary")); 
     checkpointImage = new CheckpointStorage(conf);
     checkpointImage.recoverCreate(checkpointDirs, checkpointEditsDirs);
 
     // Initialize other scheduling parameters from the configuration
     checkpointPeriod = conf.getLong("fs.checkpoint.period", 3600);
-    checkpointSize = conf.getLong("fs.checkpoint.size", 4194304);
+    checkpointTxnCount = NNStorageConfiguration.getCheckpointTxnCount(conf);
 
     // initialize the webserver for uploading files.
     String infoAddr = 
@@ -171,8 +162,7 @@ private void initialize(Configuration conf) throws IOException {
     LOG.info("Secondary Web-server up at: " + infoBindAddress + ":" +infoPort);
     LOG.warn("Checkpoint Period   :" + checkpointPeriod + " secs " +
              "(" + checkpointPeriod/60 + " min)");
-    LOG.warn("Log Size Trigger    :" + checkpointSize + " bytes " +
-             "(" + checkpointSize/1024 + " KB)");
+    LOG.warn("Log Size Trigger    :" + checkpointTxnCount  + " transactions ");
   }
 
   /**
@@ -220,8 +210,7 @@ public void run() {
       try {
         long now = System.currentTimeMillis();
 
-        long size = namenode.getEditLogSize();
-        if (size >= checkpointSize || 
+        if (shouldCheckpointBasedOnCount() || 
             now >= lastCheckpointTime + 1000 * checkpointPeriod) {
           doCheckpoint();
           lastCheckpointTime = now;
@@ -230,7 +219,6 @@ public void run() {
         LOG.error("Exception in doCheckpoint: ");
         LOG.error(StringUtils.stringifyException(e));
         e.printStackTrace();
-        checkpointImage.imageDigest = null;
       } catch (Throwable e) {
         LOG.error("Throwable Exception in doCheckpoint: ");
         LOG.error(StringUtils.stringifyException(e));
@@ -246,51 +234,51 @@ public void run() {
    * @return true if a new image has been downloaded and needs to be loaded
    * @throws IOException
    */
-  private boolean downloadCheckpointFiles(CheckpointSignature sig
-                                      ) throws IOException {
-    
-    checkpointImage.cTime = sig.cTime;
-    checkpointImage.checkpointTime = sig.checkpointTime;
-    
+  static boolean downloadCheckpointFiles(final String nnHostPort,
+      final FSImage dstImage, final CheckpointSignature sig,
+      final RemoteEditLogManifest manifest) throws IOException {
+
+    // Sanity check manifest - these could happen if, eg, someone on the
+    // NN side accidentally rmed the storage directories
+    if (manifest.getLogs().isEmpty()) {
+      throw new IOException("Found no edit logs to download on NN since txid "
+          + sig.mostRecentCheckpointTxId);
+    }
+
+    long expectedTxId = sig.mostRecentCheckpointTxId + 1;
+    if (manifest.getLogs().get(0).getStartTxId() != expectedTxId) {
+      throw new IOException("Bad edit log manifest (expected txid = "
+          + expectedTxId + ": " + manifest);
+    }
+
+    dstImage.storage.cTime = sig.cTime;
+
+    // get fsimage
     boolean downloadImage = true;
-    String fileid;
-    File[] srcNames;
-    if (sig.imageDigest.equals(checkpointImage.imageDigest)) {
+    if (sig.mostRecentCheckpointTxId == dstImage.storage
+        .getMostRecentCheckpointTxId() &&
+        sig.mostRecentCheckpointTxId != -1) {
       downloadImage = false;
       LOG.info("Image has not changed. Will not download image.");
     } else {
-      // get fsimage
-      srcNames = checkpointImage.getImageFiles();
-      assert srcNames.length > 0 : "No checkpoint targets.";
-      fileid = "getimage=1";
-      TransferFsImage.getFileClient(fsName, fileid, srcNames, false);
-      checkpointImage.imageDigest = sig.imageDigest;
-      LOG.info("Downloaded file " + srcNames[0].getName() + " size " +
-          srcNames[0].length() + " bytes.");
+      MD5Hash downloadedHash = TransferFsImage
+          .downloadImageToStorage(nnHostPort, sig.mostRecentCheckpointTxId,
+              dstImage.storage, true);
+      dstImage.checkpointUploadDone(sig.mostRecentCheckpointTxId, downloadedHash);
+      FSImage.saveDigestAndRenameCheckpointImage(sig.mostRecentCheckpointTxId,
+          downloadedHash, dstImage.storage);
+
     }
+
     // get edits file
-    fileid = "getedit=1";
-    srcNames = checkpointImage.getEditsFiles();
-    assert srcNames.length > 0 : "No checkpoint targets.";
-    TransferFsImage.getFileClient(fsName, fileid, srcNames, false);
-    LOG.info("Downloaded file " + srcNames[0].getName() + " size " +
-        srcNames[0].length() + " bytes.");
-
-    checkpointImage.checkpointUploadDone(null);
-    
+    for (RemoteEditLog log : manifest.getLogs()) {
+      if (log.inProgress())
+        break;
+      TransferFsImage.downloadEditsToStorage(nnHostPort, log,
+          dstImage.storage);
+    }
     return downloadImage;
-  }
 
-  /**
-   * Copy the new fsimage into the NameNode
-   */
-  private void putFSImage(CheckpointSignature sig) throws IOException {
-    String fileid = "putimage=1&port=" + infoPort +
-      "&machine=" +
-      InetAddress.getLocalHost().getHostAddress() +
-      "&token=" + sig.toString();
-    LOG.info("Posted URL " + fsName + fileid);
-    TransferFsImage.getFileClient(fsName, fileid, (File[])null, false);
   }
 
   /**
@@ -308,64 +296,84 @@ private String getInfoServer() throws IOException {
   /**
    * Create a new checkpoint
    */
-  void doCheckpoint() throws IOException {
+  boolean doCheckpoint() throws IOException {
 
     LOG.info("Checkpoint starting");
-    
+
     // Do the required initialization of the merge work area.
     startCheckpoint();
 
+    checkpointImage.ensureCurrentDirExists();
+    NNStorage dstStorage = checkpointImage.storage;
+
     // Tell the namenode to start logging transactions in a new edit file
     // Returns a token that would be used to upload the merged image.
-    CheckpointSignature sig = (CheckpointSignature)namenode.rollEditLog();
+    CheckpointSignature sig = namenode.rollEditLog();
 
-    // error simulation code for junit test
-    if (ErrorSimulator.getErrorSimulation(0)) {
-      throw new IOException("Simulating error0 " +
-                            "after creating edits.new");
+    // Make sure we're talking to the same NN!
+    if (checkpointImage.getNamespaceID() != 0) {
+      // If the image actually has some data, make sure we're talking
+      // to the same NN as we did before.
+      sig.validateStorageInfo(checkpointImage.storage);
+    } else {
+      // if we're a fresh 2NN, just take the storage info from the server
+      // we first talk to.
+      dstStorage.setStorageInfo(sig);
     }
 
-    boolean loadImage = downloadCheckpointFiles(sig);   // Fetch fsimage and edits
-    doMerge(sig, loadImage);                   // Do the merge
-  
+    // error simulation code for junit test
+    InjectionHandler.processEventIO(InjectionEvent.SECONDARYNAMENODE_CHECKPOINT0);
+
+    RemoteEditLogManifest manifest = namenode
+        .getEditLogManifest(sig.mostRecentCheckpointTxId + 1);
+
+    boolean loadImage = downloadCheckpointFiles(fsName, checkpointImage, sig,
+        manifest); // Fetch fsimage and edits
+    doMerge(sig, manifest, loadImage, checkpointImage);
+
     //
     // Upload the new image into the NameNode. Then tell the Namenode
     // to make this new uploaded image as the most current image.
     //
-    putFSImage(sig);
+    long txid = checkpointImage.getLastAppliedTxId();
+    TransferFsImage.uploadImageFromStorage(fsName, InetAddress.getLocalHost()
+        .getHostAddress(), infoPort, dstStorage, txid);
 
     // error simulation code for junit test
-    if (ErrorSimulator.getErrorSimulation(1)) {
-      throw new IOException("Simulating error1 " +
-                            "after uploading new image to NameNode");
-    }
+    InjectionHandler.processEventIO(InjectionEvent.SECONDARYNAMENODE_CHECKPOINT1);
 
     namenode.rollFsImage(new CheckpointSignature(checkpointImage));
-    checkpointImage.endCheckpoint();
 
-    LOG.info("Checkpoint done. New Image Size: " 
-              + checkpointImage.getFsImageName().length());
+    LOG.warn("Checkpoint done. New Image Size: "
+        + dstStorage.getFsImageName(txid).length());
+
+    // Since we've successfully checkpointed, we can remove some old
+    // image files
+    checkpointImage.purgeOldStorage();
+
+    return loadImage;
   }
 
   private void startCheckpoint() throws IOException {
-    checkpointImage.unlockAll();
+    checkpointImage.storage.unlockAll();
     checkpointImage.getEditLog().close();
     checkpointImage.recoverCreate(checkpointDirs, checkpointEditsDirs);
-    checkpointImage.startCheckpoint();
   }
 
   /**
-   * Merge downloaded image and edits and write the new image into
-   * current storage directory.
+   * Merge downloaded image and edits and write the new image into current
+   * storage directory.
    */
-  private void doMerge(CheckpointSignature sig, boolean loadImage) throws IOException {
-    if (loadImage) {  // create an empty namespace if new image
+  private void doMerge(CheckpointSignature sig, RemoteEditLogManifest manifest,
+      boolean loadImage, FSImage dstImage) throws IOException {
+    if (loadImage) { // create an empty namespace if new image
       namesystem = new FSNamesystem(checkpointImage, conf);
+      checkpointImage.setFSNamesystem(namesystem);
     }
     assert namesystem.dir.fsImage == checkpointImage;
-    checkpointImage.doMerge(sig, loadImage);
+    checkpointImage.doMerge(sig, manifest, loadImage);
   }
-
+  
   /**
    * @param argv The parameters passed to this program.
    * @exception Exception if the filesystem does not exist.
@@ -404,19 +412,20 @@ private int processArgs(String[] argv) throws Exception {
     exitCode = 0;
     try {
       if ("-checkpoint".equals(cmd)) {
-        long size = namenode.getEditLogSize();
-        if (size >= checkpointSize || 
+        long uncheckpointedTxns = countUncheckpointedTxns();
+        if (countUncheckpointedTxns() >= checkpointTxnCount || 
             argv.length == 2 && "force".equals(argv[i])) {
           doCheckpoint();
         } else {
-          System.err.println("EditLog size " + size + " bytes is " +
-                             "smaller than configured checkpoint " +
-                             "size " + checkpointSize + " bytes.");
-          System.err.println("Skipping checkpoint.");
+          LOG.info("EditLog uncheckpointed transactions " + uncheckpointedTxns
+              + "smaller than configured checkpoint size of "
+              + checkpointTxnCount + " transactions.");
+          LOG.info("Skipping checkpoint based on transaction count.");
+
         }
       } else if ("-geteditsize".equals(cmd)) {
-        long size = namenode.getEditLogSize();
-        System.out.println("EditLog size is " + size + " bytes");
+        long uncheckpointedTxns = countUncheckpointedTxns();
+        System.out.println("EditLog size is " + uncheckpointedTxns + " transactions");
       } else {
         exitCode = -1;
         LOG.error(cmd.substring(1) + ": Unknown command");
@@ -466,6 +475,18 @@ private static void printUsage(String cmd) {
                          "[-geteditsize] [-service serviceName]\n");
     }
   }
+  
+  private long countUncheckpointedTxns() throws IOException {
+    long curTxId = namenode.getTransactionID();
+    long uncheckpointedTxns = curTxId -
+      checkpointImage.storage.getMostRecentCheckpointTxId();
+    assert uncheckpointedTxns >= 0;
+    return uncheckpointedTxns;
+  }
+
+  boolean shouldCheckpointBasedOnCount() throws IOException {
+    return countUncheckpointedTxns() >= checkpointTxnCount;
+  }
 
   /**
    * main() has some simple utility methods.
@@ -495,17 +516,14 @@ public static void main(String[] argv) throws Exception {
 
   static class CheckpointStorage extends FSImage {
     /**
+     * Construct a checkpoint image.
+     * @param conf Node configuration..
+     * @throws IOException If storage cannot be access.
      */
     CheckpointStorage(Configuration conf) throws IOException {
       super(conf);
     }
 
-    @Override
-    public
-    boolean isConversionNeeded(StorageDirectory sd) {
-      return false;
-    }
-
     /**
      * Analyze checkpoint directories.
      * Create directories if they do not exist.
@@ -515,14 +533,14 @@ boolean isConversionNeeded(StorageDirectory sd) {
      * @param editsDirs
      * @throws IOException
      */
-    void recoverCreate(Collection<File> dataDirs,
-                       Collection<File> editsDirs) throws IOException {
-      Collection<File> tempDataDirs = new ArrayList<File>(dataDirs);
-      Collection<File> tempEditsDirs = new ArrayList<File>(editsDirs);
-      this.storageDirs = new ArrayList<StorageDirectory>();
-      setStorageDirectories(tempDataDirs, tempEditsDirs);
+    void recoverCreate(Collection<URI> dataDirs,
+                       Collection<URI> editsDirs) throws IOException {
+      Collection<URI> tempDataDirs = new ArrayList<URI>(dataDirs);
+      Collection<URI> tempEditsDirs = new ArrayList<URI>(editsDirs);
+      storage.setStorageDirectories(tempDataDirs, tempEditsDirs);
+      
       for (Iterator<StorageDirectory> it = 
-                   dirIterator(); it.hasNext();) {
+                   storage.dirIterator(); it.hasNext();) {
         StorageDirectory sd = it.next();
         boolean isAccessible = true;
         try { // create directories if don't exist yet
@@ -535,6 +553,7 @@ void recoverCreate(Collection<File> dataDirs,
         if(!isAccessible)
           throw new InconsistentFSStateException(sd.getRoot(),
               "cannot access checkpoint directory.");
+        
         StorageState curState;
         try {
           curState = sd.analyzeStorage(HdfsConstants.StartupOption.REGULAR);
@@ -557,52 +576,37 @@ void recoverCreate(Collection<File> dataDirs,
         }
       }
     }
-
-    /**
-     * Prepare directories for a new checkpoint.
-     * <p>
-     * Rename <code>current</code> to <code>lastcheckpoint.tmp</code>
-     * and recreate <code>current</code>.
-     * @throws IOException
-     */
-    void startCheckpoint() throws IOException {
-      for(StorageDirectory sd : storageDirs) {
-        moveCurrent(sd);
-      }
-    }
-
-    void endCheckpoint() throws IOException {
-      for(StorageDirectory sd : storageDirs) {
-        moveLastCheckpoint(sd);
+    
+    void ensureCurrentDirExists() throws IOException {
+      for (Iterator<StorageDirectory> it = storage.dirIterator(); it.hasNext();) {
+        StorageDirectory sd = it.next();
+        File curDir = sd.getCurrentDir();
+        if (!curDir.exists() && !curDir.mkdirs()) {
+          throw new IOException("Could not create directory " + curDir);
+        }
       }
     }
 
     /**
      * Merge image and edits, and verify consistency with the signature.
      */
-    private void doMerge(CheckpointSignature sig, boolean loadImage) throws IOException {
-      getEditLog().open();
-      StorageDirectory sdName = null;
-      StorageDirectory sdEdits = null;
-      Iterator<StorageDirectory> it = null;
-      if (loadImage) {
-        it = dirIterator(NameNodeDirType.IMAGE);
-        if (it.hasNext())
-          sdName = it.next();
-        if (sdName == null)
-          throw new IOException("Could not locate checkpoint fsimage");
-      }
-      it = dirIterator(NameNodeDirType.EDITS);
-      if (it.hasNext())
-        sdEdits = it.next();
-      if (sdEdits == null)
-        throw new IOException("Could not locate checkpoint edits");
+    private void doMerge(CheckpointSignature sig,
+        RemoteEditLogManifest manifest, boolean loadImage) throws IOException {
+      NNStorage dstStorage = this.storage;
+      dstStorage.setStorageInfo(sig);
+
       if (loadImage) {
-        loadFSImage(FSImage.getImageFile(sdName, NameNodeFile.IMAGE));
+        File file = dstStorage.findImageFile(sig.mostRecentCheckpointTxId);
+        if (file == null) {
+          throw new IOException("Couldn't find image file at txid "
+              + sig.mostRecentCheckpointTxId + " even though it should have "
+              + "just been downloaded");
+        }
+        loadFSImage(file);
       }
-      loadFSEdits(sdEdits);
-      sig.validateStorageInfo(this);
-      saveNamespace(false);
+      FSImage.rollForwardByApplyingLogs(manifest, this);
+      this.saveFSImageInAllDirs(this.getLastAppliedTxId(), false);
+      dstStorage.writeAll();
     }
   }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
index eb509a98..bd2a3d83 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.HftpFileSystem;
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
@@ -92,7 +93,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
       return;
     }
     DFSClient dfs = null;
-    DFSClient.DFSInputStream in = null;
+    DFSInputStream in = null;
     OutputStream os = null;
     try {
       dfs = getDFSClient(request);
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java
index 78c9dab7..1fa83396 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java
@@ -17,127 +17,132 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
-import org.apache.commons.logging.*;
-
 import java.io.*;
 import java.net.*;
 import java.security.DigestInputStream;
-import java.security.DigestOutputStream;
 import java.security.MessageDigest;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 import java.lang.Math;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
 import org.apache.hadoop.hdfs.util.DataTransferThrottler;
-import org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.ErrorSimulator;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.io.MD5Hash;
 
+
 /**
  * This class provides fetching a specified file from the NameNode.
  */
-class TransferFsImage implements FSConstants {
-  public final static String CONTENT_LENGTH = "Content-Length";
-  public static final Log LOG = LogFactory.getLog(TransferFsImage.class.getName());
-
-  private boolean isGetImage;
-  private boolean isGetEdit;
-  private boolean isGetEditNew;
-  private boolean isPutImage;
-  private int remoteport;
-  private String machineName;
-  private CheckpointSignature token;
+class TransferFsImage implements FSConstants{
   
-  /**
-   * File downloader.
-   * @param pmap key=value[] map that is passed to the http servlet as 
-   *        url parameters
-   * @param request the object from which this servelet reads the url contents
-   * @param response the object into which this servelet writes the url contents
-   * @throws IOException
-   */
-  public TransferFsImage(Map<String,String[]> pmap,
-                         HttpServletRequest request,
-                         HttpServletResponse response
-                         ) throws IOException {
-    isGetImage = isGetEdit = isPutImage = false;
-    remoteport = 0;
-    machineName = null;
-    token = null;
-
-    for (Iterator<String> it = pmap.keySet().iterator(); it.hasNext();) {
-      String key = it.next();
-      if (key.equals("getimage")) { 
-        isGetImage = true;
-      } else if (key.equals("getedit")) { 
-        isGetEdit = true;
-      } else if (key.equals("geteditnew")) { 
-        isGetEditNew = true;
-      } else if (key.equals("putimage")) { 
-        isPutImage = true;
-      } else if (key.equals("port")) { 
-        remoteport = new Integer(pmap.get("port")[0]).intValue();
-      } else if (key.equals("machine")) { 
-        machineName = pmap.get("machine")[0];
-      } else if (key.equals("token")) { 
-        token = new CheckpointSignature(pmap.get("token")[0]);
-      }
-    }
+  // Image transfer timeout
+  public static final String DFS_IMAGE_TRANSFER_TIMEOUT_KEY = "dfs.image.transfer.timeout";
+  public static final int DFS_IMAGE_TRANSFER_TIMEOUT_DEFAULT = 60 * 1000;
+  
+  public final static String CONTENT_LENGTH = "Content-Length";
+  public final static String MD5_HEADER = "X-MD5-Digest";
 
-    int numGets = (isGetImage?1:0) + (isGetEdit?1:0) + (isGetEditNew?1:0);
-    if ((numGets > 1) || (numGets == 0) && !isPutImage) {
-      throw new IOException("Illegal parameters to TransferFsImage");
-    }
-  }
+  private static final Log LOG = LogFactory.getLog(TransferFsImage.class);
 
-  boolean getEdit() {
-    return isGetEdit;
-  }
-  
-  boolean getEditNew() {
-    return isGetEditNew;
-  }
+  static MD5Hash downloadImageToStorage(
+      String fsName, long imageTxId, NNStorage dstStorage, boolean needDigest)
+      throws IOException {
 
-  boolean getImage() {
-    return isGetImage;
-  }
+    String fileid = GetImageServlet.getParamStringForImage(
+        imageTxId, dstStorage);
+    
+    String fileName = NNStorage.getCheckpointImageFileName(imageTxId);
 
-  boolean putImage() {
-    return isPutImage;
+    File[] dstFiles = dstStorage.getFiles(NameNodeDirType.IMAGE, fileName);
+    if (dstFiles.length == 0) {
+      throw new IOException("No targets in destination storage!");
+    }
+    
+    MD5Hash hash = getFileClient(fsName, fileid, dstFiles, dstStorage, needDigest);
+    LOG.info("Downloaded file " + dstFiles[0].getName() + " size " +
+        dstFiles[0].length() + " bytes.");
+    return hash;
   }
+  
+  static void downloadEditsToStorage(String fsName, RemoteEditLog log,
+      NNStorage dstStorage) throws IOException {
+    assert log.getStartTxId() > 0 && log.getEndTxId() > 0 :
+      "bad log: " + log;
+    String fileid = GetImageServlet.getParamStringForLog(
+        log, dstStorage);
+    String fileName = NNStorage.getFinalizedEditsFileName(
+        log.getStartTxId(), log.getEndTxId());
+
+    File[] dstFiles = dstStorage.getFiles(NameNodeDirType.EDITS, fileName);
+    assert !(dstFiles.length == 0) : "No checkpoint targets.";
+    
+    for (File f : dstFiles) {
+      if (f.exists() && f.canRead()) {
+        LOG.info("Skipping download of remote edit log " +
+            log + " since it already is stored locally at " + f);
+        return;
+      } else {
+        LOG.debug("Dest file: " + f);
+      }
+    }
 
-  CheckpointSignature getToken() {
-    return token;
+    getFileClient(fsName, fileid, dstFiles, dstStorage, false);
+    LOG.info("Downloaded file " + dstFiles[0].getName() + " size " +
+        dstFiles[0].length() + " bytes.");
   }
+ 
+  /**
+   * Requests that the NameNode download an image from this node.
+   *
+   * @param fsName the http address for the remote NN
+   * @param imageListenAddress the host/port where the local node is running an
+   *                           HTTPServer hosting GetImageServlet
+   * @param storage the storage directory to transfer the image from
+   * @param txid the transaction ID of the image to be uploaded
+   */
+  static void uploadImageFromStorage(String fsName,
+      String machine, int port,
+      NNStorage storage, long txid) throws IOException {
+    
+    String fileid = GetImageServlet.getParamStringToPutImage(
+        txid, machine, port, storage);
 
-  String getInfoServer() throws IOException{
-    if (machineName == null || remoteport == 0) {
-      throw new IOException ("MachineName and port undefined");
-    }
-    return machineName + ":" + remoteport;
+    LOG.info("Image upload: Posted URL " + fsName + fileid);
+    
+    // this doesn't directly upload an image, but rather asks the NN
+    // to connect back to the 2NN to download the specified image.
+    TransferFsImage.getFileClient(fsName, fileid, null, storage, false);
+    LOG.info("Uploaded image with txid " + txid + " to namenode at " +
+        fsName);
   }
 
+  
   /**
    * A server-side method to respond to a getfile http request
    * Copies the contents of the local file into the output stream.
    */
-  static void getFileServer(OutputStream outstream, File localfile, DataTransferThrottler throttler) 
+  static void getFileServer(OutputStream outstream, File localfile,
+      DataTransferThrottler throttler) 
     throws IOException {
     byte buf[] = new byte[BUFFER_SIZE];
     FileInputStream infile = null;
-    long totalReads = 0, totalSends = 0;
     try {
       infile = new FileInputStream(localfile);
-      if (ErrorSimulator.getErrorSimulation(2)
+      if (InjectionHandler.falseCondition(InjectionEvent.TRANSFERFSIMAGE_GETFILESERVER0)
           && localfile.getAbsolutePath().contains("secondary")) {
         // throw exception only when the secondary sends its image
         throw new IOException("If this exception is not caught by the " +
             "name-node fs image will be truncated.");
       }
       
-      if (ErrorSimulator.getErrorSimulation(3)
+      if (InjectionHandler.falseCondition(InjectionEvent.TRANSFERFSIMAGE_GETFILESERVER1)
           && localfile.getAbsolutePath().contains("fsimage")) {
           // Test sending image shorter than localfile
           long len = localfile.length();
@@ -148,11 +153,17 @@ static void getFileServer(OutputStream outstream, File localfile, DataTransferTh
       }
       int num = 1;
       while (num > 0) {
-        long startRead = System.currentTimeMillis();
         num = infile.read(buf);
         if (num <= 0) {
           break;
         }
+
+        if (InjectionHandler.falseCondition(InjectionEvent.TRANSFERFSIMAGE_GETFILESERVER2)) {
+          // Simulate a corrupted byte on the wire
+          LOG.warn("SIMULATING A CORRUPT BYTE IN IMAGE TRANSFER!");
+          buf[0]++;
+        }
+        InjectionHandler.processEvent(InjectionEvent.TRANSFERFSIMAGE_GETFILESERVER3);
         outstream.write(buf, 0, num);
         if (throttler != null) {
           throttler.throttle(num);
@@ -164,31 +175,50 @@ static void getFileServer(OutputStream outstream, File localfile, DataTransferTh
       }
     }
   }
+  
+  /**
+   * Get connection and read timeout.
+   */
+  private static int getHttpTimeout(NNStorage storage) {
+    if (storage == null || storage.getConf() == null) {
+      return DFS_IMAGE_TRANSFER_TIMEOUT_DEFAULT;
+    }
+    return storage.getConf().getInt(DFS_IMAGE_TRANSFER_TIMEOUT_KEY,
+        DFS_IMAGE_TRANSFER_TIMEOUT_DEFAULT);
+  }
 
   /**
    * Client-side Method to fetch file from a server
    * Copies the response from the URL to a list of local files.
-   * 
+   * @param dstStorage if an error occurs writing to one of the files,
+   *                   this storage object will be notified. 
    * @Return a digest of the received file if getChecksum is true
    */
-  static MD5Hash getFileClient(String fsName, String id, File[] localPath,
-      boolean getChecksum)
-    throws IOException {
+  static MD5Hash getFileClient(String nnHostPort,
+      String queryString, File[] localPaths,
+      NNStorage dstStorage, boolean getChecksum) throws IOException {
     byte[] buf = new byte[BUFFER_SIZE];
-    StringBuffer str = new StringBuffer("http://"+fsName+"/getimage?");
-    str.append(id);
+    String proto = "http://";
+    StringBuilder str = new StringBuilder(proto+nnHostPort+"/getimage?");
+    str.append(queryString);
 
     //
     // open connection to remote server
     //
     URL url = new URL(str.toString());
-    URLConnection connection = url.openConnection();
-    if (localPath == null) {
-      // Putting the image back
-      connection.setReadTimeout(2 * 60 * 60 * 1000); // 2 hours to upload
-    } else {
-      connection.setReadTimeout(10 * 60 * 1000); // 10 minute read timeout
+    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+    
+    int timeout = getHttpTimeout(dstStorage);
+    connection.setConnectTimeout(timeout);
+    connection.setReadTimeout(timeout);
+    
+    if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+      throw new IOException(
+          "Image transfer servlet at " + url +
+          " failed with status code " + connection.getResponseCode() +
+          "\nResponse message:\n" + connection.getResponseMessage());
     }
+    
     long advertisedSize;
     String contentLength = connection.getHeaderField(CONTENT_LENGTH);
     if (contentLength != null) {
@@ -197,6 +227,8 @@ static MD5Hash getFileClient(String fsName, String id, File[] localPath,
       throw new IOException(CONTENT_LENGTH + " header is not provided " +
                             "by the namenode when trying to fetch " + str);
     }
+    
+    MD5Hash advertisedDigest = parseMD5Header(connection);
     long received = 0;
     InputStream stream = connection.getInputStream();
     MessageDigest digester = null;
@@ -204,40 +236,78 @@ static MD5Hash getFileClient(String fsName, String id, File[] localPath,
       digester = MD5Hash.getDigester();
       stream = new DigestInputStream(stream, digester);
     }
-    FileOutputStream[] output = null;
-    
+    boolean finishedReceiving = false;
+
+    List<FileOutputStream> outputStreams = new ArrayList<FileOutputStream>();
+    MD5Hash computedDigest = null;
+
     try {
-      if (localPath != null) {
-        output = new FileOutputStream[localPath.length];
-        for (int i = 0; i < output.length; i++) {
-          output[i] = new FileOutputStream(localPath[i]);
+      if (localPaths != null) {
+        for (File f : localPaths) {
+          try {
+            if (f.exists()) {
+              LOG.warn("Overwriting existing file " + f
+                  + " with file downloaded from " + str);
+            }
+            outputStreams.add(new FileOutputStream(f));
+          } catch (IOException ioe) {
+            LOG.warn("Unable to download file " + f, ioe);
+            dstStorage.reportErrorOnFile(f);
+          }
+        }
+        
+        if (outputStreams.isEmpty()) {
+          throw new IOException(
+              "Unable to download to any storage directory");
         }
       }
+      
       int num = 1;
       while (num > 0) {
         num = stream.read(buf);
-        if (num > 0 && localPath != null) {
+        if (num > 0) {
           received += num;
-          for (int i = 0; i < output.length; i++) {
-            output[i].write(buf, 0, num);
+          for (FileOutputStream fos : outputStreams) {
+            fos.write(buf, 0, num);
           }
         }
       }
+      if(digester != null)
+        computedDigest = new MD5Hash(digester.digest());
+      finishedReceiving = true;
     } finally {
       stream.close();
-      if (output != null) {
-        for (int i = 0; i < output.length; i++) {
-          if (output[i] != null) {
-            output[i].close();
-          }
-        }
+      for (FileOutputStream fos : outputStreams) {
+        fos.getChannel().force(true);
+        fos.close();
       }
-      if (received != advertisedSize) {
+      if (finishedReceiving && received != advertisedSize) {
+        // only throw this exception if we think we read all of it on our end
+        // -- otherwise a client-side IOException would be masked by this
+        // exception that makes it look like a server-side problem!
         throw new IOException("File " + str + " received length " + received +
                               " is not of the advertised size " +
                               advertisedSize);
       }
     }
-    return digester==null ? null : new MD5Hash(digester.digest());
+    
+    if (computedDigest != null) {
+      if (advertisedDigest != null &&
+          !computedDigest.equals(advertisedDigest)) {
+        throw new IOException("File " + str + " computed digest " +
+            computedDigest + " does not match advertised digest " + 
+            advertisedDigest);
+      }
+      return computedDigest;
+    } else {
+      return null;
+    }    
   }
+
+  private static MD5Hash parseMD5Header(HttpURLConnection connection) {
+    String header = connection.getHeaderField(MD5_HEADER);
+    MD5Hash hash = (header != null) ? new MD5Hash(header) : null;
+    return hash;
+  }
+
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UnsupportedActionException.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UnsupportedActionException.java
index f2372645..e69de29b 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UnsupportedActionException.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UnsupportedActionException.java
@@ -1,34 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.hadoop.hdfs.server.namenode;
-
-import java.io.IOException;
-
-/**
- * This exception is thrown when an operation is not supported.
- */
-public class UnsupportedActionException extends IOException {
-  /** for java.io.Serializable */
-  private static final long serialVersionUID = 1L;
-
-  public UnsupportedActionException(String action) {
-    super("Action " + action + "() is not supported.");
-  }
-
-}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java
index 73059ba9..b5d482f5 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java
@@ -59,7 +59,7 @@ public synchronized boolean startUpgrade() throws IOException {
       initializeUpgrade();
       if(!upgradeState) return false;
       // write new upgrade state into disk
-      namesystem.getFSImage().writeAll();
+      namesystem.getFSImage().storage.writeAll();
     }
     assert currentUpgrades != null : "currentUpgrades is null";
     this.broadcastCommand = currentUpgrades.first().startUpgrade();
@@ -108,7 +108,7 @@ synchronized UpgradeCommand processUpgradeCommand(UpgradeCommand command
   public synchronized void completeUpgrade() throws IOException {
     // set and write new upgrade state into disk
     setUpgradeState(false, FSConstants.LAYOUT_VERSION);
-    namesystem.getFSImage().writeAll();
+    namesystem.getFSImage().storage.writeAll();
     currentUpgrades = null;
     broadcastCommand = null;
     namesystem.leaveSafeMode(false);
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ValidateNamespaceDirPolicy.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ValidateNamespaceDirPolicy.java
new file mode 100644
index 00000000..027fd0ac
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ValidateNamespaceDirPolicy.java
@@ -0,0 +1,143 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.hdfs.DFSUtil;
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
+import org.apache.hadoop.fs.DF;
+
+import java.io.File;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URI;
+import java.util.*;
+
+public class ValidateNamespaceDirPolicy {
+  
+  private static final Log LOG = LogFactory
+      .getLog(ValidateNamespaceDirPolicy.class.getName());
+
+  public static void validate(Configuration conf) throws IOException {
+    int policy = conf.getInt("dfs.name.dir.policy", 0);
+
+    String nameDirConfig = "dfs.name.dir";
+    Collection<URI> dirNamesURIs = NNStorageConfiguration.getNamespaceDirs(conf);
+    validatePolicy(conf, policy, dirNamesURIs, nameDirConfig);
+
+    String nameEditsDirConfig = "dfs.name.edits.dir";
+    Collection<URI> editsDirNamesURIs = NNStorageConfiguration.getNamespaceEditsDirs(conf);
+    validatePolicy(conf, policy, editsDirNamesURIs, nameEditsDirConfig);
+  }
+
+  private static void validatePolicy(Configuration conf,
+                        int policy,
+                        Collection<URI> locations,
+                        String configName)
+    throws IOException {
+    /* DFS name node directory policy:
+      0 - No enforcement
+      1 - Enforce that there should be at least two copies and they must be on
+          different devices
+      2 - Enforce that there should be at least two copies on different devices
+          and at least one must be on an NFS device
+    */
+    
+    // convert uri's for directory names
+    Collection<String> dirNames = new ArrayList<String>();
+    for (URI u : locations) {
+      LOG.info("NNStorage validation : checking path: " + u);
+      if ((u.getScheme().compareTo(JournalType.FILE.name().toLowerCase()) == 0)) {
+        LOG.info("NNStorage validation : path: " + u
+            + " will be processed as a file");
+        dirNames.add(u.getPath());
+      }
+    }
+    
+    switch (policy) {
+      case 0:
+        // No check needed.
+        break;
+
+      case 1:
+      case 2:
+        boolean foundNFS = false;
+        String commandPrefix = "df -P -T ";
+        HashSet<String> mountPoints = new HashSet<String>();
+
+        // Check that there should be at least two copies
+        if (dirNames.size() < 2) {
+          throw new IOException("Configuration parameter " + configName
+                      + " violated DFS name node directory policy:"
+                      + " There should be at least two copies.");
+        }
+
+        for (String name : dirNames) {
+          String command = commandPrefix + name;
+          Process p = Runtime.getRuntime().exec(command);
+          BufferedReader stdInput = new BufferedReader(new
+                 InputStreamReader(p.getInputStream()));
+
+          // Skip the first line, which is the header info
+          String outputStr = stdInput.readLine();
+          outputStr = stdInput.readLine();
+
+          // Parse the command output to get the "Type" and "Mounted on"
+          String[] fields = outputStr.split("\\s+");
+
+          if (fields.length < 2)
+            throw new IOException("Unexpected output from command ' " + command
+                        + "': " + outputStr);
+
+          // "Type" is the second column, and "Mounted on" is the last column
+          if (fields[1].equals("nfs"))
+            foundNFS = true;
+          mountPoints.add(fields[fields.length - 1]);
+        }
+
+        // Check that there should be at least two directories on different
+        // mount points
+        if (mountPoints.size() < 2) {
+          throw new IOException("Configuration parameter " + configName
+                      + " violated DFS name node directory policy:"
+                      + " There must be at least two copies on different"
+                      + " devices");
+        }
+
+        // If policy is 2, check that at least one directory is on NFS device
+        if (policy == 2 && !foundNFS) {
+          throw new IOException("Configuration parameter " + configName
+                      + " violated DFS name node directory policy:"
+                      + " There must be at least one copy on an NFS device");
+        }
+
+        break;
+
+      default:
+        throw new IOException(
+          "Unexpected configuration parameters: dfs.name.dir.policy = "
+            + policy
+            + ", must be between 0 and 2.");
+    }
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
index c6b319ef..9f18ce46 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
@@ -114,12 +114,25 @@ public class NameNodeMetrics implements Updater {
                           new MetricsTimeVaryingLong("numGetContentSummary", registry, 
                           "The number of get content summary operations");
 
+    // hftp related metrics
+    public MetricsTimeVaryingLong numFileDataServletDoGet =
+        new MetricsTimeVaryingLong("numFileDataServletDoGet", registry);
+    public MetricsTimeVaryingLong numListPathsServletDoGet =
+        new MetricsTimeVaryingLong("numListPathsServletDoGet", registry);
+    
     public MetricsTimeVaryingRate transactions =
                     new MetricsTimeVaryingRate("Transactions", registry, "Journal Transaction");
     public MetricsTimeVaryingRate syncs =
                     new MetricsTimeVaryingRate("Syncs", registry, "Journal Sync");
     public MetricsTimeVaryingLong transactionsBatchedInSync =
                     new MetricsTimeVaryingLong("JournalTransactionsBatchedInSync", registry, "Journal Transactions Batched In Sync");
+    public MetricsLongValue currentTxnId =
+                    new MetricsLongValue("CurrentTxId", registry, "Last Written Transaction Id");
+    public MetricsTimeVaryingLong rollEditLogTime =
+                    new MetricsTimeVaryingLong("Roll Edit Log Time", registry, "Roll Edit Log Time");
+    public MetricsTimeVaryingLong rollFsImageTime =
+                    new MetricsTimeVaryingLong("Roll FSImage Time", registry, "Roll FSImage Time");
+    
     public MetricsTimeVaryingRate blockReport =
                     new MetricsTimeVaryingRate("blockReport", registry, "Block Report");
     public MetricsIntValue safeModeTime =
@@ -132,6 +145,8 @@ public class NameNodeMetrics implements Updater {
                     new MetricsIntValue("numBufferedTransactions", registry);
     public MetricsLongValue numOverReplicatedBlocks =
                     new MetricsLongValue("numOverReplicatedBlocks", registry);
+    public MetricsTimeVaryingLong numFsckOperations =
+                    new MetricsTimeVaryingLong("numFsckOperations", registry);
 
       
     public NameNodeMetrics(Configuration conf, NameNode nameNode) {
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlockAlreadyCommittedException.java b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlockAlreadyCommittedException.java
new file mode 100644
index 00000000..18fde05b
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlockAlreadyCommittedException.java
@@ -0,0 +1,41 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hdfs.server.protocol;
+
+import java.io.IOException;
+
+/**
+ * Exception to indicate that block recovery fails since the block
+ * has already been committed.
+ * 
+ */
+public class BlockAlreadyCommittedException extends IOException {
+
+  /**
+   * 
+   */
+  private static final long serialVersionUID = 3333571694231935066L;
+  
+  public BlockAlreadyCommittedException(Exception e) {
+    super(e);
+  }
+  public BlockAlreadyCommittedException(String msg) {
+    super(msg);
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlocksWithLocations.java b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlocksWithLocations.java
index fed9e6c7..bc25e21d 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlocksWithLocations.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlocksWithLocations.java
@@ -67,7 +67,7 @@ public void readFields(DataInput in) throws IOException {
       int len = WritableUtils.readVInt(in); // variable length integer
       datanodeIDs = new String[len];
       for(int i=0; i<len; i++) {
-        datanodeIDs[i] = Text.readString(in);
+        datanodeIDs[i] = Text.readStringOpt(in);
       }
     }
     
@@ -76,7 +76,7 @@ public void write(DataOutput out) throws IOException {
       block.write(out);
       WritableUtils.writeVInt(out, datanodeIDs.length); // variable length int
       for(String id:datanodeIDs) {
-        Text.writeString(out, id);
+        Text.writeStringOpt(out, id);
       }
     }
   }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/IncrementalBlockReport.java b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/IncrementalBlockReport.java
index b8f44194..52c74cad 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/IncrementalBlockReport.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/IncrementalBlockReport.java
@@ -112,7 +112,7 @@ public void write(DataOutput out) throws IOException {
     }
     out.writeInt(delHints.length);
     for (String delHint : delHints) {
-      Text.writeString(out, delHint);
+      Text.writeStringOpt(out, delHint);
     }
   }
 
@@ -125,7 +125,7 @@ public void readFields(DataInput in) throws IOException {
     }
     delHints = new String[in.readInt()];
     for (int i = 0; i < delHints.length; i++) {
-      delHints[i] = Text.readString(in);
+      delHints[i] = Text.readStringOpt(in);
     }
     currentBlock = 0;
     currentHint = 0;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java
index e891f85b..ec826dae 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java
@@ -50,11 +50,11 @@ public BlocksWithLocations getBlocks(DatanodeInfo datanode, long size)
   throws IOException;
 
   /**
-   * Get the size of the current edit log (in bytes).
-   * @return The number of bytes in the current edit log.
+   * @return The most recent transaction ID that has been synced to
+   * persistent storage.
    * @throws IOException
    */
-  public long getEditLogSize() throws IOException;
+  public long getTransactionID() throws IOException;
 
   /**
    * Closes the current edit log and opens a new one. The 
@@ -86,8 +86,9 @@ public void rollFsImage(CheckpointSignature newImageSignature)
   /**
    * Gets the CheckpointSignature at the time the call was made
    * @return the CheckpointSignature
+   * @throws IOException 
    */
-  public CheckpointSignature getCheckpointSignature();
+  public CheckpointSignature getCheckpointSignature() throws IOException;
 
   /***
    * Updates the DatanodeInfo for each LocatedBlock in locatedBlocks. Used
@@ -98,4 +99,18 @@ public void rollFsImage(CheckpointSignature newImageSignature)
    */
   public LocatedBlocksWithMetaInfo updateDatanodeInfo(
       LocatedBlocks locatedBlocks) throws IOException;
+  
+  
+  /**
+   * Return a structure containing details about all edit logs available to be
+   * fetched from the NameNode.
+   * 
+   * @param sinceTxId return only logs that contain transactions >= sinceTxId
+   */
+  public RemoteEditLogManifest getEditLogManifest(long l) throws IOException; 
+  
+  /**
+   * Issued by standby to validate that it is allowed to talk to the primary.
+   */
+  public void register() throws IOException;
 }
\ No newline at end of file
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/RemoteEditLog.java b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/RemoteEditLog.java
new file mode 100644
index 00000000..71fde3a3
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/RemoteEditLog.java
@@ -0,0 +1,103 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.protocol;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
+import org.apache.hadoop.io.Writable;
+
+import com.google.common.base.Function;
+import com.google.common.collect.ComparisonChain;
+
+public class RemoteEditLog implements Writable, Comparable<RemoteEditLog> {
+  private long startTxId = HdfsConstants.INVALID_TXID;
+  private long endTxId = HdfsConstants.INVALID_TXID;
+  private boolean inProgress = false;
+  
+  public RemoteEditLog() {
+  }
+
+  public RemoteEditLog(long startTxId, long endTxId, boolean ip) {
+    this.startTxId = startTxId;
+    this.endTxId = endTxId;
+    this.inProgress = ip;
+  }
+
+  public long getStartTxId() {
+    return startTxId;
+  }
+
+  public long getEndTxId() {
+    return endTxId;
+  }
+  
+  public boolean inProgress(){
+    return inProgress;
+  }
+    
+  @Override
+  public String toString() {
+    return "[" + startTxId + "," + endTxId + "," + (!inProgress) +"]";
+  }
+
+  @Override
+  public void write(DataOutput out) throws IOException {
+    out.writeLong(startTxId);
+    out.writeLong(endTxId);
+    out.writeBoolean(inProgress);
+  }
+
+  @Override
+  public void readFields(DataInput in) throws IOException {
+    startTxId = in.readLong();
+    endTxId = in.readLong();
+    inProgress = in.readBoolean();
+  }
+  
+  @Override
+  public int compareTo(RemoteEditLog log) {
+    return ComparisonChain.start()
+      .compare(startTxId, log.startTxId)
+      .compare(endTxId, log.endTxId)
+      .result();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof RemoteEditLog)) return false;
+    return this.compareTo((RemoteEditLog)o) == 0;
+  }
+  
+  @Override
+  public int hashCode() {
+    return (int) (startTxId * endTxId);
+  }
+  
+  /**
+   * Guava <code>Function</code> which applies {@link #getStartTxId()} 
+   */
+  public static final Function<RemoteEditLog, Long> GET_START_TXID =
+    new Function<RemoteEditLog, Long>() {
+      @Override
+      public Long apply(RemoteEditLog log) {
+        return log.getStartTxId();
+      }
+    };
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/server/protocol/RemoteEditLogManifest.java b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/RemoteEditLogManifest.java
new file mode 100644
index 00000000..f871828f
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/server/protocol/RemoteEditLogManifest.java
@@ -0,0 +1,99 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.protocol;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.hadoop.io.Writable;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+
+/**
+ * An enumeration of logs available on a remote NameNode.
+ */
+public class RemoteEditLogManifest implements Writable {
+
+  private List<RemoteEditLog> logs;
+  
+  public RemoteEditLogManifest() {
+  }
+  
+  public RemoteEditLogManifest(List<RemoteEditLog> logs) {
+    this.logs = logs;
+    checkState();
+  }
+  
+  
+  /**
+   * Check that the logs are contiguous and non-overlapping
+   * sequences of transactions, in sorted order
+   * @throws IllegalStateException if incorrect
+   */
+  private void checkState()  {
+    Preconditions.checkNotNull(logs);
+    
+    RemoteEditLog prev = null;
+    for (RemoteEditLog log : logs) {
+      if (prev != null) {
+        if (log.getStartTxId() != prev.getEndTxId() + 1) {
+          throw new IllegalStateException("Invalid log manifest:" + this);
+        }
+      }
+      
+      prev = log;
+    }
+  }
+  
+  public List<RemoteEditLog> getLogs() {
+    return Collections.unmodifiableList(logs);
+  }
+
+
+  
+  @Override
+  public String toString() {
+    return "[" + Joiner.on(", ").join(logs) + "]";
+  }
+  
+  
+  @Override
+  public void write(DataOutput out) throws IOException {
+    out.writeInt(logs.size());
+    for (RemoteEditLog log : logs) {
+      log.write(out);
+    }
+  }
+
+  @Override
+  public void readFields(DataInput in) throws IOException {
+    int numLogs = in.readInt();
+    logs = Lists.newArrayList();
+    for (int i = 0; i < numLogs; i++) {
+      RemoteEditLog log = new RemoteEditLog();
+      log.readFields(in);
+      logs.add(log);
+    }
+    checkState();
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/src/hdfs/org/apache/hadoop/hdfs/tools/DFSAdmin.java
index f3eadaa3..a28e6115 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/DFSAdmin.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/DFSAdmin.java
@@ -55,7 +55,6 @@
 import org.apache.hadoop.security.authorize.RefreshAuthorizationPolicyProtocol;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.ToolRunner;
-import org.mortbay.log.Log;
 
 /**
  * This class provides some DFS administrative access.
@@ -86,11 +85,12 @@ abstract private static class DFSAdminCommand extends Command {
     /** Constructor */
     public DFSAdminCommand(FileSystem fs) {
       super(fs.getConf());
-      if (!(fs instanceof DistributedFileSystem)) {
+      DistributedFileSystem dfs = DFSUtil.convertToDFS(fs);      
+      if (dfs == null) {
         throw new IllegalArgumentException("FileSystem " + fs.getUri() + 
             " is not a distributed file system");
       }
-      this.dfs = (DistributedFileSystem) fs;
+      this.dfs = dfs;
     }
   }
   
@@ -493,6 +493,24 @@ public int refreshNodes() throws IOException {
    
     return exitCode;
   }
+  
+  /**
+   * Roll edit log at the namenode manually.
+   */
+  public int rollEditLog() throws IOException {
+    int exitCode = -1;
+
+    DistributedFileSystem dfs = getDFS();
+    if (dfs == null) {
+      System.err.println("FileSystem is " + getFS().getUri());
+      return exitCode;
+    }
+
+    dfs.rollEditLog();
+    exitCode = 0;
+   
+    return exitCode;
+  }
 
   private void printHelp(String cmd) {
     String summary = "hadoop dfsadmin is the command to execute DFS administrative commands.\n" +
@@ -507,6 +525,8 @@ private void printHelp(String cmd) {
       "\t[" + ClearSpaceQuotaCommand.USAGE +"] \n" +
       "\t[-refreshServiceAcl] [-service serviceName]\n" +
       "\t[-refreshNamenodes] datanodehost:port\n" +
+      "\t[-removeNamespace nameserviceId [datanodehost:port]]" +
+      "\t[-refreshDatanodeDataDirs] [confFilePath | --defaultPath] [datanodehost:port]\n" +
       "\t[-help [cmd]]\n";
 
     String report ="-report [-service serviceName]: " + 
@@ -571,8 +591,21 @@ private void printHelp(String cmd) {
       "\t\tNamenode will reload the authorization policy file.\n";
 
     String refreshNamenodes = "-refreshNamenodes datanodehost:port: \tGiven datanode reloads\n" +
-      "\t\tthe configuration file, starts serving new namenodes and stops serving the removed ones\n";
+      "\t\tthe configuration file, starts serving new namenodes and stops serving the removed ones.\n" +
+      "\t\tIf the datanode parameter is omitted, it will connect to the datanode running on the " +
+      "\t\tlocalhost.";
     
+    String removeNamespace = "-removeNamespace nameserviceId [datanodehost:port]: \tStops the\n" +
+      "\t\tgiven namespace by being served by the given datanode. The namespace is given trough\n" +
+      "\t\tnameserviceId argument. If no datanode is given, then the one running on the local\n" +
+      "\t\tmachine will be used.";
+    
+    String refreshDatanodeDataDirs = "-refreshDatanodeDataDirs [confFilePath | --defaultPath] datanodehost:port:\t" +
+      "Given\n\t\tdatanode refreshes the list of mnts available for the datanode.\n" +
+      "\t\tIf the datanode parameter is omitted, it will connect to the datanode running on the " +
+      "\t\tlocalhost. You can provide a config path or put the tag --defaultPath instead to use " +
+      "\t\tthe datanode's default path.";
+
     String help = "-help [cmd]: \tDisplays help for the given command or all commands if none\n" +
       "\t\tis specified.\n";
 
@@ -602,6 +635,10 @@ private void printHelp(String cmd) {
       System.out.println(refreshServiceAcl);
     } else if ("refreshNamenodes".equals(cmd)) {
       System.out.println(refreshNamenodes);
+    } else if ("removeNamespace".equals(cmd)) {
+      System.out.println(removeNamespace);
+    } else if ("refreshDatanodeDataDirs".equals(cmd)){
+      System.out.println(refreshDatanodeDataDirs);
     } else if ("help".equals(cmd)) {
       System.out.println(help);
     } else if (RecountCommand.matches(cmd)){
@@ -621,6 +658,8 @@ private void printHelp(String cmd) {
       System.out.println(ClearSpaceQuotaCommand.DESCRIPTION);
       System.out.println(refreshServiceAcl);
       System.out.println(refreshNamenodes);
+      System.out.println(removeNamespace);
+      System.out.println(refreshDatanodeDataDirs);
       System.out.println(RecountCommand.DESCRIPTION);
       System.out.println(help);
       System.out.println();
@@ -755,28 +794,105 @@ public int refreshServiceAcl() throws IOException {
     * @return exitcode 0 on success, non-zero on failure
     */
    public int refreshNamenodes(String[] argv, int i) throws IOException {
-     String dnAddr = argv[i];
-     int index = dnAddr.indexOf(':');
-     if (index < 0) {
-       return -1;
+     ClientDatanodeProtocol datanode = null;
+     String dnAddr = (argv.length == 2) ? argv[i] : null;
+     try {
+       datanode = getClientDatanodeProtocol(dnAddr);
+       if (datanode != null) {
+         datanode.refreshNamenodes();
+         return 0;
+       } else {
+         return -1;
+       }
+     } finally {
+       if (datanode != null && Proxy.isProxyClass(datanode.getClass())) {
+         RPC.stopProxy(datanode);
+       }
+     }
+   }
+   
+   public int refreshDatanodeDataDirs(String [] argv, int i) throws IOException {
+     ClientDatanodeProtocol datanode = null;
+     String confFilePath = argv[i++];
+     String dnAddr = (argv.length == 3) ? argv[i] : null;
+     try {
+       datanode = getClientDatanodeProtocol(dnAddr);
+        if (datanode != null) {
+          datanode.refreshDataDirs(confFilePath);
+          return 0;
+        } else {
+          return -1;
+        }
+      } finally {
+        if (datanode != null && Proxy.isProxyClass(datanode.getClass())) {
+          RPC.stopProxy(datanode);
+       }
      }
-     // Get the current configuration
+   }
+   
+   /**
+    * Gets a new ClientDataNodeProtocol object.
+    * @param dnAddr The address of the DataNode or null for the default value
+    *        (connecting to localhost).
+    * @return the initialized ClientDatanodeProtocol object or null on failure
+    */
+   private ClientDatanodeProtocol getClientDatanodeProtocol(String dnAddr)
+       throws IOException {
+     String hostname = null;
+     int port;
+     int index;
      Configuration conf = getConf();
+     
+     if (dnAddr == null) {
+       // Defaulting the configured address for the port
+       dnAddr = conf.get(FSConstants.DFS_DATANODE_IPC_ADDRESS_KEY);
+       hostname = "localhost";
+     }
+     index = dnAddr.indexOf(':');
+     if (index < 0) {
+       return null;
+     }
+
+     port = Integer.parseInt(dnAddr.substring(index+1));
+     if (hostname == null) {
+       hostname = dnAddr.substring(0, index);
+     }
 
-     String hostname = dnAddr.substring(0, index);
-     int port = Integer.parseInt(dnAddr.substring(index+1));
      InetSocketAddress addr = NetUtils.createSocketAddr(hostname + ":" + port);
      if (ClientDatanodeProtocol.LOG.isDebugEnabled()) {
        ClientDatanodeProtocol.LOG.debug("ClientDatanodeProtocol addr=" + addr);
      }
+     return (ClientDatanodeProtocol)RPC.getProxy(ClientDatanodeProtocol.class,
+         ClientDatanodeProtocol.versionID, addr, conf);
+   }
+   
+   
+   /**
+    * Removes a namespace from a given {@link DataNode}. It defaults to the
+    * datanode on the local machine of no datanode is given.
+    * 
+    * Usage: java DFSAdmin -removeNamespace nameserviceId [datanodehost:datanodeport]
+    * @param argv List of of command line parameters.
+    * @param i The index of the command that is being processed.
+    * @exception IOException if an error occurred while accessing
+    *            the file or path.
+    * @return exit code 0 on success, non-zero on failure
+    */
+   public int removeNamespace(String[] argv, int i) throws IOException {
+     String nameserviceId = argv[i++];
      ClientDatanodeProtocol datanode = null;
+     String dnAddr = (argv.length == 3) ? argv[i] : null;
+
      try {
-       datanode =(ClientDatanodeProtocol)RPC.getProxy(ClientDatanodeProtocol.class,
-         ClientDatanodeProtocol.versionID, addr, conf);
-       datanode.refreshNamenodes();
-       return 0;
+       datanode = getClientDatanodeProtocol(dnAddr);
+       if (datanode != null) {
+         datanode.removeNamespace(nameserviceId);
+         return 0;
+       } else {
+         return -1;
+       }
      } finally {
-       if (Proxy.isProxyClass(datanode.getClass())) {
+       if (datanode != null && Proxy.isProxyClass(datanode.getClass())) {
          RPC.stopProxy(datanode);
        }
      }
@@ -848,8 +964,8 @@ private int getBlockInfo(String[] argv, int i) throws IOException {
   	}
   	
   	StringBuilder sb = new StringBuilder();
-  	sb.append("blockid: ")
-  				.append(locatedBlock.getBlock().getBlockId()).append("\n")
+  	sb.append("block: ")
+  				.append(locatedBlock.getBlock()).append("\n")
   				.append("filename: ")
   				.append(locatedBlock.getFileName()).append("\n")
   				.append("locations: ");
@@ -909,7 +1025,13 @@ private static void printUsage(String cmd) {
                          + " [-refreshServiceAcl] [-service serviceName]");
     } else if ("-refreshNamenodes".equals(cmd)) {
       System.err.println("Usage: java DFSAdmin"
-                         + " [-refreshNamenodes] datanodehost:port");
+                         + " [-refreshNamenodes] [datanodehost:port]");
+    } else if ("-removeNamespace".equals(cmd)) {
+      System.err.println("Usage: java DFSAdmin"
+          + " -removeNamespace nameserviceId [datanodehost:port]");
+    } else if ("-refreshDatanodeDataDirs".equals(cmd)) {
+      System.err.println("Usage: java DFSAdmin [-refreshDatanodeDataDirs]"
+                         + "[confFilePath] [datanodehost:port]");
     } else if ("-getOpenFiles".equals(cmd)) {
       System.err.println("Usage: java DFSAdmin"
                          + " [-getOpenFiles] path minutes");
@@ -924,6 +1046,7 @@ private static void printUsage(String cmd) {
       System.err.println("           [-report] [-service serviceName]");
       System.err.println("           [-safemode enter | leave | get | wait] [-service serviceName]");
       System.err.println("           [-saveNamespace [force] [uncompressed] [-service serviceName]");
+      System.err.println("           [-rollEditLog [-service serviceName]");
       System.err.println("           [-refreshNodes] [-service serviceName]");
       System.err.println("           [-finalizeUpgrade] [-service serviceName]");
       System.err.println("           [-upgradeProgress status | details | force] [-service serviceName]");
@@ -931,7 +1054,10 @@ private static void printUsage(String cmd) {
       System.err.println("           [-refreshServiceAcl] [-service serviceName]");
       System.err.println("           ["+SetQuotaCommand.USAGE+"]");
       System.err.println("           ["+ClearQuotaCommand.USAGE+"]");
-      System.err.println("           [-refreshNamenodes] datanodehost:port");
+      System.err.println("           [-refreshNamenodes] [datanodehost:port]");
+      System.err.println("           [removeNamespace nameserviceId [datanodehost:port]]");
+      System.err.println("           [-refreshDatanodeDataDirs] [confFilePath] " 
+                                           + "[datanodehost:port]");
       System.err.println("           [-getOpenFiles] path minutes");
       System.err.println("           [-getBlockInfo] block-id");
       System.err.println("           ["+SetSpaceQuotaCommand.USAGE+"]");
@@ -1011,7 +1137,17 @@ public int run(String[] argv) throws Exception {
         return exitCode;
       }
     } else if ("-refreshNamenodes".equals(cmd)) {
-      if (argv.length != 2) {
+      if (argv.length < 1 || argv.length > 2) {
+        printUsage(cmd);
+        return exitCode;
+      }
+    } else if ("-removeNamespace".equals(cmd)) {
+      if (argv.length < 2 || argv.length > 3) {
+        printUsage(cmd);
+        return exitCode;
+      }
+    } else if ("-refreshDatanodeDataDirs".equals(cmd)) {
+      if (argv.length < 2 || argv.length > 3 ) {
         printUsage(cmd);
         return exitCode;
       }
@@ -1064,6 +1200,8 @@ public int run(String[] argv) throws Exception {
         setSafeMode(argv, i);
       } else if ("-saveNamespace".equals(cmd)) {
         exitCode = saveNamespace(argv, i);
+      } else if ("-rollEditLog".equals(cmd)) {
+        exitCode = rollEditLog();
       } else if ("-refreshNodes".equals(cmd)) {
         exitCode = refreshNodes();
       } else if ("-finalizeUpgrade".equals(cmd)) {
@@ -1084,6 +1222,10 @@ public int run(String[] argv) throws Exception {
         exitCode = refreshServiceAcl();
       } else if ("-refreshNamenodes".equals(cmd)) {
         exitCode = refreshNamenodes(argv, i);
+      } else if ("-removeNamespace".equals(cmd)) {
+        exitCode = removeNamespace(argv, i);
+      } else if ("-refreshDatanodeDataDirs".equals(cmd)) {
+        exitCode = refreshDatanodeDataDirs(argv, i );
       } else if ("-getOpenFiles".equals(cmd)) {
         exitCode = getOpenFiles(argv, i);
       } else if ("-getBlockInfo".equals(cmd)) {
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/DataDirFileReader.java b/src/hdfs/org/apache/hadoop/hdfs/tools/DataDirFileReader.java
new file mode 100644
index 00000000..17e5117e
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/DataDirFileReader.java
@@ -0,0 +1,80 @@
+/**	
+ * 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.	
+ */
+package org.apache.hadoop.hdfs.tools;
+
+import static java.lang.System.err;
+import java.io.*;
+import java.util.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class DataDirFileReader{
+
+  public static final Log LOG = LogFactory.getLog(DataDirFileReader.class);
+  private String DirectoryFile;
+  private String DirPaths;
+
+  public DataDirFileReader(String dirFile) throws IOException{
+    DirectoryFile = dirFile;
+  }
+
+  private void readFileToSet() throws IOException{
+    File file;
+    try {
+      file = new File(DirectoryFile);
+    } catch (Exception e) {
+      LOG.error("Received exception: " + e);
+      throw new IOException(e);
+    }
+    FileInputStream fis = new FileInputStream(file);
+    BufferedReader reader = null;
+    try {
+      reader = new BufferedReader(new InputStreamReader(fis));
+      String line;
+      //only the last line of the file is required since it contains the list
+      // of working datadirs. Anything before is not required. 
+      while ((line = reader.readLine()) != null) {
+        DirPaths = line;
+      }
+    } catch (IOException e) {
+      LOG.error("Received exception: " + e);
+      throw new IOException(e);
+    }
+    finally {
+      if(reader != null) {
+        reader.close();
+      }
+      fis.close(); 
+    }
+  }
+
+  public String getNewDirectories() {
+    if(DirPaths != null) {
+      return DirPaths;
+    } else {
+      try {
+        this.readFileToSet();
+        return DirPaths;
+      } catch (Exception e) {
+        //Unable to get the new directories so the string would be empty.
+        LOG.error("Received exception: " + e);
+        return null;
+      }
+    }
+  }  
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/FastCopy.java b/src/hdfs/org/apache/hadoop/hdfs/tools/FastCopy.java
index 436e6a8f..344e56fb 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/FastCopy.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/FastCopy.java
@@ -20,16 +20,19 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.net.InetSocketAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
@@ -122,6 +125,8 @@ public class FastCopy {
   // The time for which to wait for a block to be reported to the namenode.
   private final long BLK_WAIT_TIME;
 
+  private final Map<String, LeaseChecker> leaseCheckers = new HashMap<String, LeaseChecker>();
+
   private DistributedFileSystem srcFileSystem = null;
   private DistributedFileSystem dstFileSystem = null;
 
@@ -156,6 +161,29 @@ public FastCopy(Configuration conf, int threadPoolSize) throws Exception {
     this.rpcTimeout = conf.getInt("dfs.fastcopy.rpc.timeout", 60 * 1000); // default is 60s
   }
 
+  /**
+   * Renews the lease for the files that are being copied.
+   */
+  public class LeaseChecker extends LeaseRenewal {
+
+    private final ClientProtocol namenode;
+
+    public LeaseChecker(ClientProtocol namenode) {
+      super(clientName, conf);
+      this.namenode = namenode;
+    }
+
+    @Override
+    protected void renew() throws IOException {
+      namenode.renewLease(clientName);
+    }
+
+    @Override
+    protected void abort() {
+      // Do nothing.
+    }
+  }
+
   /**
    * Retrieves the {@link FastCopyFileStatus} object for the file.
    *
@@ -178,6 +206,40 @@ public Map<DatanodeInfo, Integer> getDatanodeErrors() {
     return Collections.unmodifiableMap(this.datanodeErrors);
   }
 
+  private static void swap(int i, int j, DatanodeInfo[] arr) {
+    DatanodeInfo tmp = arr[i];
+    arr[i] = arr[j];
+    arr[j] = tmp;
+  }
+
+  /**
+   * Aligns the source and destination locations such that common locations
+   * appear at the same index.
+   * 
+   * @param dstLocs
+   *          the destination datanodes
+   * @param srcLocs
+   *          the source datanodes
+   */
+  public static void alignDatanodes(DatanodeInfo[] dstLocs,
+      DatanodeInfo[] srcLocs) {
+    for (int i = 0; i < dstLocs.length; i++) {
+      for (int j = 0; j < srcLocs.length; j++) {
+        if (i == j)
+          continue;
+        if (dstLocs[i].equals(srcLocs[j])) {
+          if (i < j) {
+            swap(i, j, srcLocs);
+          } else {
+            swap(i, j, dstLocs);
+          }
+          break;
+        }
+      }
+    }
+  }
+
+
   private class FastFileCopy implements Callable<Boolean> {
     private final String src;
     private final String destination;
@@ -186,13 +248,11 @@ private class FastFileCopy implements Callable<Boolean> {
     public final int blockRPCExecutorPoolSize;
     private int totalBlocks;
     
-    private final FileSystem srcFs;
-    private final FileSystem dstFs;
     private final ClientProtocol srcNamenode;
     private final ClientProtocol dstNamenode;
+    private final DistributedFileSystem dstFs;
     private ProtocolProxy<ClientProtocol> srcNamenodeProtocolProxy;
     private ProtocolProxy<ClientProtocol> dstNamenodeProtocolProxy;
-    private final LeaseChecker leaseChecker;
     private final Reporter reporter;
 
     /**
@@ -408,33 +468,16 @@ public FastFileCopy(String src, String destination,
     public FastFileCopy(String src, String destination,
         DistributedFileSystem srcFs, DistributedFileSystem dstFs,
         Reporter reporter) throws Exception {
-      this.srcFs = srcFs;
-      this.dstFs = dstFs;
       this.reporter = reporter;
-      this.srcNamenodeProtocolProxy = DFSClient.createRPCNamenode(
-          NameNode.getAddress(this.srcFs.getUri().getAuthority()), conf,
-          UnixUserGroupInformation.login(conf, true));
-      this.srcNamenode = this.srcNamenodeProtocolProxy.getProxy();
-      // If both FS are same don't create unnecessary extra RPC connection.
-      if (this.dstFs.getUri().compareTo(this.srcFs.getUri()) != 0) {
-        this.dstNamenodeProtocolProxy = DFSClient.createRPCNamenode(
-            NameNode.getAddress(this.dstFs.getUri().getAuthority()), conf,
-            UnixUserGroupInformation.login(conf, true));
-        this.dstNamenode = this.dstNamenodeProtocolProxy.getProxy();
-      } else {
-        this.dstNamenodeProtocolProxy = this.srcNamenodeProtocolProxy;
-        this.dstNamenode = this.srcNamenode;
-      }
+      this.srcNamenode = srcFs.getClient().getNameNodeRPC();
+      this.srcNamenodeProtocolProxy = srcFs.getClient().namenodeProtocolProxy;
+      this.dstNamenode = dstFs.getClient().getNameNodeRPC();
+      this.dstNamenodeProtocolProxy = dstFs.getClient().namenodeProtocolProxy;
 
-      this.leaseChecker = new LeaseChecker();
-      // Start as a daemon thread.
-      Thread t = new Thread(leaseChecker);
-      t.setDaemon(true);
-      t.start();
-      
       // Remove the hdfs:// prefix and only use path component.
       this.src = new URI(src).getRawPath();
       this.destination = new URI(destination).getRawPath();
+      this.dstFs = dstFs;
       // This controls the number of concurrent blocks that would be copied per
       // file. So if we are concurrently copying 5 files at a time by setting
       // THREAD_POOL_SIZE to 5 and allowing 5 concurrent file copies and this
@@ -447,6 +490,21 @@ public FastFileCopy(String src, String destination,
     }
 
     public Boolean call() throws Exception {
+      String authority = this.dstFs.getUri().getAuthority();
+      synchronized (leaseCheckers) {
+        LeaseChecker leaseChecker = leaseCheckers.get(authority);
+        if (leaseChecker == null) {
+          leaseChecker = new LeaseChecker(this.dstNamenode);
+          // Start as a daemon thread.
+          Thread t = new Thread(leaseChecker);
+          t.setDaemon(true);
+          t.setName("Lease Renewal for client : " + clientName + ", NN : "
+              + authority);
+          t.start();
+          leaseCheckers.put(authority, leaseChecker);
+        }
+      }
+
       return copy();
     }
 
@@ -478,8 +536,7 @@ private void copyBlock(LocatedBlock src, LocatedBlock dst,
       // on the ordering of the locations that we receive from the NameNode.
       DatanodeInfo[] dstLocs = dst.getLocations();
       DatanodeInfo[] srcLocs = src.getLocations();
-      Arrays.sort(dstLocs);
-      Arrays.sort(srcLocs);
+      alignDatanodes(dstLocs, srcLocs);
 
       // We use minimum here, since its better for the NameNode to handle the
       // extra locations in either list. The locations that match up are the
@@ -489,7 +546,7 @@ private void copyBlock(LocatedBlock src, LocatedBlock dst,
       Block dstBlock = dst.getBlock();
       initializeBlockStatus(dstBlock, blocksToCopy);
       for (int i = 0; i < blocksToCopy; i++) {
-        blockRPCExecutor.submit(new BlockCopyRPC(srcNamespaceId, 
+          blockRPCExecutor.submit(new BlockCopyRPC(srcNamespaceId, 
               srcBlock, dstNamespaceId, dstBlock, supportFederation, srcLocs[i],
               dstLocs[i]));
       }
@@ -672,6 +729,7 @@ private boolean copy() throws Exception {
         // Instruct each datanode to create a copy of the respective block.
         int blocksAdded = 0;
         long startPos = 0;
+        Block lastBlock = null;
         // Loop through each block and create copies.
         for (LocatedBlock srcLocatedBlock : locatedBlocks) {
           DatanodeInfo[] favoredNodes = srcLocatedBlock.getLocations();
@@ -703,12 +761,13 @@ private boolean copy() throws Exception {
           waitForBlockCopy(blocksAdded);
 
           checkAndThrowException();          
+          lastBlock = destinationLocatedBlock.getBlock();
         }
 
         terminateExecutor();
 
         // Wait for all blocks of the file to be copied.
-        waitForFile(src, destination);
+        waitForFile(src, destination, srcFileStatus.getLen(), lastBlock);
         
       } catch (IOException e) {
         LOG.error("failed to copy src : " + src + " dst : " + destination, e);
@@ -728,11 +787,27 @@ private boolean copy() throws Exception {
      *          the source file
      * @param destination
      *          the destination file
+     * @param fileLen
+     *          the length of the file
+     * @param lastBlock
+     *          the last block of the file
      * @throws IOException
      */
-    private void waitForFile(String src, String destination)
+    private void waitForFile(String src, String destination,
+        long fileLen, Block lastBlock)
         throws IOException {
-      boolean flag = dstNamenode.complete(destination, clientName);
+      // We use this version of complete since only in this version calling
+      // complete on an already closed file doesn't throw a
+      // LeaseExpiredException.
+      
+      boolean flag = false;
+      if (dstNamenodeProtocolProxy.isMethodSupported(
+            "complete", String.class, String.class, long.class, Block.class)) {
+        flag = dstNamenode.complete(destination, clientName, fileLen,
+            lastBlock);
+      } else {
+        flag = dstNamenode.complete(destination, clientName);
+      }
       long startTime = System.currentTimeMillis();
 
       while (!flag) {
@@ -747,38 +822,16 @@ private void waitForFile(String src, String destination)
           throw new IOException("Fast Copy : Could not complete file copy, "
               + "timedout while waiting for blocks to be copied");
         }
-        flag = dstNamenode.complete(destination, clientName);
+        flag = dstNamenode.complete(destination, clientName,
+            fileLen, lastBlock);
       }
       LOG.debug("Fast Copy succeeded for files src : " + src + " destination "
           + destination);
     }
     
     private void shutdown() {
-      RPC.stopProxy(srcNamenode);
-      RPC.stopProxy(dstNamenode);
-      leaseChecker.closeRenewal();
       blockRPCExecutor.shutdownNow();
     }
-    
-    /**
-     * Renews the lease for the files that are being copied.
-     */
-    public class LeaseChecker extends LeaseRenewal {
-
-      public LeaseChecker() {
-        super(clientName, conf);
-      }
-
-      @Override
-      protected void renew() throws IOException {
-        dstNamenode.renewLease(clientName);
-      }
-
-      @Override
-      protected void abort() {
-        // Do nothing.
-      }
-    }
   }
 
   /**
@@ -795,6 +848,11 @@ public void shutdown() throws IOException {
     }
     datanodeMap.clear();
     executor.shutdownNow();
+    synchronized (leaseCheckers) {
+      for (LeaseChecker checker : leaseCheckers.values()) {
+        checker.closeRenewal();
+      }
+    }
   }
 
   public void copy(String src, String destination) throws Exception {
@@ -814,7 +872,7 @@ public void copy(String src, String destination) throws Exception {
    * 
    * @param destination
    *          the destination file, this should be the full HDFS URI
-   */
+   */ 
   public void copy(String src, String destination,
       DistributedFileSystem srcFs, DistributedFileSystem dstFs, Reporter reporter)
       throws Exception {
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsElement.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsElement.java
index 2db10d66..9a05402a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsElement.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsElement.java
@@ -77,5 +77,6 @@ public enum EditsElement {
     KEY_EXPIRY_DATE,
     KEY_LENGTH,
     KEY_BLOB,
-    CHECKSUM
+    CHECKSUM,
+    OFFSET
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java
index 216d770d..bd98d56a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java
@@ -23,7 +23,6 @@
 import org.apache.hadoop.hdfs.protocol.LayoutVersion;
 import org.apache.hadoop.hdfs.protocol.LayoutVersion.Feature;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOpCodes;
-import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
 import org.mortbay.log.Log;
 
 import static org.apache.hadoop.hdfs.tools.offlineEditsViewer.Tokenizer.ByteToken;
@@ -39,7 +38,8 @@
 class EditsLoaderCurrent implements EditsLoader {
 
   private static int[] supportedVersions = { -18, -19, -20, -21, -22, -23, -24,
-      -25, -26, -27, -28, -30, -31, -32, -33, -34, -35, -36, -37, -38};
+      -25, -26, -27, -28, -30, -31, -32, -33, -34, -35, -36, -37, -38, -39,
+      -40, -41 };
 
   private EditsVisitor v;
   private int editsVersion = 0;
@@ -99,56 +99,81 @@ private void visit_OP_CLOSE() throws IOException {
    * @param editsOpCode op code to visit
    */
   private void visit_OP_ADD_or_OP_CLOSE(FSEditLogOpCodes editsOpCode)
-    throws IOException {
-    visitTxId();
-    
-    IntToken opAddLength = v.visitInt(EditsElement.LENGTH);
-    // this happens if the edits is not properly ended (-1 op code),
-    // it is padded at the end with all zeros, OP_ADD is zero so
-    // without this check we would treat all zeros as empty OP_ADD)
-    if(opAddLength.value == 0) {
-      throw new IOException("OpCode " + editsOpCode +
-        " has zero length (corrupted edits)");
-    }    
-    v.visitStringUTF8(EditsElement.PATH);
-    v.visitStringUTF8(EditsElement.REPLICATION);
-    v.visitStringUTF8(EditsElement.MTIME);
-    v.visitStringUTF8(EditsElement.ATIME);
-    v.visitStringUTF8(EditsElement.BLOCKSIZE);
-    // now read blocks
-    IntToken numBlocksToken = v.visitInt(EditsElement.NUMBLOCKS);
-    for (int i = 0; i < numBlocksToken.value; i++) {
-      v.visitEnclosingElement(EditsElement.BLOCK);
-
-      v.visitLong(EditsElement.BLOCK_ID);
-      v.visitLong(EditsElement.BLOCK_NUM_BYTES);
-      v.visitLong(EditsElement.BLOCK_GENERATION_STAMP);
+      throws IOException {
+      visitTxId();
+      if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+        IntToken opAddLength = v.visitInt(EditsElement.LENGTH);
+        // this happens if the edits is not properly ended (-1 op code),
+        // it is padded at the end with all zeros, OP_ADD is zero so
+        // without this check we would treat all zeros as empty OP_ADD)
+        if (opAddLength.value == 0) {
+          throw new IOException("OpCode " + editsOpCode
+              + " has zero length (corrupted edits)");
+        }
+      }
+      
+      v.visitStringUTF8(EditsElement.PATH);
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+        v.visitShort(EditsElement.REPLICATION);
+        v.visitLong(EditsElement.MTIME);
+        v.visitLong(EditsElement.ATIME);
+        v.visitLong(EditsElement.BLOCKSIZE);
+      } else {
+        v.visitStringUTF8(EditsElement.REPLICATION);
+        v.visitStringUTF8(EditsElement.MTIME);
+        v.visitStringUTF8(EditsElement.ATIME);
+        v.visitStringUTF8(EditsElement.BLOCKSIZE);
+      }
+      // now read blocks
+      IntToken numBlocksToken = v.visitInt(EditsElement.NUMBLOCKS);
+      for (int i = 0; i < numBlocksToken.value; i++) {
+        v.visitEnclosingElement(EditsElement.BLOCK);
 
-      v.leaveEnclosingElement();
-    }
-    // PERMISSION_STATUS
-    v.visitEnclosingElement(EditsElement.PERMISSION_STATUS);
+        v.visitLong(EditsElement.BLOCK_ID);
+        v.visitLong(EditsElement.BLOCK_NUM_BYTES);
+        v.visitLong(EditsElement.BLOCK_GENERATION_STAMP);
 
-    v.visitStringText( EditsElement.USERNAME);
-    v.visitStringText( EditsElement.GROUPNAME);
-    v.visitShort(      EditsElement.FS_PERMISSIONS);
+        v.leaveEnclosingElement();
+      }
+      // PERMISSION_STATUS
+      v.visitEnclosingElement(EditsElement.PERMISSION_STATUS);
 
-    v.leaveEnclosingElement();
-    if(editsOpCode == FSEditLogOpCodes.OP_ADD) {
-      v.visitStringUTF8(EditsElement.CLIENT_NAME);
-      v.visitStringUTF8(EditsElement.CLIENT_MACHINE);
+      v.visitStringText( EditsElement.USERNAME);
+      v.visitStringText( EditsElement.GROUPNAME);
+      v.visitShort(      EditsElement.FS_PERMISSIONS);
+
+      v.leaveEnclosingElement();
+      if(editsOpCode == FSEditLogOpCodes.OP_ADD) {
+        v.visitStringUTF8(EditsElement.CLIENT_NAME);
+        v.visitStringUTF8(EditsElement.CLIENT_MACHINE);
+      }
     }
-  }
 
   /**
    * Visit OP_RENAME_OLD
    */
   private void visit_OP_RENAME_OLD() throws IOException {
     visitTxId();
-    v.visitInt(        EditsElement.LENGTH);
-    v.visitStringUTF8( EditsElement.SOURCE);
-    v.visitStringUTF8( EditsElement.DESTINATION);
-    v.visitStringUTF8( EditsElement.TIMESTAMP);
+    if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitInt(EditsElement.LENGTH);
+    }
+    v.visitStringUTF8(    EditsElement.SOURCE);
+    v.visitStringUTF8(    EditsElement.DESTINATION);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitLong(EditsElement.TIMESTAMP);
+    } else {
+      v.visitStringUTF8(EditsElement.TIMESTAMP);
+    }
+  }
+  
+  /**
+   * Visit OP_HARDLINK
+   */
+  private void visit_OP_HARDLINK() throws IOException {
+    visitTxId();
+    v.visitStringUTF8(EditsElement.SOURCE);
+    v.visitStringUTF8(EditsElement.DESTINATION);
+    v.visitLong(EditsElement.TIMESTAMP);
   }
 
   /**
@@ -156,9 +181,15 @@ private void visit_OP_RENAME_OLD() throws IOException {
    */
   private void visit_OP_DELETE() throws IOException {
     visitTxId();
-    v.visitInt(        EditsElement.LENGTH);
+    if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitInt(EditsElement.LENGTH);
+    }
     v.visitStringUTF8( EditsElement.PATH);
-    v.visitStringUTF8( EditsElement.TIMESTAMP);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitLong(EditsElement.TIMESTAMP);
+    } else {
+      v.visitStringUTF8(EditsElement.TIMESTAMP);
+    }
   }
 
   /**
@@ -166,10 +197,17 @@ private void visit_OP_DELETE() throws IOException {
    */
   private void visit_OP_MKDIR() throws IOException {
     visitTxId();
-    v.visitInt(        EditsElement.LENGTH);
+    if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitInt(EditsElement.LENGTH);
+    }
     v.visitStringUTF8( EditsElement.PATH);
-    v.visitStringUTF8( EditsElement.TIMESTAMP);
-    v.visitStringUTF8( EditsElement.ATIME);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitLong(EditsElement.TIMESTAMP);
+      v.visitLong(EditsElement.ATIME);
+    } else {
+      v.visitStringUTF8(EditsElement.TIMESTAMP);
+      v.visitStringUTF8(EditsElement.ATIME);
+    }
     // PERMISSION_STATUS
     v.visitEnclosingElement( EditsElement.PERMISSION_STATUS);
 
@@ -180,13 +218,14 @@ private void visit_OP_MKDIR() throws IOException {
     v.leaveEnclosingElement();
   }
 
-  /**
-   * Visit OP_SET_REPLICATION
-   */
   private void visit_OP_SET_REPLICATION() throws IOException {
     visitTxId();
     v.visitStringUTF8(EditsElement.PATH);
-    v.visitStringUTF8(EditsElement.REPLICATION);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitShort(EditsElement.REPLICATION);
+    } else {
+      v.visitStringUTF8(EditsElement.REPLICATION);
+    }
   }
 
   /**
@@ -221,10 +260,17 @@ private void visit_OP_SET_GENSTAMP() throws IOException {
    */
   private void visit_OP_TIMES() throws IOException {
     visitTxId();
-    v.visitInt(        EditsElement.LENGTH);
+    if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitInt(EditsElement.LENGTH);
+    }
     v.visitStringUTF8( EditsElement.PATH);
-    v.visitStringUTF8( EditsElement.MTIME);
-    v.visitStringUTF8( EditsElement.ATIME);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitLong(EditsElement.MTIME);
+      v.visitLong(EditsElement.ATIME);
+    } else {
+      v.visitStringUTF8(EditsElement.MTIME);
+      v.visitStringUTF8(EditsElement.ATIME);
+    }
   }
 
   /**
@@ -242,10 +288,16 @@ private void visit_OP_SET_QUOTA() throws IOException {
    */
   private void visit_OP_RENAME() throws IOException {
     visitTxId();
-    v.visitInt(           EditsElement.LENGTH);
+    if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitInt(EditsElement.LENGTH);
+    }
     v.visitStringUTF8(    EditsElement.SOURCE);
     v.visitStringUTF8(    EditsElement.DESTINATION);
-    v.visitStringUTF8(    EditsElement.TIMESTAMP);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitLong(EditsElement.TIMESTAMP);
+    } else {
+      v.visitStringUTF8(EditsElement.TIMESTAMP);
+    }
     v.visitBytesWritable( EditsElement.RENAME_OPTIONS);
   }
 
@@ -254,14 +306,27 @@ private void visit_OP_RENAME() throws IOException {
    */
   private void visit_OP_CONCAT_DELETE() throws IOException {
     visitTxId();
-    IntToken lengthToken = v.visitInt(EditsElement.LENGTH);
+    int sourceCount = 0;
+    if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      IntToken lengthToken = v.visitInt(EditsElement.LENGTH);
+      sourceCount = lengthToken.value - 2;
+      Log.info("------------------------- does not support");
+    }
     v.visitStringUTF8(EditsElement.CONCAT_TARGET);
     // all except of CONCAT_TARGET and TIMESTAMP
-    int sourceCount = lengthToken.value - 2;
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      IntToken lengthToken = v.visitInt(EditsElement.LENGTH);
+      sourceCount = lengthToken.value;
+      Log.info("------------------------- does support");
+    }
     for(int i = 0; i < sourceCount; i++) {
       v.visitStringUTF8(EditsElement.CONCAT_SOURCE);
     }
-    v.visitStringUTF8(EditsElement.TIMESTAMP);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitLong(EditsElement.TIMESTAMP);
+    } else {
+      v.visitStringUTF8(EditsElement.TIMESTAMP);
+    }
   }
 
   /**
@@ -269,11 +334,18 @@ private void visit_OP_CONCAT_DELETE() throws IOException {
    */
   private void visit_OP_SYMLINK() throws IOException {
     visitTxId();
-    v.visitInt(        EditsElement.LENGTH);
+    if (!LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitInt(EditsElement.LENGTH);
+    }
     v.visitStringUTF8( EditsElement.SOURCE);
     v.visitStringUTF8( EditsElement.DESTINATION);
-    v.visitStringUTF8( EditsElement.MTIME);
-    v.visitStringUTF8( EditsElement.ATIME);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitLong(EditsElement.MTIME);
+      v.visitLong(EditsElement.ATIME);
+    } else {
+      v.visitStringUTF8(EditsElement.MTIME);
+      v.visitStringUTF8(EditsElement.ATIME);
+    }
     // PERMISSION_STATUS
     v.visitEnclosingElement(EditsElement.PERMISSION_STATUS);
 
@@ -288,34 +360,44 @@ private void visit_OP_SYMLINK() throws IOException {
    * Visit OP_GET_DELEGATION_TOKEN
    */
   private void visit_OP_GET_DELEGATION_TOKEN() throws IOException {
-    visitTxId();  
-    v.visitByte(       EditsElement.T_VERSION);
-    v.visitStringText( EditsElement.T_OWNER);
-    v.visitStringText( EditsElement.T_RENEWER);
-    v.visitStringText( EditsElement.T_REAL_USER);
-    v.visitVLong(      EditsElement.T_ISSUE_DATE);
-    v.visitVLong(      EditsElement.T_MAX_DATE);
-    v.visitVInt(       EditsElement.T_SEQUENCE_NUMBER);
-    v.visitVInt(       EditsElement.T_MASTER_KEY_ID);
-    v.visitStringUTF8( EditsElement.T_EXPIRY_TIME);
+    visitTxId();
+    
+    v.visitByte(EditsElement.T_VERSION);
+    v.visitStringText(EditsElement.T_OWNER);
+    v.visitStringText(EditsElement.T_RENEWER);
+    v.visitStringText(EditsElement.T_REAL_USER);
+    v.visitVLong(EditsElement.T_ISSUE_DATE);
+    v.visitVLong(EditsElement.T_MAX_DATE);
+    v.visitVInt(EditsElement.T_SEQUENCE_NUMBER);
+    v.visitVInt(EditsElement.T_MASTER_KEY_ID);
+    if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+      v.visitLong(EditsElement.T_EXPIRY_TIME);
+    } else {
+      v.visitStringUTF8(EditsElement.T_EXPIRY_TIME);
+    }
   }
 
   /**
    * Visit OP_RENEW_DELEGATION_TOKEN
    */
   private void visit_OP_RENEW_DELEGATION_TOKEN()
-    throws IOException {
-    visitTxId();
-    v.visitByte(       EditsElement.T_VERSION);
-    v.visitStringText( EditsElement.T_OWNER);
-    v.visitStringText( EditsElement.T_RENEWER);
-    v.visitStringText( EditsElement.T_REAL_USER);
-    v.visitVLong(      EditsElement.T_ISSUE_DATE);
-    v.visitVLong(      EditsElement.T_MAX_DATE);
-    v.visitVInt(       EditsElement.T_SEQUENCE_NUMBER);
-    v.visitVInt(       EditsElement.T_MASTER_KEY_ID);
-    v.visitStringUTF8( EditsElement.T_EXPIRY_TIME);
-  }
+      throws IOException {
+      visitTxId();
+
+      v.visitByte(EditsElement.T_VERSION);
+      v.visitStringText(EditsElement.T_OWNER);
+      v.visitStringText(EditsElement.T_RENEWER);
+      v.visitStringText(EditsElement.T_REAL_USER);
+      v.visitVLong(EditsElement.T_ISSUE_DATE);
+      v.visitVLong(EditsElement.T_MAX_DATE);
+      v.visitVInt(EditsElement.T_SEQUENCE_NUMBER);
+      v.visitVInt(EditsElement.T_MASTER_KEY_ID);
+      if (LayoutVersion.supports(Feature.EDITLOG_OP_OPTIMIZATION, editsVersion)) {
+        v.visitLong(EditsElement.T_EXPIRY_TIME);
+      } else {
+        v.visitStringUTF8(EditsElement.T_EXPIRY_TIME);
+      }
+    }
 
   /**
    * Visit OP_CANCEL_DELEGATION_TOKEN
@@ -439,6 +521,9 @@ private void visitOpCode(FSEditLogOpCodes editsOpCode)
         case OP_START_LOG_SEGMENT: // 24
           visit_OP_BEGIN_LOG_SEGMENT();
           break;
+        case OP_HARDLINK: // 25
+          visit_OP_HARDLINK();
+          break;
         default:
         {
           throw new IOException("Unknown op code " + editsOpCode);
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/XmlEditsVisitor.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/XmlEditsVisitor.java
index e0fc7812..213c9344 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/XmlEditsVisitor.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/XmlEditsVisitor.java
@@ -92,8 +92,7 @@ void finishAbnormally() throws IOException {
   Tokenizer.Token visit(Tokenizer.Token value) throws IOException {
     EditsElement ele = value.getEditsElement();
     if (ele == EditsElement.OPCODE) {
-      printIndents();
-      write("<OFFSET>" + value.offset + "</OFFSET>\n");
+      writeTag(EditsElement.OFFSET.name(), Long.toString(value.offset));
     }
 
     writeTag(value.getEditsElement().toString(), value.toString());
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/XmlTokenizer.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/XmlTokenizer.java
index f05b7872..548f4b5d 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/XmlTokenizer.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineEditsViewer/XmlTokenizer.java
@@ -129,7 +129,12 @@ private String getNextElementsValue(String wantedName) throws IOException {
    * @return token that was just read
    */
   public Token read(Token t) throws IOException {
-    t.offset = is.getChannel().position();
+    if (t.e == EditsElement.OPCODE) {
+      // read the offset first
+      LongToken offsetToken = new LongToken(EditsElement.OFFSET);
+      offsetToken.fromString(getNextElementsValue(EditsElement.OFFSET.name()));
+      t.offset = offsetToken.value;
+    }
     t.fromString(getNextElementsValue(t.getEditsElement().toString()));
     return t;
   }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/BlockDelimitedImageVisitor.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/BlockDelimitedImageVisitor.java
new file mode 100644
index 00000000..3d1d6cb3
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/BlockDelimitedImageVisitor.java
@@ -0,0 +1,142 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.tools.offlineImageViewer;
+
+import java.io.IOException;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+/**
+ * A BlockDelimitedImageVisitor generates a text representation of the fsimage,
+ * with each element separated by a delimiter string.
+ * Each line of the text file represents one block including BLOCK_ID, NUM_BYTES,
+ * and GENERATION_STAMP. 
+ * The default delimiter is tab. The delimiter value can be via the
+ * constructor.
+ */
+class BlockDelimitedImageVisitor extends TextWriterImageVisitor {
+  private static final String defaultDelimiter = "\t"; 
+  public static final String defaultValue = "-1";
+  
+  final private LinkedList<ImageElement> elemQ = new LinkedList<ImageElement>();
+  // Elements of fsimage we're interested in tracking
+  private final Collection<ImageElement> elementsToTrack;
+  // Values for each of the elements in elementsToTrack
+  private final AbstractMap<ImageElement, String> elements = 
+                                            new HashMap<ImageElement, String>();
+  private final String delimiter;
+  
+
+  {
+    elementsToTrack = new ArrayList<ImageElement>();
+    
+    // This collection determines what elements are tracked and the order
+    // in which they are output
+    Collections.addAll(elementsToTrack,  ImageElement.BLOCK_ID,
+                                         ImageElement.NUM_BYTES,
+                                         ImageElement.GENERATION_STAMP);
+  }
+  
+  public BlockDelimitedImageVisitor(String filename) throws IOException {
+    this(filename, false);
+  }
+
+  public BlockDelimitedImageVisitor(String outputFile, boolean printToScreen) 
+                                                           throws IOException {
+    this(outputFile, printToScreen, defaultDelimiter);
+  }
+  
+  public BlockDelimitedImageVisitor(String outputFile, boolean printToScreen, 
+                               String delimiter) throws IOException {
+    super(outputFile, printToScreen);
+    this.delimiter = delimiter;
+    reset();
+  }
+
+  /**
+   * Reset the values of the elements we're tracking in order to handle
+   * the next file
+   */
+  private void reset() {
+    elements.clear();
+    for(ImageElement e : elementsToTrack) 
+      elements.put(e, null);
+    
+  }
+  
+  @Override
+  void leaveEnclosingElement() throws IOException {
+    ImageElement elem = elemQ.pop();
+    // If we're done with a block, write out our results and start over
+    if(elem == ImageElement.BLOCK) {
+      writeLine();
+      reset();
+    }
+  }
+
+  /**
+   * Iterate through all the elements we're tracking and, if a value was
+   * recorded for it, write it out.
+   */
+  private void writeLine() throws IOException {
+    Iterator<ImageElement> it = elementsToTrack.iterator();
+    
+    while(it.hasNext()) {
+      ImageElement e = it.next();
+      String v = elements.get(e);
+      if(v != null)
+        write(v);
+      else 
+        write(defaultValue);
+      if(it.hasNext())
+        write(delimiter);
+    }
+    write("\n");
+  }
+
+  @Override
+  void visit(ImageElement element, String value) throws IOException {
+    if(elements.containsKey(element))
+      elements.put(element, value);
+    if (element.equals(ImageElement.GENERATION_STAMP)
+        && (elemQ.element() == null ||
+            !elemQ.element().equals(ImageElement.BLOCK))) {
+      // Write fake block with current namenode generation stamp
+      writeLine();
+    }
+  }
+
+  @Override
+  void visitEnclosingElement(ImageElement element) throws IOException {
+    elemQ.push(element);
+  }
+
+  @Override
+  void visitEnclosingElement(ImageElement element, ImageElement key,
+      String value) throws IOException {
+    elemQ.push(element);
+  }
+  
+  @Override
+  void start() throws IOException { /* Nothing to do */ }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/DelimitedImageVisitor.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/DelimitedImageVisitor.java
index eb6cae3d..84b20f54 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/DelimitedImageVisitor.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/DelimitedImageVisitor.java
@@ -59,6 +59,8 @@ class DelimitedImageVisitor extends TextWriterImageVisitor {
     // in which they are output
     Collections.addAll(elementsToTrack,  ImageElement.INODE_PATH,
                                          ImageElement.REPLICATION,
+                                         ImageElement.INODE_TYPE,
+                                         ImageElement.INODE_HARDLINK_ID,
                                          ImageElement.MODIFICATION_TIME,
                                          ImageElement.ACCESS_TIME,
                                          ImageElement.BLOCK_SIZE,
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java
index 965d053c..37e5dad1 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java
@@ -18,7 +18,10 @@
 package org.apache.hadoop.hdfs.tools.offlineImageViewer;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.Map;
 
 /**
  * File size distribution visitor.
@@ -63,6 +66,8 @@ class FileDistributionVisitor extends TextWriterImageVisitor {
   private int totalBlocks;
   private long totalSpace;
   private long maxFileSize;
+  
+  private Map<String, ArrayList<String>> hardlinkIDToFilesMap;
 
   private FileContext current;
 
@@ -93,6 +98,7 @@ public FileDistributionVisitor(String filename,
     this.totalBlocks = 0;
     this.totalSpace = 0;
     this.maxFileSize = 0;
+    this.hardlinkIDToFilesMap = new HashMap<String, ArrayList<String>>();
   }
 
   @Override
@@ -109,6 +115,13 @@ void finish() throws IOException {
     System.out.println("totalBlocks = " + totalBlocks);
     System.out.println("totalSpace = " + totalSpace);
     System.out.println("maxFileSize = " + maxFileSize);
+    
+    System.out.println("total hardlinked files = " + this.hardlinkIDToFilesMap.size());
+    for (Map.Entry<String, ArrayList<String>> entry : this.hardlinkIDToFilesMap.entrySet()) {
+      for (String filePath : entry.getValue()) {
+        System.out.println("HardLinkID: " + entry.getKey() + "\t" + filePath);
+      }
+    }
     super.finish();
   }
 
@@ -153,6 +166,14 @@ void visit(ImageElement element, String value) throws IOException {
       case NUM_BYTES:
         current.fileSize += Long.valueOf(value);
         break;
+      case INODE_HARDLINK_ID:
+        if (this.hardlinkIDToFilesMap.containsKey(value)) {
+          this.hardlinkIDToFilesMap.get(value).add(current.path);
+        } else {
+          ArrayList<String> filePathList = new ArrayList<String>();
+          filePathList.add(current.path);
+          this.hardlinkIDToFilesMap.put(value, filePathList);
+        }
       default:
         break;
       }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
index 272df000..5e3e94be 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
@@ -19,6 +19,7 @@
 
 import java.io.DataInputStream;
 import java.io.IOException;
+import java.io.InterruptedIOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -31,7 +32,11 @@
 import org.apache.hadoop.hdfs.protocol.LayoutVersion.Feature;
 import org.apache.hadoop.hdfs.server.namenode.FSImage;
 import org.apache.hadoop.hdfs.server.namenode.FSImageSerialization;
+import org.apache.hadoop.hdfs.server.namenode.INode;
+import org.apache.hadoop.hdfs.server.namenode.INodeHardLinkFile;
 import org.apache.hadoop.hdfs.tools.offlineImageViewer.ImageVisitor.ImageElement;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.io.compress.CompressionCodec;
@@ -103,10 +108,12 @@
  *
  */
 class ImageLoaderCurrent implements ImageLoader {
-  protected final DateFormat dateFormat = 
+  private static final Date tempDate = new Date(0);
+  protected final static DateFormat dateFormat = 
                                       new SimpleDateFormat("yyyy-MM-dd HH:mm");
   private static int[] versions = { -16, -17, -18, -19, -20, -21, -22, -23,
-      -24, -25, -26, -27, -28, -30, -31, -32, -33, -34, -35, -36, -37 };
+      -24, -25, -26, -27, -28, -30, -31, -32, -33, -34, -35, -36, -37, -38,
+      -39, -40, -41};
   private int imageVersion = 0;
 
   /* (non-Javadoc)
@@ -127,6 +134,7 @@ public boolean canLoadVersion(int version) {
   public void loadImage(DataInputStream in, ImageVisitor v,
       boolean skipBlocks) throws IOException {
     try {
+      InjectionHandler.processEvent(InjectionEvent.IMAGE_LOADER_CURRENT_START);
       v.start();
       v.visitEnclosingElement(ImageElement.FS_IMAGE);
 
@@ -188,6 +196,7 @@ private void processINodesUC(DataInputStream in, ImageVisitor v,
                            ImageElement.NUM_INODES_UNDER_CONSTRUCTION, numINUC);
 
     for(int i = 0; i < numINUC; i++) {
+      checkInterruption();
       v.visitEnclosingElement(ImageElement.INODE_UNDER_CONSTRUCTION);
       byte [] name = FSImageSerialization.readBytes(in);
       String n = new String(name, "UTF8");
@@ -267,8 +276,8 @@ private void processBlocks(DataInputStream in, ImageVisitor v,
   private void processPermission(DataInputStream in, ImageVisitor v)
       throws IOException {
     v.visitEnclosingElement(ImageElement.PERMISSIONS);
-    v.visit(ImageElement.USER_NAME, Text.readString(in));
-    v.visit(ImageElement.GROUP_NAME, Text.readString(in));
+    v.visit(ImageElement.USER_NAME, Text.readStringOpt(in));
+    v.visit(ImageElement.GROUP_NAME, Text.readStringOpt(in));
     FsPermission fsp = new FsPermission(in.readShort());
     v.visit(ImageElement.PERMISSION_STRING, fsp.toString());
     v.leaveEnclosingElement(); // Permissions
@@ -355,6 +364,7 @@ private void processFullNameINodes(DataInputStream in, ImageVisitor v,
     */
   private void processINode(DataInputStream in, ImageVisitor v,
       boolean skipBlocks, String parentName) throws IOException {
+    checkInterruption();
     v.visitEnclosingElement(ImageElement.INODE);
     String pathName = FSImageSerialization.readString(in);
     if (parentName != null) {  // local name
@@ -365,10 +375,21 @@ private void processINode(DataInputStream in, ImageVisitor v,
     }
 
     v.visit(ImageElement.INODE_PATH, pathName);
+    if (LayoutVersion.supports(Feature.HARDLINK, imageVersion)) {
+      byte inodeType = in.readByte();
+      if (inodeType == INode.INodeType.HARDLINKED_INODE.type) {
+        v.visit(ImageElement.INODE_TYPE, INode.INodeType.HARDLINKED_INODE.toString());
+        long hardlinkID =  WritableUtils.readVLong(in);
+        v.visit(ImageElement.INODE_HARDLINK_ID, hardlinkID);
+      } else {
+        v.visit(ImageElement.INODE_TYPE, INode.INodeType.REGULAR_INODE.toString());
+      }
+    }
+    
     v.visit(ImageElement.REPLICATION, in.readShort());
-    v.visit(ImageElement.MODIFICATION_TIME, formatDate(in.readLong()));
+    v.visit(ImageElement.MODIFICATION_TIME, in.readLong());
     if(LayoutVersion.supports(Feature.FILE_ACCESS_TIME, imageVersion))
-      v.visit(ImageElement.ACCESS_TIME, formatDate(in.readLong()));
+      v.visit(ImageElement.ACCESS_TIME, in.readLong());
     v.visit(ImageElement.BLOCK_SIZE, in.readLong());
     int numBlocks = in.readInt();
 
@@ -393,7 +414,15 @@ private void processINode(DataInputStream in, ImageVisitor v,
    * @param date Date as read from image file
    * @return String version of date format
    */
-  private String formatDate(long date) {
-    return dateFormat.format(new Date(date));
+  static String formatDate(long date) {
+    tempDate.setTime(date);
+    return dateFormat.format(tempDate);
+  }
+  
+  private void checkInterruption() throws IOException {
+    if (Thread.currentThread().isInterrupted()) {
+      InjectionHandler.processEvent(InjectionEvent.IMAGE_LOADER_CURRENT_INTERRUPT);
+      throw new InterruptedIOException("Image loader interrupted");
+    }
   }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageVisitor.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageVisitor.java
index c95b320e..3ef792fa 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageVisitor.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageVisitor.java
@@ -72,7 +72,9 @@ public enum ImageElement {
     NUM_DELEGATION_TOKENS,
     DELEGATION_TOKENS,
     DELEGATION_TOKEN_IDENTIFIER,
-    DELEGATION_TOKEN_EXPIRY_TIME
+    DELEGATION_TOKEN_EXPIRY_TIME,
+    INODE_TYPE,
+    INODE_HARDLINK_ID
   }
   
   /**
@@ -108,6 +110,11 @@ void visit(ImageElement element, int value) throws IOException {
   }
 
   void visit(ImageElement element, long value) throws IOException {
+    if (element == ImageElement.ACCESS_TIME ||
+        element == ImageElement.MODIFICATION_TIME) {
+      visit(element, ImageLoaderCurrent.formatDate(value));
+      return;
+    }
     visit(element, Long.toString(value));
   }
 
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsImageVisitor.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsImageVisitor.java
index bf570c96..5f81a82a 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsImageVisitor.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsImageVisitor.java
@@ -18,9 +18,10 @@
 package org.apache.hadoop.hdfs.tools.offlineImageViewer;
 
 import java.io.IOException;
-import java.util.Formatter;
 import java.util.LinkedList;
 
+import org.apache.hadoop.hdfs.server.namenode.INode;
+
 /**
  * LsImageVisitor displays the blocks of the namespace in a format very similar
  * to the output of ls/lsr.  Entries are marked as directories or not,
@@ -38,17 +39,18 @@ public class LsImageVisitor extends TextWriterImageVisitor {
 
   private int numBlocks;
   private String perms;
-  private int replication;
+  private String replication;
   private String username;
   private String group;
   private long filesize;
   private String modTime;
   private String path;
   private String linkTarget;
+  private String type;
+  private String hardlinkId;
 
   private boolean inInode = false;
   final private StringBuilder sb = new StringBuilder();
-  final private Formatter formatter = new Formatter(sb);
 
   public LsImageVisitor(String filename) throws IOException {
     super(filename);
@@ -63,10 +65,9 @@ public LsImageVisitor(String filename, boolean printToScreen) throws IOException
    */
   private void newLine() {
     numBlocks = 0;
-    perms = username = group = path = linkTarget = "";
+    perms = username = group = path = linkTarget = replication = hardlinkId = "";
     filesize = 0l;
-    replication = 0;
-
+    type = INode.INodeType.REGULAR_INODE.toString();
     inInode = true;
   }
 
@@ -78,19 +79,30 @@ private void newLine() {
   private final static int widthUser = 8; 
   private final static int widthGroup = 10; 
   private final static int widthSize = 10;
+  private final static int widthHardlinkId = 10;
   private final static int widthMod = 10;
-  private final static String lsStr = " %" + widthRepl + "s %" + widthUser + 
-                                       "s %" + widthGroup + "s %" + widthSize +
-                                       "d %" + widthMod + "s %s";
+  
+  private final static String SPACE = " ";
+
   private void printLine() throws IOException {
-    sb.append(numBlocks < 0 ? "d" : "-");
+    boolean hardlinktype =
+      type.equals(INode.INodeType.HARDLINKED_INODE.toString());
+    String file = (numBlocks < 0 ) ? "d" : ( (hardlinktype) ? "h" : "-");
+    sb.append(file);
     sb.append(perms);
 
     if (0 != linkTarget.length()) {
       path = path + " -> " + linkTarget; 
     }
-    formatter.format(lsStr, replication > 0 ? replication : "-",
-                           username, group, filesize, modTime, path);
+
+    printString(replication.equals("0") ? "-" : replication, widthRepl, sb);
+    printString(file.equals("h") ? hardlinkId : "-", widthHardlinkId, sb);
+    printString(username, widthUser, sb);
+    printString(group, widthGroup, sb);
+    printString(Long.toString(filesize), widthSize, sb);
+    printString(modTime, widthMod, sb);
+    printString(path, 0, sb);
+    
     sb.append("\n");
 
     write(sb.toString());
@@ -98,6 +110,16 @@ private void printLine() throws IOException {
 
     inInode = false;
   }
+  
+  private void printString(String s, int width, StringBuilder sb) {
+    int filler = Math.max(0, width - s.length());
+    
+    // insert an extra space
+    for (int i = 0; i < filler + 1; i++) {
+      sb.append(SPACE);
+    }
+    sb.append(s);
+  }
 
   @Override
   void start() throws IOException {}
@@ -121,6 +143,31 @@ void leaveEnclosingElement() throws IOException {
       printLine();
   }
 
+  @Override
+  void visit(ImageElement element, long value) throws IOException {
+    if(inInode) {
+      switch(element) {
+      case NUM_BYTES:
+        filesize += value;
+        break;
+      case MODIFICATION_TIME:
+        visit(element, ImageLoaderCurrent.formatDate(value));
+        break;
+      // these elements are not processed by LsImageVisitor
+      // we can discard them prior to converting to String
+      case ACCESS_TIME:
+      case NS_QUOTA:
+      case DS_QUOTA:
+      case BLOCK_SIZE:
+      case BLOCK_ID:
+      case GENERATION_STAMP:
+        break;
+      default:
+        visit(element, Long.toString(value));
+      }
+    }
+  }
+  
   // Maintain state of location within the image tree and record
   // values needed to display the inode in ls-style format.
   @Override
@@ -135,7 +182,7 @@ void visit(ImageElement element, String value) throws IOException {
         perms = value;
         break;
       case REPLICATION:
-        replication = Integer.valueOf(value);
+        replication = value;
         break;
       case USER_NAME:
         username = value;
@@ -152,6 +199,12 @@ void visit(ImageElement element, String value) throws IOException {
       case SYMLINK:
         linkTarget = value;
         break;
+      case INODE_TYPE:
+        type = value;
+        break;
+      case INODE_HARDLINK_ID:
+        hardlinkId = value;
+        break;
       default:
         // This is OK.  We're not looking for all the values.
         break;
@@ -162,7 +215,7 @@ void visit(ImageElement element, String value) throws IOException {
   @Override
   void visitEnclosingElement(ImageElement element) throws IOException {
     elemQ.push(element);
-    if(element == ImageElement.INODE)
+    if (element == ImageElement.INODE)
       newLine();
   }
 
@@ -175,4 +228,14 @@ void visitEnclosingElement(ImageElement element,
     else if (element == ImageElement.BLOCKS)
       numBlocks = Integer.valueOf(value);
   }
+  
+  @Override
+  void visitEnclosingElement(ImageElement element,
+      ImageElement key, int value) throws IOException {
+    elemQ.push(element);
+    if(element == ImageElement.INODE)
+      newLine();
+    else if (element == ImageElement.BLOCKS)
+      numBlocks = value;
+  }
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageDecompressor.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageDecompressor.java
new file mode 100644
index 00000000..9b4de927
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageDecompressor.java
@@ -0,0 +1,236 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.tools.offlineImageViewer;
+
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.protocol.LayoutVersion;
+import org.apache.hadoop.hdfs.protocol.LayoutVersion.Feature;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogLoader.PositionTrackingInputStream;
+import org.apache.hadoop.hdfs.server.namenode.FSImageCompression;
+
+/**
+ * OfflineImageViewer to dump the contents of an Hadoop image file to XML or the
+ * console. Main entry point into utility, either via the command line or
+ * programatically.
+ */
+public class OfflineImageDecompressor {
+
+  private final static String usage = "Usage: bin/hdfs oid -i INPUTFILE -o OUTPUTFILE\n"
+      + "Offline Image Decompressor\n"
+      + "The oid utility will attempt to decompress image files.\n"
+      + "The tool works offline and does not require a running cluster in\n"
+      + "order to process an image file.\n"
+      + "Required command line arguments:\n"
+      + "-i,--inputFile <arg>   FSImage file to process.\n"
+      + "-o,--outputFile <arg>  Name of output file. If the specified\n"
+      + "                       file exists, it will be overwritten.\n";
+
+  private final String inputFile;
+  private final String outputFile;
+  private int lastProgress = 0;
+
+  public OfflineImageDecompressor(String inputFile, String outputFile) {
+    this.inputFile = inputFile;
+    this.outputFile = outputFile;
+  }
+
+  /**
+   * Process image file.
+   */
+  private void go() throws IOException {
+    long start = System.currentTimeMillis();
+    System.out.println("Decompressing image file: " + inputFile + " to "
+        + outputFile);
+    DataInputStream in = null;
+    DataOutputStream out = null;
+
+    try {
+      // setup in
+      PositionTrackingInputStream ptis = new PositionTrackingInputStream(
+          new FileInputStream(new File(inputFile)));
+      in = new DataInputStream(ptis);
+
+      // read header information
+      int imgVersion = in.readInt();
+      if (!LayoutVersion.supports(Feature.FSIMAGE_COMPRESSION, imgVersion)) {
+        System.out
+            .println("Image is not compressed. No output will be produced.");
+        return;
+      }
+      int namespaceId = in.readInt();
+      long numFiles = in.readLong();
+      long genstamp = in.readLong();
+
+      long imgTxId = -1;
+      if (LayoutVersion.supports(Feature.STORED_TXIDS, imgVersion)) {
+        imgTxId = in.readLong();
+      }
+      FSImageCompression compression = FSImageCompression
+          .readCompressionHeader(new Configuration(), in);
+      if (compression.isNoOpCompression()) {
+        System.out
+            .println("Image is not compressed. No output will be produced.");
+        return;
+      }
+      in = compression.unwrapInputStream(in);
+      System.out.println("Starting decompression.");
+
+      // setup output
+      out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(
+          outputFile)));
+
+      // write back the uncompressed information
+      out.writeInt(imgVersion);
+      out.writeInt(namespaceId);
+      out.writeLong(numFiles);
+      out.writeLong(genstamp);
+      if (LayoutVersion.supports(Feature.STORED_TXIDS, imgVersion)) {
+        out.writeLong(imgTxId);
+      }
+      // no compression
+      out.writeBoolean(false);
+
+      // copy the data
+      long size = new File(inputFile).length();
+      // read in 1MB chunks
+      byte[] block = new byte[1024 * 1024];
+      while (true) {
+        int bytesRead = in.read(block);
+        if (bytesRead <= 0)
+          break;
+        out.write(block, 0, bytesRead);
+        printProgress(ptis.getPos(), size);
+      }
+
+      out.close();
+
+      long stop = System.currentTimeMillis();
+      System.out.println("Input file : " + inputFile + " size: " + size);
+      System.out.println("Output file: " + outputFile + " size: "
+          + new File(outputFile).length());
+      System.out.println("Decompression completed in " + (stop - start)
+          + " ms.");
+    } finally {
+      if (in != null)
+        in.close();
+      if (out != null)
+        out.close();
+    }
+  }
+
+  /**
+   * Print the progress.
+   */
+  private void printProgress(long read, long size) {
+    int progress = Math.min(100, (int) ((100 * read) / size));
+    if (progress > lastProgress) {
+      lastProgress = progress;
+      System.out.println("Completed " + lastProgress + " % ");
+    }
+  }
+
+  /**
+   * Build command-line options and descriptions
+   */
+  public static Options buildOptions() {
+    Options options = new Options();
+
+    // Build in/output file arguments, which are required, but there is no
+    // addOption method that can specify this
+    OptionBuilder.isRequired();
+    OptionBuilder.hasArgs();
+    OptionBuilder.withLongOpt("outputFile");
+    options.addOption(OptionBuilder.create("o"));
+
+    OptionBuilder.isRequired();
+    OptionBuilder.hasArgs();
+    OptionBuilder.withLongOpt("inputFile");
+    options.addOption(OptionBuilder.create("i"));
+
+    options.addOption("h", "help", false, "");
+    return options;
+  }
+
+  /**
+   * Entry point to command-line-driven operation. User may specify options and
+   * start fsimage viewer from the command line. Program will process image file
+   * and exit cleanly or, if an error is encountered, inform user and exit.
+   * 
+   * @param args
+   *          Command line options
+   * @throws IOException
+   */
+  public static void main(String[] args) throws IOException {
+    Options options = buildOptions();
+    if (args.length == 0) {
+      printUsage();
+      return;
+    }
+
+    CommandLineParser parser = new PosixParser();
+    CommandLine cmd;
+
+    try {
+      cmd = parser.parse(options, args);
+    } catch (ParseException e) {
+      System.out.println("Error parsing command-line options: ");
+      printUsage();
+      return;
+    }
+
+    if (cmd.hasOption("h")) { // print help and exit
+      printUsage();
+      return;
+    }
+
+    String inputFile = cmd.getOptionValue("i");
+    String outputFile = cmd.getOptionValue("o");
+
+    try {
+      OfflineImageDecompressor d = new OfflineImageDecompressor(inputFile,
+          outputFile);
+      d.go();
+    } catch (EOFException e) {
+      System.err.println("Input file ended unexpectedly.  Exiting");
+    } catch (IOException e) {
+      System.err.println("Encountered exception.  Exiting: " + e.getMessage());
+    }
+  }
+
+  /**
+   * Print application usage instructions.
+   */
+  private static void printUsage() {
+    System.out.println(usage);
+  }
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
index 52dff5cc..5983b4dc 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
@@ -58,6 +58,11 @@ public class OfflineImageViewer {
     "  * Indented: This processor enumerates over all of the elements in\n" +
     "    the fsimage file, using levels of indentation to delineate\n" +
     "    sections within the file.\n" +
+    "  * BlockDelimited: Generate a text file with all block\n" +
+    "    information, seperated by a delimiter. Each line represents one\n" +
+    "    block including BLOCK_ID, NUM_BYTES and GENERATION_STAMP. \n" +
+    "    The default delimiter is \u0001, which could be changed via the\n" +
+    "    -delimiter argument. This processor will ignore -skipBlocks option\n" +
     "  * Delimited: Generate a text file with all of the elements common\n" +
     "    to both inodes and inodes-under-construction, separated by a\n" +
     "    delimiter. The default delimiter is \u0001, though this may be\n" +
@@ -91,7 +96,8 @@ public class OfflineImageViewer {
     "-skipBlocks            Skip inodes' blocks information. May\n" +
     "                       significantly decrease output.\n" +
     "                       (default = false).\n" +
-    "-delimiter <arg>       Delimiting string to use with Delimited processor\n";
+    "-delimiter <arg>       Delimiting string to use with Delimited or \n" +
+    "                       BlockDelimited processor\n";
 
   private final boolean skipBlocks;
   private final String inputFile;
@@ -215,7 +221,8 @@ public static void main(String[] args) throws IOException {
     String outputFile = cmd.getOptionValue("o");
     String delimiter = cmd.getOptionValue("delimiter");
     
-    if( !(delimiter == null || processor.equals("Delimited")) ) {
+    if( !(delimiter == null || processor.equals("Delimited") ||
+        processor.equals("BlockDelimited"))) {
       System.out.println("Can only specify -delimiter with Delimited processor");
       printUsage();
       return;
@@ -231,6 +238,11 @@ public static void main(String[] args) throws IOException {
                  new DelimitedImageVisitor(outputFile, printToScreen) :
                  new DelimitedImageVisitor(outputFile, printToScreen, delimiter);
       skipBlocks = false;
+    } else if (processor.equals("BlockDelimited")) {
+      v = delimiter == null ?  
+          new BlockDelimitedImageVisitor(outputFile, printToScreen) :
+          new BlockDelimitedImageVisitor(outputFile, printToScreen, delimiter);
+      skipBlocks = false;
     } else if (processor.equals("FileDistribution")) {
       long maxSize = Long.parseLong(cmd.getOptionValue("maxSize", "0"));
       int step = Integer.parseInt(cmd.getOptionValue("step", "0"));
diff --git a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/TextWriterImageVisitor.java b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/TextWriterImageVisitor.java
index 88e66df6..2e36d626 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/TextWriterImageVisitor.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/TextWriterImageVisitor.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs.tools.offlineImageViewer;
 
+import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 
@@ -34,7 +35,7 @@
 abstract class TextWriterImageVisitor extends ImageVisitor {
   private boolean printToScreen = false;
   private boolean okToWrite = false;
-  final private FileWriter fw;
+  final private BufferedWriter bw;
 
   /**
    * Create a processor that writes to the file named.
@@ -56,7 +57,7 @@ public TextWriterImageVisitor(String filename, boolean printToScreen)
          throws IOException {
     super();
     this.printToScreen = printToScreen;
-    fw = new FileWriter(filename);
+    bw = new BufferedWriter(new FileWriter(filename), 1024 * 1024);
     okToWrite = true;
   }
   
@@ -80,7 +81,7 @@ void finishAbnormally() throws IOException {
    * Close output stream and prevent further writing
    */
   private void close() throws IOException {
-    fw.close();
+    bw.close();
     okToWrite = false;
   }
 
@@ -97,7 +98,7 @@ protected void write(String toWrite) throws IOException  {
       System.out.print(toWrite);
 
     try {
-      fw.write(toWrite);
+      bw.write(toWrite);
     } catch (IOException e) {
       okToWrite = false;
       throw e;
diff --git a/src/hdfs/org/apache/hadoop/hdfs/util/AtomicFileOutputStream.java b/src/hdfs/org/apache/hadoop/hdfs/util/AtomicFileOutputStream.java
new file mode 100644
index 00000000..9ac4861f
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/util/AtomicFileOutputStream.java
@@ -0,0 +1,94 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.util;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.io.IOUtils;
+
+/**
+ * A FileOutputStream that has the property that it will only show
+ * up at its destination once it has been entirely written and flushed
+ * to disk. While being written, it will use a .tmp suffix.
+ * 
+ * When the output stream is closed, it is flushed, fsynced, and
+ * will be moved into place, overwriting any file that already
+ * exists at that location.
+ * 
+ * <b>NOTE</b>: on Windows platforms, it will not atomically
+ * replace the target file - instead the target file is deleted
+ * before this one is moved into place.
+ */
+public class AtomicFileOutputStream extends FilterOutputStream {
+
+  private static final String TMP_EXTENSION = ".tmp";
+  
+  private final static Log LOG = LogFactory.getLog(
+      AtomicFileOutputStream.class);
+  
+  private final File origFile;
+  private final File tmpFile;
+  
+  public AtomicFileOutputStream(File f) throws FileNotFoundException {
+    // Code unfortunately must be duplicated below since we can't assign anything
+    // before calling super
+    super(new FileOutputStream(new File(f.getParentFile(), f.getName() + TMP_EXTENSION)));
+    origFile = f.getAbsoluteFile();
+    tmpFile = new File(f.getParentFile(), f.getName() + TMP_EXTENSION).getAbsoluteFile();
+  }
+
+  @Override
+  public void close() throws IOException {
+    boolean triedToClose = false, success = false;
+    try {
+      flush();
+      ((FileOutputStream)out).getChannel().force(true);
+
+      triedToClose = true;
+      super.close();
+      success = true;
+    } finally {
+      if (success) {
+        boolean renamed = tmpFile.renameTo(origFile);
+        if (!renamed) {
+          // On windows, renameTo does not replace.
+          if (!origFile.delete() || !tmpFile.renameTo(origFile)) {
+            throw new IOException("Could not rename temporary file " +
+                tmpFile + " to " + origFile);
+          }
+        }
+      } else {
+        if (!triedToClose) {
+          // If we failed when flushing, try to close it to not leak an FD
+          IOUtils.closeStream(out);
+        }
+        // close wasn't successful, try to delete the tmp file
+        if (!tmpFile.delete()) {
+          LOG.warn("Unable to delete tmp file " + tmpFile);
+        }
+      }
+    }
+  }
+
+}
diff --git a/src/hdfs/org/apache/hadoop/hdfs/util/InjectionEvent.java b/src/hdfs/org/apache/hadoop/hdfs/util/InjectionEvent.java
index b1c3b728..df1d0eb2 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/util/InjectionEvent.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/util/InjectionEvent.java
@@ -26,11 +26,21 @@
  */
 public enum InjectionEvent {
   
+  JOURNALANDSTREAM_STARTLOGSEGMENT,
+  
   FSIMAGE_STARTING_SAVE_NAMESPACE,
   FSIMAGE_CREATING_SAVER_THREADS,
   FSIMAGE_STARTING_SAVER_THREAD,
   FSIMAGE_SN_CLEANUP,
   FSIMAGE_CANCEL_REQUEST_RECEIVED,
+  FSIMAGE_SAVED_IMAGE,
+  
+  FSEDIT_LOG_WRITE_END_LOG_SEGMENT,
+  
+  FSNAMESYSTEM_CLOSE_DIRECTORY,
+  FSNAMESYSTEM_STOP_LEASEMANAGER,
+  
+  LEASEMANAGER_CHECKLEASES,
 
   STANDBY_CANCELLED_EXCEPTION_THROWN,
   STANDBY_FELL_BEHIND,
@@ -38,22 +48,70 @@ public enum InjectionEvent {
   STANDBY_QUIESCE_INGEST, 
   STANDBY_ENTER_CHECKPOINT, 
   STANDBY_EXIT_CHECKPOINT,
+  STANDBY_EXIT_CHECKPOINT_EXCEPTION,
   STANDBY_BEFORE_SAVE_NAMESPACE, 
   STANDBY_BEFORE_PUT_IMAGE,
   STANDBY_BEFORE_ROLL_EDIT, 
   STANDBY_BEFORE_ROLL_IMAGE, 
   STANDBY_BEGIN_RUN, 
-  STANDBY_INTERRUPT,
+  STANDBY_EDITS_NOT_EXISTS,
+  STANDBY_CREATE_INGEST_RUNLOOP,
+  STANDBY_AFTER_DO_CHECKPOINT,
+  STANDBY_CHECKPOINT_TRIGGER,
+  STANDBY_VALIDATE_CREATE,
+  STANDBY_VALIDATE_CREATE_FAIL,
+  STANDBY_QUIESCE_INITIATED,
+  STANDBY_QUIESCE_INTERRUPT,
+  STANDBY_QUIESCE_INGEST_CKPT,
+  STANDBY_RECOVER_STATE,
+  STANDBY_JOURNAL_GETSTREAM,
+  STANDBY_FAILOVER_INPROGRESS,
 
   INGEST_BEFORE_LOAD_EDIT,
   INGEST_READ_OP,
+  INGEST_CLEAR_STANDBY_STATE,
+  INGEST_TXID_CHECK,
   
   OFFERSERVICE_SCHEDULE_HEARTBEAT,
   OFFERSERVICE_SCHEDULE_BR,
+  OFFERSERVICE_CLEAR_PRIMARY,
+  OFFERSERVICE_START,
+  OFFERSERVICE_BEFORE_REGISTRATION,
   
   AVATARNODE_CHECKEDITSTREAMS,
   AVATARNODE_SHUTDOWN,
+  AVATARNODE_WAIT_FOR_RESTART,
 
+  AVATARDATANODE_BEFORE_START_OFFERSERVICE1,
   AVATARDATANODE_START_OFFERSERVICE1,
-  AVATARDATANODE_START_OFFERSERVICE2
+  AVATARDATANODE_START_OFFERSERVICE2,
+
+  TRANSFERFSIMAGE_GETFILESERVER0, 
+  TRANSFERFSIMAGE_GETFILESERVER1, 
+  TRANSFERFSIMAGE_GETFILESERVER2,
+  TRANSFERFSIMAGE_GETFILESERVER3,
+
+  SECONDARYNAMENODE_CHECKPOINT0, 
+  SECONDARYNAMENODE_CHECKPOINT1,
+  
+  AVATARXEIVER_RUNTIME_FAILURE,
+
+  NAMENODE_AFTER_CREATE_FILE,
+  NAMENODE_STOP_CLIENT_RPC,
+  NAMENODE_REGISTER,
+  NAMENODE_GET_BLOCKS_TOTAL,
+
+  NAMENODE_FSCK_START,
+
+  AVATARZK_GET_REGISTRATION_TIME,
+  AVATARZK_GET_PRIMARY_ADDRESS,
+
+  DAFS_CHECK_FAILOVER,
+  
+  IMAGE_LOADER_CURRENT_START,
+  IMAGE_LOADER_CURRENT_INTERRUPT,
+  
+  SAVE_NAMESPACE_CONTEXT_EXCEPTION,
+
+  STANDBY_ENTER_SAFE_MODE
 }
diff --git a/src/hdfs/org/apache/hadoop/hdfs/util/LightWeightHashSet.java b/src/hdfs/org/apache/hadoop/hdfs/util/LightWeightHashSet.java
index 23e6f086..2f82600c 100644
--- a/src/hdfs/org/apache/hadoop/hdfs/util/LightWeightHashSet.java
+++ b/src/hdfs/org/apache/hadoop/hdfs/util/LightWeightHashSet.java
@@ -17,12 +17,11 @@
  */
 package org.apache.hadoop.hdfs.util;
 
-import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
 
@@ -493,7 +492,7 @@ public String toString() {
   }
 
   /** Print detailed information of this object. */
-  public void printDetails(final PrintStream out) {
+  public void printDetails(final PrintWriter out) {
     out.print(this + ", entries = [");
     for (int i = 0; i < entries.length; i++) {
       if (entries[i] != null) {
diff --git a/src/hdfs/org/apache/hadoop/hdfs/util/MD5FileUtils.java b/src/hdfs/org/apache/hadoop/hdfs/util/MD5FileUtils.java
new file mode 100644
index 00000000..02f48d9e
--- /dev/null
+++ b/src/hdfs/org/apache/hadoop/hdfs/util/MD5FileUtils.java
@@ -0,0 +1,153 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.io.MD5Hash;
+import org.apache.hadoop.util.StringUtils;
+
+/**
+ * Static functions for dealing with files of the same format
+ * that the Unix "md5sum" utility writes.
+ */
+public abstract class MD5FileUtils {
+  private static final Log LOG = LogFactory.getLog(
+      MD5FileUtils.class);
+
+  public static final String MD5_SUFFIX = ".md5";
+  private static final Pattern LINE_REGEX =
+    Pattern.compile("([0-9a-f]{32}) [ \\*](.+)");
+  
+  /**
+   * Verify that the previously saved md5 for the given file matches
+   * expectedMd5.
+   * @throws IOException 
+   */
+  public static void verifySavedMD5(File dataFile, MD5Hash expectedMD5)
+      throws IOException {
+    MD5Hash storedHash = readStoredMd5ForFile(dataFile);
+    // Check the hash itself
+    if (!expectedMD5.equals(storedHash)) {
+      throw new IOException(
+          "File " + dataFile + " did not match stored MD5 checksum " +
+          " (stored: " + storedHash + ", computed: " + expectedMD5);
+    }
+  }
+  
+  /**
+   * Read the md5 checksum stored alongside the given file, or null
+   * if no md5 is stored.
+   * @param dataFile the file containing data
+   * @return the checksum stored in dataFile.md5
+   */
+  public static MD5Hash readStoredMd5ForFile(File dataFile) throws IOException {
+    File md5File = getDigestFileForFile(dataFile);
+
+    String md5Line;
+    
+    if (!md5File.exists()) {
+      return null;
+    }
+    
+    BufferedReader reader =
+      new BufferedReader(new FileReader(md5File));
+    try {
+      md5Line = reader.readLine();
+      if (md5Line == null) { md5Line = ""; }
+      md5Line = md5Line.trim();
+    } catch (IOException ioe) {
+      throw new IOException("Error reading md5 file at " + md5File, ioe);
+    } finally {
+      IOUtils.cleanup(LOG, reader);
+    }
+    
+    Matcher matcher = LINE_REGEX.matcher(md5Line);
+    if (!matcher.matches()) {
+      throw new IOException("Invalid MD5 file at " + md5File
+          + " (does not match expected pattern)");
+    }
+    String storedHash = matcher.group(1);
+    File referencedFile = new File(matcher.group(2));
+
+    // Sanity check: Make sure that the file referenced in the .md5 file at
+    // least has the same name as the file we expect
+    if (!referencedFile.getName().equals(dataFile.getName())) {
+      throw new IOException(
+          "MD5 file at " + md5File + " references file named " +
+          referencedFile.getName() + " but we expected it to reference " +
+          dataFile);
+    }
+    return new MD5Hash(storedHash);
+  }
+  
+  /**
+   * Read dataFile and compute its MD5 checksum.
+   */
+  public static MD5Hash computeMd5ForFile(File dataFile) throws IOException {
+    InputStream in = new FileInputStream(dataFile);
+    try {
+      MessageDigest digester = MD5Hash.getDigester();
+      DigestInputStream dis = new DigestInputStream(in, digester);
+      IOUtils.copyBytes(dis, new IOUtils.NullOutputStream(), 128*1024, false);
+      
+      return new MD5Hash(digester.digest());
+    } finally {
+      IOUtils.closeStream(in);
+    }
+  }
+
+  /**
+   * Save the ".md5" file that lists the md5sum of another file.
+   * @param dataFile the original file whose md5 was computed
+   * @param digest the computed digest
+   * @throws IOException
+   */
+  public static void saveMD5File(File dataFile, MD5Hash digest)
+      throws IOException {
+    File md5File = getDigestFileForFile(dataFile);
+    String digestString = StringUtils.byteToHexString(
+        digest.getDigest());
+    String md5Line = digestString + " *" + dataFile.getName() + "\n";
+    
+    AtomicFileOutputStream afos = new AtomicFileOutputStream(md5File);
+    afos.write(md5Line.getBytes());
+    afos.close();
+    LOG.info("Saved MD5 " + digest + " to " + md5File);
+  }
+
+  /**
+   * @return a reference to the file with .md5 suffix that will
+   * contain the md5 checksum for the given data file.
+   */
+  public static File getDigestFileForFile(File file) {
+    return new File(file.getParentFile(), file.getName() + MD5_SUFFIX);
+  }
+}
diff --git a/src/mapred/mapred-default.xml b/src/mapred/mapred-default.xml
index 11418840..d9407c68 100644
--- a/src/mapred/mapred-default.xml
+++ b/src/mapred/mapred-default.xml
@@ -132,6 +132,17 @@
   </description>
 </property>
 
+<property>	
+ <name>mapred.localdir.confpath</name>	
+ <value></value>	
+ <description>Determines where on the local filesystem on the data node	
+ to locate the config file with the list of working directories. This is an	
+ absolute path to that file and the data is stored in a new line deliminated	
+ file. This allows for a dynamic list of directories without modifying the 	
+ actual config file itself.	
+ </description>	
+</property>
+
 <property>
   <name>mapred.system.dir</name>
   <value>${hadoop.tmp.dir}/mapred/system</value>
diff --git a/src/mapred/org/apache/hadoop/mapred/Child.java b/src/mapred/org/apache/hadoop/mapred/Child.java
index 797e2698..ed3f867b 100644
--- a/src/mapred/org/apache/hadoop/mapred/Child.java
+++ b/src/mapred/org/apache/hadoop/mapred/Child.java
@@ -30,11 +30,14 @@
 import org.apache.hadoop.fs.FSError;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.ipc.ProtocolProxy;
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.VersionedProtocol;
 import org.apache.hadoop.metrics.MetricsContext;
 import org.apache.hadoop.metrics.MetricsUtil;
 import org.apache.hadoop.metrics.jvm.JvmMetrics;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.Shell;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.log4j.LogManager;
@@ -64,11 +67,17 @@ public static void main(String[] args) throws Throwable {
     final int SLEEP_LONGER_COUNT = 5;
     int jvmIdInt = Integer.parseInt(args[3]);
     JVMId jvmId = new JVMId(firstTaskid.getJobID(),firstTaskid.isMap(),jvmIdInt);
+    UserGroupInformation ticket = UserGroupInformation.login(defaultConf);
+    int timeout = defaultConf.getInt("mapred.socket.timeout", 60000);
     TaskUmbilicalProtocol umbilical =
-      (TaskUmbilicalProtocol)RPC.getProxy(TaskUmbilicalProtocol.class,
+      ((ProtocolProxy<TaskUmbilicalProtocol>) RPC.getProtocolProxy(
+          TaskUmbilicalProtocol.class,
           TaskUmbilicalProtocol.versionID,
           address,
-          defaultConf);
+          ticket,
+          defaultConf,
+          NetUtils.getDefaultSocketFactory(defaultConf),
+          timeout)).getProxy();
     proxiesCreated.add(umbilical);
     int numTasksToExecute = -1; //-1 signifies "no limit"
     int numTasksExecuted = 0;
@@ -141,7 +150,7 @@ public void run() {
         //are viewable immediately
         TaskLog.syncLogs(firstTaskid, taskid, isCleanup);
         JobConf job = new JobConf(task.getJobFile());
-        umbilical = convertToDirectUmbilicalIfNecessary(umbilical, job);
+        umbilical = convertToDirectUmbilicalIfNecessary(umbilical, job, task);
         //setupWorkDir actually sets up the symlinks for the distributed
         //cache. After a task exits we wipe the workdir clean, and hence
         //the symlinks have to be rebuilt.
@@ -210,7 +219,11 @@ public void run() {
   }
 
   private static TaskUmbilicalProtocol convertToDirectUmbilicalIfNecessary(
-      TaskUmbilicalProtocol umbilical, JobConf job) throws IOException {
+      TaskUmbilicalProtocol umbilical, JobConf job, Task task) throws IOException {
+    // We only need a direct umbilical for reducers.
+    if (task.isMapTask()) {
+      return umbilical;
+    }
     String directUmbilicalAddress =
         job.get(DirectTaskUmbilical.MAPRED_DIRECT_TASK_UMBILICAL_ADDRESS);
     if (directUmbilicalAddress != null) {
diff --git a/src/mapred/org/apache/hadoop/mapred/ExpireUnusedJobFiles.java b/src/mapred/org/apache/hadoop/mapred/ExpireUnusedJobFiles.java
new file mode 100644
index 00000000..341d9e9c
--- /dev/null
+++ b/src/mapred/org/apache/hadoop/mapred/ExpireUnusedJobFiles.java
@@ -0,0 +1,147 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.mapred;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.LocatedFileStatus;
+import org.apache.hadoop.fs.RemoteIterator;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+import java.io.IOException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Used to expire files in cache that hasn't been accessed for a while
+ */
+public class ExpireUnusedJobFiles implements Runnable {
+  /** Logger. */
+  private static final Log LOG =
+    LogFactory.getLog(ExpireUnusedJobFiles.class);
+
+  /** Clock. */
+  private final Clock clock;
+  /** The directory to clean. */
+  private final Path dirToClean;
+  /** The filesystem to use. */
+  private final FileSystem fs;
+  /** clean threshold in milliseconds. */
+  private final long cleanThreshold;
+  /** pattern to match for the files to be deleted */
+  private final Pattern fileToCleanPattern;
+
+  /**
+   * Constructor.
+   * @param clock The clock.
+   * @param dirToClean The directory to be cleaned
+   * @param fs The filesystem.
+   * @param fileToCleanPattern the pattern for the filename
+   * @param cleanThreshold the time to clean the dir
+   * @param cleanInterval the interval to clean the dir
+   */
+  public ExpireUnusedJobFiles(
+    Clock clock, FileSystem fs,
+    Path dirToClean, Pattern fileToCleanPattern,
+    long cleanThreshold, long cleanInterval) {
+    this(clock, fs, dirToClean, fileToCleanPattern, cleanThreshold);
+
+    Executors.newScheduledThreadPool(1).scheduleAtFixedRate(
+      this,
+      cleanInterval,
+      cleanInterval,
+      TimeUnit.MILLISECONDS);
+
+    LOG.info("ExpireUnusedJobFiles created with " +
+      " path = " + dirToClean +
+      " cleanInterval = " + cleanInterval +
+      " cleanThreshold = " + cleanThreshold);
+  }
+
+  /**
+   * Constructor.
+   * @param clock The clock.
+   * @param dirToClean The directory to be cleaned
+   * @param fs The filesystem.
+   * @param fileToCleanPattern the pattern for the filename
+   * @param cleanThreshold the time to clean the dir
+   */
+  private ExpireUnusedJobFiles(
+    Clock clock, FileSystem fs,
+    Path dirToClean, Pattern fileToCleanPattern,
+    long cleanThreshold) {
+    this.clock = clock;
+    this.fs = fs;
+    this.dirToClean = dirToClean;
+    this.fileToCleanPattern = fileToCleanPattern;
+    this.cleanThreshold = cleanThreshold;
+  }
+
+  @Override
+  public void run() {
+    long currentTime = clock.getTime();
+    try {
+      LOG.info(Thread.currentThread().getId() + ":Trying to clean " + dirToClean);
+      if (!fs.exists(dirToClean)) {
+        return;
+      }
+
+      RemoteIterator<LocatedFileStatus> itor;
+      for( itor = fs.listLocatedStatus(dirToClean); itor.hasNext();) {
+        LocatedFileStatus dirStat = itor.next();
+        // Check if this is a directory matching the pattern
+        if (!dirStat.isDir()) {
+          continue;
+        }
+        Path subDirPath = dirStat.getPath();
+        String dirname = subDirPath.toUri().getPath();
+        Matcher m = fileToCleanPattern.matcher(dirname);
+        if (m.find()) {
+          if (currentTime - dirStat.getModificationTime() > cleanThreshold) {
+            // recursively delete all the files/dirs
+            LOG.info("Delete " + subDirPath);
+            fs.delete(subDirPath, true);
+          }
+        }
+      }
+    } catch (IOException ioe) {
+      LOG.error("IOException when clearing dir " + ioe.getMessage());
+    }
+  }
+
+  public static void main(String[] args) throws IOException {
+    if (args.length < 3) {
+      System.err.println("Usage: " + ExpireUnusedJobFiles.class + " path pattern thresholdsec");
+      System.exit(1);
+    }
+    Configuration conf = new Configuration();
+    Path dir = new Path(args[0]);
+    FileSystem fs = dir.getFileSystem(conf);
+    Pattern p = Pattern.compile(args[1]);
+    long clearThreshold = Integer.parseInt(args[2]) * 1000L;
+    ExpireUnusedJobFiles expire = new ExpireUnusedJobFiles(new Clock(), fs, dir, p , clearThreshold);
+    expire.run();
+  }
+}
+
+
diff --git a/src/mapred/org/apache/hadoop/mapred/JobClient.java b/src/mapred/org/apache/hadoop/mapred/JobClient.java
index 7874f937..1598212e 100644
--- a/src/mapred/org/apache/hadoop/mapred/JobClient.java
+++ b/src/mapred/org/apache/hadoop/mapred/JobClient.java
@@ -87,6 +87,7 @@
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.ipc.RemoteException;
 
 /**
  * <code>JobClient</code> is the primary interface for the user-job to interact
@@ -189,6 +190,9 @@ public static enum TaskStatusFilter { NONE, KILLED, FAILED, SUCCEEDED, ALL }
   private static Map<JobID, List<RawSplit>> jobSplitCache =
     new HashMap<JobID, List<RawSplit>>();
 
+  /** Indexes distributed cache files */
+  private DistributedCacheIndex filesInCache;
+
   /**
    * A NetworkedJob is an implementation of RunningJob.  It holds
    * a JobProfile object to provide some info, and interacts with the
@@ -482,26 +486,28 @@ public void init(JobConf conf) throws IOException {
       if (tracker.indexOf(":") == -1) {
         // Not a host:port pair.
         // Construct a job tracker in the same process.
-        Class<?> clazz = conf.getClass("mapred.job.tracker.class", null);
-        if (clazz != null) {
-          try {
+        try {
+          Class<?> clazz = conf.getClass("mapred.job.tracker.class", null);
+          if (clazz != null) {
             Constructor<?> constructor =
               clazz.getDeclaredConstructor(new Class[]{JobConf.class});
             this.jobSubmitClient =
               (JobSubmissionProtocol) constructor.newInstance(conf);
             isJobTrackerInProc = true;
-          } catch (NoSuchMethodException e) {
-            throw new IOException("cannot construct local runner", e);
-          } catch (InstantiationException e) {
-            throw new IOException("cannot construct local runner", e);
-          } catch (IllegalAccessException e) {
-            throw new IOException("cannot construct local runner", e);
-          } catch (InvocationTargetException e) {
-            throw new IOException("cannot construct local runner", e);
+          } else {
+            throw new IOException(
+              "In-proc job tracker class(mapred.job.tracker.class) not specified");
           }
-        } else {
-          throw new IOException(
-            "In-proc job tracker class(mapred.job.tracker.class) not specified");
+        } catch (NoSuchMethodException e) {
+          throw new IOException("cannot construct local runner", e);
+        } catch (InstantiationException e) {
+          throw new IOException("cannot construct local runner", e);
+        } catch (IllegalAccessException e) {
+          throw new IOException("cannot construct local runner", e);
+        } catch (InvocationTargetException e) {
+          throw new IOException("cannot construct local runner", e);
+        } catch (Throwable e) {
+          throw new IOException("Unknown exception", e);
         }
       } else {
         this.jobSubmitClient = createRPCProxy(JobTracker.getAddress(conf), conf);
@@ -625,7 +631,12 @@ private Path copyRemoteFiles(FileSystem jtFs, Path parentDir,
         // We "touch" the file to update its access time
         // This is done only 10% of the time to reduce load on the namenode
         if (r.nextLong() % 10 == 0) {
-          jtFs.setTimes(realPath, -1, System.currentTimeMillis());
+          try {
+            jtFs.setTimes(realPath, -1, System.currentTimeMillis());
+          }
+          catch (RemoteException e){
+            LOG.warn("Error in setTimes", e);
+          }
         }
 
         return qualifiedRealPath;
@@ -667,43 +678,6 @@ private Path copyRemoteFiles(FileSystem jtFs, Path parentDir,
     return jtFs.makeQualified(newPath);
   }
 
-  private Set<Path> filesInCache = null;
-  private long filesInCacheTs = 0;
-  private final static long FCACHE_REFRESH_INTERVAL = 1000L * 60 * 60;
-
-  private void populateFileListings(FileSystem fs, Path[] f) {
-
-    long now = System.currentTimeMillis();
-    if (filesInCache != null &&
-        now - filesInCacheTs < FCACHE_REFRESH_INTERVAL) {
-      // the list of uploaded files has been refreshed recently.
-      return;
-    }
-
-    filesInCache = new HashSet<Path>();
-
-    for (int i = 0; i < f.length; i++)
-      localizeFileListings(fs, f[i]);
-
-    filesInCacheTs = now;
-  }
-
-  private void localizeFileListings(FileSystem fs, Path f) {
-    FileStatus[] lstatus;
-    try {
-      lstatus = fs.listStatus(f);
-
-      for (int i = 0; i < lstatus.length; i++) {
-        if (!lstatus[i].isDir()) {
-          filesInCache.add(lstatus[i].getPath());
-        }
-      }
-    } catch (Exception e) {
-      // If something goes wrong, the worst that can happen is that files don't
-      // get cached. Noting fatal.
-    }
-  }
-
   private static class FileInfo {
     String md5;
     long fileLength;
@@ -808,6 +782,11 @@ private void copyAndConfigureFiles(JobConf job, Path uploadFileDir,
     FileSystem fs = getFs();
     LOG.debug("default FileSystem: " + fs.getUri());
 
+    // We know file system of distributed cache, initialize index
+    if (filesInCache == null) {
+      filesInCache = new DistributedCacheIndex(fs);
+    }
+
     uploadFileDir = fs.makeQualified(uploadFileDir);
     uploadFileDir = new Path(uploadFileDir.toUri().getPath());
     FsPermission mapredSysPerms = new FsPermission(JOB_DIR_PERMISSION);
@@ -820,11 +799,6 @@ private void copyAndConfigureFiles(JobConf job, Path uploadFileDir,
     Path libjarsDir = new Path(uploadFileDir, "libjars");
     short replication = (short)job.getInt("mapred.submit.replication", 10);
 
-    if (shared) {
-      populateFileListings(fs,
-          new Path[] { filesDir, archivesDir, libjarsDir});
-    }
-
     fileInfo = new HashMap<URI, FileInfo>();
 
     String originalJar = job.getJar();
@@ -1308,19 +1282,7 @@ private List<RawSplit> computeOldSplits(JobConf job) throws IOException {
     InputSplit[] splits =
       job.getInputFormat().getSplits(job, job.getNumMapTasks());
 
-    // if the number of tasks exceed a configured limit, then display an
-    // apppropriate error message to the user. This check is also done by
-    // the JobTracker and is the right place to enforce it. But the check is
-    // done here too so that we can display an appropriate error message
-    // to the user. Here we check only the number of mappers whereas the
-    // JobTrcker applies this limit against the sum of mappers and reducers.
-    int maxTasks = job.getInt("mapred.jobtracker.maxtasks.per.job", -1);
-    if (maxTasks!= -1 && splits.length + job.getNumReduceTasks() > maxTasks) {
-      throw new IOException(
-                "The number of tasks for this job " +
-                (splits.length + job.getNumReduceTasks()) +
-                " exceeds the configured limit " + maxTasks);
-    }
+    validateNumberOfTasks(splits.length,job.getNumReduceTasks(),job);
 
     // sort the splits into order based on size, so that the biggest
     // go first
@@ -1382,6 +1344,25 @@ public int compare(org.apache.hadoop.mapreduce.InputSplit o1,
     }
   }
 
+  // if the number of tasks exceed a configured limit, then display an
+  // apppropriate error message to the user. This check is also done by
+  // the JobTracker and is the right place to enforce it. But the check is
+  // done here too so that we can display an appropriate error message
+  // to the user. Here we check only the number of mappers whereas the
+  // JobTrcker applies this limit against the sum of mappers and reducers.
+  private void validateNumberOfTasks(int splits, int reduceTasks, JobConf conf) 
+    throws IOException {
+    int maxTasks = conf.getInt("mapred.jobtracker.maxtasks.per.job", -1);
+    int totalTasks = splits + reduceTasks;
+
+    if ((maxTasks!= -1) && (totalTasks > maxTasks)) {
+      throw new IOException(
+                "The number of tasks for this job " +
+                totalTasks +
+                " exceeds the configured limit " + maxTasks);
+    }
+  }
+
   @SuppressWarnings("unchecked")
   private <T extends org.apache.hadoop.mapreduce.InputSplit>
   List<RawSplit> computeNewSplits(JobContext job)
@@ -1394,6 +1375,8 @@ List<RawSplit> computeNewSplits(JobContext job)
     T[] array = (T[])
       splits.toArray(new org.apache.hadoop.mapreduce.InputSplit[splits.size()]);
 
+    validateNumberOfTasks(splits.size(),job.getNumReduceTasks(),conf);
+    
     // sort the splits into order based on size, so that the biggest
     // go first
     Arrays.sort(array, new NewSplitComparator());
@@ -2280,14 +2263,8 @@ public int run(String[] argv) throws Exception {
           }
         }
       } else if (killJob) {
-        RunningJob job = getJob(JobID.forName(jobid));
-        if (job == null) {
-          System.out.println("Could not find job " + jobid);
-        } else {
-          job.killJob();
-          System.out.println("Killed job " + jobid);
-          exitCode = 0;
-        }
+        jobSubmitClient.killJob(JobID.forName(jobid));
+        System.out.println("Killed job " + jobid);
       } else if (setJobPriority) {
         RunningJob job = getJob(JobID.forName(jobid));
         if (job == null) {
@@ -2577,5 +2554,43 @@ public static void main(String argv[]) throws Exception {
     int res = ToolRunner.run(new JobClient(), argv);
     System.exit(res);
   }
-}
 
+  /**
+   * Retrieves information about files that are present in distributed cache
+   */
+  private static class DistributedCacheIndex {
+    /** File system where distributed cache files are stored */
+    private FileSystem fs;
+
+    /**
+     * Constructs index on provided file system
+     * @param fs
+     */
+    public DistributedCacheIndex(FileSystem fs) {
+      this.fs = fs;
+    }
+
+    /**
+     * Notifies that given path is present in distributed cache
+     * @param path path to check
+     */
+    public void add(Path path) {
+    }
+
+    /**
+     * Checks whether given file is present in distributed cache
+     * @param path path to check
+     * @return
+     */
+    public boolean contains(Path path) {
+      try {
+        return fs.exists(path);
+      } catch (IOException e) {
+        // This is not a tragedy, in worst case we reupload file
+        return false;
+      }
+    }
+
+  }
+
+}
diff --git a/src/mapred/org/apache/hadoop/mapred/JobConf.java b/src/mapred/org/apache/hadoop/mapred/JobConf.java
index a9535547..ac82b6bd 100644
--- a/src/mapred/org/apache/hadoop/mapred/JobConf.java
+++ b/src/mapred/org/apache/hadoop/mapred/JobConf.java
@@ -230,6 +230,51 @@ public class JobConf extends Configuration {
   public static final String MAPRED_REDUCE_TASK_JAVA_OPTS =
     "mapred.reduce.child.java.opts";
 
+  /**
+   * Configuration key to set the java command line options for the job setup
+   * tasks.
+   *
+   * Java opts for the task tracker child job setup processes.
+   * The following symbol, if present, will be interpolated: @taskid@.
+   * It is replaced by current TaskID. Any other occurrences of '@' will go
+   * unchanged.
+   * For example, to enable verbose gc logging to a file named for the taskid in
+   * /tmp and to set the heap maximum to be a gigabyte, pass a 'value' of:
+   *          -Xmx1024m -verbose:gc -Xloggc:/tmp/@taskid@.gc
+   */
+  public static final String MAPRED_JOB_SETUP_TASK_JAVA_OPTS =
+      "mapred.jobsetup.child.java.opts";
+
+  /**
+   * Configuration key to set the java command line options for the job
+   * cleanup tasks.
+   *
+   * Java opts for the task tracker child job cleanup processes.
+   * The following symbol, if present, will be interpolated: @taskid@.
+   * It is replaced by current TaskID. Any other occurrences of '@' will go
+   * unchanged.
+   * For example, to enable verbose gc logging to a file named for the taskid in
+   * /tmp and to set the heap maximum to be a gigabyte, pass a 'value' of:
+   *          -Xmx1024m -verbose:gc -Xloggc:/tmp/@taskid@.gc
+   */
+  public static final String MAPRED_JOB_CLEANUP_TASK_JAVA_OPTS =
+      "mapred.jobcleanup.child.java.opts";
+
+  /**
+   * Configuration key to set the java command line options for the task
+   * cleanup tasks.
+   *
+   * Java opts for the task tracker child task cleanup processes.
+   * The following symbol, if present, will be interpolated: @taskid@.
+   * It is replaced by current TaskID. Any other occurrences of '@' will go
+   * unchanged.
+   * For example, to enable verbose gc logging to a file named for the taskid in
+   * /tmp and to set the heap maximum to be a gigabyte, pass a 'value' of:
+   *          -Xmx1024m -verbose:gc -Xloggc:/tmp/@taskid@.gc
+   */
+  public static final String MAPRED_TASK_CLEANUP_TASK_JAVA_OPTS =
+      "mapred.taskcleanup.child.java.opts";
+
   public static final String DEFAULT_MAPRED_TASK_JAVA_OPTS = "-Xmx200m";
 
   /**
@@ -264,6 +309,14 @@ public class JobConf extends Configuration {
   public static final String MAPRED_REDUCE_TASK_ULIMIT =
     "mapred.reduce.child.ulimit";
 
+  /**
+   * Configuration key to set the maximum memory for a task (in mega-bytes).
+   * Jobs requesting more will be killed.
+   */
+  public static final String MAX_TASK_MEMORY_MB = "mapred.child.java.max.memory.mb";
+
+  public static final int MAX_TASK_MEMORY_MB_DEFAULT = 4096;
+
   /**
    * Configuration key to set the environment of the child map/reduce tasks.
    *
@@ -413,6 +466,10 @@ public String[] getLocalDirs() throws IOException {
     return getStrings("mapred.local.dir");
   }
 
+  public String getLogDir() {
+    return get("mapred.tasktracker.log.dir");
+  }
+
   /**
    * Use MRAsyncDiskService.moveAndDeleteAllVolumes instead.
    * @see org.apache.hadoop.util.MRAsyncDiskService#cleanupAllVolumes()
diff --git a/src/mapred/org/apache/hadoop/mapred/JobInProgress.java b/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
index 1cf7bd90..999cb05c 100644
--- a/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
+++ b/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
@@ -248,6 +248,9 @@ public static enum Counter {
     RACK_MAP_INPUT_BYTES,
     TOTAL_MAP_WAIT_MILLIS,
     TOTAL_REDUCE_WAIT_MILLIS,
+    TOTAL_HIGH_MEMORY_MAP_TASK_KILLED,
+    TOTAL_HIGH_MEMORY_REDUCE_TASK_KILLED,
+    
   }
   Counters jobCounters = new Counters();
 
@@ -3050,7 +3053,7 @@ private void failedTask(TaskInProgress tip, TaskAttemptID taskid,
                           TaskTracker taskTracker, boolean wasRunning,
                           boolean wasComplete, boolean wasAttemptRunning) {
     this.jobtracker.getTaskErrorCollector().collect(
-        tip, taskid, taskTracker, JobTracker.getClock().getTime());
+        tip, taskid, JobTracker.getClock().getTime());
     final JobTrackerInstrumentation metrics = jobtracker.getInstrumentation();
     // check if the TIP is already failed
     boolean wasFailed = tip.isFailed();
diff --git a/src/mapred/org/apache/hadoop/mapred/JvmManager.java b/src/mapred/org/apache/hadoop/mapred/JvmManager.java
index 6d420b8a..024963dd 100644
--- a/src/mapred/org/apache/hadoop/mapred/JvmManager.java
+++ b/src/mapred/org/apache/hadoop/mapred/JvmManager.java
@@ -214,6 +214,13 @@ synchronized public void taskFinished(TaskRunner tr) {
         JvmRunner jvmRunner;
         if ((jvmRunner = jvmIdToRunner.get(jvmId)) != null) {
           jvmRunner.taskRan();
+          // This JVM is done. Unfortunately sometimes the
+          // process hangs around, so we should sigkill it
+          // However it is only applicable to the JVMs that
+          // ran all the tasks they were supposed to
+          if (jvmRunner.ranAll()) {
+            jvmRunner.kill();
+          }
         }
       }
     }
@@ -503,5 +510,19 @@ public JvmEnv(List<String> setup, Vector<String> vargs, File stdout,
       this.env = env;
       this.conf = conf;
     }
+
+    @Override
+    public String toString() {
+      return "JvmEnv{" +
+          "vargs=" + vargs +
+          ", setup=" + setup +
+          ", stdout=" + stdout +
+          ", stderr=" + stderr +
+          ", workDir=" + workDir +
+          ", logSize=" + logSize +
+          ", conf=" + conf +
+          ", env=" + env +
+          '}';
+    }
   }
 }
diff --git a/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java b/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
index 696b2794..0bc35582 100644
--- a/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
+++ b/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
@@ -36,6 +36,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -59,6 +60,8 @@ public class LocalJobRunner implements JobSubmissionProtocol {
   private JobConf conf;
   private volatile int map_tasks = 0;
   private volatile int reduce_tasks = 0;
+  private volatile int mapperNo = 0;
+  private volatile int reducerNo = 0;
 
   private JobTrackerInstrumentation myMetrics = null;
   private String runnerLogDir;
@@ -220,6 +223,7 @@ public void run() {
               if (status != 0) {
                 Job.this.statusUpdate(task.getTaskID(), failedStatus(task));
               } else {
+                Job.this.statusUpdate(task.getTaskID(), succeededStatus(task));
                 Job.this.numSucceededMaps++;
               }
               break;
@@ -345,6 +349,10 @@ public void run() {
           numReduceTasks = 1;
           job.setNumReduceTasks(1);
         }
+        mapperNo = rawSplits.length;
+        reducerNo = numReduceTasks;
+        LOG.info("Mapper No: " + mapperNo);
+        LOG.info("Reducer No: " + reducerNo);
         outputCommitter.setupJob(jContext);
         status.setSetupProgress(1.0f);
         
@@ -368,6 +376,7 @@ public void run() {
             // Special handling for the single mapper case.
             if (this.doSequential || rawSplits.length == 1) {
               map.run(localConf, this);
+	      this.statusUpdate(map.getTaskID(), succeededStatus(map));
               numSucceededMaps++;
               myMetrics.completeMap(mapId);
               map_tasks -= 1;
@@ -511,11 +520,15 @@ public JvmTask getTask(JvmContext context) {
       }
     }
 
-    public boolean statusUpdate(TaskAttemptID taskId, TaskStatus taskStatus) 
+    private final Vector<TaskCompletionEvent> taskCompletionEvents = new Vector<TaskCompletionEvent>();
+    private final AtomicInteger taskCompletionEventTracker = new AtomicInteger(0);
+
+    public boolean statusUpdate(TaskAttemptID taskId, TaskStatus taskStatus)
         throws IOException, InterruptedException {
       LOG.info(taskStatus.getStateString());
       float taskIndex = mapIds.indexOf(taskId);
-      if (taskIndex >= 0) {                       // mapping
+      boolean isMap = taskIndex >= 0;
+      if (isMap) {
         float numTasks = mapIds.size();
         status.setMapProgress(taskIndex/numTasks + taskStatus.getProgress()/numTasks);
       } else {
@@ -526,7 +539,44 @@ public boolean statusUpdate(TaskAttemptID taskId, TaskStatus taskStatus)
         updateCounters(taskId, taskCounters);
       }
 
-      // ignore phase
+      // Match TaskStatus.State to TaskCompletionEvent.Status
+      //
+      // TaskStatus.State {RUNNING, SUCCEEDED, FAILED, UNASSIGNED, KILLED,
+      //                   COMMIT_PENDING, FAILED_UNCLEAN, KILLED_UNCLEAN}
+      // TaskCompletionEvent.Status {FAILED, KILLED, SUCCEEDED, OBSOLETE,
+      //                             TIPFAILED, SUCCEEDED_NO_OUTPUT}
+      TaskCompletionEvent.Status taskCompletionEventStatus = null;
+      boolean writeCompletionEvent = false;
+      switch (taskStatus.getRunState()) {
+        case SUCCEEDED:
+          taskCompletionEventStatus = TaskCompletionEvent.Status.SUCCEEDED;
+          writeCompletionEvent = true;
+          break;
+        case KILLED:
+          taskCompletionEventStatus = TaskCompletionEvent.Status.KILLED;
+          writeCompletionEvent = true;
+          break;
+        case FAILED:
+          taskCompletionEventStatus = TaskCompletionEvent.Status.FAILED;
+          writeCompletionEvent = true;
+          break;
+      }
+      if(writeCompletionEvent) {
+        int idWithinJob;
+        if (isMap) {
+          idWithinJob = (int) taskIndex;   // index of map task
+        } else {
+          idWithinJob = 0;                // We have only 1 reduce task.
+        }
+        TaskCompletionEvent taskCompletionEvent = new TaskCompletionEvent(
+            taskCompletionEventTracker.getAndIncrement(),
+            taskId,
+            idWithinJob,
+            isMap,
+            taskCompletionEventStatus,
+            null); // We don't need taskTrackerHttp as it's running on localhost.
+        taskCompletionEvents.add(taskCompletionEvent);
+      }
 
       return true;
     }
@@ -596,7 +646,19 @@ public MapTaskCompletionEventsUpdate getMapCompletionEvents(JobID jobId,
       return new MapTaskCompletionEventsUpdate(TaskCompletionEvent.EMPTY_ARRAY,
                                                false);
     }
-    
+
+    public TaskCompletionEvent[] getTaskCompletionEvents(
+        int fromEventId, int maxEvents) {
+      TaskCompletionEvent[] events = TaskCompletionEvent.EMPTY_ARRAY;
+      synchronized (taskCompletionEvents) {
+        if (taskCompletionEvents.size() > fromEventId) {
+          int actualMax =
+              Math.min(maxEvents, (taskCompletionEvents.size() - fromEventId));
+          events = taskCompletionEvents.subList(fromEventId, actualMax + fromEventId).toArray(events);
+        }
+      }
+      return events;
+    }
   }
 
   public LocalJobRunner(JobConf conf) throws IOException {
@@ -642,10 +704,10 @@ public JobProfile getJobProfile(JobID id) {
   }
 
   public TaskReport[] getMapTaskReports(JobID id) {
-    return new TaskReport[0];
+    return (this.mapperNo > 0)? new TaskReport[this.mapperNo] : new TaskReport[0];
   }
   public TaskReport[] getReduceTaskReports(JobID id) {
-    return new TaskReport[0];
+    return (this.reducerNo > 0)? new TaskReport[this.reducerNo] : new TaskReport[0];
   }
   public TaskReport[] getCleanupTaskReports(JobID id) {
     return new TaskReport[0];
@@ -686,9 +748,12 @@ public ClusterStatus getClusterStatus(boolean detailed) {
 
   public JobStatus[] jobsToComplete() {return null;}
 
-  public TaskCompletionEvent[] getTaskCompletionEvents(JobID jobid
-      , int fromEventId, int maxEvents) throws IOException {
-    return TaskCompletionEvent.EMPTY_ARRAY;
+  public TaskCompletionEvent[] getTaskCompletionEvents(
+      JobID jobid, int fromEventId, int maxEvents) throws IOException{
+    Job job = jobs.get(jobid);
+    if (job == null) return TaskCompletionEvent.EMPTY_ARRAY;
+
+    return job.getTaskCompletionEvents(fromEventId, maxEvents);
   }
   
   public JobStatus[] getAllJobs() {return null;}
@@ -699,8 +764,8 @@ public TaskCompletionEvent[] getTaskCompletionEvents(JobID jobid
    * To be implemented
    */
   public String[] getTaskDiagnostics(TaskAttemptID taskid)
-  		throws IOException{
-	  return new String [0];
+      throws IOException{
+    return new String [0];
   }
 
   /**
@@ -797,6 +862,12 @@ public static void main(String[] args) throws Throwable {
     }
   }
 
+  static TaskStatus succeededStatus(Task task) {
+    TaskStatus taskStatus = (TaskStatus) task.taskStatus.clone();
+    taskStatus.setRunState(TaskStatus.State.SUCCEEDED);
+    return taskStatus;
+  }
+
   static TaskStatus failedStatus(Task task) {
     TaskStatus taskStatus = (TaskStatus) task.taskStatus.clone();
     taskStatus.setRunState(TaskStatus.State.FAILED);
diff --git a/src/mapred/org/apache/hadoop/mapred/LocalityStats.java b/src/mapred/org/apache/hadoop/mapred/LocalityStats.java
new file mode 100644
index 00000000..da31b6c9
--- /dev/null
+++ b/src/mapred/org/apache/hadoop/mapred/LocalityStats.java
@@ -0,0 +1,216 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.mapred;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.net.Node;
+import org.apache.hadoop.net.TopologyCache;
+import org.apache.hadoop.mapred.JobInProgress.Counter;
+
+import java.util.ArrayList;
+
+/**
+ * Record locality information. Can perform the locality computation in a
+ * separate thread.
+ */
+public class LocalityStats implements Runnable {
+  /** Logger. */
+  private static final Log LOG = LogFactory.getLog(LocalityStats.class);
+  /** Topology cache. */
+  private final TopologyCache topologyCache;
+  /** Max locality level. */
+  private final int maxLevel;
+  /** Job Counters. */
+  private final Counters jobCounters;
+  /** Job Statistics. */
+  private final JobStats jobStats;
+  /** List of records to be used for asynchronous operation. */
+  private final ArrayList<Record> localityRecords = new ArrayList<Record>();
+  /** In async mode, used to check if we are running. */
+  private volatile boolean running = true;
+
+  /**
+   * Constructor.
+   * @param jobConf Job Configuration.
+   * @param maxLevel The maximum locality level.
+   * @param counters The job counters to update.
+   * @param jobStats The job statistics to update.
+   */
+  public LocalityStats(
+    JobConf jobConf, int maxLevel, Counters counters, JobStats jobStats,
+    TopologyCache topologyCache) {
+    this.topologyCache = topologyCache;
+    this.maxLevel = maxLevel;
+    this.jobCounters = counters;
+    this.jobStats = jobStats;
+  }
+
+  public String getNode(String host) {
+    return topologyCache.getNode(host).toString();
+  }
+
+  /**
+   * Representation of information for asynchronous update.
+   */
+  private static class Record {
+    /** The task. */
+    private final TaskInProgress tip;
+    /** The task tracker host. */
+    private final String host;
+    /** The number of bytes processed. */
+    private final long inputBytes;
+
+    /**
+     * Constructor
+     * @param tip The task.
+     * @param host The task tracker host.
+     * @param inputBytes The number of bytes processed.
+     */
+    private Record(TaskInProgress tip, String host, long inputBytes) {
+      this.tip = tip;
+      this.host = host;
+      this.inputBytes = inputBytes;
+    }
+  }
+
+  /**
+   * In async mode, stop the thread.
+   */
+  public void stop() {
+    running = false;
+  }
+
+  /**
+   * Asynchronous update of locality.
+   * @param tip The task.
+   * @param host The task tracker host.
+   * @param inputBytes The number of bytes processed.
+   */
+  public void record(
+    TaskInProgress tip, String host, long inputBytes) {
+    synchronized (localityRecords) {
+      localityRecords.add(new Record(tip, host, inputBytes));
+      localityRecords.notify();
+    }
+  }
+
+  @Override
+  public void run() {
+    LOG.info("Starting locality computation thread");
+    while (running) {
+      Record record = null;
+      synchronized (localityRecords) {
+        while (localityRecords.isEmpty()) {
+          try {
+            localityRecords.wait();
+          } catch (InterruptedException e) {
+            if (!running) {
+              return;
+            }
+          }
+        }
+        // Remove last element in the array.
+        record = localityRecords.remove(localityRecords.size() - 1);
+      }
+      computeStatistics(record);
+    }
+    LOG.info("Exiting locality computation thread");
+  }
+
+  /**
+   * Peform the computation statistics based on a locality record.
+   * @param record The locality information.
+   */
+  private void computeStatistics(Record record) {
+    computeStatistics(record.tip, record.host, record.inputBytes);
+  }
+
+  /**
+   * Peform the computation statistics.
+   * @param tip The task.
+   * @param host The task tracker host.
+   * @param inputBytes The number of bytes processed.
+   */
+  private void computeStatistics(
+    TaskInProgress tip, String host, long inputBytes) {
+    int level = this.maxLevel;
+    String[] splitLocations = tip.getSplitLocations();
+    if (splitLocations.length > 0) {
+      Node tracker = topologyCache.getNode(host);
+      // find the right level across split locations
+      for (String local : splitLocations) {
+        Node datanode = topologyCache.getNode(local);
+        int newLevel = this.maxLevel;
+        if (tracker != null && datanode != null) {
+          newLevel = getMatchingLevelForNodes(tracker, datanode, maxLevel);
+        }
+        if (newLevel < level) {
+          level = newLevel;
+          if (level == 0) {
+            break;
+          }
+        }
+      }
+    }
+    boolean updateTaskCountOnly = inputBytes < 0;
+    switch (level) {
+    case 0:
+      if (updateTaskCountOnly) {
+        LOG.info("Chose data-local task " + tip.getTIPId());
+        jobCounters.incrCounter(Counter.DATA_LOCAL_MAPS, 1);
+        jobStats.incNumDataLocalMaps();
+      } else {
+        jobCounters.incrCounter(Counter.LOCAL_MAP_INPUT_BYTES, inputBytes);
+        jobStats.incLocalMapInputBytes(inputBytes);
+      }
+      break;
+    case 1:
+      if (updateTaskCountOnly) {
+        LOG.info("Chose rack-local task " + tip.getTIPId());
+        jobCounters.incrCounter(Counter.RACK_LOCAL_MAPS, 1);
+        jobStats.incNumRackLocalMaps();
+      } else {
+        jobCounters.incrCounter(Counter.RACK_MAP_INPUT_BYTES, inputBytes);
+        jobStats.incRackMapInputBytes(inputBytes);
+      }
+      break;
+    default:
+      LOG.info("Chose non-local task " + tip.getTIPId() + " at level " + level);
+      // check if there is any locality
+      if (updateTaskCountOnly && level != this.maxLevel) {
+        jobCounters.incrCounter(Counter.OTHER_LOCAL_MAPS, 1);
+      }
+      break;
+    }
+  }
+
+  public static int getMatchingLevelForNodes(Node n1, Node n2, int maxLevel) {
+    int count = 0;
+    do {
+      if (n1.equals(n2)) {
+        return count;
+      }
+      ++count;
+      n1 = n1.getParent();
+      n2 = n2.getParent();
+    } while (n1 != null && n2 != null);
+    return maxLevel;
+  }
+
+}
diff --git a/src/mapred/org/apache/hadoop/mapred/PoolFairnessCalculator.java b/src/mapred/org/apache/hadoop/mapred/PoolFairnessCalculator.java
index b32283e8..a167e448 100644
--- a/src/mapred/org/apache/hadoop/mapred/PoolFairnessCalculator.java
+++ b/src/mapred/org/apache/hadoop/mapred/PoolFairnessCalculator.java
@@ -322,8 +322,10 @@ public static void calculateFairness(
 
     if (LOG.isInfoEnabled()) {
       LOG.info("calculateFairness took " +
-          (System.currentTimeMillis() - startTime) +  " millisecond(s).\n" +
-          metricsBuilder.toString());
+          (System.currentTimeMillis() - startTime) +  " millisecond(s).");
+    }
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("\n" + metricsBuilder.toString());
     }
   }
 }
diff --git a/src/mapred/org/apache/hadoop/mapred/RamManager.java b/src/mapred/org/apache/hadoop/mapred/RamManager.java
index 38baf6bd..3ab1a1ec 100644
--- a/src/mapred/org/apache/hadoop/mapred/RamManager.java
+++ b/src/mapred/org/apache/hadoop/mapred/RamManager.java
@@ -24,16 +24,14 @@
  */
 interface RamManager {
   /**
-   * Reserve memory for data coming through the given input-stream.
+   * Reserve memory for data
    * 
    * @param requestedSize size of memory requested
-   * @param in input stream
    * @throws InterruptedException
    * @return <code>true</code> if memory was allocated immediately, 
    *         else <code>false</code>
    */
-  boolean reserve(int requestedSize, InputStream in) 
-  throws InterruptedException;
+  void reserve(int requestedSize) throws InterruptedException;
   
   /**
    * Return memory to the pool.
diff --git a/src/mapred/org/apache/hadoop/mapred/ReduceTask.java b/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
index 3b7ec5f3..89e05c36 100644
--- a/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
+++ b/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.mapred;
 
 import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.File;
 import java.io.IOException;
@@ -26,6 +27,8 @@
 import java.io.OutputStream;
 import java.lang.Math;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.net.URI;
 import java.net.URL;
@@ -75,9 +78,10 @@
 import org.apache.hadoop.mapred.IFile.*;
 import org.apache.hadoop.mapred.Merger.Segment;
 import org.apache.hadoop.mapred.SortedRanges.SkipRangeIterator;
-import org.apache.hadoop.mapred.Task.Counter;
 import org.apache.hadoop.mapred.TaskTracker.TaskInProgress;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapred.TaskAttemptID;
+import org.apache.hadoop.mapred.ShuffleHeader;
 import org.apache.hadoop.metrics.MetricsContext;
 import org.apache.hadoop.metrics.MetricsRecord;
 import org.apache.hadoop.metrics.MetricsUtil;
@@ -191,7 +195,7 @@ public boolean isMapTask() {
   }
 
   public int getNumMaps() { return numMaps; }
-  
+
   /**
    * Localize the given JobConf to be specific for this task.
    */
@@ -487,6 +491,7 @@ void runOldReducer(JobConf job,
     String finalName = getOutputName(getPartition());
 
     FileSystem fs = FileSystem.get(job);
+    boolean isDataProcessedByReducer = false;
 
     final RecordWriter<OUTKEY,OUTVALUE> out =
       job.getOutputFormat().getRecordWriter(fs, job, finalName, reporter);
@@ -526,6 +531,9 @@ public void collect(OUTKEY key, OUTVALUE value)
         }
         lastKey = values.getKey();
         reduceInputKeyCounter.increment(1);
+        if (!isDataProcessedByReducer) {
+          isDataProcessedByReducer = true;
+        }
         reducer.reduce(values.getKey(), values, collector, reporter);
         if(incrProcCount) {
           reporter.incrCounter(SkipBadRecords.COUNTER_GROUP,
@@ -535,6 +543,12 @@ public void collect(OUTKEY key, OUTVALUE value)
         values.informReduceProgress();
       }
 
+      if (isDataProcessedByReducer) {
+        reporter.incrCounter(Counter.REDUCERS_PROCESSING_DATA, 1);
+      }
+      else {
+        reporter.incrCounter(Counter.REDUCERS_PROCESSING_NO_DATA, 1);
+      }
       //Clean up: repeated in catch block below
       reducer.close();
       out.close(reporter);
@@ -640,14 +654,23 @@ public long getTotalBytesProcessed() {
     output.close(reducerContext);
   }
 
+  /**
+   * State of this copy output
+   */
   private static enum CopyOutputErrorType {
-    NO_ERROR,
-    READ_ERROR,
-    OTHER_ERROR
+    INIT, ///< Initial state
+    NO_ERROR, ///< Completed without error
+    READ_ERROR, ///< Read error for this output
+    SERIOUS_ERROR, ///< Should re-run this map
+    OTHER_ERROR ///< Other error
   };
 
   class ReduceCopier<K, V> implements MRConstants {
 
+    /** The maximum map outputs fetched in a single try */
+    public static final String MAX_MAPOUTPUT_PER_HOST =
+        "mapred.copier.max.mapoutput.per.host";
+
     /** Reference to the umbilical object */
     private TaskUmbilicalProtocol umbilical;
     private final TaskReporter reporter;
@@ -666,9 +689,9 @@ class ReduceCopier<K, V> implements MRConstants {
     private ReduceTask reduceTask;
 
     /**
-     * the list of map outputs currently being copied
+     * map of hosts and their map output locations
      */
-    private List<MapOutputLocation> scheduledCopies;
+    private List<HostMapOutputLocations> scheduledCopies;
 
     /**
      *  the results of dispatched copy attempts
@@ -696,7 +719,7 @@ class ReduceCopier<K, V> implements MRConstants {
     /**
      * the set of unique hosts from which we are copying
      */
-    private Set<String> uniqueHosts;
+    private Set<String> uniqueHosts = new HashSet<String>();
 
     /**
      * A reference to the RamManager for writing the map outputs to.
@@ -772,7 +795,7 @@ class ReduceCopier<K, V> implements MRConstants {
      */
     private Set <TaskID> copiedMapOutputs =
       Collections.synchronizedSet(new TreeSet<TaskID>());
-    
+
     private AtomicInteger emptyMaps = new AtomicInteger(0);
 
     /**
@@ -798,6 +821,11 @@ class ReduceCopier<K, V> implements MRConstants {
      */
     private final int abortFailureLimit;
 
+    /**
+     *  Maximum number of map outputs fetched at a time from a single host
+     */
+    private final int maxMapOutputsPerFetch;
+
     /**
      * Initial penalty time in ms for a fetch failure.
      */
@@ -850,14 +878,14 @@ class ReduceCopier<K, V> implements MRConstants {
     private static final float MIN_PENDING_MAPS_PERCENT = 0.25f;
     /**
      * Maximum no. of unique maps from which we failed to fetch map-outputs
-     * even after {@link #maxFetchRetriesPerMap} retries; after this the
+     * even after {@link #maxFailedUniqueFetches} retries; after this the
      * reduce task is failed.
      */
     private int maxFailedUniqueFetches = 5;
 
     /**
      * The maps from which we fail to fetch map-outputs
-     * even after {@link #maxFetchRetriesPerMap} retries.
+     * even after {@link #maxFailedUniqueFetches} retries.
      */
     Set<TaskID> fetchFailedMaps = new TreeSet<TaskID>();
 
@@ -889,7 +917,7 @@ class ReduceCopier<K, V> implements MRConstants {
      */
     private final Map<String, List<MapOutputLocation>> mapLocations =
       new ConcurrentHashMap<String, List<MapOutputLocation>>();
-    
+
     /**
      * Get the number of maps whose output have been copied, or ignored if the output is empty
      */
@@ -907,6 +935,7 @@ class ShuffleClientMetrics implements Updater {
       private MetricsRecord shuffleMetrics = null;
       private int numFailedFetches = 0;
       private int numSuccessFetches = 0;
+      private int numSeriousFailureFetches = 0;
       private long numBytes = 0;
       private int numThreadsBusy = 0;
       ShuffleClientMetrics(JobConf conf) {
@@ -929,6 +958,9 @@ public synchronized void failedFetch() {
       public synchronized void successFetch() {
         ++numSuccessFetches;
       }
+      public synchronized void seriousFailureFetch() {
+        ++numSeriousFailureFetches;
+      }
       public synchronized void threadBusy() {
         ++numThreadsBusy;
       }
@@ -942,6 +974,8 @@ public void doUpdates(MetricsContext unused) {
                                     numFailedFetches);
           shuffleMetrics.incrMetric("shuffle_success_fetches",
                                     numSuccessFetches);
+          shuffleMetrics.incrMetric("shuffle_serious_failures_fetches",
+              numSeriousFailureFetches);
           if (numCopiers != 0) {
             shuffleMetrics.setMetric("shuffle_fetchers_busy_percent",
                 100*((float)numThreadsBusy/numCopiers));
@@ -951,6 +985,7 @@ public void doUpdates(MetricsContext unused) {
           numBytes = 0;
           numSuccessFetches = 0;
           numFailedFetches = 0;
+          numSeriousFailureFetches = 0;
         }
         shuffleMetrics.update();
       }
@@ -967,12 +1002,9 @@ private class CopyResult {
 
       //a flag signifying whether a copy result is obsolete
       private static final int OBSOLETE = -2;
+      private static final int ERROR_SIZE = -1;
 
       private CopyOutputErrorType error = CopyOutputErrorType.NO_ERROR;
-      CopyResult(MapOutputLocation loc, long size) {
-        this.loc = loc;
-        this.size = size;
-      }
 
       CopyResult(MapOutputLocation loc, long size, CopyOutputErrorType error) {
         this.loc = loc;
@@ -988,8 +1020,15 @@ public boolean isObsolete() {
       public String getHost() { return loc.getHost(); }
       public MapOutputLocation getLocation() { return loc; }
       public CopyOutputErrorType getError() { return error; }
+
+      @Override
+      public String toString() {
+        return "(loc=" + loc + ",size=" + size + ",error=" + error;
+      }
     }
 
+    private AtomicInteger finishedSuccessfulCopies = new AtomicInteger(0);
+    private AtomicInteger finishedFailedCopies = new AtomicInteger(0);
     private int nextMapOutputCopierId = 0;
     private boolean reportReadErrorImmediately;
 
@@ -997,17 +1036,23 @@ public boolean isObsolete() {
      * Abstraction to track a map-output.
      */
     private class MapOutputLocation {
-      TaskAttemptID taskAttemptId;
-      TaskID taskId;
-      String ttHost;
-      URL taskOutput;
+      final TaskAttemptID taskAttemptId;
+      final TaskID taskId;
+      /** Http for task tracker id */
+      final String httpTaskTracker;
+      /** Task tracker host */
+      final String ttHost;
+      /** Amount read from the map output */
+      long sizeRead = 0;
+      /** Result of copy attempt */
+      CopyOutputErrorType errorType = CopyOutputErrorType.INIT;
 
       public MapOutputLocation(TaskAttemptID taskAttemptId,
-                               String ttHost, URL taskOutput) {
+                               String ttHost, String httpTaskTracker) {
         this.taskAttemptId = taskAttemptId;
         this.taskId = this.taskAttemptId.getTaskID();
         this.ttHost = ttHost;
-        this.taskOutput = taskOutput;
+        this.httpTaskTracker = httpTaskTracker;
       }
 
       public TaskAttemptID getTaskAttemptId() {
@@ -1018,12 +1063,129 @@ public TaskID getTaskId() {
         return taskId;
       }
 
+      public String getHttpTaskTracker() {
+        return httpTaskTracker;
+      }
+
       public String getHost() {
         return ttHost;
       }
 
-      public URL getOutputLocation() {
-        return taskOutput;
+      public long getSizeRead() {
+        return sizeRead;
+      }
+
+      public CopyOutputErrorType getErrorType() {
+        return errorType;
+      }
+
+      /**
+       * Reset the mutable values for this object
+       */
+      public void reset() {
+        sizeRead = 0;
+        errorType = CopyOutputErrorType.INIT;
+      }
+
+      @Override
+      public String toString() {
+        return "(" + taskAttemptId + "," + ttHost + ",sizeRead=" + sizeRead +
+            ",errorType=" + errorType + ",httpTaskTracker=" +
+            httpTaskTracker + ")";
+      }
+    }
+
+    /**
+     * Groups multiple locations to a single host
+     */
+    private class HostMapOutputLocations {
+      /** Http tasktracker as a string */
+      private final String httpTaskTracker;
+      /** One or more map output locations on this host */
+      private final List<MapOutputLocation> locations;
+
+      HostMapOutputLocations(String httpTaskTracker,
+          List<MapOutputLocation> locations) throws MalformedURLException {
+        this.httpTaskTracker = httpTaskTracker;
+        this.locations = locations;
+        if (locations == null || locations.isEmpty()) {
+          throw new RuntimeException("locations is null or empty - " +
+              locations);
+        }
+      }
+
+      /**
+       * Only get the locations that are fetchable (not copied or not made
+       * obsolete).
+       *
+       * @param copiedMapOutputs Synchronized set of already copied map outputs
+       * @param obsoleteMapIdsSet Synchronized set of obsolete map ids
+       * @return List of fetchable locations (could be empty)
+       */
+      List<MapOutputLocation> getFetchableLocations(
+          Set<TaskID> copiedMapOutputs,
+          Set<TaskAttemptID> obsoleteMapIdsSet) {
+        List<MapOutputLocation> fetchableLocations =
+            new ArrayList<MapOutputLocation>(locations.size());
+        for (MapOutputLocation location : locations) {
+          // Check if we still need to copy the output from this location
+          if (copiedMapOutputs.contains(location.getTaskId())) {
+            location.errorType = CopyOutputErrorType.NO_ERROR;
+            location.sizeRead = CopyResult.OBSOLETE;
+            LOG.info("getFetchableLocations: Already " +
+                "copied - " + location + ", will not try again");
+          } else if (obsoleteMapIds.contains(location.getTaskAttemptId())) {
+            location.errorType = CopyOutputErrorType.NO_ERROR;
+            location.sizeRead = CopyResult.OBSOLETE;
+            LOG.info("getFetchableLocations: Obsolete - " + location + ", " +
+                "will not try now.");
+          } else {
+            fetchableLocations.add(location);
+          }
+        }
+        return fetchableLocations;
+      }
+
+      /**
+       * Get a URL for all the fetchable locations
+       *
+       * @param fetchableLocations List of fetchable locations
+       * @return URL for fetchable locations, null if
+       *         fetchableLocations is empty
+       * @throws MalformedURLException
+       */
+      URL getFetchableLocationsURL(List<MapOutputLocation> fetchableLocations)
+          throws MalformedURLException {
+        if (fetchableLocations.isEmpty()) {
+          return null;
+        }
+        StringBuilder mapTaskIdStringBuilder = new StringBuilder();
+        for (int i = 0; i < fetchableLocations.size(); ++i) {
+          mapTaskIdStringBuilder.append(
+              fetchableLocations.get(i).getTaskAttemptId());
+          if ((i + 1) != fetchableLocations.size()) {
+            mapTaskIdStringBuilder.append(",");
+          }
+        }
+        MapOutputLocation location = fetchableLocations.get(0);
+        return new URL(httpTaskTracker +
+            "/mapOutput?job=" + location.getTaskId().getJobID() +
+            "&map=" + mapTaskIdStringBuilder.toString() +
+            "&reduce=" + getPartition());
+      }
+
+      @Override
+      public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("httpTaskTracker=" + httpTaskTracker +
+            ",count=" + locations.size() + ",locations=");
+        for (int i = 0; i < locations.size(); ++i) {
+          sb.append(locations.get(i).toString());
+          if (i != (locations.size() - 1)) {
+            sb.append(",");
+          }
+        }
+        return sb.toString();
       }
     }
 
@@ -1074,6 +1236,12 @@ public void discard() throws IOException {
           fs.delete(file, true);
         }
       }
+
+      @Override
+      public String toString() {
+        return "(mapId=" + mapId + ",mapAttemptId=" + mapAttemptId +
+            ",compressedSize=" + compressedSize + ")";
+      }
     }
 
     class ShuffleRamManager implements RamManager {
@@ -1112,22 +1280,11 @@ public ShuffleRamManager(Configuration conf) throws IOException {
                  ", MaxSingleShuffleLimit=" + maxSingleShuffleLimit);
       }
 
-      public synchronized boolean reserve(int requestedSize, InputStream in)
-      throws InterruptedException {
+      public synchronized void reserve(int requestedSize)
+          throws InterruptedException {
         // Wait till the request can be fulfilled...
         while ((size + requestedSize) > maxSize) {
 
-          // Close the input...
-          if (in != null) {
-            try {
-              in.close();
-            } catch (IOException ie) {
-              LOG.info("Failed to close connection with: " + ie);
-            } finally {
-              in = null;
-            }
-          }
-
           // Track pending requests
           synchronized (dataAvailable) {
             ++numPendingRequests;
@@ -1144,8 +1301,6 @@ public synchronized boolean reserve(int requestedSize, InputStream in)
         }
 
         size += requestedSize;
-
-        return (in != null);
       }
 
       public synchronized void unreserve(int requestedSize) {
@@ -1235,7 +1390,8 @@ private class MapOutputCopier extends Thread {
       private final int shuffleConnectionTimeout;
       private final int shuffleReadTimeout;
 
-      private MapOutputLocation currentLocation = null;
+      /** Current map output locations this copier is fetching */
+      private List<MapOutputLocation> currentLocations = null;
       private int id = nextMapOutputCopierId++;
       private Reporter reporter;
       private boolean readError = false;
@@ -1269,39 +1425,51 @@ public void stopCopier() {
         this.interrupt();
       }
 
-
       /**
-       * Fail the current file that we are fetching
-       * @return were we currently fetching?
+       * Starting on this map location.
+       * @param locations Locations that will be fetched
        */
-      public synchronized boolean fail() {
-        if (currentLocation != null) {
-          finish(-1, CopyOutputErrorType.OTHER_ERROR);
-          return true;
-        } else {
-          return false;
-        }
+      private synchronized void startLocations(
+          List<MapOutputLocation> locations) {
+        currentLocations = locations;
       }
 
       /**
-       * Get the current map output location.
+       * Finish up the copy depending on success or not.  If not successful,
+       * fail all the remaining unfetched map outputs, while saving the
+       * completed ones.
+       *
+       * @param readError a flag indicating if there was a read error fetching
+       *                  the outputs if we got here with a read error it will
+       *                  mark all locations as failed with a read error so
+       *                  we do not attempt more fetches from this tasktracker
        */
-      public synchronized MapOutputLocation getLocation() {
-        return currentLocation;
-      }
-
-      private synchronized void start(MapOutputLocation loc) {
-        currentLocation = loc;
-      }
-
-      private synchronized void finish(long size, CopyOutputErrorType error) {
-        if (currentLocation != null) {
-          LOG.debug(getName() + " finishing " + currentLocation + " =" + size);
+      private synchronized void finish(boolean readError) {
+        if (currentLocations != null) {
+          LOG.info(getName() + " finishing " + currentLocations.size());
           synchronized (copyResults) {
-            copyResults.add(new CopyResult(currentLocation, size, error));
+            for (MapOutputLocation location : currentLocations) {
+              if (location.getErrorType() == CopyOutputErrorType.NO_ERROR) {
+                finishedSuccessfulCopies.incrementAndGet();
+                LOG.info(getName() + " finish: Success getting location " +
+                    location + ", successful = " + finishedSuccessfulCopies +
+                    ", failed = " + finishedFailedCopies);
+                copyResults.add(new CopyResult(
+                    location, location.getSizeRead(), location.getErrorType()));
+              } else {
+                finishedFailedCopies.incrementAndGet();
+                LOG.warn(getName() + " finish: Failed getting location " +
+                    location + ", error = " + location.errorType +
+                    ", successful = " + finishedSuccessfulCopies +
+                    ", failed = " + finishedFailedCopies);
+                CopyOutputErrorType error = readError ?
+                    CopyOutputErrorType.READ_ERROR : location.getErrorType();
+                copyResults.add(new CopyResult(location, -1, error));
+              }
+            }
             copyResults.notify();
           }
-          currentLocation = null;
+          currentLocations = null;
         }
       }
 
@@ -1310,48 +1478,56 @@ private synchronized void finish(long size, CopyOutputErrorType error) {
        */
       @Override
       public void run() {
+        long copyWaitStartTime = 0;
+        long copyWaitEndTime = 0;
         while (!shutdown) {
           try {
-            MapOutputLocation loc = null;
-            long size = -1;
-
+            HostMapOutputLocations loc = null;
             synchronized (scheduledCopies) {
+              copyWaitStartTime = System.currentTimeMillis();
+              LOG.debug(getName() + " run: Waiting for copies");
               while (scheduledCopies.isEmpty()) {
                 scheduledCopies.wait();
               }
+              copyWaitEndTime = System.currentTimeMillis();
+ 
+              Counters.Counter copyWaitWallClock = 
+                reporter.getCounter(Counter.REDUCE_COPY_WAIT_WALLCLOCK);
+              copyWaitWallClock.increment(copyWaitEndTime - copyWaitStartTime);
+
               loc = scheduledCopies.remove(0);
+              LOG.debug(getName() + " run: From scheduledCopies, got " + loc);
             }
             CopyOutputErrorType error = CopyOutputErrorType.OTHER_ERROR;
             readError = false;
             try {
               shuffleClientMetrics.threadBusy();
-              start(loc);
-              size = copyOutput(loc);
-              shuffleClientMetrics.successFetch();
-              error = CopyOutputErrorType.NO_ERROR;
+              startLocations(loc.locations);
+              reporter.progress();
+              copyHostOutput(loc);
             } catch (IOException e) {
-              LOG.warn(reduceTask.getTaskID() + " copy failed: " +
-                       loc.getTaskAttemptId() + " from " + loc.getHost(), e);
               shuffleClientMetrics.failedFetch();
               if (readError) {
                 error = CopyOutputErrorType.READ_ERROR;
               }
-              // Reset
-              size = -1;
+              LOG.warn(getName() + " " + reduceTask.getTaskID() +
+                  " copy failed: " +
+                  loc.toString() + ", readError = " + readError +
+                  ", error = " + error, e);
             } finally {
               shuffleClientMetrics.threadFree();
-              finish(size, error);
+              finish(error == CopyOutputErrorType.READ_ERROR);
             }
           } catch (InterruptedException e) {
             if (shutdown)
               break; // ALL DONE
           } catch (FSError e) {
-            LOG.error("Task: " + reduceTask.getTaskID() + " - FSError: " +
-                      StringUtils.stringifyException(e));
+            LOG.error(getName() + " Task: " + reduceTask.getTaskID() + " - " +
+                "FSError: " + StringUtils.stringifyException(e));
             try {
               umbilical.fsError(reduceTask.getTaskID(), e.getMessage());
             } catch (IOException io) {
-              LOG.error("Could not notify TT of FSError: " +
+              LOG.error(getName() + " Could not notify TT of FSError: " +
                       StringUtils.stringifyException(io));
             }
           } catch (Throwable th) {
@@ -1367,20 +1543,76 @@ public void run() {
 
       }
 
-      /** Copies a a map output from a remote host, via HTTP.
-       * @param currentLocation the map output location to be copied
-       * @return the path (fully qualified) of the copied file
-       * @throws IOException if there is an error copying the file
-       * @throws InterruptedException if the copier should give up
+      /**
+       * Copy one or more outputs for a host.
+       *
+       * @param hostMapLocations All locations for a host
+       * @throws IOException
+       * @throws InterruptedException
        */
-      private long copyOutput(MapOutputLocation loc
-                              ) throws IOException, InterruptedException {
-        // check if we still need to copy the output from this location
-        if (copiedMapOutputs.contains(loc.getTaskId()) ||
-            obsoleteMapIds.contains(loc.getTaskAttemptId())) {
-          return CopyResult.OBSOLETE;
+      private void copyHostOutput(HostMapOutputLocations hostMapLocations)
+          throws IOException, InterruptedException {
+        // One more check to see what is already copied or obsolete
+        List<MapOutputLocation> fetchableLocations =
+            hostMapLocations.getFetchableLocations(
+                copiedMapOutputs, obsoleteMapIds);
+        if (fetchableLocations.isEmpty()) {
+          return;
         }
+        HttpURLConnection connection = (HttpURLConnection)
+            hostMapLocations.getFetchableLocationsURL(fetchableLocations).
+            openConnection();
+        LOG.info(getName() + " copyHostOutput: Getting " +
+            fetchableLocations.size() + " output(s) from " +
+            hostMapLocations.httpTaskTracker);
+        DataInputStream input =
+            new DataInputStream(getInputStream(connection,
+                shuffleConnectionTimeout, shuffleReadTimeout));
+        for (MapOutputLocation location : fetchableLocations) {
+          try {
+            reporter.progress();
+            long size = copyOutput(connection, input, location);
+            location.sizeRead = size;
 
+            // Cannot continue once we have a single OBSOLETE output
+            if (location.sizeRead == CopyResult.OBSOLETE) {
+              LOG.warn(getName() + " copyHostOutput: Exiting early due to " +
+                  "obsolete output for location " + location);
+              break;
+            } else if (location.sizeRead == CopyResult.ERROR_SIZE) {
+              LOG.warn(getName() + " copyHostOutput: Exiting early due to " +
+                " error copying output for location " + location);
+              break;
+            }
+          } catch (IOException e) {
+            // Cannot continue is there was an error from the previous output
+            LOG.warn(getName() + " copyHostOutput: got error when copying" +
+                " " +
+                "output from " + location + ", read failed", e);
+            location.errorType = CopyOutputErrorType.READ_ERROR;
+            location.sizeRead = -1;
+            throw e;
+          }
+        }
+        // This close is unsafe if there was a read error. Since the stream
+        // does a read before actually closing this can hang for a long time
+        // leading to the reduce task time out
+        input.close();
+      }
+
+      /**
+       * Copies a a map output from a remote host, via HTTP.
+       * @param connection Reused connection to the host for this output
+       * @param input Input stream to grab the data
+       * @loc Location of the map output
+       * @return the amount copied in bytes or CopyResult.OBSOLETE if obsolete
+       * @throws IOException if there is an error copying the file
+       * @throws InterruptedException if the copier should give up
+       */
+      private long copyOutput(HttpURLConnection connection,
+                              DataInputStream input,
+                              MapOutputLocation loc)
+                              throws IOException, InterruptedException {
         // a temp filename. If this file gets created in ramfs, we're fine,
         // else, we will check the localFS to find a suitable final location
         // for this path
@@ -1393,23 +1625,38 @@ private long copyOutput(MapOutputLocation loc
 
         // Copy the map output to a temp file whose name is unique to this attempt
         Path tmpMapOutput = new Path(filename+"-"+id);
-
-        // Copy the map output
-        MapOutput mapOutput = getMapOutput(loc, tmpMapOutput,
-                                           reduceId.getTaskID().getId());
+        MapOutputStatus mapOutputStatus = getMapOutput(
+            connection, input, loc, tmpMapOutput, reduceId.getTaskID().getId());
+        loc.errorType = mapOutputStatus.errorType;
+        if (loc.errorType == CopyOutputErrorType.NO_ERROR) {
+          shuffleClientMetrics.successFetch();
+        } else if (loc.errorType == CopyOutputErrorType.SERIOUS_ERROR) {
+          shuffleClientMetrics.seriousFailureFetch();
+          shuffleClientMetrics.failedFetch();
+        } else if (loc.errorType == CopyOutputErrorType.OTHER_ERROR ||
+            loc.errorType == CopyOutputErrorType.READ_ERROR) {
+          shuffleClientMetrics.failedFetch();
+        }
+        MapOutput mapOutput = mapOutputStatus.mapOutput;
         if (mapOutput == null) {
-          throw new IOException("Failed to fetch map-output for " +
-                                loc.getTaskAttemptId() + " from " +
-                                loc.getHost());
+          LOG.error("Failed to fetch map-output for " +
+              loc.getTaskAttemptId() + " from " +
+              loc.getHost() + " due to " + mapOutputStatus.errorType);
+          return -1;
         }
 
         // The size of the map-output
         long bytes = mapOutput.compressedSize;
 
+        LOG.debug(getName() + " copyOutput: Got back mapoutput " +
+            mapOutput);
+
         // lock the ReduceTask while we do the rename
         synchronized (ReduceTask.this) {
           if (copiedMapOutputs.contains(loc.getTaskId())) {
             mapOutput.discard();
+            LOG.info(getName() + " copyOutput: obsolete fetch, disgarding" +
+                loc);
             return CopyResult.OBSOLETE;
           }
 
@@ -1418,7 +1665,8 @@ private long copyOutput(MapOutputLocation loc
             try {
               mapOutput.discard();
             } catch (IOException ioe) {
-              LOG.info("Couldn't discard output of " + loc.getTaskId());
+              LOG.info(getName() + " copyOutput: Couldn't discard output of " +
+                  loc.getTaskId());
             }
 
             // Note that we successfully copied the map-output
@@ -1462,72 +1710,98 @@ private long copyOutput(MapOutputLocation loc
        * @param taskId map taskid
        */
       private void noteCopiedMapOutput(TaskID taskId) {
+        LOG.debug(getName() + " noteCopiedMapOutput: total " +
+            copiedMapOutputs.size() + " copied " + taskId);
         copiedMapOutputs.add(taskId);
         ramManager.setNumCopiedMapOutputs(numMaps - getNumMapsCopyCompleted());
       }
 
+      /**
+       * Helper return object to capture the MapOutput and error type
+       */
+      private class MapOutputStatus {
+        /** Saved map output (could be null if there was an error) */
+        final MapOutput mapOutput;
+        /** Error of the MapOutput */
+        final CopyOutputErrorType errorType;
+
+        MapOutputStatus(MapOutput mapOutput, CopyOutputErrorType errorType) {
+          this.mapOutput = mapOutput;
+          this.errorType = errorType;
+        }
+      }
+
       /**
        * Get the map output into a local file (either in the inmemory fs or on the
        * local fs) from the remote server.
        * We use the file system so that we generate checksum files on the data.
+       * @param connection Single connection for multiple map output fetches
+       * @param input Data input to read the output from
        * @param mapOutputLoc map-output to be fetched
        * @param filename the filename to write the data into
-       * @param connectionTimeout number of milliseconds for connection timeout
-       * @param readTimeout number of milliseconds for read timeout
-       * @return the path of the file that got created
+       * @param reduce reduce task number
+       * @return Mapoutput (null if couldn't fetch) and status of the fetch
        * @throws IOException when something goes wrong
        */
-      private MapOutput getMapOutput(MapOutputLocation mapOutputLoc,
-                                     Path filename, int reduce)
+      private MapOutputStatus getMapOutput(HttpURLConnection connection,
+                                           DataInputStream input,
+                                           MapOutputLocation mapOutputLoc,
+                                           Path filename, int reduce)
       throws IOException, InterruptedException {
-        // Connect
-        HttpURLConnection connection =
-          (HttpURLConnection) mapOutputLoc.getOutputLocation().openConnection();
-
-        InputStream input = getInputStream(connection, shuffleConnectionTimeout,
-                                           shuffleReadTimeout);
-
-        // Validate header from map output
+        // Read the shuffle header and validate header
         TaskAttemptID mapId = null;
+        long decompressedLength = -1;
+        long compressedLength = -1;
+        int forReduce = -1;
+        boolean found = false;
         try {
-          mapId =
-            TaskAttemptID.forName(connection.getHeaderField(FROM_MAP_TASK));
-        } catch (IllegalArgumentException ia) {
-          LOG.warn("Invalid map id ", ia);
-          return null;
+          ShuffleHeader header = new ShuffleHeader();
+          header.readFields(input);
+          // Special case where the map output was not found
+          if (header.found == false) {
+            LOG.warn("getMapOutput: Header for " + mapOutputLoc + " indicates" +
+                "the map output can't be found, indicating a serious error.");
+            return new MapOutputStatus(null,
+                CopyOutputErrorType.SERIOUS_ERROR);
+          }
+          mapId = TaskAttemptID.forName(header.mapId);
+          compressedLength = header.compressedLength;
+          decompressedLength = header.uncompressedLength;
+          forReduce = header.forReduce;
+        } catch (IllegalArgumentException e) {
+          LOG.warn(getName() + " Invalid map id (maybe protocol mismatch)", e);
+          return new MapOutputStatus(null, CopyOutputErrorType.SERIOUS_ERROR);
+        }
+        if (mapId == null) {
+          LOG.warn("Missing header " + FROM_MAP_TASK + " in response for " +
+            connection.getURL());
+          return new MapOutputStatus(null, CopyOutputErrorType.SERIOUS_ERROR);
         }
         TaskAttemptID expectedMapId = mapOutputLoc.getTaskAttemptId();
         if (!mapId.equals(expectedMapId)) {
-          LOG.warn("data from wrong map:" + mapId +
+          LOG.warn(getName() + " data from wrong map:" + mapId +
               " arrived to reduce task " + reduce +
               ", where as expected map output should be from " + expectedMapId);
-          return null;
+          return new MapOutputStatus(null, CopyOutputErrorType.SERIOUS_ERROR);
         }
-
-        long decompressedLength =
-          Long.parseLong(connection.getHeaderField(RAW_MAP_OUTPUT_LENGTH));
-        long compressedLength =
-          Long.parseLong(connection.getHeaderField(MAP_OUTPUT_LENGTH));
-
         if (compressedLength < 0 || decompressedLength < 0) {
-          LOG.warn(getName() + " invalid lengths in map output header: id: " +
+          LOG.warn(getName() + " invalid lengths in map output header: id:" +
+              " " +
               mapId + " compressed len: " + compressedLength +
               ", decompressed len: " + decompressedLength);
-          return null;
+          return new MapOutputStatus(null, CopyOutputErrorType.SERIOUS_ERROR);
         }
-        int forReduce =
-          (int)Integer.parseInt(connection.getHeaderField(FOR_REDUCE_TASK));
-
         if (forReduce != reduce) {
-          LOG.warn("data for the wrong reduce: " + forReduce +
+          LOG.warn(getName() + " data for the wrong reduce: " + forReduce +
               " with compressed len: " + compressedLength +
               ", decompressed len: " + decompressedLength +
               " arrived to reduce task " + reduce);
-          return null;
+          return new MapOutputStatus(null, CopyOutputErrorType.SERIOUS_ERROR);
         }
-        LOG.info(connection.getURL() + " header: " + mapId +
-                 ", compressed len: " + compressedLength +
-                 ", decompressed len: " + decompressedLength);
+        LOG.info(getName() + " getMapOutput: " + connection.getURL() +
+            " header: " + mapId +
+            ", compressed len: " + compressedLength +
+            ", decompressed len: " + decompressedLength);
 
         //We will put a file in memory if it meets certain criteria:
         //1. The size of the (decompressed) file should be less than 25% of
@@ -1540,23 +1814,24 @@ private MapOutput getMapOutput(MapOutputLocation mapOutputLoc,
         // Shuffle
         MapOutput mapOutput = null;
         if (shuffleInMemory) {
-          LOG.info("Shuffling " + decompressedLength + " bytes (" +
-              compressedLength + " raw bytes) " +
+          LOG.info(getName() + " Shuffling " + decompressedLength +
+              " bytes (" + compressedLength + " raw bytes) " +
               "into RAM from " + mapOutputLoc.getTaskAttemptId());
 
           mapOutput = shuffleInMemory(mapOutputLoc, connection, input,
                                       (int)decompressedLength,
                                       (int)compressedLength);
         } else {
-          LOG.info("Shuffling " + decompressedLength + " bytes (" +
-              compressedLength + " raw bytes) " +
+          LOG.info(getName() + " Shuffling " + decompressedLength +
+              " bytes (" + compressedLength + " raw bytes) " +
               "into Local-FS from " + mapOutputLoc.getTaskAttemptId());
 
-          mapOutput = shuffleToDisk(mapOutputLoc, input, filename,
-              compressedLength);
+          mapOutput = shuffleToDisk(mapOutputLoc, connection, input,
+                                    filename, compressedLength);
         }
 
-        return mapOutput;
+        return new MapOutputStatus(mapOutput,
+            CopyOutputErrorType.NO_ERROR);
       }
 
       /**
@@ -1628,32 +1903,13 @@ private InputStream getInputStream(URLConnection connection,
       }
 
       private MapOutput shuffleInMemory(MapOutputLocation mapOutputLoc,
-                                        URLConnection connection,
+                                        HttpURLConnection connection,
                                         InputStream input,
                                         int mapOutputLength,
                                         int compressedLength)
       throws IOException, InterruptedException {
         // Reserve ram for the map-output
-        boolean createdNow = ramManager.reserve(mapOutputLength, input);
-
-        // Reconnect if we need to
-        if (!createdNow) {
-          // Reconnect
-          try {
-            connection = mapOutputLoc.getOutputLocation().openConnection();
-            input = getInputStream(connection, shuffleConnectionTimeout,
-                                   shuffleReadTimeout);
-          } catch (IOException ioe) {
-            LOG.info("Failed reopen connection to fetch map-output from " +
-                     mapOutputLoc.getHost(), ioe);
-
-            // Inform the ram-manager
-            ramManager.closeInMemoryFile(mapOutputLength);
-            ramManager.unreserve(mapOutputLength);
-
-            throw ioe;
-          }
-        }
+        ramManager.reserve(mapOutputLength);
 
         IFileInputStream checksumIn =
           new IFileInputStream(input,compressedLength);
@@ -1677,6 +1933,8 @@ private MapOutput shuffleInMemory(MapOutputLocation mapOutputLoc,
           int n = 0;
           try {
             n = input.read(shuffleData, 0, shuffleData.length);
+          } catch (IOException iex) {
+            throw iex;
           } catch (Throwable t) {
             // Catch and rethrow as IOE since decompressor can throw
             // something else that IOException for corrupt map output
@@ -1696,13 +1954,12 @@ private MapOutput shuffleInMemory(MapOutputLocation mapOutputLoc,
             }
           }
 
-          LOG.info("Read " + bytesRead + " bytes from map-output for " +
-                   mapOutputLoc.getTaskAttemptId());
+          LOG.info(getName() + " shuffleInMemory: Read " + bytesRead +
+              " bytes from map-output for " + mapOutputLoc.getTaskAttemptId());
 
-          input.close();
         } catch (IOException ioe) {
-          LOG.info("Failed to shuffle from " + mapOutputLoc.getTaskAttemptId(),
-                   ioe);
+          LOG.info(getName() + " Failed to shuffle from " +
+              mapOutputLoc.getTaskAttemptId(), ioe);
 
           // Inform the ram-manager
           ramManager.closeInMemoryFile(mapOutputLength);
@@ -1712,13 +1969,19 @@ private MapOutput shuffleInMemory(MapOutputLocation mapOutputLoc,
           try {
             mapOutput.discard();
           } catch (IOException ignored) {
-            LOG.info("Failed to discard map-output from " +
-                     mapOutputLoc.getTaskAttemptId(), ignored);
+            LOG.info(getName() + " shuffleInMemory: Failed to discard " +
+                "map-output from " + mapOutputLoc.getTaskAttemptId(), ignored);
           }
           mapOutput = null;
 
-          // Close the streams
-          IOUtils.cleanup(LOG, input);
+          if (ioe instanceof SocketTimeoutException) {
+            // If there was a timeout exception closing can hang forever
+            // disconnect instead
+            connection.disconnect();
+          } else {
+            // Close the streams
+            IOUtils.cleanup(LOG, input);
+          }
 
           // Re-throw
           readError = true;
@@ -1738,33 +2001,36 @@ private MapOutput shuffleInMemory(MapOutputLocation mapOutputLoc,
             mapOutput.discard();
           } catch (IOException ignored) {
             // IGNORED because we are cleaning up
-            LOG.info("Failed to discard map-output from " +
+            LOG.info(getName() + " Failed to discard map-output from " +
                      mapOutputLoc.getTaskAttemptId(), ignored);
           }
           mapOutput = null;
 
-          throw new IOException("Incomplete map output received for " +
-                                mapOutputLoc.getTaskAttemptId() + " from " +
-                                mapOutputLoc.getOutputLocation() + " (" +
-                                bytesRead + " instead of " +
-                                mapOutputLength + ")"
-          );
+          throw new IOException(getName() +
+              " Incomplete map output received for " +
+              mapOutputLoc.getTaskAttemptId() + " from " +
+              mapOutputLoc + " (" +
+              bytesRead + " instead of " +
+              mapOutputLength + ") with readError " +
+              readError);
         }
 
         // TODO: Remove this after a 'fix' for HADOOP-3647
         if (mapOutputLength > 0) {
           DataInputBuffer dib = new DataInputBuffer();
           dib.reset(shuffleData, 0, shuffleData.length);
-          LOG.info("Rec #1 from " + mapOutputLoc.getTaskAttemptId() + " -> (" +
-                   WritableUtils.readVInt(dib) + ", " +
-                   WritableUtils.readVInt(dib) + ") from " +
-                   mapOutputLoc.getHost());
+          LOG.info(getName() + " Rec #1 from " +
+              mapOutputLoc.getTaskAttemptId() + " -> (" +
+              WritableUtils.readVInt(dib) + ", " +
+              WritableUtils.readVInt(dib) + ") from " +
+              mapOutputLoc.getHost());
         }
 
         return mapOutput;
       }
 
       private MapOutput shuffleToDisk(MapOutputLocation mapOutputLoc,
+                                      HttpURLConnection connection,
                                       InputStream input,
                                       Path filename,
                                       long mapOutputLength)
@@ -1779,7 +2045,6 @@ private MapOutput shuffleToDisk(MapOutputLocation mapOutputLoc,
                         conf, localFileSys.makeQualified(localFilename),
                         mapOutputLength);
 
-
         // Copy data to local-disk
         OutputStream output = null;
         long bytesRead = 0;
@@ -1787,48 +2052,43 @@ private MapOutput shuffleToDisk(MapOutputLocation mapOutputLoc,
           output = rfs.create(localFilename);
 
           byte[] buf = new byte[64 * 1024];
-          int n = -1;
-          try {
-            n = input.read(buf, 0, buf.length);
-          } catch (IOException ioe) {
-            readError = true;
-            throw ioe;
-          }
-          while (n > 0) {
-            bytesRead += n;
-            shuffleClientMetrics.inputBytes(n);
-            output.write(buf, 0, n);
-
-            // indicate we're making progress
+          long remainingBytes = mapOutputLength;
+          int lastRead = 1;
+          while (remainingBytes != 0 && lastRead > 0) {
+            lastRead = input.read(buf, 0,
+                (int) Math.min(remainingBytes, buf.length));
+            shuffleClientMetrics.inputBytes(lastRead);
+            output.write(buf, 0, lastRead);
             reporter.progress();
-            try {
-              n = input.read(buf, 0, buf.length);
-            } catch (IOException ioe) {
-              readError = true;
-              throw ioe;
-            }
+            bytesRead += lastRead;
+            remainingBytes -= lastRead;
           }
 
-          LOG.info("Read " + bytesRead + " bytes from map-output for " +
-              mapOutputLoc.getTaskAttemptId());
-
+          LOG.info(getName() + " shuffleToDisk: Read " + bytesRead +
+              " bytes (expected " + mapOutputLength +
+              ") from map-output for " + mapOutputLoc.getTaskAttemptId());
           output.close();
-          input.close();
         } catch (IOException ioe) {
-          LOG.info("Failed to shuffle from " + mapOutputLoc.getTaskAttemptId(),
-                   ioe);
+          LOG.info(getName() + " Failed to shuffle from " +
+              mapOutputLoc.getTaskAttemptId(), ioe);
 
           // Discard the map-output
           try {
             mapOutput.discard();
           } catch (IOException ignored) {
-            LOG.info("Failed to discard map-output from " +
+            LOG.info(getName() + "Failed to discard map-output from " +
                 mapOutputLoc.getTaskAttemptId(), ignored);
           }
           mapOutput = null;
 
-          // Close the streams
-          IOUtils.cleanup(LOG, input, output);
+          if (ioe instanceof SocketTimeoutException) {
+            // If there was a timeout exception closing can hang forever
+            // disconnect instead
+            connection.disconnect();
+          } else {
+            // Close the streams
+            IOUtils.cleanup(LOG, input, output);
+          }
 
           // Re-throw
           throw ioe;
@@ -1840,7 +2100,7 @@ private MapOutput shuffleToDisk(MapOutputLocation mapOutputLoc,
             mapOutput.discard();
           } catch (Exception ioe) {
             // IGNORED because we are cleaning up
-            LOG.info("Failed to discard map-output from " +
+            LOG.info(getName() + "Failed to discard map-output from " +
                 mapOutputLoc.getTaskAttemptId(), ioe);
           } catch (Throwable t) {
             String msg = getTaskID() + " : Failed in shuffle to disk :"
@@ -1849,16 +2109,15 @@ private MapOutput shuffleToDisk(MapOutputLocation mapOutputLoc,
           }
           mapOutput = null;
 
-          throw new IOException("Incomplete map output received for " +
-                                mapOutputLoc.getTaskAttemptId() + " from " +
-                                mapOutputLoc.getOutputLocation() + " (" +
-                                bytesRead + " instead of " +
-                                mapOutputLength + ")"
+          throw new IOException(getName() + " Incomplete map output received " +
+              "for " + mapOutputLoc.getTaskAttemptId() + " from " +
+              mapOutputLoc + " (" +
+              bytesRead + " instead of " +
+              mapOutputLength + ")"
           );
         }
 
         return mapOutput;
-
       }
 
     } // MapOutputCopier
@@ -1909,7 +2168,7 @@ public ReduceCopier(TaskUmbilicalProtocol umbilical, JobConf conf,
       this.umbilical = umbilical;
       this.reduceTask = ReduceTask.this;
 
-      this.scheduledCopies = new ArrayList<MapOutputLocation>(100);
+      this.scheduledCopies = new ArrayList<HostMapOutputLocations>(100);
       this.copyResults = new ArrayList<CopyResult>(100);
       this.numCopiers = conf.getInt("mapred.reduce.parallel.copies", 5);
       this.maxInFlight = 4 * numCopiers;
@@ -1943,6 +2202,7 @@ public ReduceCopier(TaskUmbilicalProtocol umbilical, JobConf conf,
       }
       this.maxInMemReduce = (int)Math.min(
           Runtime.getRuntime().maxMemory() * maxRedPer, Integer.MAX_VALUE);
+      this.maxMapOutputsPerFetch = conf.getInt(MAX_MAPOUTPUT_PER_HOST, 10);
 
       // Setup the RamManager
       ramManager = new ShuffleRamManager(conf);
@@ -1954,9 +2214,6 @@ public ReduceCopier(TaskUmbilicalProtocol umbilical, JobConf conf,
       // hosts -> next contact time
       this.penaltyBox = new LinkedHashMap<String, Long>();
 
-      // hostnames
-      this.uniqueHosts = new HashSet<String>();
-
       // Seed the random number generator with a reasonably globally unique seed
       long randomSeed = System.nanoTime() +
                         (long)Math.pow(this.reduceTask.getPartition(),
@@ -1975,6 +2232,7 @@ private boolean busyEnough(int numInFlight) {
 
     public boolean fetchOutputs() throws IOException {
       int totalFailures = 0;
+      int totalCopyResultsReceived = 0;
       int numInFlight = 0, numCopied = 0;
       DecimalFormat  mbpsFormat = new DecimalFormat("0.00");
       final Progress copyPhase =
@@ -2023,9 +2281,11 @@ public boolean fetchOutputs() throws IOException {
             logNow = true;
           }
           if (logNow) {
-            LOG.info(reduceTask.getTaskID() + " Need another "
-                   + (numMaps - getNumMapsCopyCompleted()) + " map output(s) "
-                   + "where " + numInFlight + " is already in progress");
+            LOG.info(
+                reduceTask.getTaskID() + " Need another " +
+                (numMaps - getNumMapsCopyCompleted()) + " map output(s) " +
+                ", total " + numMaps + " where " + numInFlight + " is " +
+                "already in progress");
           }
 
           // Put the hash entries for the failed fetches.
@@ -2033,6 +2293,7 @@ public boolean fetchOutputs() throws IOException {
 
           while (locItr.hasNext()) {
             MapOutputLocation loc = locItr.next();
+            loc.reset();
             List<MapOutputLocation> locList =
               mapLocations.get(loc.getHost());
 
@@ -2059,23 +2320,26 @@ public boolean fetchOutputs() throws IOException {
 
           // now walk through the cache and schedule what we can
           int numScheduled = 0;
+          int numHostDups = 0;
           int numDups = 0;
 
           synchronized (scheduledCopies) {
+            // Map of http host to list of output locations (http is unique,
+            // even if there are multiple task trackers on the same machine
+            Map<String, List<MapOutputLocation>> chosenLocationMap =
+                new HashMap<String, List<MapOutputLocation>>();
 
             // Randomize the map output locations to prevent
             // all reduce-tasks swamping the same tasktracker
             List<String> hostList = new ArrayList<String>();
             hostList.addAll(mapLocations.keySet());
 
-            Collections.shuffle(hostList, this.random);
-
             Iterator<String> hostsItr = hostList.iterator();
 
             while (hostsItr.hasNext()) {
-
               String host = hostsItr.next();
-
+              LOG.debug("fetchOutputs: Looking at host " + host + ", " +
+                  "total  " + mapLocations.keySet().size());
               List<MapOutputLocation> knownOutputsByLoc =
                 mapLocations.get(host);
 
@@ -2091,8 +2355,11 @@ public boolean fetchOutputs() throws IOException {
 
               //Identify duplicate hosts here
               if (uniqueHosts.contains(host)) {
-                 numDups += knownOutputsByLoc.size();
-                 continue;
+                LOG.debug("fetchOutputs: Duplicate " + host +
+                    ", numDups= " + numDups);
+                numDups += knownOutputsByLoc.size();
+                ++numHostDups;
+                continue;
               }
 
               Long penaltyEnd = penaltyBox.get(host);
@@ -2110,11 +2377,9 @@ public boolean fetchOutputs() throws IOException {
                 continue;
 
               synchronized (knownOutputsByLoc) {
-
                 locItr = knownOutputsByLoc.iterator();
 
                 while (locItr.hasNext()) {
-
                   MapOutputLocation loc = locItr.next();
 
                   // Do not schedule fetches from OBSOLETE maps
@@ -2124,7 +2389,16 @@ public boolean fetchOutputs() throws IOException {
                   }
 
                   uniqueHosts.add(host);
-                  scheduledCopies.add(loc);
+
+                  List<MapOutputLocation> locationList =
+                      chosenLocationMap.get(loc.getHttpTaskTracker());
+                  if (locationList == null) {
+                    locationList = new ArrayList<MapOutputLocation>();
+                    chosenLocationMap.put(loc.getHttpTaskTracker(),
+                                          locationList);
+                  }
+                  locationList.add(loc);
+                  LOG.info("fetchOutputs: Scheduling location " + loc);
                   locItr.remove();  // remove from knownOutputs
                   numInFlight++; numScheduled++;
 
@@ -2137,6 +2411,36 @@ public boolean fetchOutputs() throws IOException {
                   //
                 }
               }
+
+              // Add the HostMapOutputLocations to scheduled copies in chunks
+              // of maxMapOutputsPerFetch
+              List<HostMapOutputLocations> tmpScheduledCopies =
+                  new ArrayList<HostMapOutputLocations>();
+              for (Map.Entry<String, List<MapOutputLocation>> entry :
+                  chosenLocationMap.entrySet()) {
+                final List<MapOutputLocation> outputList = entry.getValue();
+                int remaining = outputList.size();
+                int index = 0;
+                while (remaining >= maxMapOutputsPerFetch) {
+                  tmpScheduledCopies.add(
+                      new HostMapOutputLocations(entry.getKey(),
+                          new ArrayList<MapOutputLocation>(
+                              outputList.subList(
+                                  index, index + maxMapOutputsPerFetch))));
+                  index += maxMapOutputsPerFetch;
+                  remaining -= maxMapOutputsPerFetch;
+                }
+                if (remaining > 0) {
+                  tmpScheduledCopies.add(
+                      new HostMapOutputLocations(entry.getKey(),
+                          new ArrayList<MapOutputLocation>(
+                              outputList.subList(index, index + remaining))));
+                }
+              }
+              chosenLocationMap.clear();
+
+              Collections.shuffle(tmpScheduledCopies, this.random);
+              scheduledCopies.addAll(tmpScheduledCopies);
             }
             scheduledCopies.notifyAll();
           }
@@ -2144,7 +2448,8 @@ public boolean fetchOutputs() throws IOException {
           if (numScheduled > 0 || logNow) {
             LOG.info(reduceTask.getTaskID() + " Scheduled " + numScheduled +
                    " outputs (" + penaltyBox.size() +
-                   " slow hosts and " + numDups + " dup hosts)");
+                   " slow hosts and " + numDups + " dup because hosts " +
+                   "dup hosts " + numHostDups + ")");
           }
 
           if (penaltyBox.size() > 0 && logNow) {
@@ -2186,6 +2491,8 @@ public boolean fetchOutputs() throws IOException {
               break;
             }
 
+            LOG.info("Got new copy result - " + (++totalCopyResultsReceived)
+                + " " + cr);
             if (cr.getSuccess()) {  // a successful copy
               numCopied++;
               lastProgressTime = System.currentTimeMillis();
@@ -2211,6 +2518,10 @@ public boolean fetchOutputs() throws IOException {
                        cr.getLocation().getTaskAttemptId() + " from host: " +
                        cr.getHost());
             } else {
+              LOG.info(reduceTask.getTaskID() +
+                  " Adding back to retryFetches the failed copy result " +
+                  cr.getLocation().getTaskAttemptId() + " from host: " +
+                  cr.getHost());
               retryFetches.add(cr.getLocation());
 
               // note the failed-fetch
@@ -2235,7 +2546,8 @@ public boolean fetchOutputs() throws IOException {
               }
 
               checkAndInformJobTracker(noFailedFetches, mapTaskId,
-                  cr.getError().equals(CopyOutputErrorType.READ_ERROR));
+                  cr.getError().equals(CopyOutputErrorType.READ_ERROR) ||
+                      cr.getError().equals(CopyOutputErrorType.SERIOUS_ERROR));
 
               // note unique failed-fetch maps
               if (noFailedFetches == maxFetchFailuresBeforeReporting) {
@@ -2277,12 +2589,15 @@ public boolean fetchOutputs() throws IOException {
                      fetchFailedMaps.size() == (numMaps - getNumMapsCopyCompleted()))
                     && !reducerHealthy
                     && (!reducerProgressedEnough || reducerStalled)) {
-                  LOG.fatal("Shuffle failed with too many fetch failures " +
-                            "and insufficient progress!" +
-                            "Killing task " + getTaskID() + ".");
-                  umbilical.shuffleError(getTaskID(),
-                                         "Exceeded MAX_FAILED_UNIQUE_FETCHES " + maxFailedUniqueFetches + ";" +
-                                         " bailing-out.");
+                  LOG.fatal("Shuffle failed with too many fetch failures (" +
+                      fetchFailedMaps.size() + ") " + fetchFailedMaps +
+                      "and/or insufficient progress!" +
+                      "  Killing task " + getTaskID() + ".");
+                  umbilical.shuffleError(
+                      getTaskID(),
+                      "Exceeded MAX_FAILED_UNIQUE_FETCHES " +
+                          maxFailedUniqueFetches + ";" +
+                          " bailing-out.");
                 }
 
               }
@@ -2297,6 +2612,8 @@ public boolean fetchOutputs() throws IOException {
                        cr.getHost() + " to penalty box, next contact in " +
                        (currentBackOff/1000) + " seconds");
             }
+            LOG.info(reduceTask.getTaskID() + " removing from uniqueHosts: " +
+                cr.getHost());
             uniqueHosts.remove(cr.getHost());
             numInFlight--;
           }
@@ -2794,8 +3111,11 @@ private class GetMapEventsThread extends Thread {
 
       private IntWritable fromEventId = new IntWritable(0);
       private static final long SLEEP_TIME = 1000;
+      private static final String EVENT_SLEEP_MS = "mapred.event.sleep.ms";
+      private final long actualSleepTime;
 
       public GetMapEventsThread() {
+        actualSleepTime = conf.getLong(EVENT_SLEEP_MS, SLEEP_TIME);
         setName("Thread for polling Map Completion Events");
         setDaemon(true);
       }
@@ -2811,16 +3131,16 @@ public void run() {
             if (numNewMaps == 0) {
                if (getNumMapsCopyCompleted() == numMaps) {
                   break;
-              }   
+              }
             }
             else if (numNewMaps > 0) {
                 LOG.info(reduceTask.getTaskID() + ": " +
-                  "Got " + numNewMaps + " new map-outputs");
+                  "Got " + numNewMaps + " new map-output(s)");
                 synchronized (mapLocations) {
                   mapLocations.notify();
                 }
             }
-            Thread.sleep(SLEEP_TIME);
+            Thread.sleep(actualSleepTime);
           }
           catch (InterruptedException e) {
             // ignore. if we are shutting down - the while condition
@@ -2854,7 +3174,7 @@ private int getMapCompletionEvents() throws IOException {
                                            MAX_EVENTS_TO_FETCH,
                                            reduceTask.getTaskID());
         TaskCompletionEvent events[] = update.getMapTaskCompletionEvents();
-        
+
         // Check if the reset is required.
         // Since there is no ordering of the task completion events at the
         // reducer, the only option to sync with the new jobtracker is to reset
@@ -2881,29 +3201,26 @@ private int getMapCompletionEvents() throws IOException {
               URI u = URI.create(event.getTaskTrackerHttp());
               String host = u.getHost();
               TaskAttemptID taskId = event.getTaskAttemptId();
-              URL mapOutputLocation = new URL(event.getTaskTrackerHttp() +
-                                      "/mapOutput?job=" + taskId.getJobID() +
-                                      "&map=" + taskId +
-                                      "&reduce=" + getPartition());
               List<MapOutputLocation> loc = mapLocations.get(host);
               if (loc == null) {
                 loc = Collections.synchronizedList
                   (new LinkedList<MapOutputLocation>());
                 mapLocations.put(host, loc);
-               }
-              loc.add(new MapOutputLocation(taskId, host, mapOutputLocation));
+              }
+              loc.add(new MapOutputLocation(
+                  taskId, host, event.getTaskTrackerHttp()));
               numNewMaps ++;
             }
             break;
             case SUCCEEDED_NO_OUTPUT:
             {
                // Remove the task from list of tasks to be copied
-               TaskID taskId = event.getTaskAttemptId().getTaskID(); 
+               TaskID taskId = event.getTaskAttemptId().getTaskID();
                copiedMapOutputs.remove(taskId);
                emptyMaps.incrementAndGet();
                LOG.info("Map does not have any output, ignoring taskId: " + taskId);
                break;
-            }    
+            }
             case FAILED:
             case KILLED:
             case OBSOLETE:
diff --git a/src/mapred/org/apache/hadoop/mapred/ShuffleHandler.java b/src/mapred/org/apache/hadoop/mapred/ShuffleHandler.java
index 586911f2..10e7329a 100644
--- a/src/mapred/org/apache/hadoop/mapred/ShuffleHandler.java
+++ b/src/mapred/org/apache/hadoop/mapred/ShuffleHandler.java
@@ -9,33 +9,25 @@
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.METHOD_NOT_ALLOWED;
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.OK;
-import static org.jboss.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
 import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import javax.crypto.SecretKey;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.LocalDirAllocator;
-import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.mapred.TaskTracker.ShuffleServerMetrics;
 
+import org.apache.hadoop.util.DiskChecker;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
@@ -61,7 +53,7 @@ public class ShuffleHandler extends SimpleChannelUpstreamHandler {
   /** Class logger */
   public static final Log LOG = LogFactory.getLog(ShuffleHandler.class);
   private final NettyMapOutputAttributes attributes;
-  private int port;
+  private final int port;
   /** Metrics of all shuffles */
   private final ShuffleServerMetrics shuffleMetrics;
 
@@ -96,9 +88,9 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent evt)
     final List<String> mapIds = splitMaps(q.get("map"));
     final List<String> reduceQ = q.get("reduce");
     final List<String> jobQ = q.get("job");
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("RECV: " + request.getUri() +
-          "\n  mapId: " + mapIds +
+    if (LOG.isInfoEnabled()) {
+      LOG.info("RECV: " + request.getUri() +
+          "\n  mapIds: " + mapIds +
           "\n  reduceId: " + reduceQ +
           "\n  jobId: " + jobQ);
     }
@@ -130,13 +122,11 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent evt)
       return;
     }
 
-    if (mapIds.size() > 1) {
-      throw new IllegalArgumentException(
-        "Doesn't support more than one map id.  Current requst is asking for "
-        + mapIds.size());
-    }
+    // Generate simple response without security
+    HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
 
     Channel ch = evt.getChannel();
+    ch.write(response);
     // TODO refactor the following into the pipeline
     ChannelFuture lastMap = null;
     for (String mapId : mapIds) {
@@ -145,6 +135,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent evt)
             sendMapOutput(ctx, ch, jobId, mapId, reduceId);
         if (null == lastMap) {
           sendError(ctx, NOT_FOUND);
+          shuffleMetrics.failedOutput();
           return;
         }
       } catch (IOException e) {
@@ -160,58 +151,73 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent evt)
   protected ChannelFuture sendMapOutput(ChannelHandlerContext ctx, Channel ch,
       String jobId, String mapId, int reduce) throws IOException {
     LocalDirAllocator lDirAlloc = attributes.getLocalDirAllocator();
-    FileSystem rfs = ((LocalFileSystem) attributes.getLocalFS()).getRaw();
-
     ShuffleServerMetrics shuffleMetrics = attributes.getShuffleServerMetrics();
     TaskTracker tracker = attributes.getTaskTracker();
+    boolean found = true;
 
+    Path indexFileName = null;
+    Path mapOutputFileName = null;
+    try {
     // Index file
-    Path indexFileName = lDirAlloc.getLocalPathToRead(
+    indexFileName = lDirAlloc.getLocalPathToRead(
         TaskTracker.getIntermediateOutputDir(jobId, mapId)
         + "/file.out.index", attributes.getJobConf());
     // Map-output file
-    Path mapOutputFileName = lDirAlloc.getLocalPathToRead(
+    mapOutputFileName = lDirAlloc.getLocalPathToRead(
         TaskTracker.getIntermediateOutputDir(jobId, mapId)
         + "/file.out", attributes.getJobConf());
+    } catch (DiskChecker.DiskErrorException e) {
+      LOG.error("sendMapOutput: Failed to retrieve index or map output " +
+          "file, will send ShuffleHeader noting the file can't be found.",
+          e);
+      found = false;
+    }
 
     /**
      * Read the index file to get the information about where
      * the map-output for the given reducer is available.
      */
-    IndexRecord info = tracker.getIndexInformation(mapId, reduce,indexFileName);
-
-    HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-
-    //set the custom "from-map-task" http header to the map task from which
-    //the map output data is being transferred
-    response.setHeader(MRConstants.FROM_MAP_TASK, mapId);
-
-    //set the custom "Raw-Map-Output-Length" http header to
-    //the raw (decompressed) length
-    response.setHeader(MRConstants.RAW_MAP_OUTPUT_LENGTH,
-        Long.toString(info.rawLength));
-
-    //set the custom "Map-Output-Length" http header to
-    //the actual number of bytes being transferred
-    response.setHeader(MRConstants.MAP_OUTPUT_LENGTH,
-        Long.toString(info.partLength));
+    IndexRecord info = null;
+    try {
+      info = tracker.getIndexInformation(mapId, reduce, indexFileName);
+    } catch (IOException e) {
+      LOG.error("sendMapOutput: Failed to get the index information, " +
+          "will send ShuffleHeader noting that the file can't be found.", e);
+      found = false;
+      info = new IndexRecord(-1, 0, 0);
+    }
 
-    //set the custom "for-reduce-task" http header to the reduce task number
-    //for which this map output is being transferred
-    response.setHeader(MRConstants.FOR_REDUCE_TASK, Integer.toString(reduce));
+    RandomAccessFile spill = null;
+    if (mapOutputFileName != null) {
+      File spillfile = new File(mapOutputFileName.toString());
+      try {
+        spill = new RandomAccessFile(spillfile, "r");
+      } catch (FileNotFoundException e) {
+        LOG.error("sendMapOutput: " + spillfile + " not found, " +
+            "will send ShuffleHeader noting that the file can't be found.", e);
+        found = false;
+      }
+    }
 
-    ch.write(response);
-    File spillfile = new File(mapOutputFileName.toString());
-    RandomAccessFile spill;
-    try {
-      spill = new RandomAccessFile(spillfile, "r");
-    } catch (FileNotFoundException e) {
-      LOG.info(spillfile + " not found");
-      return null;
+    final ShuffleHeader header =
+        new ShuffleHeader(mapId, info.partLength, info.rawLength, reduce,
+            found);
+    final DataOutputBuffer dob = new DataOutputBuffer();
+    header.write(dob);
+    ChannelFuture writeFuture =
+        ch.write(wrappedBuffer(dob.getData(), 0, dob.getLength()));
+    // Exit early if we didn't find the spill file.
+    if (found == false || spill == null) {
+      attributes.getTaskTracker().mapOutputLost(
+          TaskAttemptID.forName(mapId),
+          "sendMapOutput: Couldn't get mapId = " + mapId + ", reduce " +
+              reduce);
+      return writeFuture;
     }
+
     final FileRegion partition = new DefaultFileRegion(
       spill.getChannel(), info.startOffset, info.partLength);
-    ChannelFuture writeFuture = ch.write(partition);
+    writeFuture = ch.write(partition);
     writeFuture.addListener(new ChanneFutureListenerMetrics(partition));
     shuffleMetrics.outputBytes(info.partLength); // optimistic
     LOG.info("Sending out " + info.partLength + " bytes for reduce: " +
@@ -241,8 +247,10 @@ private ChanneFutureListenerMetrics(FileRegion partition) {
 
     @Override
     public void operationComplete(ChannelFuture future) throws Exception {
+      if (future.isSuccess()) {
+        shuffleMetrics.successOutput();
+      }
       partition.releaseExternalResources();
-      shuffleMetrics.successOutput();
     }
   }
 
diff --git a/src/mapred/org/apache/hadoop/mapred/ShuffleHeader.java b/src/mapred/org/apache/hadoop/mapred/ShuffleHeader.java
new file mode 100644
index 00000000..03186b60
--- /dev/null
+++ b/src/mapred/org/apache/hadoop/mapred/ShuffleHeader.java
@@ -0,0 +1,76 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.mapred;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableUtils;
+
+/**
+ * Shuffle Header information that is sent by the TaskTracker and 
+ * deciphered by the Fetcher thread of Reduce task
+ *
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Stable
+public class ShuffleHeader implements Writable {
+
+  /**
+   * The longest possible length of task attempt id that we will accept.
+   */
+  private static final int MAX_ID_LENGTH = 1000;
+
+  String mapId;
+  long uncompressedLength;
+  long compressedLength;
+  int forReduce;
+  boolean found;
+  
+  public ShuffleHeader() { }
+  
+  public ShuffleHeader(String mapId, long compressedLength,
+      long uncompressedLength, int forReduce, boolean found) {
+    this.mapId = mapId;
+    this.compressedLength = compressedLength;
+    this.uncompressedLength = uncompressedLength;
+    this.forReduce = forReduce;
+    this.found = found;
+  }
+  
+  public void readFields(DataInput in) throws IOException {
+    mapId = WritableUtils.readStringSafely(in, MAX_ID_LENGTH);
+    compressedLength = WritableUtils.readVLong(in);
+    uncompressedLength = WritableUtils.readVLong(in);
+    forReduce = WritableUtils.readVInt(in);
+    found = in.readBoolean();
+  }
+
+  public void write(DataOutput out) throws IOException {
+    Text.writeString(out, mapId);
+    WritableUtils.writeVLong(out, compressedLength);
+    WritableUtils.writeVLong(out, uncompressedLength);
+    WritableUtils.writeVInt(out, forReduce);
+    out.writeBoolean(found);
+  }
+}
diff --git a/src/mapred/org/apache/hadoop/mapred/Task.java b/src/mapred/org/apache/hadoop/mapred/Task.java
index 3c8ee3b9..45e8f219 100644
--- a/src/mapred/org/apache/hadoop/mapred/Task.java
+++ b/src/mapred/org/apache/hadoop/mapred/Task.java
@@ -21,6 +21,10 @@
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.MemoryUsage;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.text.NumberFormat;
@@ -30,6 +34,7 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -57,6 +62,7 @@
 import org.apache.hadoop.util.ResourceCalculatorPlugin;
 import org.apache.hadoop.util.ResourceCalculatorPlugin.*;
 
+
 /** 
  * Base class for tasks.
  * 
@@ -67,7 +73,7 @@ abstract public class Task implements Writable, Configurable {
     LogFactory.getLog(Task.class);
 
   // Counters used by Task subclasses
-  public static enum Counter { 
+  public static enum Counter {
     MAP_INPUT_RECORDS, 
     MAP_OUTPUT_RECORDS,
     MAP_SKIPPED_RECORDS,
@@ -88,6 +94,7 @@ public static enum Counter {
     REDUCE_SHUFFLE_BYTES,
     REDUCE_INPUT_BYTES,
     REDUCE_COPY_WALLCLOCK,
+    REDUCE_COPY_WAIT_WALLCLOCK,
     REDUCE_COPY_CPU,
     REDUCE_SORT_WALLCLOCK,
     REDUCE_SORT_CPU,
@@ -100,9 +107,22 @@ public static enum Counter {
     SPILLED_RECORDS,
     CPU_MILLISECONDS,
     PHYSICAL_MEMORY_BYTES,
-    VIRTUAL_MEMORY_BYTES
+    VIRTUAL_MEMORY_BYTES,
+    REDUCERS_PROCESSING_NO_DATA,
+    REDUCERS_PROCESSING_DATA
+  }
+  
+  //Counters for Map Tasks
+  public static enum MapCounter {
+    MAP_CPU_MILLISECONDS
   }
   
+  //Counters for Reduce Tasks
+  public static enum ReduceCounter {
+    REDUCE_CPU_MILLISECONDS
+  }
+  
+ 
   /**
    * Counters to measure the usage of the different file systems.
    * Always return the String array with two elements. First one is the name of  
@@ -119,10 +139,12 @@ protected static String[] getFileSystemCounterNames(String uriScheme) {
               scheme + "_WRITE_EXCEPTIONS"};
   }
   
+ 
   /**
    * Name of the FileSystem counters' group
    */
   protected static final String FILESYSTEM_COUNTER_GROUP = "FileSystemCounters";
+  protected static final String GC_COUNTER_GROUP = "GC Counters";
 
   ///////////////////////////////////////////////////////////
   // Helper methods to construct task-output paths
@@ -472,6 +494,8 @@ public abstract TaskRunner createRunner(TaskTracker tracker,
 
   /* flag to track whether task is done */
   private AtomicBoolean taskDone = new AtomicBoolean(false);
+
+  private AtomicLong lastProgressUpdate = new AtomicLong(0);
   
   public abstract boolean isMapTask();
 
@@ -516,6 +540,40 @@ public void initialize(JobConf job, JobID id,
         resourceCalculator.getProcResourceValues().getCumulativeCpuTime();
     }
   }
+
+  protected class TaskReporterMonitor
+      implements Runnable {
+    @Override
+    public void run() {
+      long taskTimeout = conf.getLong("mapred.task.timeout",
+          10 * 60 * 1000);
+      if (taskTimeout == 0) {
+        // There's no timeout so we don't need to monitor
+        return;
+      }
+      lastProgressUpdate.set(System.currentTimeMillis());
+      while (!taskDone.get()) {
+        try {
+          Thread.sleep(PROGRESS_INTERVAL);
+        } catch (InterruptedException iex) {
+          if (taskDone.get()) {
+            LOG.debug(getTaskID() + " Progress/ping thread exiting " +
+                "since it got interrupted");
+            break;
+          } else {
+            LOG.warn ("Unexpected InterruptedException");
+          }
+        }
+        long now = System.currentTimeMillis();
+        long delay = now - lastProgressUpdate.get();
+        if (delay > taskTimeout / 2) {
+          ReflectionUtils.logThreadInfo(LOG, "Task haven't updated progress in " +
+              (delay / 1000) + " seconds",
+              taskTimeout / (10 * 1000));
+        }
+      }
+    }
+  }
   
   protected class TaskReporter 
       extends org.apache.hadoop.mapreduce.StatusReporter
@@ -524,6 +582,7 @@ protected class TaskReporter
     private InputSplit split = null;
     private Progress taskProgress;
     private Thread pingThread = null;
+    private Thread monitorThread = null;
     /**
      * flag that indicates whether progress update needs to be sent to parent.
      * If true, it has been set. If false, it has been reset. 
@@ -599,7 +658,7 @@ public InputSplit getInputSplit() throws UnsupportedOperationException {
       } else {
         return split;
       }
-    }    
+    }
     /** 
      * The communication thread handles communication with the parent (Task Tracker). 
      * It sends progress updates if progress has been made or if the task needs to 
@@ -628,15 +687,24 @@ public void run() {
           }
 
           if (sendProgress) {
+            LOG.info("Sending progress update to the TaskTracker");
+            lastProgressUpdate.set(System.currentTimeMillis());
             // we need to send progress update
             updateCounters();
+            LOG.info("Updated counters for the progress update");
             taskStatus.statusUpdate(taskProgress.get(),
                                     taskProgress.toString(), 
                                     counters);
+            long rpcStart = System.currentTimeMillis();
             taskFound = umbilical.statusUpdate(taskId, taskStatus);
+            long rpcDone = System.currentTimeMillis();
+            if (rpcDone - rpcStart > 500) {
+              LOG.info("Sent the update to the TaskTracker spending " + (rpcDone - rpcStart) + " ms");
+            }
             taskStatus.clearStatus();
           }
           else {
+            LOG.info("Sending a ping to the TaskTracker");
             // send ping 
             taskFound = umbilical.ping(taskId);
           }
@@ -668,12 +736,21 @@ public void startCommunicationThread() {
         pingThread.setDaemon(true);
         pingThread.start();
       }
+      if (monitorThread == null) {
+        monitorThread = new Thread(new TaskReporterMonitor());
+        monitorThread.setDaemon(true);
+        monitorThread.start();
+      }
     }
     public void stopCommunicationThread() throws InterruptedException {
       if (pingThread != null) {
         pingThread.interrupt();
         pingThread.join();
       }
+      if (monitorThread != null) {
+        monitorThread.interrupt();
+        monitorThread.join();
+      }
     }
   }
   
@@ -695,7 +772,69 @@ protected void reportNextRecordRange(final TaskUmbilicalProtocol umbilical,
     LOG.debug("sending reportNextRecordRange " + range);
     umbilical.reportNextRecordRange(taskId, range);
   }
-
+  
+  /**
+   * Update counters about Garbage Collection
+   */
+  void updateGCcounters(){
+    long gccount = 0;
+    long gctime = 0;
+        
+    for(GarbageCollectorMXBean gc :
+      ManagementFactory.getGarbageCollectorMXBeans()) {
+    
+      long count = gc.getCollectionCount();
+      if(count >= 0) {
+        gccount += count;
+      }
+      
+      long time = gc.getCollectionTime();
+      if(time >= 0) {
+        gctime += time;
+      }
+    }
+    
+    Iterator beans = ManagementFactory.getMemoryPoolMXBeans().iterator();
+    long aftergc = 0;
+    long maxaftergc = 0;
+    
+    while (beans.hasNext()){
+      MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next();
+      String beanname = bean.getName();
+      
+      if(!beanname.toUpperCase().contains("OLD GEN")) continue;
+      
+      MemoryUsage mu = bean.getCollectionUsage();
+      
+      if(mu == null) continue;
+      
+      aftergc = mu.getUsed();
+      
+      if(aftergc > maxaftergc) {
+        maxaftergc = aftergc;
+      }
+      
+    }
+    
+    counters.findCounter(GC_COUNTER_GROUP,"Total number of GC")
+      .setValue(gccount);
+    counters.findCounter(GC_COUNTER_GROUP,"Total time of GC in milliseconds")
+      .setValue(gctime);
+    counters.findCounter(GC_COUNTER_GROUP,"Heap size after last GC in bytes")
+      .setValue(maxaftergc);
+    
+    long currentMax =
+      counters.findCounter(GC_COUNTER_GROUP,"Max heap size after GC in bytes")
+        .getValue();
+    
+    if(maxaftergc>currentMax){
+      counters.findCounter(GC_COUNTER_GROUP,"Max heap size after GC in bytes")
+        .setValue(maxaftergc);
+    }
+    
+  }
+  
+      
   /**
    * Update resource information counters
    */
@@ -712,6 +851,12 @@ void updateResourceCounters() {
     counters.findCounter(Counter.CPU_MILLISECONDS).setValue(cpuTime);
     counters.findCounter(Counter.PHYSICAL_MEMORY_BYTES).setValue(pMem);
     counters.findCounter(Counter.VIRTUAL_MEMORY_BYTES).setValue(vMem);
+    if(isMapTask()) { //Mapper Task
+      counters.findCounter(MapCounter.MAP_CPU_MILLISECONDS).setValue(cpuTime);
+    }
+    else {
+      counters.findCounter(ReduceCounter.REDUCE_CPU_MILLISECONDS).setValue(cpuTime);
+    }
   }
   
   protected ProcResourceValues getCurrentProcResourceValues() {
@@ -832,6 +977,7 @@ private synchronized void updateCounters() {
       updater.updateCounters();      
     }
     updateResourceCounters();
+    updateGCcounters();
   }
 
   public void done(TaskUmbilicalProtocol umbilical,
@@ -1379,7 +1525,7 @@ protected void combine(RawKeyValueIterator kvIter,
   }
   
   protected static class NewCombinerRunner<K, V> extends CombinerRunner<K,V> {
-    private final Class<? extends org.apache.hadoop.mapreduce.Reducer<K,V,K,V>> 
+    private final Class<? extends org.apache.hadoop.mapreduce.Reducer<K,V,K,V>>
         reducerClass;
     private final org.apache.hadoop.mapreduce.TaskAttemptID taskId;
     private final RawComparator<K> comparator;
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskErrorCollector.java b/src/mapred/org/apache/hadoop/mapred/TaskErrorCollector.java
index 6c25bf06..0989a8c7 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskErrorCollector.java
+++ b/src/mapred/org/apache/hadoop/mapred/TaskErrorCollector.java
@@ -58,6 +58,7 @@ public class TaskErrorCollector implements Updater {
   public static final String NUM_WINDOWS_KEY = "mapred.taskerrorcollector.window.number";
   public static final String WINDOW_LENGTH_KEY = "mapred.taskerrorcollector.window.milliseconds";
   public static final String CONFIG_FILE_KEY = "mapred.taskerrorcollector.error.file";
+  public static final String COUNTER_GROUP_NAME = "TaskError";
   
   public static final Log LOG = LogFactory.getLog(TaskErrorCollector.class);
   
@@ -74,23 +75,30 @@ public class TaskErrorCollector implements Updater {
   private long lastWindowIndex = 0;
   private final int windowLength;
   private final int numWindows;
-  private final LinkedList<Map<TaskError, Integer>> errorCountsQueue;
-  private final LinkedList<Long> startTimeQueue;
+  private final LinkedList<Map<TaskError, Integer>> errorCountsQueue =
+    new LinkedList<Map<TaskError, Integer>>();
+  private final LinkedList<Long> startTimeQueue = new LinkedList<Long>();
   private final Map<TaskError, Integer> sinceStartErrorCounts;
 
-  
   // Used by metrics
-  private final Map<TaskError, MetricsTimeVaryingLong> errorCountsMetrics;
+  private final Map<TaskError, MetricsTimeVaryingLong> errorCountsMetrics =
+    new HashMap<TaskError, MetricsTimeVaryingLong>();
 
   public TaskErrorCollector(Configuration conf) {
-    errorCountsQueue = new LinkedList<Map<TaskError, Integer>>();
-    startTimeQueue = new LinkedList<Long>();
-    errorCountsMetrics = new HashMap<TaskError, MetricsTimeVaryingLong>();
+    this(
+      conf,
+      conf.getInt(WINDOW_LENGTH_KEY, WINDOW_LENGTH),
+      conf.getInt(NUM_WINDOWS_KEY, NUM_WINDOWS));
+  }
+
+  public TaskErrorCollector(
+    Configuration conf, int windowLength, int numWindows) {
+    this.windowLength = windowLength;
+    this.numWindows = numWindows;
+
     MetricsContext context = MetricsUtil.getContext("mapred");
     metricsRecord = MetricsUtil.createRecord(context, "taskerror");
     registry = new MetricsRegistry();
-    windowLength = conf.getInt(WINDOW_LENGTH_KEY, WINDOW_LENGTH);
-    numWindows = conf.getInt(NUM_WINDOWS_KEY, NUM_WINDOWS);
 
     context.registerUpdater(this);
 
@@ -135,10 +143,10 @@ private Map<TaskError, Integer> createErrorCountsMap() {
   }
 
   public synchronized void collect(TaskInProgress tip, TaskAttemptID taskId,
-      TaskTracker taskTracker, long now) {
+      long now) {
     List<String> diagnostics = tip.getDiagnosticInfo(taskId);
     if (diagnostics == null || diagnostics.isEmpty()) {
-      incErrorCounts(UNKNOWN_ERROR, taskTracker, now);
+      incErrorCounts(UNKNOWN_ERROR, now);
       return;
     }
     String latestDiagnostic = diagnostics.get(diagnostics.size() - 1);
@@ -147,14 +155,14 @@ public synchronized void collect(TaskInProgress tip, TaskAttemptID taskId,
     for (TaskError error : knownErrors.values()) {
       String p = error.pattern.toString();
       if (error.pattern.matcher(latestDiagnostic).matches()) {
-        incErrorCounts(error, taskTracker, now);
+        incErrorCounts(error, now);
         found = true;
         break;
       }
     }
     if (!found) {
       LOG.info("Undefined diagnostic info:" + latestDiagnostic);
-      incErrorCounts(UNKNOWN_ERROR, taskTracker, now);
+      incErrorCounts(UNKNOWN_ERROR, now);
     }
   }
 
@@ -185,7 +193,7 @@ public synchronized Map<TaskError, Integer> getErrorCounts() {
     return Collections.unmodifiableMap(sinceStartErrorCounts);
   }
 
-  private void incErrorCounts(TaskError error, TaskTracker tt, long now) {
+  private void incErrorCounts(TaskError error, long now) {
 
     Map<TaskError, Integer> current = getCurrentErrorCounts(now);
     current.put(error, current.get(error) + 1); 
@@ -210,6 +218,19 @@ private Map<TaskError, Integer> getCurrentErrorCounts(long now) {
     return errorCountsQueue.getFirst();
   }
 
+  public synchronized Counters getErrorCountsCounters() {
+    Counters ctrs = new Counters();
+    Counters.Group grp = ctrs.getGroup(COUNTER_GROUP_NAME);
+    for (Map<TaskError, Integer> errorCountMap : errorCountsQueue) {
+      for (Map.Entry<TaskError, Integer> entry : errorCountMap.entrySet()) {
+        String key = entry.getKey().name;
+        int val = entry.getValue();
+        grp.getCounterForName(key).increment(val);
+      }
+    }
+    return ctrs;
+  }
+
   public class TaskError {
     final String name;
     final Pattern pattern;
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java b/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
index d67ff226..8332400c 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
+++ b/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
@@ -1139,8 +1139,12 @@ boolean canBeSpeculatedUsingProgressRate(long currentTime) {
     // if stddev > mean - we are stuck. cap the max difference at a 
     // more meaningful number.
     maxDiff = Math.min(maxDiff, taskStats.mean() * job.getStddevMeanRatioMax());
-
-    return (taskStats.mean() - progressRate > maxDiff);
+    boolean canBeSpeculated = (taskStats.mean() - progressRate > maxDiff);
+    if (canBeSpeculated) {
+      LOG.info("Task " + getTIPId() + " can be speculated with progressRate = "
+          + progressRate + " and taskStats = " + taskStats);
+    }
+    return canBeSpeculated;
   }
 
   
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskLog.java b/src/mapred/org/apache/hadoop/mapred/TaskLog.java
index 22985f08..58f28618 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskLog.java
+++ b/src/mapred/org/apache/hadoop/mapred/TaskLog.java
@@ -58,9 +58,12 @@ public class TaskLog {
   private static final Log LOG =
     LogFactory.getLog(TaskLog.class);
 
-  private static final File LOG_DIR = 
-    new File(System.getProperty("hadoop.log.dir"), 
-             "userlogs").getAbsoluteFile();
+  private static final File LOG_DIR = getLogDir(
+    System.getProperty("hadoop.log.dir"));
+
+  static File getLogDir(String hadoopLogDir) {
+    return new File(hadoopLogDir, "userlogs").getAbsoluteFile();
+  }
   
   // localFS is set in (and used by) writeToIndexFile()
   static LocalFileSystem localFS = null;
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskMemoryManagerThread.java b/src/mapred/org/apache/hadoop/mapred/TaskMemoryManagerThread.java
index 66e80232..1d381091 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskMemoryManagerThread.java
+++ b/src/mapred/org/apache/hadoop/mapred/TaskMemoryManagerThread.java
@@ -55,6 +55,7 @@ class TaskMemoryManagerThread extends Thread {
   private long maxRssMemoryAllowedForAllTasks;
   private int maxRssMemoryAllowedUpdateCounter;
   static private boolean doUpdateReservedPhysicalMemory = true;
+  static public final String HIGH_MEMORY_KEYWORD = "high-memory";
   static public final String TT_MEMORY_MANAGER_MONITORING_INTERVAL =
           "mapred.tasktracker.taskmemorymanager.monitoring-interval";
   // The amount of memory which will not be used for running tasks
@@ -547,7 +548,7 @@ public int compare(TaskAttemptID tid1, TaskAttemptID tid2) {
         long taskMemoryLimit = getTaskMemoryLimit(tid);
         long taskMemory = getTaskCumulativeRssmem(tid);
         String pid = processTreeInfoMap.get(tid).getPID();
-        String msg = "high-memory task:" + tid +
+        String msg = HIGH_MEMORY_KEYWORD + " task:" + tid +
             " pid:" + pid +
             " taskMemory:" + taskMemory +
             " taskMemoryLimit:" + taskMemoryLimit +
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskRunner.java b/src/mapred/org/apache/hadoop/mapred/TaskRunner.java
index c8044f75..0ab9b879 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskRunner.java
+++ b/src/mapred/org/apache/hadoop/mapred/TaskRunner.java
@@ -44,6 +44,8 @@ abstract class TaskRunner extends Thread {
   /** Should the user classpath be added first? */
   public static final String MAPREDUCE_JOB_USER_CLASSPATH_FIRST =
       "mapreduce.job.user.classpath.first";
+  public static final String MAPREDUCE_TASK_SYSTEM_CLASSPATH_PROPERTY =
+      "MAPREDUCE_TASK_SYSTEM_CLASSPATH";
   volatile boolean killed = false;
   private TaskTracker.TaskInProgress tip;
   private Task t;
@@ -115,6 +117,8 @@ private static String stringifyPathArray(Path[] p){
 
   /**
    * Get the java command line options for the child map/reduce tasks.
+   * Overriden by specific launchers.
+   *
    * @param jobConf job configuration
    * @param defaultValue default value
    * @return the java command line options for child map/reduce tasks
@@ -124,7 +128,18 @@ private static String stringifyPathArray(Path[] p){
    */
   @Deprecated
   public String getChildJavaOpts(JobConf jobConf, String defaultValue) {
-    return jobConf.get(JobConf.MAPRED_TASK_JAVA_OPTS, defaultValue);
+    if (getTask().isJobSetupTask()) {
+      return jobConf.get(JobConf.MAPRED_JOB_SETUP_TASK_JAVA_OPTS,
+          defaultValue);
+    } else if (getTask().isJobCleanupTask()) {
+      return jobConf.get(JobConf.MAPRED_JOB_CLEANUP_TASK_JAVA_OPTS,
+          defaultValue);
+    } else if (getTask().isTaskCleanupTask()) {
+      return jobConf.get(JobConf.MAPRED_TASK_CLEANUP_TASK_JAVA_OPTS,
+          defaultValue);
+    } else {
+      return jobConf.get(JobConf.MAPRED_TASK_JAVA_OPTS, defaultValue);
+    }
   }
 
   /**
@@ -206,8 +221,17 @@ private static void appendSystemClasspath(JobConf conf,
       classPath.append(debugRuntime);
       classPath.append(pathSeparator);
     }
-    // start with same classpath as parent process
-    classPath.append(System.getProperty("java.class.path"));
+    // Determine system classpath for tasks. Default to tasktracker's
+    // classpath.
+    String systemClasspath = System.getenv(
+      MAPREDUCE_TASK_SYSTEM_CLASSPATH_PROPERTY);
+    if (systemClasspath == null) {
+      systemClasspath = System.getProperty("java.class.path");
+    }
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("System classpath " + systemClasspath);
+    }
+    classPath.append(systemClasspath);
     classPath.append(pathSeparator);
   }
 
@@ -483,10 +507,17 @@ sharedFiles[i], conf, new Path(TaskTracker.getCacheSubdir()),
 
       //  Build exec child jmv args.
       Vector<String> vargs = new Vector<String>(8);
-      File jvm =                                  // use same jvm as parent
-        new File(new File(System.getProperty("java.home"), "bin"), "java");
-
-      vargs.add(jvm.toString());
+      String javaRunnerCommand = conf.get("mapred.taskrunner.java.runner");
+      if (javaRunnerCommand != null) {
+        LOG.info("Using java runner " + javaRunnerCommand);
+        for (String arg : javaRunnerCommand.split("\\s+")) {
+          vargs.add(arg);
+        }
+      } else {
+        File jvm =                                  // use same jvm as parent
+          new File(new File(System.getProperty("java.home"), "bin"), "java");
+        vargs.add(jvm.toString());
+      }
 
       // Add child (task) java-vm options.
       //
@@ -519,7 +550,7 @@ sharedFiles[i], conf, new Path(TaskTracker.getCacheSubdir()),
       String javaOpts = getChildJavaOpts(conf,
                                          JobConf.DEFAULT_MAPRED_TASK_JAVA_OPTS);
       javaOpts = javaOpts.replace("@taskid@", taskid.toString());
-      String [] javaOptsSplit = javaOpts.split(" ");
+      String [] javaOptsSplit = javaOpts.split(" +");
 
       // Add java.library.path; necessary for loading native libraries.
       //
@@ -585,12 +616,12 @@ sharedFiles[i], conf, new Path(TaskTracker.getCacheSubdir()),
       vargs.add("-Dhadoop.tasklog.taskid=" + taskid);
       vargs.add("-Dhadoop.tasklog.totalLogFileSize=" + logSize);
 
-      if (conf.getProfileEnabled()) {
-        if (conf.getProfileTaskRange(t.isMapTask()
-                                     ).isIncluded(t.getPartition())) {
-          File prof = TaskLog.getTaskLogFile(taskid, TaskLog.LogName.PROFILE);
-          vargs.add(String.format(conf.getProfileParams(), prof.toString()));
-        }
+      boolean shouldProfile = (tracker.getProfileAllTasks() ||
+        (conf.getProfileEnabled() &&
+          conf.getProfileTaskRange(t.isMapTask()).isIncluded(t.getPartition())));
+      if (shouldProfile) {
+        File prof = TaskLog.getTaskLogFile(taskid, TaskLog.LogName.PROFILE);
+        vargs.add(String.format(conf.getProfileParams(), prof.toString()));
       }
 
       // Add main class and its arguments
@@ -616,7 +647,9 @@ sharedFiles[i], conf, new Path(TaskTracker.getCacheSubdir()),
       // Set up the redirection of the task's stdout and stderr streams
       File stdout = TaskLog.getTaskLogFile(taskid, TaskLog.LogName.STDOUT);
       File stderr = TaskLog.getTaskLogFile(taskid, TaskLog.LogName.STDERR);
-      stdout.getParentFile().mkdirs();
+      File parent = stdout.getParentFile();
+      parent.mkdirs();
+      LOG.info("Task log directory " + parent);
       tracker.getTaskTrackerInstrumentation().reportTaskLaunch(taskid, stdout, stderr);
 
       Map<String, String> env = new HashMap<String, String>();
@@ -667,10 +700,10 @@ sharedFiles[i], conf, new Path(TaskTracker.getCacheSubdir()),
           }
         }
       }
-
-      jvmManager.launchJvm(this,
-          jvmManager.constructJvmEnv(setup,vargs,stdout,stderr,logSize,
-              workDir, env, conf));
+      JvmManager.JvmEnv jvmEnv = jvmManager.constructJvmEnv(setup,vargs,stdout,stderr,logSize,
+          workDir, env, conf);
+      LOG.info("Running task " + taskid + " in the jvm " + jvmEnv);
+      jvmManager.launchJvm(this, jvmEnv);
       synchronized (lock) {
         while (!done) {
           lock.wait();
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskTracker.java b/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
index c1fd5e2c..8c73e59a 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
+++ b/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
@@ -26,6 +26,7 @@
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -180,6 +181,7 @@ static enum State {NORMAL, STALE, INTERRUPTED, DENIED}
   private LocalDirAllocator localDirAllocator = null;
   String taskTrackerName;
   String localHostname;
+  String localHostAddress = null;
   InetSocketAddress jobTrackAddr;
 
   InetSocketAddress taskReportAddress;
@@ -289,6 +291,8 @@ static enum State {NORMAL, STALE, INTERRUPTED, DENIED}
   private volatile boolean oobHeartbeatOnTaskCompletion;
   static final String TT_FAST_FETCH = "mapred.tasktracker.events.fastfetch";
   private volatile boolean fastFetch = false;
+  public static final String TT_PROFILE_ALL_TASKS = "mapred.tasktracker.profile.alltasks";
+  private volatile boolean profileAllTasks = false;
 
   // Track number of completed tasks to send an out-of-band heartbeat
   protected IntWritable finishedCount = new IntWritable(0);
@@ -372,6 +376,7 @@ public class ShuffleServerMetrics implements Updater {
     private long outputBytes = 0;
     private int failedOutputs = 0;
     private int successOutputs = 0;
+    private int missingOutputs = 0;
     private int httpQueueLen = 0;
     private ThreadPoolExecutor nettyWorkerThreadPool = null;
     ShuffleServerMetrics(JobConf conf) {
@@ -396,6 +401,9 @@ synchronized void failedOutput() {
     synchronized void successOutput() {
       ++successOutputs;
     }
+    synchronized void missingOutput() {
+      ++missingOutputs;
+    }
     synchronized void setHttpQueueLen(int queueLen) {
       this.httpQueueLen = queueLen;
     }
@@ -417,6 +425,8 @@ public void doUpdates(MetricsContext unused) {
                                         failedOutputs);
         shuffleMetricsRecord.incrMetric("shuffle_success_outputs",
                                         successOutputs);
+        shuffleMetricsRecord.incrMetric("shuffle_missing_outputs",
+                                        missingOutputs);
         // Netty map output metrics
         if (nettyWorkerThreadPool != null) {
           shuffleMetricsRecord.setMetric("netty_mapoutput_activecount",
@@ -433,6 +443,7 @@ public void doUpdates(MetricsContext unused) {
         outputBytes = 0;
         failedOutputs = 0;
         successOutputs = 0;
+        missingOutputs = 0;
       }
       shuffleMetricsRecord.update();
     }
@@ -679,6 +690,19 @@ protected synchronized void initialize(JobConf conf) throws IOException {
       (fConf.get("mapred.tasktracker.dns.interface","default"),
        fConf.get("mapred.tasktracker.dns.nameserver","default"));
     }
+  
+    try {
+      java.net.InetAddress inetAddress = java.net.InetAddress.getByName(this.localHostname);
+      if (inetAddress != null) {
+        this.localHostAddress = inetAddress.getHostAddress();
+      }
+      else {
+        LOG.info("Unable to get IPaddress for " + this.localHostname);
+      }
+    } catch (UnknownHostException e) {
+      LOG.info("Unable to get IPaddress for " + this.localHostname);
+    }
+
     Class<? extends ResourceCalculatorPlugin> clazz =
         fConf.getClass(MAPRED_TASKTRACKER_MEMORY_CALCULATOR_PLUGIN_PROPERTY,
             null, ResourceCalculatorPlugin.class);
@@ -820,12 +844,17 @@ protected synchronized void initialize(JobConf conf) throws IOException {
     // Setup task completion event store
     useTaskCompletionEventsStore = fConf.getBoolean(
         MAPRED_TASKTRACKER_TCE_STORE_PROPERTY, false);
+    profileAllTasks = fConf.getBoolean(TT_PROFILE_ALL_TASKS, false);
   }
 
   protected String getLocalHostname() {
     return localHostname;
   }
 
+  protected String getLocalHostAddress() {
+    return localHostAddress;
+  }
+
   protected TaskUmbilicalProtocol getUmbilical(
     TaskInProgress tip ) throws IOException {
     return this;
@@ -835,6 +864,10 @@ protected void cleanupUmbilical(TaskUmbilicalProtocol t) {
     return;
   }
 
+  public boolean getProfileAllTasks() {
+    return profileAllTasks;
+  }
+
   protected void initializeMapEventFetcher() {
     // start the thread that will fetch map task completion events
     this.mapEventsFetcher = new MapEventsFetcherThread();
@@ -1357,7 +1390,8 @@ protected void initNettyMapOutputHttpServer(JobConf conf) throws IOException {
       nettyMapOutputServer.getWorkerThreadPool());
     HttpMapOutputPipelineFactory pipelineFactory =
         new HttpMapOutputPipelineFactory(attributes, nettyHttpPort);
-    this.nettyMapOutputHttpPort = nettyMapOutputServer.start(pipelineFactory);
+    this.nettyMapOutputHttpPort = nettyMapOutputServer.start(
+      conf, pipelineFactory);
   }
 
   protected void initHttpServer(JobConf conf,
@@ -2170,6 +2204,26 @@ long getDiskSpace(boolean free) throws IOException {
     return biggestSeenSoFar;
   }
 
+  /**
+   * Obtain the free space on the log disk. If the log disk is not configured,
+   * returns Long.MAX_VALUE
+   * @return The free space available.
+   * @throws IOException
+   */
+  long getLogDiskFreeSpace() throws IOException {
+    String logDir = fConf.getLogDir();
+    // If the log disk is not specified we assume it is usable.
+    if (logDir == null) {
+      return Long.MAX_VALUE;
+    }
+    DF df = localDirsDf.get(logDir);
+    if (df == null) {
+      df = new DF(new File(logDir), fConf);
+      localDirsDf.put(logDir, df);
+    }
+    return df.getAvailable();
+  }
+
   /**
    * Try to get the size of output for this task.
    * Returns -1 if it can't be found.
@@ -4384,6 +4438,7 @@ public Collection<String> getReconfigurableProperties() {
     Set<String> properties = new HashSet<String>();
     properties.add(TT_FAST_FETCH);
     properties.add(TT_OUTOFBAND_HEARBEAT);
+    properties.add(TT_PROFILE_ALL_TASKS);
     return properties;
   }
 
@@ -4394,6 +4449,8 @@ protected void reconfigurePropertyImpl(String property, String newVal)
       this.fastFetch = Boolean.valueOf(newVal);
     } else if (property.equals(TT_OUTOFBAND_HEARBEAT)) {
       this.oobHeartbeatOnTaskCompletion = Boolean.valueOf(newVal);
+    } else if (property.equals(TT_PROFILE_ALL_TASKS)) {
+      this.profileAllTasks = Boolean.valueOf(newVal);
     }
   }
 }
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java b/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java
index 61d1637c..68c987f5 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java
+++ b/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.mapred;
 
+import java.util.Collection;
 import org.apache.hadoop.metrics.MetricsContext;
 import org.apache.hadoop.metrics.MetricsRecord;
 import org.apache.hadoop.metrics.MetricsUtil;
@@ -26,9 +27,17 @@
 import org.apache.hadoop.metrics.util.MetricsBase;
 import org.apache.hadoop.metrics.util.MetricsRegistry;
 import org.apache.hadoop.metrics.util.MetricsTimeVaryingRate;
+import org.apache.hadoop.util.ProcfsBasedProcessTree;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 class TaskTrackerMetricsInst extends TaskTrackerInstrumentation
                              implements Updater {
+  /** Configuration variable for extra jvms */
+  public static final String EXTRA_JVMS = "mapred.extraJvms";
+  private static final Log LOG =
+      LogFactory.getLog(TaskTrackerMetricsInst.class);
   /** Registry of a subset of metrics */
   private final MetricsRegistry registry = new MetricsRegistry();
   private final MetricsTimeVaryingRate taskLaunchMsecs =
@@ -48,9 +57,17 @@ class TaskTrackerMetricsInst extends TaskTrackerInstrumentation
   private int tasksFailedPing = 0;
   private long unaccountedMemory = 0;
 
+  /** Tree for checking the proc fs */
+  private ProcfsBasedProcessTree processTree =
+      new ProcfsBasedProcessTree("-1", false, -1);
+  /** Extra JVMs allowed beyond the maps + reduces before dumping procs */
+  private final int extraJvms;
+  private final boolean checkJvms = ProcfsBasedProcessTree.isAvailable();
+
   public TaskTrackerMetricsInst(TaskTracker t) {
     super(t);
     JobConf conf = tt.getJobConf();
+    extraJvms = conf.getInt(EXTRA_JVMS, 16);
     String sessionId = conf.getSessionId();
     // Initiate Java VM Metrics
     JvmMetrics.init("TaskTracker", sessionId);
@@ -96,6 +113,25 @@ public MetricsTimeVaryingRate getTaskLaunchMsecs() {
     return taskLaunchMsecs;
   }
 
+  /**
+   * Check the number of jvms running on this node and also set the metric
+   * For use in doUpdates().
+   */
+  private void checkAndSetJvms() {
+    Collection<String> jvmProcs =
+        processTree.getProcessNameContainsCount("java ");
+    metricsRecord.setMetric("all_node_jvms", jvmProcs.size());
+    int maxExpected = tt.getMaxActualMapTasks() + tt.getMaxActualReduceTasks() +
+        extraJvms;
+    if (maxExpected < jvmProcs.size()) {
+      LOG.warn("checkAndSetJvms: Expected up to " + maxExpected + " jvms, " +
+          "but got " + jvmProcs.size());
+      for (String jvmProc : jvmProcs) {
+        LOG.warn(jvmProc);
+      }
+    }
+  }
+
   /**
    * Since this object is a registered updater, this method will be called
    * periodically, e.g. every 5 seconds.
@@ -111,6 +147,9 @@ public void doUpdates(MetricsContext unused) {
         tt.getAveMapSlotRefillMsecs());
       metricsRecord.setMetric("aveReduceSlotRefillMsecs",
         tt.getAveReduceSlotRefillMsecs());
+      if (checkJvms) {
+        checkAndSetJvms();
+      }
 
       metricsRecord.setMetric("maps_running", tt.getRunningMaps());
       metricsRecord.setMetric("reduces_running", tt.getRunningReduces());
diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 8bd9e05f..a4ac5878 100644
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -36,7 +36,11 @@
 export PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
 
 # List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib src/org/apache/hadoop/io/compress/lzma src/org/apache/hadoop/syscall lib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib \
+					src/org/apache/hadoop/io/compress/lzma \
+					src/org/apache/hadoop/io/compress/snappy \
+					src/org/apache/hadoop/syscall \
+					lib
 
 # The following export is needed to build libhadoop.so in the 'lib' directory
 export SUBDIRS
diff --git a/src/native/Makefile.in b/src/native/Makefile.in
index 606305d4..dfdf5989 100644
--- a/src/native/Makefile.in
+++ b/src/native/Makefile.in
@@ -208,7 +208,12 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
 # List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib src/org/apache/hadoop/io/compress/lzma src/org/apache/hadoop/syscall lib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib \
+					src/org/apache/hadoop/io/compress/lzma \
+					src/org/apache/hadoop/io/compress/snappy \
+					src/org/apache/hadoop/syscall \
+					lib
+
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/src/native/acinclude.m4 b/src/native/acinclude.m4
index d63469e8..7ab1d5f7 100644
--- a/src/native/acinclude.m4
+++ b/src/native/acinclude.m4
@@ -13,6 +13,8 @@ AC_CACHE_CHECK([Checking for the 'actual' dynamic-library for '-l$1'], ac_cv_lib
       ac_cv_libname_$1="`objdump -p conftest | grep NEEDED | grep $1 | sed 's/\W*NEEDED\W*\(.*\)\W*$/\"\1\"/'`"
     elif test ! -z "`which ldd | grep -v 'no ldd'`"; then
       ac_cv_libname_$1="`ldd conftest | grep $1 | sed 's/^[[[^A-Za-z0-9]]]*\([[[A-Za-z0-9\.]]]*\)[[[^A-Za-z0-9]]]*=>.*$/\"\1\"/'`"
+    elif test ! -z "`which otool | grep -v 'no otool'`"; then
+      ac_cv_libname_$1=\"`otool -L conftest | grep $1 | sed -e 's/^[  ]*//' -e 's/ .*//' -e 's/.*\/\(.*\)$/\1/'`\";
     else
       AC_MSG_ERROR(Can't find either 'objdump' or 'ldd' to compute the dynamic library for '-l$1')
     fi
diff --git a/src/native/config.h.in b/src/native/config.h.in
index 554bbf0d..c78d8210 100644
--- a/src/native/config.h.in
+++ b/src/native/config.h.in
@@ -3,6 +3,9 @@
 /* The 'actual' dynamic-library for '-llzma' */
 #undef HADOOP_LZMA_LIBRARY
 
+/* The 'actual' dynamic-library for '-lsnappy' */
+#undef HADOOP_SNAPPY_LIBRARY
+
 /* The 'actual' dynamic-library for '-lz' */
 #undef HADOOP_ZLIB_LIBRARY
 
@@ -36,6 +39,9 @@
 /* Define to 1 if you have the `posix_fadvise' function. */
 #undef HAVE_POSIX_FADVISE
 
+/* Define to 1 if you have the <snappy-c.h> header file. */
+#undef HAVE_SNAPPY_C_H
+
 /* Define to 1 if you have the <stddef.h> header file. */
 #undef HAVE_STDDEF_H
 
diff --git a/src/native/configure b/src/native/configure
index 6cc76297..bc77e3b4 100755
--- a/src/native/configure
+++ b/src/native/configure
@@ -20507,6 +20507,8 @@ else
       ac_cv_libname_z="`objdump -p conftest | grep NEEDED | grep z | sed 's/\W*NEEDED\W*\(.*\)\W*$/\"\1\"/'`"
     elif test ! -z "`which ldd | grep -v 'no ldd'`"; then
       ac_cv_libname_z="`ldd conftest | grep z | sed 's/^[^A-Za-z0-9]*\([A-Za-z0-9\.]*\)[^A-Za-z0-9]*=>.*$/\"\1\"/'`"
+    elif test ! -z "`which otool | grep -v 'no otool'`"; then
+      ac_cv_libname_z=\"`otool -L conftest | grep z | sed -e 's/^  *//' -e 's/ .*//' -e 's/.*\/\(.*\)$/\1/'`\";
     else
       { { echo "$as_me:$LINENO: error: Can't find either 'objdump' or 'ldd' to compute the dynamic library for '-lz'" >&5
 echo "$as_me: error: Can't find either 'objdump' or 'ldd' to compute the dynamic library for '-lz'" >&2;}
@@ -20537,6 +20539,7 @@ done
 
 
 
+
 for ac_header in lzma/lzma.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -20694,6 +20697,8 @@ else
       ac_cv_libname_lzma="`objdump -p conftest | grep NEEDED | grep lzma | sed 's/\W*NEEDED\W*\(.*\)\W*$/\"\1\"/'`"
     elif test ! -z "`which ldd | grep -v 'no ldd'`"; then
       ac_cv_libname_lzma="`ldd conftest | grep lzma | sed 's/^[^A-Za-z0-9]*\([A-Za-z0-9\.]*\)[^A-Za-z0-9]*=>.*$/\"\1\"/'`"
+    elif test ! -z "`which otool | grep -v 'no otool'`"; then
+      ac_cv_libname_lzma=\"`otool -L conftest | grep lzma | sed -e 's/^  *//' -e 's/ .*//' -e 's/.*\/\(.*\)$/\1/'`\";
     else
       { { echo "$as_me:$LINENO: error: Can't find either 'objdump' or 'ldd' to compute the dynamic library for '-llzma'" >&5
 echo "$as_me: error: Can't find either 'objdump' or 'ldd' to compute the dynamic library for '-llzma'" >&2;}
@@ -21229,6 +21234,194 @@ fi
 done
 
 
+
+for ac_header in snappy-c.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+echo "$as_me:$LINENO: checking Checking for the 'actual' dynamic-library for '-lsnappy'" >&5
+echo $ECHO_N "checking Checking for the 'actual' dynamic-library for '-lsnappy'... $ECHO_C" >&6
+if test "${ac_cv_libname_snappy+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+  echo 'int main(int argc, char **argv){return 0;}' > conftest.c
+  if test -z "`${CC} ${LDFLAGS} -o conftest conftest.c -lsnappy 2>&1`"; then
+        if test ! -z "`which objdump | grep -v 'no objdump'`"; then
+      ac_cv_libname_snappy="`objdump -p conftest | grep NEEDED | grep snappy | sed 's/\W*NEEDED\W*\(.*\)\W*$/\"\1\"/'`"
+    elif test ! -z "`which ldd | grep -v 'no ldd'`"; then
+      ac_cv_libname_snappy="`ldd conftest | grep snappy | sed 's/^[^A-Za-z0-9]*\([A-Za-z0-9\.]*\)[^A-Za-z0-9]*=>.*$/\"\1\"/'`"
+    elif test ! -z "`which otool | grep -v 'no otool'`"; then
+      ac_cv_libname_snappy=\"`otool -L conftest | grep snappy | sed -e 's/^  *//' -e 's/ .*//' -e 's/.*\/\(.*\)$/\1/'`\";
+    else
+      { { echo "$as_me:$LINENO: error: Can't find either 'objdump' or 'ldd' to compute the dynamic library for '-lsnappy'" >&5
+echo "$as_me: error: Can't find either 'objdump' or 'ldd' to compute the dynamic library for '-lsnappy'" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    ac_cv_libname_snappy=libnotfound.so
+  fi
+  rm -f conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_libname_snappy" >&5
+echo "${ECHO_T}$ac_cv_libname_snappy" >&6
+
+cat >>confdefs.h <<_ACEOF
+#define HADOOP_SNAPPY_LIBRARY ${ac_cv_libname_snappy}
+_ACEOF
+
+
+else
+  { echo "$as_me:$LINENO: WARNING: Snappy headers were not found... building without snappy." >&5
+echo "$as_me: WARNING: Snappy headers were not found... building without snappy." >&2;}
+fi
+
+done
+
+
 # Checks for typedefs, structures, and compiler characteristics.
 echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
@@ -21442,7 +21635,7 @@ fi
 done
 
 
-                                                  ac_config_files="$ac_config_files Makefile src/org/apache/hadoop/io/compress/zlib/Makefile src/org/apache/hadoop/io/compress/lzma/Makefile src/org/apache/hadoop/syscall/Makefile lib/Makefile"
+                                                            ac_config_files="$ac_config_files Makefile src/org/apache/hadoop/io/compress/snappy/Makefile src/org/apache/hadoop/io/compress/zlib/Makefile src/org/apache/hadoop/io/compress/lzma/Makefile src/org/apache/hadoop/syscall/Makefile lib/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -22001,6 +22194,7 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "src/org/apache/hadoop/io/compress/snappy/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/org/apache/hadoop/io/compress/snappy/Makefile" ;;
   "src/org/apache/hadoop/io/compress/zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/org/apache/hadoop/io/compress/zlib/Makefile" ;;
   "src/org/apache/hadoop/io/compress/lzma/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/org/apache/hadoop/io/compress/lzma/Makefile" ;;
   "src/org/apache/hadoop/syscall/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/org/apache/hadoop/syscall/Makefile" ;;
diff --git a/src/native/configure.ac b/src/native/configure.ac
index 34517efe..da035acf 100644
--- a/src/native/configure.ac
+++ b/src/native/configure.ac
@@ -87,6 +87,7 @@ AC_SUBST([JNI_CPPFLAGS])
 dnl Check for zlib headers
 AC_CHECK_HEADERS([zlib.h zconf.h], AC_COMPUTE_NEEDED_DSO(z,HADOOP_ZLIB_LIBRARY), AC_MSG_ERROR(Zlib headers were not found... native-hadoop library needs zlib to build. Please install the requisite zlib development package.))
 
+
 dnl Check for lzma headers
 AC_CHECK_HEADERS([lzma/lzma.h], AC_COMPUTE_NEEDED_DSO(lzma,HADOOP_LZMA_LIBRARY), AC_MSG_ERROR(lzma headers were not found... native-hadoop library needs lzma to build. Please install the requisite lzma-4.999.5alpha development package.
 ))
@@ -97,6 +98,9 @@ AC_CHECK_HEADERS(fcntl.h, [AC_CHECK_FUNCS(posix_fadvise)])
 dnl check for sync_file_range
 AC_CHECK_HEADERS(fcntl.h, [AC_CHECK_FUNCS(sync_file_range)])
 
+dnl Check for snappy headers
+AC_CHECK_HEADERS([snappy-c.h], AC_COMPUTE_NEEDED_DSO(snappy,HADOOP_SNAPPY_LIBRARY), AC_MSG_WARN(Snappy headers were not found... building without snappy.))
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
@@ -104,6 +108,7 @@ AC_C_CONST
 AC_CHECK_FUNCS([memset])
 
 AC_CONFIG_FILES([Makefile
+                 src/org/apache/hadoop/io/compress/snappy/Makefile
                  src/org/apache/hadoop/io/compress/zlib/Makefile
                  src/org/apache/hadoop/io/compress/lzma/Makefile
                  src/org/apache/hadoop/syscall/Makefile
diff --git a/src/native/lib/Makefile.am b/src/native/lib/Makefile.am
index 28b11283..f78923fb 100644
--- a/src/native/lib/Makefile.am
+++ b/src/native/lib/Makefile.am
@@ -50,7 +50,7 @@ libhadoop_la_SOURCES = $(srcdir)/../src/org/apache/hadoop/io/nativeio/file_descr
                        $(srcdir)/../src/org/apache/hadoop/util/NativeCrc32.c \
                        $(srcdir)/../src/org/apache/hadoop/util/bulk_crc32.c
 libhadoop_la_LDFLAGS = -version-info 1:0:0
-libhadoop_la_LIBADD = $(HADOOP_OBJS) -ldl -ljvm
+libhadoop_la_LIBADD = $(HADOOP_OBJS) -ldl -ljvm -lrt
 
 #
 #vim: sw=4: ts=4: noet
diff --git a/src/native/lib/Makefile.in b/src/native/lib/Makefile.in
index 02b0e6fc..a98fc97e 100644
--- a/src/native/lib/Makefile.in
+++ b/src/native/lib/Makefile.in
@@ -210,7 +210,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
 # Add .lo files in $(SUBDIRS) to construct libhadoop.so
-# Do not include this directory "lib" itself in the resursive search
+# Do not include this directory "lib" itself in the recursive search
 MYSUBDIRS = $(addprefix ../,$(SUBDIRS))
 NEWSUBDIRS = (filter-out "../lib", $(MYSUBDIRS))
 HADOOP_OBJS = $(foreach path,$(NEWSUBDIRS),$(wildcard $(path)/*.lo))
diff --git a/src/native/lib/snappy/include/snappy-c.h b/src/native/lib/snappy/include/snappy-c.h
new file mode 100644
index 00000000..88e1122d
--- /dev/null
+++ b/src/native/lib/snappy/include/snappy-c.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2011 Martin Gieseking <martin.gieseking@uos.de>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Plain C interface (a wrapper around the C++ implementation).
+ */
+
+#ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_C_H_
+#define UTIL_SNAPPY_OPENSOURCE_SNAPPY_C_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+
+/*
+ * Return values; see the documentation for each function to know
+ * what each can return.
+ */
+typedef enum {
+  SNAPPY_OK = 0,
+  SNAPPY_INVALID_INPUT = 1,
+  SNAPPY_BUFFER_TOO_SMALL = 2,
+} snappy_status;
+
+/*
+ * Takes the data stored in "input[0..input_length-1]" and stores
+ * it in the array pointed to by "compressed".
+ *
+ * <compressed_length> signals the space available in "compressed".
+ * If it is not at least equal to "snappy_max_compressed_length(input_length)",
+ * SNAPPY_BUFFER_TOO_SMALL is returned. After successful compression,
+ * <compressed_length> contains the true length of the compressed output,
+ * and SNAPPY_OK is returned.
+ *
+ * Example:
+ *   size_t output_length = snappy_max_compressed_length(input_length);
+ *   char* output = (char*)malloc(output_length);
+ *   if (snappy_compress(input, input_length, output, &output_length)
+ *       == SNAPPY_OK) {
+ *     ... Process(output, output_length) ...
+ *   }
+ *   free(output);
+ */
+snappy_status snappy_compress(const char* input,
+                              size_t input_length,
+                              char* compressed,
+                              size_t* compressed_length);
+
+/*
+ * Given data in "compressed[0..compressed_length-1]" generated by
+ * calling the snappy_compress routine, this routine stores
+ * the uncompressed data to
+ *   uncompressed[0..uncompressed_length-1].
+ * Returns failure (a value not equal to SNAPPY_OK) if the message
+ * is corrupted and could not be decrypted.
+ *
+ * <uncompressed_length> signals the space available in "uncompressed".
+ * If it is not at least equal to the value returned by
+ * snappy_uncompressed_length for this stream, SNAPPY_BUFFER_TOO_SMALL
+ * is returned. After successful decompression, <uncompressed_length>
+ * contains the true length of the decompressed output.
+ *
+ * Example:
+ *   size_t output_length;
+ *   if (snappy_uncompressed_length(input, input_length, &output_length)
+ *       != SNAPPY_OK) {
+ *     ... fail ...
+ *   }
+ *   char* output = (char*)malloc(output_length);
+ *   if (snappy_uncompress(input, input_length, output, &output_length)
+ *       == SNAPPY_OK) {
+ *     ... Process(output, output_length) ...
+ *   }
+ *   free(output);
+ */
+snappy_status snappy_uncompress(const char* compressed,
+                                size_t compressed_length,
+                                char* uncompressed,
+                                size_t* uncompressed_length);
+
+/*
+ * Returns the maximal size of the compressed representation of
+ * input data that is "source_length" bytes in length.
+ */
+size_t snappy_max_compressed_length(size_t source_length);
+
+/*
+ * REQUIRES: "compressed[]" was produced by snappy_compress()
+ * Returns SNAPPY_OK and stores the length of the uncompressed data in
+ * *result normally. Returns SNAPPY_INVALID_INPUT on parsing error.
+ * This operation takes O(1) time.
+ */
+snappy_status snappy_uncompressed_length(const char* compressed,
+                                         size_t compressed_length,
+                                         size_t* result);
+
+/*
+ * Check if the contents of "compressed[]" can be uncompressed successfully.
+ * Does not return the uncompressed data; if so, returns SNAPPY_OK,
+ * or if not, returns SNAPPY_INVALID_INPUT.
+ * Takes time proportional to compressed_length, but is usually at least a
+ * factor of four faster than actual decompression.
+ */
+snappy_status snappy_validate_compressed_buffer(const char* compressed,
+                                                size_t compressed_length);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  /* UTIL_SNAPPY_OPENSOURCE_SNAPPY_C_H_ */
diff --git a/src/native/lib/snappy/include/snappy-sinksource.h b/src/native/lib/snappy/include/snappy-sinksource.h
new file mode 100644
index 00000000..faabfa1e
--- /dev/null
+++ b/src/native/lib/snappy/include/snappy-sinksource.h
@@ -0,0 +1,137 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef UTIL_SNAPPY_SNAPPY_SINKSOURCE_H_
+#define UTIL_SNAPPY_SNAPPY_SINKSOURCE_H_
+
+#include <stddef.h>
+
+
+namespace snappy {
+
+// A Sink is an interface that consumes a sequence of bytes.
+class Sink {
+ public:
+  Sink() { }
+  virtual ~Sink();
+
+  // Append "bytes[0,n-1]" to this.
+  virtual void Append(const char* bytes, size_t n) = 0;
+
+  // Returns a writable buffer of the specified length for appending.
+  // May return a pointer to the caller-owned scratch buffer which
+  // must have at least the indicated length.  The returned buffer is
+  // only valid until the next operation on this Sink.
+  //
+  // After writing at most "length" bytes, call Append() with the
+  // pointer returned from this function and the number of bytes
+  // written.  Many Append() implementations will avoid copying
+  // bytes if this function returned an internal buffer.
+  //
+  // If a non-scratch buffer is returned, the caller may only pass a
+  // prefix of it to Append().  That is, it is not correct to pass an
+  // interior pointer of the returned array to Append().
+  //
+  // The default implementation always returns the scratch buffer.
+  virtual char* GetAppendBuffer(size_t length, char* scratch);
+
+
+ private:
+  // No copying
+  Sink(const Sink&);
+  void operator=(const Sink&);
+};
+
+// A Source is an interface that yields a sequence of bytes
+class Source {
+ public:
+  Source() { }
+  virtual ~Source();
+
+  // Return the number of bytes left to read from the source
+  virtual size_t Available() const = 0;
+
+  // Peek at the next flat region of the source.  Does not reposition
+  // the source.  The returned region is empty iff Available()==0.
+  //
+  // Returns a pointer to the beginning of the region and store its
+  // length in *len.
+  //
+  // The returned region is valid until the next call to Skip() or
+  // until this object is destroyed, whichever occurs first.
+  //
+  // The returned region may be larger than Available() (for example
+  // if this ByteSource is a view on a substring of a larger source).
+  // The caller is responsible for ensuring that it only reads the
+  // Available() bytes.
+  virtual const char* Peek(size_t* len) = 0;
+
+  // Skip the next n bytes.  Invalidates any buffer returned by
+  // a previous call to Peek().
+  // REQUIRES: Available() >= n
+  virtual void Skip(size_t n) = 0;
+
+ private:
+  // No copying
+  Source(const Source&);
+  void operator=(const Source&);
+};
+
+// A Source implementation that yields the contents of a flat array
+class ByteArraySource : public Source {
+ public:
+  ByteArraySource(const char* p, size_t n) : ptr_(p), left_(n) { }
+  virtual ~ByteArraySource();
+  virtual size_t Available() const;
+  virtual const char* Peek(size_t* len);
+  virtual void Skip(size_t n);
+ private:
+  const char* ptr_;
+  size_t left_;
+};
+
+// A Sink implementation that writes to a flat array without any bound checks.
+class UncheckedByteArraySink : public Sink {
+ public:
+  explicit UncheckedByteArraySink(char* dest) : dest_(dest) { }
+  virtual ~UncheckedByteArraySink();
+  virtual void Append(const char* data, size_t n);
+  virtual char* GetAppendBuffer(size_t len, char* scratch);
+
+  // Return the current output pointer so that a caller can see how
+  // many bytes were produced.
+  // Note: this is not a Sink method.
+  char* CurrentDestination() const { return dest_; }
+ private:
+  char* dest_;
+};
+
+
+}
+
+#endif  // UTIL_SNAPPY_SNAPPY_SINKSOURCE_H_
diff --git a/src/native/lib/snappy/include/snappy-stubs-public.h b/src/native/lib/snappy/include/snappy-stubs-public.h
new file mode 100644
index 00000000..9ee4ca52
--- /dev/null
+++ b/src/native/lib/snappy/include/snappy-stubs-public.h
@@ -0,0 +1,85 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+// Author: sesse@google.com (Steinar H. Gunderson)
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Various type stubs for the open-source version of Snappy.
+//
+// This file cannot include config.h, as it is included from snappy.h,
+// which is a public header. Instead, snappy-stubs-public.h is generated by
+// from snappy-stubs-public.h.in at configure time.
+
+#ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+#define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+
+#if 1
+#include <stdint.h>
+#endif
+
+#if 1
+#include <stddef.h>
+#endif
+
+#define SNAPPY_MAJOR 1
+#define SNAPPY_MINOR 0
+#define SNAPPY_PATCHLEVEL 5
+#define SNAPPY_VERSION \
+    ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
+
+#include <string>
+
+namespace snappy {
+
+#if 1
+typedef int8_t int8;
+typedef uint8_t uint8;
+typedef int16_t int16;
+typedef uint16_t uint16;
+typedef int32_t int32;
+typedef uint32_t uint32;
+typedef int64_t int64;
+typedef uint64_t uint64;
+#else
+typedef signed char int8;
+typedef unsigned char uint8;
+typedef short int16;
+typedef unsigned short uint16;
+typedef int int32;
+typedef unsigned int uint32;
+typedef long long int64;
+typedef unsigned long long uint64;
+#endif
+
+typedef std::string string;
+
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&);               \
+  void operator=(const TypeName&)
+
+}  // namespace snappy
+
+#endif  // UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
diff --git a/src/native/lib/snappy/include/snappy.h b/src/native/lib/snappy/include/snappy.h
new file mode 100644
index 00000000..8c2075fe
--- /dev/null
+++ b/src/native/lib/snappy/include/snappy.h
@@ -0,0 +1,155 @@
+// Copyright 2005 and onwards Google Inc.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// A light-weight compression algorithm.  It is designed for speed of
+// compression and decompression, rather than for the utmost in space
+// savings.
+//
+// For getting better compression ratios when you are compressing data
+// with long repeated sequences or compressing data that is similar to
+// other data, while still compressing fast, you might look at first
+// using BMDiff and then compressing the output of BMDiff with
+// Snappy.
+
+#ifndef UTIL_SNAPPY_SNAPPY_H__
+#define UTIL_SNAPPY_SNAPPY_H__
+
+#include <stddef.h>
+#include <string>
+
+#include "snappy-stubs-public.h"
+
+namespace snappy {
+  class Source;
+  class Sink;
+
+  // ------------------------------------------------------------------------
+  // Generic compression/decompression routines.
+  // ------------------------------------------------------------------------
+
+  // Compress the bytes read from "*source" and append to "*sink". Return the
+  // number of bytes written.
+  size_t Compress(Source* source, Sink* sink);
+
+  bool GetUncompressedLength(Source* source, uint32* result);
+
+  // ------------------------------------------------------------------------
+  // Higher-level string based routines (should be sufficient for most users)
+  // ------------------------------------------------------------------------
+
+  // Sets "*output" to the compressed version of "input[0,input_length-1]".
+  // Original contents of *output are lost.
+  //
+  // REQUIRES: "input[]" is not an alias of "*output".
+  size_t Compress(const char* input, size_t input_length, string* output);
+
+  // Decompresses "compressed[0,compressed_length-1]" to "*uncompressed".
+  // Original contents of "*uncompressed" are lost.
+  //
+  // REQUIRES: "compressed[]" is not an alias of "*uncompressed".
+  //
+  // returns false if the message is corrupted and could not be decompressed
+  bool Uncompress(const char* compressed, size_t compressed_length,
+                  string* uncompressed);
+
+
+  // ------------------------------------------------------------------------
+  // Lower-level character array based routines.  May be useful for
+  // efficiency reasons in certain circumstances.
+  // ------------------------------------------------------------------------
+
+  // REQUIRES: "compressed" must point to an area of memory that is at
+  // least "MaxCompressedLength(input_length)" bytes in length.
+  //
+  // Takes the data stored in "input[0..input_length]" and stores
+  // it in the array pointed to by "compressed".
+  //
+  // "*compressed_length" is set to the length of the compressed output.
+  //
+  // Example:
+  //    char* output = new char[snappy::MaxCompressedLength(input_length)];
+  //    size_t output_length;
+  //    RawCompress(input, input_length, output, &output_length);
+  //    ... Process(output, output_length) ...
+  //    delete [] output;
+  void RawCompress(const char* input,
+                   size_t input_length,
+                   char* compressed,
+                   size_t* compressed_length);
+
+  // Given data in "compressed[0..compressed_length-1]" generated by
+  // calling the Snappy::Compress routine, this routine
+  // stores the uncompressed data to
+  //    uncompressed[0..GetUncompressedLength(compressed)-1]
+  // returns false if the message is corrupted and could not be decrypted
+  bool RawUncompress(const char* compressed, size_t compressed_length,
+                     char* uncompressed);
+
+  // Given data from the byte source 'compressed' generated by calling
+  // the Snappy::Compress routine, this routine stores the uncompressed
+  // data to
+  //    uncompressed[0..GetUncompressedLength(compressed,compressed_length)-1]
+  // returns false if the message is corrupted and could not be decrypted
+  bool RawUncompress(Source* compressed, char* uncompressed);
+
+  // Returns the maximal size of the compressed representation of
+  // input data that is "source_bytes" bytes in length;
+  size_t MaxCompressedLength(size_t source_bytes);
+
+  // REQUIRES: "compressed[]" was produced by RawCompress() or Compress()
+  // Returns true and stores the length of the uncompressed data in
+  // *result normally.  Returns false on parsing error.
+  // This operation takes O(1) time.
+  bool GetUncompressedLength(const char* compressed, size_t compressed_length,
+                             size_t* result);
+
+  // Returns true iff the contents of "compressed[]" can be uncompressed
+  // successfully.  Does not return the uncompressed data.  Takes
+  // time proportional to compressed_length, but is usually at least
+  // a factor of four faster than actual decompression.
+  bool IsValidCompressedBuffer(const char* compressed,
+                               size_t compressed_length);
+
+  // *** DO NOT CHANGE THE VALUE OF kBlockSize ***
+  //
+  // New Compression code chops up the input into blocks of at most
+  // the following size.  This ensures that back-references in the
+  // output never cross kBlockSize block boundaries.  This can be
+  // helpful in implementing blocked decompression.  However the
+  // decompression code should not rely on this guarantee since older
+  // compression code may not obey it.
+  static const int kBlockLog = 15;
+  static const size_t kBlockSize = 1 << kBlockLog;
+
+  static const int kMaxHashTableBits = 14;
+  static const size_t kMaxHashTableSize = 1 << kMaxHashTableBits;
+
+}  // end namespace snappy
+
+
+#endif  // UTIL_SNAPPY_SNAPPY_H__
diff --git a/src/native/lib/snappy/lib/libsnappy.a b/src/native/lib/snappy/lib/libsnappy.a
new file mode 100644
index 00000000..16cfca99
Binary files /dev/null and b/src/native/lib/snappy/lib/libsnappy.a differ
diff --git a/src/native/lib/snappy/lib/libsnappy.la b/src/native/lib/snappy/lib/libsnappy.la
new file mode 100755
index 00000000..d45a9b5d
--- /dev/null
+++ b/src/native/lib/snappy/lib/libsnappy.la
@@ -0,0 +1,41 @@
+# libsnappy.la - a libtool library file
+# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libsnappy.so.1'
+
+# Names of this library.
+library_names='libsnappy.so.1.1.3 libsnappy.so.1 libsnappy.so'
+
+# The name of the static archive.
+old_library='libsnappy.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=''
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libsnappy.
+current=2
+age=1
+revision=3
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/lib'
diff --git a/src/native/lib/snappy/lib/libsnappy.so b/src/native/lib/snappy/lib/libsnappy.so
new file mode 100755
index 00000000..1e5e0b1e
Binary files /dev/null and b/src/native/lib/snappy/lib/libsnappy.so differ
diff --git a/src/native/lib/snappy/lib/libsnappy.so.1 b/src/native/lib/snappy/lib/libsnappy.so.1
new file mode 100755
index 00000000..1e5e0b1e
Binary files /dev/null and b/src/native/lib/snappy/lib/libsnappy.so.1 differ
diff --git a/src/native/lib/snappy/lib/libsnappy.so.1.1.3 b/src/native/lib/snappy/lib/libsnappy.so.1.1.3
new file mode 100755
index 00000000..1e5e0b1e
Binary files /dev/null and b/src/native/lib/snappy/lib/libsnappy.so.1.1.3 differ
diff --git a/src/native/packageNativeHadoop.sh b/src/native/packageNativeHadoop.sh
index 6088944f..7f478a58 100755
--- a/src/native/packageNativeHadoop.sh
+++ b/src/native/packageNativeHadoop.sh
@@ -64,4 +64,19 @@ then
   done  
 fi
 
+if [ "${BUNDLE_SNAPPY_LIB}" == "true" ]
+then
+  if [ -d ${SNAPPY_LIB_DIR} ]
+  then
+    echo "Copying Snappy library in ${SNAPPY_LIB_DIR} to $DIST_LIB_DIR/$platform/"
+    cd ${SNAPPY_LIB_DIR}
+    $TAR . | (cd $DIST_LIB_DIR/$platform; $UNTAR)
+  else
+    echo "Snappy lib directory ${SNAPPY_LIB_DIR} does not exist"
+    exit 1
+  fi
+else
+  echo "Skipping Copying Snappy library, BUNDLE_SNAPPY_LIB=${BUNDLE_SNAPPY_LIB}"
+fi
+
 #vim: ts=2: sw=2: et
diff --git a/src/native/src/org/apache/hadoop/io/compress/snappy/Makefile.am b/src/native/src/org/apache/hadoop/io/compress/snappy/Makefile.am
new file mode 100644
index 00000000..f400f6c4
--- /dev/null
+++ b/src/native/src/org/apache/hadoop/io/compress/snappy/Makefile.am
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+
+vpath %.c $(HADOOP_NATIVE_SRCDIR)/$(subdir)
+
+AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src -I$(HADOOP_NATIVE_SRCDIR)/lib/snappy/include
+AM_LDFLAGS = @JNI_LDFLAGS@ -L$(HADOOP_NATIVE_SRCDIR)/lib/snappy/lib
+AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL)
+
+lib_LTLIBRARIES = libhadoopsnappy.la
+
+libhadoopsnappy_la_SOURCES = SnappyCompressor.c SnappyDecompressor.c
+libhadoopsnappy_la_LDFLAGS = -version-info 0:1:0
+
+#
+#vim: sw=4: ts=4: noet
+#
diff --git a/src/native/src/org/apache/hadoop/io/compress/snappy/Makefile.in b/src/native/src/org/apache/hadoop/io/compress/snappy/Makefile.in
new file mode 100644
index 00000000..0747fdb8
--- /dev/null
+++ b/src/native/src/org/apache/hadoop/io/compress/snappy/Makefile.in
@@ -0,0 +1,482 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# 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.
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../../../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/org/apache/hadoop/io/compress/snappy
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libhadoopsnappy_la_LIBADD =
+am_libhadoopsnappy_la_OBJECTS = SnappyCompressor.lo \
+	SnappyDecompressor.lo
+libhadoopsnappy_la_OBJECTS = $(am_libhadoopsnappy_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhadoopsnappy_la_SOURCES)
+DIST_SOURCES = $(libhadoopsnappy_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_CPPFLAGS = @JNI_CPPFLAGS@
+JNI_LDFLAGS = @JNI_LDFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src -I$(HADOOP_NATIVE_SRCDIR)/lib/snappy/include
+AM_LDFLAGS = @JNI_LDFLAGS@ -L$(HADOOP_NATIVE_SRCDIR)/lib/snappy/lib
+AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL)
+lib_LTLIBRARIES = libhadoopsnappy.la
+libhadoopsnappy_la_SOURCES = SnappyCompressor.c SnappyDecompressor.c
+libhadoopsnappy_la_LDFLAGS = -version-info 0:1:0
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/org/apache/hadoop/io/compress/snappy/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/org/apache/hadoop/io/compress/snappy/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libhadoopsnappy.la: $(libhadoopsnappy_la_OBJECTS) $(libhadoopsnappy_la_DEPENDENCIES) 
+	$(LINK) -rpath $(libdir) $(libhadoopsnappy_la_LDFLAGS) $(libhadoopsnappy_la_OBJECTS) $(libhadoopsnappy_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SnappyCompressor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SnappyDecompressor.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-libLTLIBRARIES
+
+
+vpath %.c $(HADOOP_NATIVE_SRCDIR)/$(subdir)
+
+#
+#vim: sw=4: ts=4: noet
+#
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c b/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
new file mode 100644
index 00000000..13991c23
--- /dev/null
+++ b/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
@@ -0,0 +1,127 @@
+/*
+ * 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.
+ */
+
+#if defined HAVE_CONFIG_H
+  #include <config.h>
+#endif
+
+#if defined HADOOP_SNAPPY_LIBRARY
+
+#if defined HAVE_STDIO_H
+  #include <stdio.h>
+#else
+  #error 'stdio.h not found'
+#endif
+
+#if defined HAVE_STDLIB_H
+  #include <stdlib.h>
+#else
+  #error 'stdlib.h not found'
+#endif
+
+#if defined HAVE_STRING_H
+  #include <string.h>
+#else
+  #error 'string.h not found'
+#endif
+
+#if defined HAVE_DLFCN_H
+  #include <dlfcn.h>
+#else
+  #error 'dlfcn.h not found'
+#endif
+
+#include "org_apache_hadoop_io_compress_snappy.h"
+#include "org_apache_hadoop_io_compress_snappy_SnappyCompressor.h"
+
+static jfieldID SnappyCompressor_clazz;
+static jfieldID SnappyCompressor_uncompressedDirectBuf;
+static jfieldID SnappyCompressor_uncompressedDirectBufLen;
+static jfieldID SnappyCompressor_compressedDirectBuf;
+static jfieldID SnappyCompressor_directBufferSize;
+
+static snappy_status (*dlsym_snappy_compress)(const char*, size_t, char*, size_t*);
+
+JNIEXPORT void JNICALL Java_org_apache_hadoop_io_compress_snappy_SnappyCompressor_initIDs
+(JNIEnv *env, jclass clazz){
+
+  // Load libsnappy.so
+  void *libsnappy = dlopen(HADOOP_SNAPPY_LIBRARY, RTLD_LAZY | RTLD_GLOBAL);
+  if (!libsnappy) {
+    char* msg = (char*)malloc(1000);
+    snprintf(msg, 1000, "%s (%s)!", "Cannot load " HADOOP_SNAPPY_LIBRARY, dlerror());
+    THROW(env, "java/lang/UnsatisfiedLinkError", msg);
+    return;
+  }
+
+  // Locate the requisite symbols from libsnappy.so
+  dlerror();                                 // Clear any existing error
+  LOAD_DYNAMIC_SYMBOL(dlsym_snappy_compress, env, libsnappy, "snappy_compress");
+
+  SnappyCompressor_clazz = (*env)->GetStaticFieldID(env, clazz, "clazz",
+                                                 "Ljava/lang/Class;");
+  SnappyCompressor_uncompressedDirectBuf = (*env)->GetFieldID(env, clazz,
+                                                           "uncompressedDirectBuf",
+                                                           "Ljava/nio/Buffer;");
+  SnappyCompressor_uncompressedDirectBufLen = (*env)->GetFieldID(env, clazz,
+                                                              "uncompressedDirectBufLen", "I");
+  SnappyCompressor_compressedDirectBuf = (*env)->GetFieldID(env, clazz,
+                                                         "compressedDirectBuf",
+                                                         "Ljava/nio/Buffer;");
+  SnappyCompressor_directBufferSize = (*env)->GetFieldID(env, clazz,
+                                                       "directBufferSize", "I");
+}
+
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_io_compress_snappy_SnappyCompressor_compressBytesDirect
+(JNIEnv *env, jobject thisj){
+  // Get members of SnappyCompressor
+  jobject clazz = (*env)->GetStaticObjectField(env, thisj, SnappyCompressor_clazz);
+  jobject uncompressed_direct_buf = (*env)->GetObjectField(env, thisj, SnappyCompressor_uncompressedDirectBuf);
+  jint uncompressed_direct_buf_len = (*env)->GetIntField(env, thisj, SnappyCompressor_uncompressedDirectBufLen);
+  jobject compressed_direct_buf = (*env)->GetObjectField(env, thisj, SnappyCompressor_compressedDirectBuf);
+  jint compressed_direct_buf_len = (*env)->GetIntField(env, thisj, SnappyCompressor_directBufferSize);
+
+  // Get the input direct buffer
+  LOCK_CLASS(env, clazz, "SnappyCompressor");
+  const char* uncompressed_bytes = (const char*)(*env)->GetDirectBufferAddress(env, uncompressed_direct_buf);
+  UNLOCK_CLASS(env, clazz, "SnappyCompressor");
+
+  if (uncompressed_bytes == 0) {
+    return (jint)0;
+  }
+
+  // Get the output direct buffer
+  LOCK_CLASS(env, clazz, "SnappyCompressor");
+  char* compressed_bytes = (char *)(*env)->GetDirectBufferAddress(env, compressed_direct_buf);
+  UNLOCK_CLASS(env, clazz, "SnappyCompressor");
+
+  if (compressed_bytes == 0) {
+    return (jint)0;
+  }
+
+  snappy_status ret = dlsym_snappy_compress(uncompressed_bytes, uncompressed_direct_buf_len, compressed_bytes, &compressed_direct_buf_len);
+  if (ret != SNAPPY_OK){
+    THROW(env, "Ljava/lang/InternalError", "Could not compress data. Buffer length is too small.");
+  }
+
+  (*env)->SetIntField(env, thisj, SnappyCompressor_uncompressedDirectBufLen, 0);
+
+  return (jint)compressed_direct_buf_len;
+}
+
+#endif //define HADOOP_SNAPPY_LIBRARY
diff --git a/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c b/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
new file mode 100644
index 00000000..767c5f4b
--- /dev/null
+++ b/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
@@ -0,0 +1,131 @@
+/*
+ * 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.
+ */
+
+#if defined HAVE_CONFIG_H
+  #include <config.h>
+#endif
+
+#if defined HADOOP_SNAPPY_LIBRARY
+
+#if defined HAVE_STDIO_H
+  #include <stdio.h>
+#else
+  #error 'stdio.h not found'
+#endif
+
+#if defined HAVE_STDLIB_H
+  #include <stdlib.h>
+#else
+  #error 'stdlib.h not found'
+#endif
+
+#if defined HAVE_STRING_H
+  #include <string.h>
+#else
+  #error 'string.h not found'
+#endif
+
+#if defined HAVE_DLFCN_H
+  #include <dlfcn.h>
+#else
+  #error 'dlfcn.h not found'
+#endif
+
+#include "org_apache_hadoop_io_compress_snappy.h"
+#include "org_apache_hadoop_io_compress_snappy_SnappyDecompressor.h"
+
+static jfieldID SnappyDecompressor_clazz;
+static jfieldID SnappyDecompressor_compressedDirectBuf;
+static jfieldID SnappyDecompressor_compressedDirectBufLen;
+static jfieldID SnappyDecompressor_uncompressedDirectBuf;
+static jfieldID SnappyDecompressor_directBufferSize;
+
+static snappy_status (*dlsym_snappy_uncompress)(const char*, size_t, char*, size_t*);
+
+JNIEXPORT void JNICALL Java_org_apache_hadoop_io_compress_snappy_SnappyDecompressor_initIDs
+(JNIEnv *env, jclass clazz){
+
+  // Load libsnappy.so
+  void *libsnappy = dlopen(HADOOP_SNAPPY_LIBRARY, RTLD_LAZY | RTLD_GLOBAL);
+  if (!libsnappy) {
+    char* msg = (char*)malloc(1000);
+    snprintf(msg, 1000, "%s (%s)!", "Cannot load " HADOOP_SNAPPY_LIBRARY, dlerror());
+    THROW(env, "java/lang/UnsatisfiedLinkError", msg);
+    return;
+  }
+
+  // Locate the requisite symbols from libsnappy.so
+  dlerror();                                 // Clear any existing error
+  LOAD_DYNAMIC_SYMBOL(dlsym_snappy_uncompress, env, libsnappy, "snappy_uncompress");
+
+  SnappyDecompressor_clazz = (*env)->GetStaticFieldID(env, clazz, "clazz",
+                                                   "Ljava/lang/Class;");
+  SnappyDecompressor_compressedDirectBuf = (*env)->GetFieldID(env,clazz,
+                                                           "compressedDirectBuf",
+                                                           "Ljava/nio/Buffer;");
+  SnappyDecompressor_compressedDirectBufLen = (*env)->GetFieldID(env,clazz,
+                                                              "compressedDirectBufLen", "I");
+  SnappyDecompressor_uncompressedDirectBuf = (*env)->GetFieldID(env,clazz,
+                                                             "uncompressedDirectBuf",
+                                                             "Ljava/nio/Buffer;");
+  SnappyDecompressor_directBufferSize = (*env)->GetFieldID(env, clazz,
+                                                         "directBufferSize", "I");
+}
+
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_io_compress_snappy_SnappyDecompressor_decompressBytesDirect
+(JNIEnv *env, jobject thisj){
+  // Get members of SnappyDecompressor
+  jobject clazz = (*env)->GetStaticObjectField(env,thisj, SnappyDecompressor_clazz);
+  jobject compressed_direct_buf = (*env)->GetObjectField(env,thisj, SnappyDecompressor_compressedDirectBuf);
+  jint compressed_direct_buf_len = (*env)->GetIntField(env,thisj, SnappyDecompressor_compressedDirectBufLen);
+  jobject uncompressed_direct_buf = (*env)->GetObjectField(env,thisj, SnappyDecompressor_uncompressedDirectBuf);
+  size_t uncompressed_direct_buf_len = (*env)->GetIntField(env, thisj, SnappyDecompressor_directBufferSize);
+
+  // Get the input direct buffer
+  LOCK_CLASS(env, clazz, "SnappyDecompressor");
+  const char* compressed_bytes = (const char*)(*env)->GetDirectBufferAddress(env, compressed_direct_buf);
+  UNLOCK_CLASS(env, clazz, "SnappyDecompressor");
+
+  if (compressed_bytes == 0) {
+    return (jint)0;
+  }
+
+  // Get the output direct buffer
+  LOCK_CLASS(env, clazz, "SnappyDecompressor");
+  char* uncompressed_bytes = (char *)(*env)->GetDirectBufferAddress(env, uncompressed_direct_buf);
+  UNLOCK_CLASS(env, clazz, "SnappyDecompressor");
+
+  if (uncompressed_bytes == 0) {
+    return (jint)0;
+  }
+
+  snappy_status ret = dlsym_snappy_uncompress(compressed_bytes, compressed_direct_buf_len, uncompressed_bytes, &uncompressed_direct_buf_len);
+  if (ret == SNAPPY_BUFFER_TOO_SMALL){
+    THROW(env, "Ljava/lang/InternalError", "Could not decompress data. Buffer length is too small.");
+  } else if (ret == SNAPPY_INVALID_INPUT){
+    THROW(env, "Ljava/lang/InternalError", "Could not decompress data. Input is invalid.");
+  } else if (ret != SNAPPY_OK){
+    THROW(env, "Ljava/lang/InternalError", "Could not decompress data.");
+  }
+
+  (*env)->SetIntField(env, thisj, SnappyDecompressor_compressedDirectBufLen, 0);
+
+  return (jint)uncompressed_direct_buf_len;
+}
+
+#endif //define HADOOP_SNAPPY_LIBRARY
diff --git a/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h b/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
new file mode 100644
index 00000000..815e0306
--- /dev/null
+++ b/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
@@ -0,0 +1,58 @@
+/**
+ * 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.
+ */
+
+
+#if !defined ORG_APACHE_HADOOP_IO_COMPRESS_SNAPPY_SNAPPY_H
+#define ORG_APACHE_HADOOP_IO_COMPRESS_SNAPPY_SNAPPY_H
+
+
+#if defined HAVE_CONFIG_H
+  #include <config.h>
+#endif
+
+#if defined HADOOP_SNAPPY_LIBRARY
+
+  #if defined HAVE_STDDEF_H
+    #include <stddef.h>
+  #else
+    #error 'stddef.h not found'
+  #endif
+
+  #if defined HAVE_SNAPPY_C_H
+    #include <snappy-c.h>
+  #else
+    #error 'Please install snappy-development packages for your platform.'
+  #endif
+
+  #if defined HAVE_DLFCN_H
+    #include <dlfcn.h>
+  #else
+    #error "dlfcn.h not found"
+  #endif
+
+  #if defined HAVE_JNI_H
+    #include <jni.h>
+  #else
+    #error 'jni.h not found'
+  #endif
+
+  #include "org_apache_hadoop.h"
+
+#endif //define HADOOP_SNAPPY_LIBRARY
+
+#endif //ORG_APACHE_HADOOP_IO_COMPRESS_SNAPPY_SNAPPY_H
diff --git a/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy_SnappyCompressor.h b/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy_SnappyCompressor.h
new file mode 100644
index 00000000..89a490a4
--- /dev/null
+++ b/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy_SnappyCompressor.h
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_apache_hadoop_io_compress_snappy_SnappyCompressor */
+
+#ifndef _Included_org_apache_hadoop_io_compress_snappy_SnappyCompressor
+#define _Included_org_apache_hadoop_io_compress_snappy_SnappyCompressor
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef org_apache_hadoop_io_compress_snappy_SnappyCompressor_DEFAULT_DIRECT_BUFFER_SIZE
+#define org_apache_hadoop_io_compress_snappy_SnappyCompressor_DEFAULT_DIRECT_BUFFER_SIZE 65536L
+/*
+ * Class:     org_apache_hadoop_io_compress_snappy_SnappyCompressor
+ * Method:    initIDs
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_apache_hadoop_io_compress_snappy_SnappyCompressor_initIDs
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_apache_hadoop_io_compress_snappy_SnappyCompressor
+ * Method:    compressBytesDirect
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_io_compress_snappy_SnappyCompressor_compressBytesDirect
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c b/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
index 979800a0..6930f885 100644
--- a/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
+++ b/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/syscall.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "org_apache_hadoop.h"
@@ -252,13 +253,14 @@ Java_org_apache_hadoop_io_nativeio_NativeIO_stat(
     JNIEnv *env, jclass class, jstring path) {
   jboolean isCopy;
   jobject jStat = NULL;
+  const char *file = NULL;
 
   if (!path) {
     THROW(env, "java/io/IOException", "Invalid argument passed");
     goto cleanup;
   }
 
-  const char *file = (*env)->GetStringUTFChars(env, path, &isCopy);
+  file = (*env)->GetStringUTFChars(env, path, &isCopy);
   if (!file) {
     THROW(env, "java/io/IOException", "Invalid argument passed");
     goto cleanup;
@@ -271,6 +273,7 @@ Java_org_apache_hadoop_io_nativeio_NativeIO_stat(
     throw_ioe(env, errno);
     goto cleanup;
   }
+
   jStat = process_stat(env, result);
 
 cleanup:
@@ -480,6 +483,50 @@ Java_org_apache_hadoop_io_nativeio_NativeIO_link(
   }
 }
 
+/*
+ * public static native void clock_gettime(int which_clock, TimeSpec tp);
+ */
+JNIEXPORT void JNICALL
+Java_org_apache_hadoop_io_nativeio_NativeIO_clock_1gettime(JNIEnv *env,
+                                                           jclass class,
+                                                           jint which_clock,
+                                                           jobject tp) {
+  jfieldID tv_secFid, tv_nsecFid;
+  jclass cls = NULL;
+  struct timespec _tp;
+  long rc;
+
+  // check for null time
+  if (!tp) {
+    THROW(env, "java/io/IOException", "Invalid argument passed");
+    return;
+  }
+
+  // perform linux call
+  rc = clock_gettime(which_clock, &_tp);
+  if(rc) {
+    throw_ioe(env, errno);
+    return;
+  }
+
+  // populate object with correct values
+  cls = (*env)->GetObjectClass(env, tp);
+  if(!cls) {
+    THROW(env, "java/io/IOException", "GetObjectClass failed");
+    return;
+  }
+  tv_secFid = (*env)->GetFieldID(env, cls, "tv_sec", "J");
+  tv_nsecFid = (*env)->GetFieldID(env, cls, "tv_nsec", "J");
+
+  if (tv_secFid == NULL || tv_nsecFid == NULL) {
+    THROW(env, "java/io/IOException",
+          "tp argument must have long members tv_sec and tv_nsec");
+    return;
+  }
+  (*env)->SetLongField(env, tp, tv_secFid, _tp.tv_sec);
+  (*env)->SetLongField(env, tp, tv_nsecFid, _tp.tv_nsec);
+}
+
 
 /*
  * Determine how big a buffer we need for reentrant getpwuid_r and getgrnam_r
diff --git a/src/saveVersion.sh b/src/saveVersion.sh
index fa776bbd..558d4f8d 100755
--- a/src/saveVersion.sh
+++ b/src/saveVersion.sh
@@ -25,7 +25,7 @@ user=`whoami`
 date=`date`
 
 # if this is ture, we use svn revision number instead of git revision number
-use_svn=`if [ -d .svn ]; then echo "true"; else echo "false"; fi`
+use_svn=true; `svn info > /dev/null 2>&1` || use_svn=false
 
 if [ $use_svn != "true" -a -d .git ]; then
   revision=`git log -1 --pretty=format:"%H"`
diff --git a/src/saveVersion.sh.orig b/src/saveVersion.sh.orig
new file mode 100755
index 00000000..fa776bbd
--- /dev/null
+++ b/src/saveVersion.sh.orig
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# 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 file is used to generate the BuildStamp.java class that
+# records the user, url, revision and timestamp.
+unset LANG
+unset LC_CTYPE
+version=$1
+user=`whoami`
+date=`date`
+
+# if this is ture, we use svn revision number instead of git revision number
+use_svn=`if [ -d .svn ]; then echo "true"; else echo "false"; fi`
+
+if [ $use_svn != "true" -a -d .git ]; then
+  revision=`git log -1 --pretty=format:"%H"`
+  hostname=`hostname`
+  branch=`git branch | sed -n -e 's/^* //p'`
+  url="git://$hostname/$cwd on branch $branch"
+else
+  revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
+  url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
+fi
+mkdir -p build/src/org/apache/hadoop
+cat << EOF | \
+  sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
+      -e "s|URL|$url|" -e "s/REV/$revision/" \
+      > build/src/org/apache/hadoop/package-info.java
+/*
+ * Generated by src/saveVersion.sh
+ */
+@HadoopVersionAnnotation(version="VERSION", revision="REV", 
+                         user="USER", date="DATE", url="URL")
+package org.apache.hadoop;
+EOF
diff --git a/src/test/org/apache/hadoop/conf/TestConfiguration.java b/src/test/org/apache/hadoop/conf/TestConfiguration.java
index b6268b06..e0f479b8 100644
--- a/src/test/org/apache/hadoop/conf/TestConfiguration.java
+++ b/src/test/org/apache/hadoop/conf/TestConfiguration.java
@@ -602,43 +602,48 @@ public void testDumpConfiguratioWithoutDefaults() throws IOException {
   }
   
   public void testConcurrentDefaultResourceChange() throws Exception {
-    
-    final Exception[] ex = new Exception[1];
-    
-    // Load a lot of default resources.
-    Thread tload = new Thread() {
-      @Override
-      public void run() {
-        for (int i = 0; i < 500; i++) {
-          Configuration.addDefaultResource("a" + i);
-        }
-      }
-    };
-    
-    // Create configurations at the same time.
-    Thread tcreate = new Thread() {
-      @Override
-      public void run() {
-        try {
+    try {
+      final Exception[] ex = new Exception[1];
+      
+      // Load a lot of default resources.
+      Thread tload = new Thread() {
+        @Override
+        public void run() {
           for (int i = 0; i < 500; i++) {
-            Configuration conf = new Configuration();
-            conf.get("test");
+            Configuration.addDefaultResource("a" + i);
+          }
+        }
+      };
+      
+      // Create configurations at the same time.
+      Thread tcreate = new Thread() {
+        @Override
+        public void run() {
+          try {
+            for (int i = 0; i < 500; i++) {
+              Configuration conf = new Configuration();
+              conf.get("test");
+            }
+          } catch (Exception e) {
+            ex[0] = e;
           }
-        } catch (Exception e) {
-          ex[0] = e;
         }
+      };
+      
+      // Starts the threads together
+      tload.start();
+      tcreate.start();
+      
+      tload.join();
+      tcreate.join();
+      
+      // Check exception
+      assertNull("Should not have thrown exception " + ex[0], ex[0]);
+    } finally {
+      for (int i = 0; i < 500; i++) {
+        Configuration.removeDefaultResource("a" + i);
       }
-    };
-    
-    // Starts the threads together
-    tload.start();
-    tcreate.start();
-    
-    tload.join();
-    tcreate.join();
-    
-    // Check exception
-    assertNull("Should not have thrown exception " + ex[0], ex[0]);
+    }
   }  
 }
 
diff --git a/src/test/org/apache/hadoop/fs/TestCopyFiles.java b/src/test/org/apache/hadoop/fs/TestCopyFiles.java
index 01fab0c9..fc586f56 100644
--- a/src/test/org/apache/hadoop/fs/TestCopyFiles.java
+++ b/src/test/org/apache/hadoop/fs/TestCopyFiles.java
@@ -45,6 +45,7 @@
 import org.apache.hadoop.tools.DistCp;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.log4j.Level;
+import org.mortbay.log.Log;
 
 
 /**
@@ -1377,6 +1378,49 @@ public void testCopyByChunkMapCount() throws Exception {
     }
   }
   
+  public void testDistCpWithTOSSuccess() throws Exception {
+    distcpWithTOS(new int[] {-1, 4, 191});
+  }
+  
+  public void testDistCpWithTOSFailure() throws Exception {
+    try {
+      distcpWithTOS(new int[] {200});
+      fail("Expected failure for wrong tos value");
+    } catch (Exception e) {
+      Log.warn("Expected exception: " + e.getMessage(), e);
+    }
+  }
+  
+  private void distcpWithTOS(int[] tosValue) throws Exception {
+    String namenode = null;
+    MiniDFSCluster dfs = null;
+    MiniMRCluster mr = null;
+    try {
+      Configuration conf = new Configuration();
+      dfs = new MiniDFSCluster(conf, 3, true, null);
+      FileSystem fs = dfs.getFileSystem();
+      namenode = fs.getUri().toString();
+      mr = new MiniMRCluster(3, namenode, 1);
+      MyFile[] files = createFiles(fs.getUri(), "/srcdat");
+      
+      Configuration job = mr.createJobConf();
+      for (int i = 0; i < tosValue.length; i++) {
+        ToolRunner.run(new DistCp(job),
+            new String[] {"-m", "100", 
+                          "-tos", String.valueOf(tosValue[i]),
+                          "-log",
+                          namenode+"/logs" + String.valueOf(i),
+                          namenode+"/srcdat",
+                          namenode+"/destdat" + String.valueOf(i)});
+        assertTrue("Source and destination directories do not match.",
+                   checkFiles(fs, "/destdat" + String.valueOf(i), files));
+      }
+    } finally {
+      if (dfs != null) { dfs.shutdown(); }
+      if (mr != null) { mr.shutdown(); }
+    }
+  }
+  
   public void testMapCount() throws Exception {
     String namenode = null;
     MiniDFSCluster dfs = null;
diff --git a/src/test/org/apache/hadoop/fs/TestTrash.java b/src/test/org/apache/hadoop/fs/TestTrash.java
index c9d6cae0..e6afaf92 100644
--- a/src/test/org/apache/hadoop/fs/TestTrash.java
+++ b/src/test/org/apache/hadoop/fs/TestTrash.java
@@ -24,7 +24,6 @@
 import java.io.DataOutputStream;
 import java.net.URI;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -34,15 +33,25 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.Trash;
 import org.apache.hadoop.fs.LocalFileSystem;
+import org.junit.Before;
 
 /**
  * This class tests commands from Trash.
  */
 public class TestTrash extends TestCase {
-
-  private final static Path TEST_DIR =
+  
+  public final static Path TEST_DIR =
     new Path(new File(System.getProperty("test.build.data","/tmp")
           ).toString().replace(' ', '+'), "testTrash");
+  
+  @Before
+  public void setUp() throws IOException {
+    File testDir = new File(TEST_DIR.toUri().getPath());
+    if (testDir.exists()) {
+      FileUtil.fullyDelete(testDir);
+      testDir.mkdirs();
+    }
+  }
 
   protected static Path writeFile(FileSystem fs, Path f) throws IOException {
     DataOutputStream out = fs.create(f);
diff --git a/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java b/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java
index 201258dd..66076268 100644
--- a/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java
+++ b/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java
@@ -191,6 +191,7 @@ public static void recoverFile(MiniDFSCluster cluster, FileSystem fs,
       } catch (IOException e) {
         if (!e.getMessage().contains("being recovered") &&
             !e.getMessage().contains("being created")) {
+          LOG.info("Failed open for append, throw", e);
           throw e;
         }
         LOG.info("Failed open for append, waiting on lease recovery");
diff --git a/src/test/org/apache/hadoop/hdfs/DFSClientAdapter.java b/src/test/org/apache/hadoop/hdfs/DFSClientAdapter.java
index a4031edb..ca568b6a 100644
--- a/src/test/org/apache/hadoop/hdfs/DFSClientAdapter.java
+++ b/src/test/org/apache/hadoop/hdfs/DFSClientAdapter.java
@@ -9,9 +9,9 @@ public class DFSClientAdapter {
   public static void abortForTest(FSDataOutputStream out) throws IOException {
     OutputStream stream = out.getWrappedStream();
 
-    if (stream instanceof DFSClient.DFSOutputStream) {
-      DFSClient.DFSOutputStream dfsOutputStream =
-        (DFSClient.DFSOutputStream) stream;
+    if (stream instanceof DFSOutputStream) {
+      DFSOutputStream dfsOutputStream =
+        (DFSOutputStream) stream;
       dfsOutputStream.abortForTests();
     }
     //no-op otherwise
diff --git a/src/test/org/apache/hadoop/hdfs/DFSTestThreadUtil.java b/src/test/org/apache/hadoop/hdfs/DFSTestThreadUtil.java
new file mode 100644
index 00000000..bf7dd617
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/DFSTestThreadUtil.java
@@ -0,0 +1,68 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Iterator;
+import java.util.Set;
+
+public class DFSTestThreadUtil {
+
+  // A list of threads that might hang around (maybe due to a JVM bug).
+  private static final String[] excludedThreads = { "SunPKCS11" };
+  private static final String[] excludedThreadGroups = { "system" };
+
+  private static boolean isExcludedThread(Thread th) {
+    for (String badThread : excludedThreads) {
+      if (th.getName().contains(badThread)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  private static boolean isExcludedGroupThread(Thread th) {
+    for (String badThread : excludedThreadGroups) {
+      if (th.getThreadGroup().getName().contains(badThread)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public static void checkRemainingThreads(Set<Thread> old) throws Exception {
+    Thread.sleep(15000);
+
+    Set<Thread> threads = Thread.getAllStackTraces().keySet();
+    threads.removeAll(old);
+    if (threads.size() != 0) {
+      System.out.println("Following threads are not clean up:");
+      Iterator<Thread> it = threads.iterator();
+      while (it.hasNext()) {
+        Thread th = it.next();
+        if (isExcludedThread(th) || isExcludedGroupThread(th)) {
+          it.remove();
+          continue;
+        }
+        System.out.println("Thread: " + th.getName() + " : " + th.toString());
+      }
+    }
+    assertTrue("This is not a clean shutdown", threads.size() == 0);
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/DFSTestUtil.java b/src/test/org/apache/hadoop/hdfs/DFSTestUtil.java
index 17f2f205..3c841050 100644
--- a/src/test/org/apache/hadoop/hdfs/DFSTestUtil.java
+++ b/src/test/org/apache/hadoop/hdfs/DFSTestUtil.java
@@ -25,12 +25,20 @@
 import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Random;
 import junit.framework.TestCase;
 import org.apache.hadoop.hdfs.DFSClient.DFSDataInputStream;
 import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.BlockPathInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -38,10 +46,15 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.BlockLocation;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  */
 public class DFSTestUtil extends TestCase {
   
+  private static final Log LOG = LogFactory.getLog(DFSTestUtil.class);
+  
   private static Random gen = new Random();
   private static String[] dirNames = {
     "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"
@@ -254,7 +267,7 @@ static void setLogLevel2All(org.apache.commons.logging.Log log) {
         ).getLogger().setLevel(org.apache.log4j.Level.ALL);
   }
 
-  static String readFile(File f) throws IOException {
+  public static String readFile(File f) throws IOException {
     StringBuilder b = new StringBuilder();
     BufferedReader in = new BufferedReader(new FileReader(f));
     for(int c; (c = in.read()) != -1; b.append((char)c));
@@ -287,4 +300,108 @@ public static byte[] generateSequentialBytes(int start, int length) {
     
     return result;
   }  
+  
+  static byte[] inBytes = "something".getBytes();
+
+  public static void creatFileAndWriteSomething(DistributedFileSystem dfs,
+      String filestr, short replication) throws IOException {
+    Path filepath = new Path(filestr);
+    
+    FSDataOutputStream out = dfs.create(filepath, replication);
+    try {
+      out.write(inBytes);
+    } finally {
+      out.close();
+    }
+  }
+  
+  public static BlockPathInfo getBlockPathInfo(String filename,
+      MiniDFSCluster miniCluster, DFSClient dfsclient) throws IOException {
+    LocatedBlocks locations = dfsclient.namenode.getBlockLocations(filename, 0,
+        Long.MAX_VALUE);
+    assertEquals(1, locations.locatedBlockCount());
+    LocatedBlock locatedblock = locations.getLocatedBlocks().get(0);
+    DataNode datanode = miniCluster.getDataNode(locatedblock.getLocations()[0]
+        .getIpcPort());
+    assertTrue(datanode != null);
+
+    Block lastblock = locatedblock.getBlock();
+    DataNode.LOG.info("newblocks=" + lastblock);
+
+    return datanode.getBlockPathInfo(lastblock);
+  }
+  
+
+  /**
+   * Recursively delete the contents of dir, but not the dir itself. Deletes any
+   * subdirectory which is empty after its files are deleted.
+   */
+  public static int deleteContents(File dir) {
+    return deleteContents(dir, true);
+  }
+
+  /**
+   * Recursively delete the contents of dir, but not the dir itself. If
+   * deleteEmptyDirs is true, this deletes any subdirectory which is empty after
+   * its files are deleted.
+   */
+  public static int deleteContents(File dir, boolean deleteEmptyDirs) {
+    if (null == dir) {
+      throw new IllegalArgumentException("null dir");
+    }
+    if ((!dir.exists()) || (!dir.canWrite())) {
+      return 0;
+    }
+    if (!dir.isDirectory()) {
+      dir.delete();
+      return 1;
+    }
+    String[] fromFiles = dir.list();
+    int result = 0;
+    for (int i = 0; i < fromFiles.length; i++) {
+      String string = fromFiles[i];
+      File file = new File(dir, string);
+      if (file.isDirectory()) {
+        result += deleteContents(file, deleteEmptyDirs);
+        if (deleteEmptyDirs && (0 == file.list().length)) {
+          file.delete();
+        }
+      } else {
+        file.delete();
+        result++;
+      }
+    }
+    return result;
+  }
+  
+  // extracts only the file:// entries from the list of given URIS
+  public static Collection<File> getFileStorageDirs(Collection<URI> uris) {
+    ArrayList<File> directories = new ArrayList<File>();
+    for (URI uri : uris) {
+      if (uri.getScheme().compareTo(JournalType.FILE.name().toLowerCase()) == 0) {
+        directories.add(new File(uri.getPath()));
+      }
+    }
+    return directories;
+  }
+  
+  // sleep for one second
+  public static void waitSecond() {
+    try {
+      LOG.info("Waiting.....");
+      Thread.sleep(1000);
+    } catch (InterruptedException e) {
+      return;
+    }
+  }
+  
+  // sleep for n seconds
+  public static void waitNSecond(int n) {
+    try {
+      LOG.info("Waiting.....");
+      Thread.sleep(n * 1000);
+    } catch (InterruptedException e) {
+      return;
+    }
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/FastCopySetupUtil.java b/src/test/org/apache/hadoop/hdfs/FastCopySetupUtil.java
index 11716e74..b5e8bf75 100644
--- a/src/test/org/apache/hadoop/hdfs/FastCopySetupUtil.java
+++ b/src/test/org/apache/hadoop/hdfs/FastCopySetupUtil.java
@@ -362,13 +362,13 @@ public void testFastCopyShellMultiple(boolean hardlink, String extraargs[])
     int i;
     for (i = 0; i < COPIES; i++) {
       generateRandomFile(fs, src + i, TMPFILESIZE); // Create a file
-      argsList.add(src + i);
+      argsList.add(fs.makeQualified(new Path(src + i)).toString());
     }
     String destination = "/testFastCopyShellMultipleDestination" + hardlink;
     fs.mkdirs(new Path(destination));
     NameNode namenode = cluster.getNameNode();
 
-    argsList.add(destination);
+    argsList.add(fs.makeQualified(new Path(destination)).toString());
     argsList.addAll(Arrays.asList(extraargs));
     String args[] = new String[argsList.size()];
     args = argsList.toArray(args);
diff --git a/src/test/org/apache/hadoop/hdfs/Hoopla.java b/src/test/org/apache/hadoop/hdfs/Hoopla.java
index 2753599a..c8b08741 100644
--- a/src/test/org/apache/hadoop/hdfs/Hoopla.java
+++ b/src/test/org/apache/hadoop/hdfs/Hoopla.java
@@ -56,6 +56,9 @@ public class Hoopla extends Configured implements Tool {
   static private int numIterationsPerThread = 10000;
   static private short replication = 1;
   static private boolean doScatterGatherPread = true;
+  static private boolean useLocal = true;
+  static private boolean verifyChecksum = false;
+
 
   // switch off all logging so that the benchmark runs in constant time
   {
@@ -66,7 +69,8 @@ public class Hoopla extends Configured implements Tool {
 
   public static void printUsage() {
     System.out.println("USAGE: bin/hadoop hadoop-*.jar Hoopla [-noscattergather] [-fileName] " +
-                       "[-fileSize] [-blockSize] [-numThreads] [-numIterationsPerThread]");
+                       "[-fileSize] [-blockSize] [-numThreads] [-numIterationsPerThread] " +
+                       "[-nolocal] [-verifychecksum]");
     System.exit(0);
   }
 
@@ -87,6 +91,10 @@ public int run(String[] args) throws IOException {
     for (int i = 0; i < args.length; i++) {
       if (args[i].equals("-noscattergather")) {
         doScatterGatherPread = false;
+      } else if (args[i].equals("-nolocal")) {
+        useLocal = false;
+      } else if (args[i].equals("-verifychecksum")) {
+        verifyChecksum = true;
       } else if (args[i].equals("-fileName")) {
         fileName = new Path(args[++i]);
       } else if (args[i].equals("-blocksize")) {
@@ -114,11 +122,14 @@ public int run(String[] args) throws IOException {
     // is not impacted by unavailabity of server threads.
     Configuration conf = new Configuration();
     conf.setInt("dfs.datanode.scan.period.hours", -1); // disable periodic scanner
-    conf.setInt("dfs.datanode.max.xcievers", numThreads); // datanode threads
+    conf.setInt("dfs.datanode.max.xcievers",
+      Math.max(100, (int)(numThreads * 1.2))); // datanode threads
+    conf.setBoolean("dfs.read.shortcircuit", useLocal);
 
     // create cluster
     MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
     FileSystem fs = cluster.getFileSystem(0);
+    fs.setVerifyChecksum(verifyChecksum);
 
     // create a single large file
     FSDataOutputStream stm = fs.create(fileName, true,
diff --git a/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java b/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 10afcc9e..7473f4f0 100644
--- a/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -27,7 +27,9 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.nio.channels.FileChannel;
 import java.util.Random;
 import java.io.RandomAccessFile;
@@ -42,14 +44,13 @@
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumWriter;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
-import org.apache.hadoop.hdfs.server.datanode.DataStorage;
 import org.apache.hadoop.hdfs.server.datanode.FSDatasetInterface;
 import org.apache.hadoop.hdfs.server.datanode.NameSpaceSliceStorage;
 import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
-import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.namenode.NNStorageConfiguration;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
-import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
 import org.apache.hadoop.hdfs.tools.DFSAdmin;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
@@ -68,8 +69,14 @@ public class MiniDFSCluster {
   public static int currNSId = 0;
   
   private static final int PORT_START = 10000;
-  // the next port that will be handed out (if it is free)
-  private volatile static int nextPort = PORT_START;
+  private static final int PORT_END = 32000;
+  private static final Random random = new Random(); 
+  
+  private static final Set<Integer> usedPorts = new HashSet<Integer>();
+  
+  static {
+    DataNode.setSecureRandom(new Random());
+  }
 
   /**
    * Check whether a port is free.
@@ -86,8 +93,8 @@ static boolean isPortFree(int port) {
         if (socket != null) {
           socket.close();
         }
-      } catch (IOException ignore) {
-        // do nothing
+      } catch (IOException e) {
+        return false;
       }
     }
     return true;
@@ -105,25 +112,26 @@ public static int getFreePort() {
    * @return the first free port of the range
    */
   public static int getFreePorts(int num) {
-    int port = nextPort;
-
+    int port = -1;
+   
     boolean found = true;
     do {
+      found = true;
+      port = PORT_START + random.nextInt(PORT_END - PORT_START - num);
       for (int i = port; i < port + num; i++) {
-        if (!isPortFree(i)) {
-          port = i + 1;
+        if (!isPortFree(i) || usedPorts.contains(i)) {
           found = false;
           break; // from for loop
         }
       }
     } while (!found);
-
-    nextPort = port + num;
+    for(int i = port; i < port + num; i++)
+      usedPorts.add(i);
     LOG.info("using free port " + port + "(+" + (num - 1) + ")");
     return port;
   }
 
-  public class DataNodeProperties {
+  public class DataNodeProperties implements ShutdownInterface {
     public DataNode datanode;
     Configuration conf;
     String[] dnArgs;
@@ -133,22 +141,35 @@ public class DataNodeProperties {
       this.conf = conf;
       this.dnArgs = args;
     }
+
+    @Override
+    public void shutdown() throws IOException {
+      if (this.datanode != null)
+        this.datanode.shutdown();
+    }
   }
   
   boolean federation = false;
-  private Configuration conf;
+  Configuration conf;
   private NameNodeInfo[] nameNodes;
   
   /**
    * Stores the information related to a namenode in the cluster
    */
-  static class NameNodeInfo {
+  static class NameNodeInfo implements ShutdownInterface {
     final NameNode nameNode;
     final Configuration conf;
     NameNodeInfo(NameNode nn, Configuration conf) {
       this.nameNode = nn;
       this.conf = new Configuration(conf);
     }
+    @Override
+    public void shutdown() throws IOException {
+      if (nameNode != null) {
+        nameNode.stop();
+        nameNode.join();
+      }
+    }
   }
 
   //private Configuration conf;
@@ -226,7 +247,26 @@ public MiniDFSCluster(Configuration conf,
   
   public MiniDFSCluster(Configuration conf,
                         int numDataNodes,
-                        boolean format,
+                        String[] racks,
+                        String[] hosts,
+                        boolean setupHostsFile,
+                        boolean waitActive,
+                        boolean format) throws IOException {
+    this(0, conf, numDataNodes, format, true, true, null, racks, hosts, null,
+        true, setupHostsFile, 1, false, waitActive);
+  }
+
+  public MiniDFSCluster(Configuration conf,
+                        int numDataNodes,
+                        String[] racks,
+                        String[] hosts,
+                        boolean setupHostsFile,
+                        boolean waitActive) throws IOException {
+    this(0, conf, numDataNodes, true, true, true, null, racks, hosts, null,
+        true, setupHostsFile, 1, false, waitActive);
+  }
+
+  public MiniDFSCluster(Configuration conf, int numDataNodes, boolean format,
                         String[] racks,
                         int numNameNodes) throws IOException {
     this(0, conf, numDataNodes, format, true, true, null, racks, null, null, 
@@ -393,6 +433,23 @@ public MiniDFSCluster(int nameNodePort,
          manageDataDfsDirs, operation, racks, hosts, simulatedCapacities, true, false, 1, false);
   }
 
+  public MiniDFSCluster(int nameNodePort, 
+                        Configuration conf,
+                        int numDataNodes,
+                        boolean format,
+                        boolean manageNameDfsDirs,
+                        boolean manageDataDfsDirs,
+                        StartupOption operation,
+                        String[] racks, String hosts[],
+                        long[] simulatedCapacities,
+                        boolean waitSafeMode,
+                        boolean setupHostsFile,
+                        int numNameNodes,
+                        boolean federation) throws IOException {
+    this(nameNodePort, conf, numDataNodes, format, manageNameDfsDirs,
+        manageDataDfsDirs, operation, racks, hosts, simulatedCapacities,
+        waitSafeMode, setupHostsFile, numNameNodes, federation, true);
+  }
 
 
   /**
@@ -432,7 +489,8 @@ public MiniDFSCluster(int nameNodePort,
                         boolean waitSafeMode,
                         boolean setupHostsFile,
                         int numNameNodes,
-                        boolean federation) throws IOException {
+                        boolean federation,
+                        boolean waitActive) throws IOException {
     this.conf = conf;
     this.waitSafeMode = waitSafeMode;
     try {
@@ -453,6 +511,8 @@ public MiniDFSCluster(int nameNodePort,
     conf.setClass("topology.node.switch.mapping.impl", 
                    StaticMapping.class, DNSToSwitchMapping.class);
     
+    //http image download timeout
+    conf.setInt("dfs.image.transfer.timeout", 10 * 1000);
     
     this.federation = federation;
     
@@ -492,9 +552,11 @@ public MiniDFSCluster(int nameNodePort,
     // Start the DataNodes
     if (numDataNodes > 0) {
       startDataNodes(conf, numDataNodes, manageDataDfsDirs, operation, racks,
-          hosts, simulatedCapacities, setupHostsFile);
+          hosts, simulatedCapacities, setupHostsFile, waitActive);
+    }
+    if (waitActive) {
+      waitClusterUp();
     }
-    waitClusterUp();
   }
   
   /** Initialize configuration for federation cluster */
@@ -640,6 +702,15 @@ public void startDataNodes(Configuration conf, int numDataNodes,
     startDataNodes(conf, numDataNodes, manageDfsDirs, operation,
         racks, hosts, simulatedCapacities, false);
   }
+  
+  public synchronized void startDataNodes(Configuration conf, int numDataNodes, 
+                             boolean manageDfsDirs, StartupOption operation, 
+                             String[] racks, String[] hosts,
+                             long[] simulatedCapacities,
+                             boolean setupHostsFile) throws IOException {
+    startDataNodes(conf, numDataNodes, manageDfsDirs, operation,
+        racks, hosts, simulatedCapacities, false, true);
+  }
 
   /**
    * Modify the config and start up additional DataNodes.  The info port for
@@ -669,7 +740,8 @@ public synchronized void startDataNodes(Configuration conf, int numDataNodes,
                              boolean manageDfsDirs, StartupOption operation, 
                              String[] racks, String[] hosts,
                              long[] simulatedCapacities,
-                             boolean setupHostsFile) throws IOException {
+                             boolean setupHostsFile,
+                             boolean waitActive) throws IOException {
 
     int curDatanodesNum = dataNodes.size();
     // for mincluster's the default initialDelay for BRs is 0
@@ -763,7 +835,9 @@ public synchronized void startDataNodes(Configuration conf, int numDataNodes,
     }
     curDatanodesNum += numDataNodes;
     this.numDataNodes += numDataNodes;
-    waitActive();
+    if (waitActive) {
+      waitActive();
+    }
   }
   
   
@@ -915,14 +989,16 @@ public void shutdown() {
    */
   public void shutdown(boolean remove) {
     System.out.println("Shutting down the Mini HDFS Cluster");
-    shutdownDataNodes(remove);
-    for (NameNodeInfo nnInfo : nameNodes) {
-      NameNode nameNode = nnInfo.nameNode;
-      if (nameNode != null) {
-        nameNode.stop();
-        nameNode.join();
-        nameNode = null;
-      }
+    List<Thread> threads = new ArrayList<Thread>();    
+    // add datanodes to be shutdown
+    processDatanodesForShutdown(threads);
+    // add all namenodes to be shutdown
+    processNamenodesForShutdown(threads);
+    joinThreads(threads);
+    // clean dn list if needed
+    if(remove) {
+      dataNodes.clear();
+      numDataNodes = 0;
     }
   }
   
@@ -934,8 +1010,35 @@ public void shutdownDataNodes() {
    * is left running so that new DataNodes may be started.
    */
   public void shutdownDataNodes(boolean remove) {
-    for (int i = dataNodes.size()-1; i >= 0; i--) {
-      shutdownDataNode(i, remove);
+    List<Thread> threads = new ArrayList<Thread>();    
+    // add datanodes to be shutdown
+    processDatanodesForShutdown(threads);
+    joinThreads(threads);   
+    if(remove) {
+      dataNodes.clear();
+      numDataNodes = 0;
+    }
+  }
+  
+  /*
+   * Adds all datanodes to shutdown list
+   */
+  private void processDatanodesForShutdown(Collection<Thread> threads) {
+    for (int i = dataNodes.size()-1; i >= 0; i--) {    
+      Thread st = new Thread(new ShutDownUtil(dataNodes.get(i)));
+      st.start();
+      threads.add(st);
+    }
+  }
+
+  /*
+   * Adds all namenodes to shutdown list
+   */
+  private void processNamenodesForShutdown(Collection<Thread> threads) {
+    for (NameNodeInfo nnInfo : nameNodes) {
+      Thread st = new Thread(new ShutDownUtil(nnInfo));
+      st.start();
+      threads.add(st);
     }
   }
   
@@ -975,9 +1078,11 @@ public synchronized void shutdownNameNode(int nnIndex) {
    * Shutdown namenodes.
    */
   public synchronized void shutdownNameNodes() {
-    for (int i = 0; i<nameNodes.length; i++) {
-      shutdownNameNode(i);
-    }
+    System.out.println("Shutting down the namenodes");
+    List<Thread> threads = new ArrayList<Thread>();    
+    // add all namenodes to be shutdown
+    processNamenodesForShutdown(threads);
+    joinThreads(threads);
   }
 
   /**
@@ -1030,22 +1135,31 @@ public synchronized void restartNameNode(int nnIndex, String[] argv, boolean wai
   /*
    * Corrupt a block on all datanode
    */
-  void corruptBlockOnDataNodes(String blockName) throws Exception{
+  void corruptBlockOnDataNodes(Block block) throws Exception{
     for (int i=0; i < dataNodes.size(); i++)
-      corruptBlockOnDataNode(i,blockName);
+      corruptBlockOnDataNode(i,block);
   }
 
   /*
    * Corrupt a block on a particular datanode
    */
-  boolean corruptBlockOnDataNode(int i, String blockName) throws Exception {
+  boolean corruptBlockOnDataNode(int i, Block block) throws Exception {
     Random random = new Random();
     boolean corrupted = false;
     if (i < 0 || i >= dataNodes.size())
       return false;
     for (int dn = i*2; dn < i*2+2; dn++) {
+      String blockFileName;
+      if (this.getDataNodes().get(0).useInlineChecksum) {
+        blockFileName = BlockInlineChecksumWriter.getInlineChecksumFileName(
+            block, FSConstants.CHECKSUM_TYPE, conf
+                .getInt("io.bytes.per.checksum",
+                    FSConstants.DEFAULT_BYTES_PER_CHECKSUM));
+      } else {
+        blockFileName = block.getBlockName();
+      }
       File blockFile = new File(getBlockDirectory("data" + (dn+1)),
-                                blockName);
+          blockFileName);
       System.out.println("Corrupting for: " + blockFile);
       if (blockFile.exists()) {
         // Corrupt replica by writing random bytes into replica
@@ -1222,7 +1336,8 @@ public Collection<File> getNameDirs() {
   }
   
   public Collection<File> getNameDirs(int nnIndex) {
-    return FSNamesystem.getNamespaceDirs(nameNodes[nnIndex].conf);
+    return DFSTestUtil.getFileStorageDirs(
+        NNStorageConfiguration.getNamespaceDirs(nameNodes[nnIndex].conf));
   }
 
   /**
@@ -1234,7 +1349,8 @@ public Collection<File> getNameEditsDirs() {
   }
   
   public Collection<File> getNameEditsDirs(int nnIndex) {
-    return FSNamesystem.getNamespaceEditsDirs(nameNodes[nnIndex].conf);
+    return DFSTestUtil.getFileStorageDirs(
+        NNStorageConfiguration.getNamespaceEditsDirs(nameNodes[nnIndex].conf));
   }
 
   /**
@@ -1490,7 +1606,7 @@ public static File getDataDirectory(Configuration conf) {
     return new File(base_dir, "data");
   }
 
-  private File getBaseDirectory() {
+  public File getBaseDirectory() {
     return getBaseDirectory(conf);
   }
 
@@ -1498,6 +1614,12 @@ public static File getBaseDirectory(Configuration conf) {
     return new File(System.getProperty("test.build.data", "build/test/data"),
         "dfs/" + conf.get(DFS_CLUSTER_ID, ""));
   }
+  
+  public static void clearBaseDirectory(Configuration conf) throws IOException {
+    File baseDir = getBaseDirectory(conf);
+    FileUtil.fullyDelete(baseDir);
+    baseDir.mkdirs();
+  }
 
   /**
    * Get the base data directory
@@ -1688,4 +1810,41 @@ public int getNumNameNodes() {
   static public int getNSId() {
     return MiniDFSCluster.currNSId++;
   }
+  
+  /////////////////////////////////////////
+  // used for parallel shutdown
+  
+  public static interface ShutdownInterface {
+    void shutdown() throws IOException;    
+  }
+  
+  public static class ShutDownUtil implements Runnable {
+    private ShutdownInterface node;
+    ShutDownUtil(ShutdownInterface node) {
+      this.node = node;
+    }
+   
+    @Override
+    public void run() {
+      try {
+        node.shutdown();
+      } catch (Throwable e) {
+        LOG.error("Error when shutting down", e);
+      }
+    }
+  }
+  
+  // helper for shutdown methods
+  public static boolean joinThreads(Collection<Thread> threads) {
+    boolean success = true;
+    for (Thread st : threads) {
+      try {
+        st.join();
+      } catch (InterruptedException e) {
+        success = false;
+        LOG.error("Interruption", e);
+      }
+    }
+    return success;
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/NNBench.java b/src/test/org/apache/hadoop/hdfs/NNBench.java
index e05e3b95..f7870eff 100644
--- a/src/test/org/apache/hadoop/hdfs/NNBench.java
+++ b/src/test/org/apache/hadoop/hdfs/NNBench.java
@@ -19,7 +19,13 @@
 package org.apache.hadoop.hdfs;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+import java.util.Random;
 import java.io.DataInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStreamReader;
@@ -40,6 +46,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FilterFileSystem;
 import org.apache.hadoop.fs.FileSystem;
 
 import org.apache.hadoop.io.Text;
@@ -99,6 +106,7 @@ public class NNBench extends Configured implements Tool {
   public static int bytesToWrite = 0; // default is 0
   public static long bytesPerChecksum = 1l; // default is 1
   public static long numberOfFiles = 1l; // default is 1
+  public static boolean hardlinks = false; // default is false;
   public static short replicationFactorPerFile = 1; // default is 1
   public static String baseDir = "/benchmarks/NNBench";  // default
   public static boolean readFileAfterOpen = false; // default is to not read
@@ -264,6 +272,9 @@ public static void parseInputs(final String[] args, Configuration config) {
       } else if (args[i].equals("-numberOfFiles")) {
         checkArgs(i + 1, args.length);
         numberOfFiles = Long.parseLong(args[++i]);
+      } else if (args[i].equals("-hardlinks")) {
+        checkArgs(i + 1, args.length);
+        hardlinks = true;
       } else if (args[i].equals("-replicationFactorPerFile")) {
         checkArgs(i + 1, args.length);
         replicationFactorPerFile = Short.parseShort(args[++i]);
@@ -301,6 +312,7 @@ public static void parseInputs(final String[] args, Configuration config) {
     config.setInt("test.nnbench.bytestowrite", bytesToWrite);
     config.setLong("test.nnbench.bytesperchecksum", bytesPerChecksum);
     config.setLong("test.nnbench.numberoffiles", numberOfFiles);
+    config.setBoolean("test.nnbench.hardlinks", hardlinks);
     config.setInt("test.nnbench.replicationfactor", 
             (int) replicationFactorPerFile);
     config.set("test.nnbench.basedir", baseDir);
@@ -335,6 +347,7 @@ private static void analyzeResults(
     long totalTimeTPmS = 0l;
     long lateMaps = 0l;
     long numOfExceptions = 0l;
+    long hardlinkErrors = 0l;
     long successfulFileOps = 0l;
     
     long mapStartTimeTPmS = 0l;
@@ -359,6 +372,8 @@ private static void analyzeResults(
         lateMaps = Long.parseLong(tokens.nextToken());
       } else if (attr.endsWith(":numOfExceptions")) {
         numOfExceptions = Long.parseLong(tokens.nextToken());
+      } else if (attr.endsWith(":hardlinkErrors")) {
+        hardlinkErrors = Long.parseLong(tokens.nextToken());
       } else if (attr.endsWith(":successfulFileOps")) {
         successfulFileOps = Long.parseLong(tokens.nextToken());
       } else if (attr.endsWith(":mapStartTimeTPmS")) {
@@ -441,6 +456,7 @@ private static void analyzeResults(
     "",
     "        # maps that missed the barrier: " + lateMaps,
     "                          # exceptions: " + numOfExceptions,
+    "                    # hardlink errors : " + hardlinkErrors,
     "",
     resultTPSLine1,
     resultTPSLine2,
@@ -614,7 +630,9 @@ static class NNBenchMapper extends Configured
     FileSystem filesystem = null;
     private String hostName = null;
 
+    private Random random = new Random();
     long numberOfFiles = 1l;
+    boolean hardlinks = false;
     long blkSize = 1l;
     short replFactor = 1;
     int bytesToWrite = 0;
@@ -630,6 +648,8 @@ static class NNBenchMapper extends Configured
     long totalTimeAL1 = 0l;
     long totalTimeAL2 = 0l;
     long successfulFileOps = 0l;
+    long hardlinkErrors = 0l;
+    List<List<Path>> hardlinkList = new ArrayList<List<Path>>();
     
     /**
      * Constructor
@@ -690,6 +710,66 @@ private boolean barrier() {
       
       return retVal;
     }
+
+    private void createHardLinks(Path filePath) throws IOException {
+      if (hardlinks && random.nextBoolean()) {
+        List<Path> hardlinks = new ArrayList<Path>();
+        hardlinks.add(filePath);
+        int nlinks = 1 + random.nextInt(3);
+        for (int i = 0; i < nlinks; i++) {
+          Path target = new Path(filePath.toUri() + "hardlink" + i);
+          filesystem.hardLink(filePath, target);
+          if (random.nextBoolean()) {
+            // Delete directly from namenode, otherwise file will
+            // instead go to trash.
+            if (filesystem instanceof FilterFileSystem) {
+              ((DistributedFileSystem) (((FilterFileSystem) filesystem)
+                .getRawFileSystem())).dfs.namenode.delete(target
+              .toString());
+            } else {
+              ((DistributedFileSystem) filesystem).dfs.namenode
+                .delete(target.toString());
+            }
+          } else {
+            hardlinks.add(target);
+          }
+        }
+        hardlinkList.add(hardlinks);
+      }
+    }
+
+    private void verifyHardLinks() {
+      if (hardlinks) {
+        for (List<Path> paths : hardlinkList) {
+          try {
+            Path src = paths.get(0);
+            String[] actual = filesystem.getHardLinkedFiles(src);
+            Arrays.sort(actual);
+            String[] expected = new String[paths.size() - 1];
+            for (int i = 1; i < paths.size(); i++) {
+              expected[i-1] = paths.get(i).toString();
+            }
+            Arrays.sort(expected);
+            LOG.info("Actual hardlink files for " + src + " : ");
+            for (String s : actual) {
+              LOG.info(s);
+            }
+            LOG.info("Expected hardlink files for " + src + " : ");
+            for (String s : expected) {
+              LOG.info(s);
+            }
+            if (!Arrays.equals(expected, actual)) {
+              LOG.warn("Hardlinked files for : " + src + " do not match!");
+              hardlinkErrors++;
+            }
+          } catch (IOException e) {
+            LOG.info("Exception recorded in op: " +
+                "getHardLinkedFiles");
+            numOfExceptions++;
+          }
+        }
+      }
+    }
     
     /**
      * Map method
@@ -701,6 +781,7 @@ public void map(Text key,
       Configuration conf = filesystem.getConf();
       
       numberOfFiles = conf.getLong("test.nnbench.numberoffiles", 1l);
+      hardlinks = conf.getBoolean("test.nnbench.hardlinks", false);
       blkSize = conf.getLong("test.nnbench.blocksize", 1l);
       replFactor = (short) (conf.getInt("test.nnbench.replicationfactor", 1));
       bytesToWrite = conf.getInt("test.nnbench.bytestowrite", 0);
@@ -714,6 +795,7 @@ public void map(Text key,
       long endTimeTPms = 0l;
       
       numOfExceptions = 0;
+      hardlinkErrors = 0l;
       startTimeAL = 0l;
       totalTimeAL1 = 0l;
       totalTimeAL2 = 0l;
@@ -747,6 +829,8 @@ public void map(Text key,
           new Text(String.valueOf(totalTimeAL2)));
       output.collect(new Text("l:numOfExceptions"), 
           new Text(String.valueOf(numOfExceptions)));
+      output.collect(new Text("l:hardlinkErrors"),
+          new Text(String.valueOf(hardlinkErrors)));
       output.collect(new Text("l:successfulFileOps"), 
           new Text(String.valueOf(successfulFileOps)));
       output.collect(new Text("l:totalTimeTPmS"), 
@@ -797,14 +881,17 @@ private void doCreateWriteOp(String name,
             successfulFileOps ++;
 
             reporter.setStatus("Finish "+ l + " files");
+            createHardLinks(filePath);
           } catch (IOException e) {
             LOG.info("Exception recorded in op: " +
-                    "Create/Write/Close");
+                    "Create/Write/Close/HardLink");
  
             numOfExceptions++;
           }
         }
       }
+      verifyHardLinks();
+
     }
     
     /**
diff --git a/src/test/org/apache/hadoop/hdfs/TestAccessTime.java b/src/test/org/apache/hadoop/hdfs/TestAccessTime.java
new file mode 100644
index 00000000..a2300d3c
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/TestAccessTime.java
@@ -0,0 +1,278 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs;
+
+import junit.framework.TestCase;
+import java.io.*;
+import java.util.Random;
+import java.net.*;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.FileStatus;
+import org.mortbay.log.Log;
+
+/**
+ * This class tests the access time of files.
+ * 
+ */
+public class TestAccessTime extends TestCase {
+
+  static final long seed         = 0xDEADBEEFL;
+  static final int  blockSize    = 8192;
+  static final int  fileSize     = 16384;
+  static final int  numDatanodes = 6;
+
+  Random            myrand       = new Random();
+  Path              hostsFile;
+  Path              excludeFile;
+  Configuration     conf;
+  boolean           touchable;
+  boolean           changable;
+
+  static void sleep(long ms) {
+    try {
+      Thread.sleep(ms);
+    } catch (InterruptedException e) {
+      System.out.println("ms=" + ms + e.getMessage());
+    }
+  }
+  private void createFile(FileSystem fileSys, Path name, int repl,
+    boolean overwrite) throws IOException {
+    // create and write a file that contains three blocks of data
+    FSDataOutputStream stm = fileSys.create(name, overwrite, 
+      fileSys.getConf().getInt("io.file.buffer.size", 4096), (short) repl, (long) blockSize);
+    byte[] buffer = new byte[fileSize];
+    Random rand = new Random(seed);
+    rand.nextBytes(buffer);
+    sleep(1);
+    stm.write(buffer);
+    FileStatus stat = fileSys.getFileStatus(name);
+    long atime1 = stat.getAccessTime();
+    long mtime1 = stat.getModificationTime();
+    System.out.println("Creating after write: accessTime = " + atime1
+                       + " modTime = " + mtime1);
+    sleep(1);
+    stm.close();
+    stat = fileSys.getFileStatus(name);
+    atime1 = stat.getAccessTime();
+    mtime1 = stat.getModificationTime();
+    System.out.println("Creating after close: accessTime = " + atime1
+                       + " modTime = " + mtime1);
+  }
+
+  private void appendFile(FileSystem fileSys, Path name, int repl)
+    throws IOException {
+    // create and write a file that contains three blocks of data
+    FSDataOutputStream stm = fileSys.append(name,
+      fileSys.getConf().getInt("io.file.buffer.size", 4096));
+    byte[] buffer = new byte[fileSize];
+    Random rand = new Random(seed);
+    rand.nextBytes(buffer);
+    sleep(1);
+    stm.write(buffer);
+    FileStatus stat = fileSys.getFileStatus(name);
+    long atime1 = stat.getAccessTime();
+    long mtime1 = stat.getModificationTime();
+    System.out.println("Appending after write: accessTime = " + atime1
+                       + " modTime = " + mtime1);
+    sleep(1);
+    stm.close();
+    stat = fileSys.getFileStatus(name);
+    atime1 = stat.getAccessTime();
+    mtime1 = stat.getModificationTime();
+    System.out.println("Appending after close: accessTime = " + atime1
+                       + " modTime = " + mtime1);
+  }
+
+  private void cleanupFile(FileSystem fileSys, Path name) throws IOException {
+    assertTrue(fileSys.exists(name));
+    fileSys.delete(name, true);
+    assertTrue(!fileSys.exists(name));
+  }
+
+  private void printDatanodeReport(DatanodeInfo[] info) {
+    System.out.println("-------------------------------------------------");
+    for (int i = 0; i < info.length; i++) {
+      System.out.println(info[i].getDatanodeReport());
+      System.out.println();
+    }
+  }
+
+  public void dounit() throws IOException {
+    Configuration conf = new Configuration();
+    System.out.println("Testing accessTime with touchable = " + touchable
+                       + " changable = " + changable);
+    if (touchable) {
+      conf.set("dfs.access.time.touchable", "true");
+    } else {
+      conf.set("dfs.access.time.touchable", "false");
+    }
+    if (changable) {
+      conf.set("dfs.access.time.precision", "3600000");
+    } else {
+      conf.set("dfs.access.time.precision", "0");
+    }
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, true, null);
+    cluster.waitActive();
+    InetSocketAddress addr = new InetSocketAddress("localhost",
+      cluster.getNameNodePort());
+    DFSClient client = new DFSClient(addr, conf);
+    DatanodeInfo[] info = client.datanodeReport(DatanodeReportType.LIVE);
+    assertEquals("Number of Datanodes ", numDatanodes, info.length);
+    FileSystem fileSys = cluster.getFileSystem();
+    int replicas = numDatanodes - 1;
+    assertTrue(fileSys instanceof DistributedFileSystem);
+
+    try {
+      //
+      // create file and record access time of test file
+      //
+      String testfilename = "test.dat1";
+      System.out.println("Creating testdir1 and " + testfilename);
+      Path dir1 = new Path("testdir1");
+      Path file1 = new Path(dir1, testfilename);
+
+      createFile(fileSys, file1, replicas, false);
+      FileStatus stat = fileSys.getFileStatus(file1);
+      long atime1 = stat.getAccessTime();
+      long mtime1 = stat.getModificationTime();
+      System.out.println("The access time after creating the file is " + atime1);
+      System.out.println("The mod time after creating the file is " + mtime1);
+      stat = fileSys.getFileStatus(dir1);
+      long adir1 = stat.getAccessTime();
+      System.out.println("The access time for the dir is " + adir1);
+      assertTrue(atime1 != 0);
+
+      //
+      // append file
+      //
+      System.out.println("Appending testdir1/" + testfilename);
+      appendFile(fileSys, file1, replicas);
+      stat = fileSys.getFileStatus(file1);
+      long atime2 = stat.getAccessTime();
+      long mtime2 = stat.getModificationTime();
+      System.out.println("The access time after appending the file is "
+                         + atime2);
+      System.out.println("The mod time after appending the file is " + mtime2);
+      stat = fileSys.getFileStatus(dir1);
+      long adir2 = stat.getAccessTime();
+      System.out.println("The access time for the dir is " + adir2);
+      if (!changable) {
+        assertTrue(atime1 == atime2);
+      } else {
+        assertTrue(atime1 != atime2);
+      }
+      assertTrue(mtime1 != mtime2);
+
+      //
+      // overwrite file
+      //
+      System.out.println("Overwriting testdir1/" + testfilename);
+      createFile(fileSys, file1, replicas, true);
+      stat = fileSys.getFileStatus(file1);
+      long atime3 = stat.getAccessTime();
+      long mtime3 = stat.getModificationTime();
+      System.out.println("The access time after overwriting the file is "
+                         + atime3);
+      System.out.println("The modification time after overwriting the file is "
+                         + mtime3);
+      stat = fileSys.getFileStatus(dir1);
+      long adir3 = stat.getAccessTime();
+      System.out.println("The access time for the dir is " + adir3);
+      if (!changable) {
+        assertTrue(atime1 == atime3);
+      } else {
+        assertTrue(atime2 != atime3);
+      }
+      assertTrue(mtime2 != mtime3);
+
+      // setTimes
+      System.out.println("setTime for testdir1/" + testfilename);
+      long atime4 = atime3 - (24L * 3600L * 1000L);
+      long mtime4 = mtime3 - (3600L * 1000L);
+      try {
+        fileSys.setTimes(file1, mtime4, atime4);
+      } catch (org.apache.hadoop.ipc.RemoteException e) {
+        assertTrue(touchable == false);
+        Log.info("Expected exception from the server for failed touch");
+      }
+      System.out.println("set modifictaion=" + mtime4 + " accessTime=" + atime4);
+
+      stat = fileSys.getFileStatus(file1);
+      long atime5 = stat.getAccessTime();
+      long mtime5 = stat.getModificationTime();
+      System.out.println("The access time after setting the file is " + atime5);
+      System.out.println("The modification time after setting the file is "
+                         + mtime5);
+      stat = fileSys.getFileStatus(dir1);
+      long adir4 = stat.getAccessTime();
+      System.out.println("The access time for the dir is " + adir4);
+      if (!touchable) {
+        assertTrue(atime4 != atime5);
+        assertTrue(mtime4 != mtime5);
+        assertTrue(atime3 == atime5);
+        assertTrue(mtime3 == mtime5);
+      } else {
+        assertTrue(atime4 == atime5);
+        assertTrue(mtime4 == mtime5);
+      }
+
+      cleanupFile(fileSys, file1);
+      cleanupFile(fileSys, dir1);
+    } catch (IOException e) {
+      info = client.datanodeReport(DatanodeReportType.ALL);
+      printDatanodeReport(info);
+      throw e;
+    } finally {
+      fileSys.close();
+      cluster.shutdown();
+    }
+  }
+
+  /**
+   * Tests access time in DFS.
+   */
+  public void testNoTouchDoChange() throws IOException {
+    touchable = false;
+    changable = true;
+    dounit();
+  }
+
+  public void testNoTouchNoChange() throws IOException {
+    touchable = false;
+    changable = false;
+    dounit();
+  }
+
+  public void testTouchNoChange() throws IOException {
+    touchable = true;
+    changable = false;
+    dounit();
+  }
+
+  public void testTouchChange() throws IOException {
+    touchable = true;
+    changable = true;
+    dounit();
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/TestBlockReaderLocal.java b/src/test/org/apache/hadoop/hdfs/TestBlockReaderLocal.java
new file mode 100644
index 00000000..a4a077db
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/TestBlockReaderLocal.java
@@ -0,0 +1,246 @@
+package org.apache.hadoop.hdfs;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Random;
+
+import static org.junit.Assert.*;
+
+/**
+ * BlockReaderLocal Tests
+ */
+public class TestBlockReaderLocal {
+
+  private static final Random random = new Random();
+  private static final int BLOCK_SIZE = 1024;
+  private static final int FILE_SIZE = 4000;
+
+  // writes a random file of given seed, size and path in the FileSystem fs
+  // and returns the written bytes
+  private byte[] writeRandomFile(FileSystem fs, Path path, int seed, int size)
+      throws IOException {
+    byte[] fileData = new byte[size];
+    new Random(seed).nextBytes(fileData);
+
+    FSDataOutputStream outputStream = fs.create(path, true,
+        fs.getConf().getInt("io.file.buffer.size", 4096),
+        (short) 1, BLOCK_SIZE);
+    try {
+      outputStream.write(fileData);
+    } finally {
+      outputStream.close();
+    }
+    return fileData;
+  }
+
+  private void assertDir(String path, FileSystem fs, FileSystem... rest) 
+      throws IOException {
+    Path p = new Path(path);
+    assertTrue(path + " should be a directory", fs.getFileStatus(p).isDir());
+    for (FileSystem fileSystem : rest) {
+      assertTrue(path + " should be a directory", 
+          fileSystem.getFileStatus(p).isDir());
+    }
+  }
+
+  public void assertFile(FileSystem fs, Path path, int fileSize, 
+                         byte[] fileData) throws IOException {
+    
+    assertTrue(path + " is not a file", fs.isFile(path));
+    assertEquals("file size do not match for " + path, fileSize, 
+        fs.getContentSummary(path).getLength());
+    
+    FSDataInputStream inputStream = fs.open(path);
+    try {
+      byte[] readFileData = new byte[fileSize];
+      inputStream.readFully(readFileData);
+      assertArrayEquals("file data do not match for " +
+          path, fileData, readFileData);
+    } finally {
+      inputStream.close();
+    }
+  }
+
+  private Configuration buildConfigurationFor(String dfsClusterId) {
+    Configuration conf = new Configuration();
+    conf.setBoolean("dfs.read.shortcircuit", true);
+    conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", false);
+    if (dfsClusterId != null) {
+      conf.set(MiniDFSCluster.DFS_CLUSTER_ID, dfsClusterId);
+    }
+    return conf;
+  }
+
+  private MiniDFSCluster newColocatedMiniDFSCluster(String dfsClusterId) 
+      throws IOException {
+    
+    Configuration conf = buildConfigurationFor(dfsClusterId);
+    return new MiniDFSCluster(conf, 2, true, null);
+  }
+
+  private MiniDFSCluster newFederatedMiniDFSCluster(String dfsClusterId)
+      throws IOException {
+    
+    Configuration conf = buildConfigurationFor(dfsClusterId);
+    return new MiniDFSCluster(conf, 2, true, null, 2);
+  }
+
+  private void initBlockIdRandomizer(long seed) {
+
+    Class klass = FSNamesystem.class;
+    String randomizerFieldName = "randBlockId";
+    try {
+      Field field = klass.getDeclaredField(randomizerFieldName);
+      field.setAccessible(true);
+      field.set(null, new Random(seed));
+    } catch (Exception e) {
+      Assert.fail("Could not reset Block randomizer field -> "
+          + klass.getSimpleName() + "." + randomizerFieldName +
+          " " + e.getClass().getName() + ": " + e.getLocalizedMessage());
+    }
+
+  }
+
+  /**
+   * Test to ensure that namespace id is used for caching block path. 
+   * We use an identical random seed for generating block id sequences for two
+   * file systems in two different cluster. Then we store two different files 
+   * in each filesystem and assert that they we get the files stored.
+   * Observe that the block ids for each of these files are same. So, to 
+   * retrieve the random bits we
+   * stored, namesapce of each filesystem must be accounted for caching blocks.
+   *
+   * sequences
+   * @throws IOException
+   */
+  @Test
+  public void testColocatedNamespaceId() throws IOException {
+    String prefix = getClass().getSimpleName() + "-colocated-";
+    MiniDFSCluster cluster1 = newColocatedMiniDFSCluster(prefix +
+        random.nextInt(Integer.MAX_VALUE));
+    MiniDFSCluster cluster2 = newColocatedMiniDFSCluster(prefix +
+        random.nextInt(Integer.MAX_VALUE));
+
+
+    FileSystem fs1 = cluster1.getFileSystem();
+    FileSystem fs2 = cluster2.getFileSystem();
+    try {
+      // check that / exists
+      assertDir("/", fs1, fs2);
+      Path file = new Path("file.dat");
+      initBlockIdRandomizer(0xcafebabe);
+      byte[] fileData1 = writeRandomFile(fs1, file, 0xABADCAFE, FILE_SIZE);
+
+      initBlockIdRandomizer(0xcafebabe);
+      byte[] fileData2 = writeRandomFile(fs2, file, 0xABADCAFE, FILE_SIZE);
+
+      assertFile(fs1, file, FILE_SIZE, fileData1);
+      assertFile(fs2, file, FILE_SIZE, fileData2);
+    } finally {
+      fs1.close();
+      cluster1.shutdown();
+      fs2.close();
+      cluster2.shutdown();
+    }
+  }
+
+  /**
+   * We store two files in two different HDFS clusters at the same path and
+   * ensure that we can retrieve them successfully.
+   *
+   * @throws IOException
+   */
+  @Test
+  public void testColocatedClustersIpcPorts() throws IOException {
+    String prefix = getClass().getSimpleName() + "-colocated-";
+    MiniDFSCluster cluster1 = newColocatedMiniDFSCluster(prefix +
+        random.nextInt(Integer.MAX_VALUE));
+    MiniDFSCluster cluster2 = newColocatedMiniDFSCluster(prefix +
+        random.nextInt(Integer.MAX_VALUE));
+
+
+    FileSystem fs1 = cluster1.getFileSystem();
+    FileSystem fs2 = cluster2.getFileSystem();
+    try {
+      // check that / exists
+      assertDir("/", fs1, fs2);
+
+      Path file = new Path("file.dat");
+      byte[] fileData1 = writeRandomFile(fs1, file, 0x1234, FILE_SIZE);
+      byte[] fileData2 = writeRandomFile(fs2, file, 0xabcd, FILE_SIZE);
+
+      assertFile(fs1, file, FILE_SIZE, fileData1);
+      assertFile(fs2, file, FILE_SIZE, fileData2);
+    } finally {
+      fs1.close();
+      cluster1.shutdown();
+      fs2.close();
+      cluster2.shutdown();
+    }
+  }
+
+  //Federated tests
+  @Test
+  public void testFederatedNamespaceId() throws IOException {
+    String prefix = getClass().getSimpleName() + "-federated-";
+    MiniDFSCluster cluster = newFederatedMiniDFSCluster(prefix +
+        random.nextInt(Integer.MAX_VALUE));
+
+    FileSystem fs1 = cluster.getFileSystem(0);
+    FileSystem fs2 = cluster.getFileSystem(1);
+    try {
+      // check that / exists
+      assertDir("/", fs1, fs2);
+      Path file = new Path("file.dat");
+      initBlockIdRandomizer(0xcafebabe);
+      byte[] fileData1 = writeRandomFile(fs1, file, 0xABADCAFE, FILE_SIZE);
+
+      initBlockIdRandomizer(0xcafebabe);
+      byte[] fileData2 = writeRandomFile(fs2, file, 0xABADCAFE, FILE_SIZE);
+
+      assertFile(fs1, file, FILE_SIZE, fileData1);
+      assertFile(fs2, file, FILE_SIZE, fileData2);
+    } finally {
+      fs1.close();
+      cluster.shutdown();
+      fs2.close();
+    }
+  }
+
+  @Test
+  public void testFederatedClustersIpcPorts() throws IOException {
+    String prefix = getClass().getSimpleName() + "-federated-";
+    MiniDFSCluster cluster = newFederatedMiniDFSCluster(prefix +
+        random.nextInt(Integer.MAX_VALUE));
+
+
+    FileSystem fs1 = cluster.getFileSystem(0);
+    FileSystem fs2 = cluster.getFileSystem(1);
+    try {
+      // check that / exists
+      assertDir("/", fs1, fs2);
+
+      Path file = new Path("file.dat");
+      byte[] fileData1 = writeRandomFile(fs1, file, 0x1234, FILE_SIZE);
+      byte[] fileData2 = writeRandomFile(fs2, file, 0xabcd, FILE_SIZE);
+
+      assertFile(fs1, file, FILE_SIZE, fileData1);
+      assertFile(fs2, file, FILE_SIZE, fileData2);
+    } finally {
+      fs1.close();
+      cluster.shutdown();
+      fs2.close();
+    }
+  }
+
+}
+
diff --git a/src/test/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java b/src/test/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java
index ecb85836..03e49907 100644
--- a/src/test/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java
+++ b/src/test/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.server.namenode.DatanodeDescriptor;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
diff --git a/src/test/org/apache/hadoop/hdfs/TestCheckDisk.java b/src/test/org/apache/hadoop/hdfs/TestCheckDisk.java
index beedcdbc..414f8c4d 100644
--- a/src/test/org/apache/hadoop/hdfs/TestCheckDisk.java
+++ b/src/test/org/apache/hadoop/hdfs/TestCheckDisk.java
@@ -33,7 +33,7 @@
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.BlockPathInfo;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
diff --git a/src/test/org/apache/hadoop/hdfs/TestChecksumFile.java b/src/test/org/apache/hadoop/hdfs/TestChecksumFile.java
index 54890a14..edd895ed 100644
--- a/src/test/org/apache/hadoop/hdfs/TestChecksumFile.java
+++ b/src/test/org/apache/hadoop/hdfs/TestChecksumFile.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.RandomAccessFile;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Random;
@@ -33,7 +34,7 @@
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.BlockPathInfo;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
@@ -49,12 +50,14 @@
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.ClientAdapter;
 import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.util.DataChecksum;
 import org.apache.hadoop.util.Progressable;
 
 public class TestChecksumFile extends junit.framework.TestCase {
   static final int BLOCK_SIZE = 1024;
   static final short REPLICATION_NUM = (short) 1;
   byte[] inBytes = "something".getBytes();
+  byte[] inBytes2 = "another".getBytes();
 
   static void checkMetaInfo(int namespaceId, Block b, InterDatanodeProtocol idp)
       throws IOException {
@@ -65,6 +68,7 @@ public void testRecoverZeroChecksumFile() throws Exception {
     MiniDFSCluster cluster = createMiniCluster();
     try {
       cluster.waitActive();
+      cluster.getDataNodes().get(0).useInlineChecksum = false;
 
       // create a file
       DistributedFileSystem dfs = (DistributedFileSystem) cluster
@@ -138,13 +142,16 @@ public void testMissingChecksumFile() throws Exception {
     MiniDFSCluster cluster = createMiniCluster();
     try {
       cluster.waitActive();
+      cluster.getDataNodes().get(0).useInlineChecksum = false;
+
       // create a file
       DistributedFileSystem dfs = (DistributedFileSystem) cluster
           .getFileSystem();
       String filestr = "/testMissingChecksumFile";
-      creatFileAndWriteSomething(dfs, filestr);
+      DFSTestUtil.creatFileAndWriteSomething(dfs, filestr, (short)2);
 
-      BlockPathInfo blockPathInfo = getBlockPathInfo(filestr, cluster, dfs.dfs);
+      BlockPathInfo blockPathInfo = DFSTestUtil.getBlockPathInfo(filestr,
+          cluster, dfs.dfs);
       String metaPath = blockPathInfo.getMetaPath();
 
       // Delete the checksum file
@@ -169,13 +176,16 @@ public void testCorruptChecksumFile() throws Exception {
     MiniDFSCluster cluster = createMiniCluster();
     try {
       cluster.waitActive();
+      cluster.getDataNodes().get(0).useInlineChecksum = false;
+
       // create a file
       DistributedFileSystem dfs = (DistributedFileSystem) cluster
           .getFileSystem();
       String filestr = "/testCorruptChecksumFile";
-      creatFileAndWriteSomething(dfs, filestr);
+      DFSTestUtil.creatFileAndWriteSomething(dfs, filestr, (short)2);
 
-      BlockPathInfo blockPathInfo = getBlockPathInfo(filestr, cluster, dfs.dfs);
+      BlockPathInfo blockPathInfo = DFSTestUtil.getBlockPathInfo(filestr,
+          cluster, dfs.dfs);
       String metaPath = blockPathInfo.getMetaPath();
 
       // Populate the checksum file
@@ -212,13 +222,16 @@ public void testDisableReadChecksum() throws Exception {
     MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
     try {
       cluster.waitActive();
+      cluster.getDataNodes().get(0).useInlineChecksum = false;
+
       // create a file
       DistributedFileSystem dfs = (DistributedFileSystem) cluster
           .getFileSystem();
       String filestr = "/testDisableReadChecksum";
-      creatFileAndWriteSomething(dfs, filestr);
+      DFSTestUtil.creatFileAndWriteSomething(dfs, filestr, (short)2);
 
-      BlockPathInfo blockPathInfo = getBlockPathInfo(filestr, cluster, dfs.dfs);
+      BlockPathInfo blockPathInfo = DFSTestUtil.getBlockPathInfo(filestr,
+          cluster, dfs.dfs);
       String metaPath = blockPathInfo.getMetaPath();
 
       // Pollute the checksum file
@@ -244,38 +257,94 @@ public void testDisableReadChecksum() throws Exception {
     }
   }
   
-  private MiniDFSCluster createMiniCluster() throws IOException {
-    Configuration conf = new Configuration();
-    conf.setLong("dfs.block.size", BLOCK_SIZE);
-    conf.setBoolean("dfs.support.append", true);
-    return new MiniDFSCluster(conf, 1, true, null);
-  }
-  
-  private void creatFileAndWriteSomething(DistributedFileSystem dfs,
-      String filestr) throws IOException {
-    Path filepath = new Path(filestr);
-    
-    FSDataOutputStream out = dfs.create(filepath, true);
+  public void testCorruptInlineChecksumFile() throws Exception {
+    MiniDFSCluster cluster = createMiniCluster();
     try {
-      out.write(inBytes);
+      cluster.waitActive();
+      cluster.getDataNodes().get(0).useInlineChecksum = true;
+
+      // create a file
+      DistributedFileSystem dfs = (DistributedFileSystem) cluster
+          .getFileSystem();
+      String filestr = "/testCorruptInlineChecksumFile";
+      DFSTestUtil.creatFileAndWriteSomething(dfs, filestr, (short)2);
+
+      BlockPathInfo blockPathInfo = DFSTestUtil.getBlockPathInfo(filestr, cluster, dfs.dfs);
+      String blockPath = blockPathInfo.getBlockPath();
+
+      // Populate the checksum file
+      RandomAccessFile blockOut = new RandomAccessFile(blockPath, "rw");
+      try {
+        blockOut.seek(DataChecksum.getChecksumHeaderSize());
+        blockOut.write(inBytes2);
+      } finally {
+        blockOut.close();
+      }
+
+      // Exception when read from the file
+      InputStream in = dfs.open(new Path(filestr));
+      try {
+        TestCase.assertEquals(inBytes.length, in.read(inBytes));
+        TestCase.fail();
+      } catch (IOException e) {
+      } finally {
+        in.close();
+      }
     } finally {
-      out.close();
+      cluster.shutdown();
     }
+
   }
 
-  private BlockPathInfo getBlockPathInfo(String filename,
-      MiniDFSCluster miniCluster, DFSClient dfsclient) throws IOException {
-    LocatedBlocks locations = dfsclient.namenode.getBlockLocations(filename, 0,
-        Long.MAX_VALUE);
-    assertEquals(1, locations.locatedBlockCount());
-    LocatedBlock locatedblock = locations.getLocatedBlocks().get(0);
-    DataNode datanode = miniCluster.getDataNode(locatedblock.getLocations()[0]
-        .getIpcPort());
-    assertTrue(datanode != null);
+  public void testDisableReadInlineChecksum() throws Exception {
+    Configuration conf = new Configuration();
+    conf.setLong("dfs.block.size", BLOCK_SIZE);
+    conf.setBoolean("dfs.support.append", true);
+    // Not sending checksum
+    conf.setBoolean("dfs.datanode.read.ignore.checksum", true);
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
+    try {
+      cluster.waitActive();
+      cluster.getDataNodes().get(0).useInlineChecksum = true;
+
+      // create a file
+      DistributedFileSystem dfs = (DistributedFileSystem) cluster
+          .getFileSystem();
+      String filestr = "/testDisableReadInlineChecksum";
+      DFSTestUtil.creatFileAndWriteSomething(dfs, filestr, (short)2);
 
-    Block lastblock = locatedblock.getBlock();
-    DataNode.LOG.info("newblocks=" + lastblock);
+      BlockPathInfo blockPathInfo = DFSTestUtil.getBlockPathInfo(filestr, cluster, dfs.dfs);
+      String blockPath = blockPathInfo.getBlockPath();
 
-    return datanode.getBlockPathInfo(lastblock);
+      // Populate the checksum file
+      RandomAccessFile blockOut = new RandomAccessFile(blockPath, "rw");
+      try {
+        blockOut.seek(DataChecksum.getChecksumHeaderSize());
+        blockOut.write(inBytes2);
+      } finally {
+        blockOut.close();
+      }
+
+      // File can be read without any exception
+      InputStream in = dfs.open(new Path(filestr));
+      try {
+        TestCase.assertEquals(inBytes.length, in.read(inBytes));
+        TestCase.assertEquals(0, in.available());
+      } finally {
+        in.close();
+      }
+    } finally {
+      cluster.shutdown();
+    }
+  }
+  
+  
+  private MiniDFSCluster createMiniCluster() throws IOException {
+    Configuration conf = new Configuration();
+    conf.setLong("dfs.block.size", BLOCK_SIZE);
+    conf.setBoolean("dfs.support.append", true);
+    return new MiniDFSCluster(conf, 1, true, null);
   }
+  
+
 }
diff --git a/src/test/org/apache/hadoop/hdfs/TestCloseFile.java b/src/test/org/apache/hadoop/hdfs/TestCloseFile.java
index 536e78c8..493e60b5 100644
--- a/src/test/org/apache/hadoop/hdfs/TestCloseFile.java
+++ b/src/test/org/apache/hadoop/hdfs/TestCloseFile.java
@@ -8,7 +8,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
 import org.apache.hadoop.hdfs.server.namenode.SafeModeException;
 import org.apache.hadoop.ipc.RemoteException;
diff --git a/src/test/org/apache/hadoop/hdfs/TestCorruptBlocks.java b/src/test/org/apache/hadoop/hdfs/TestCorruptBlocks.java
new file mode 100644
index 00000000..f7e32f01
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/TestCorruptBlocks.java
@@ -0,0 +1,104 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hdfs;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumWriter;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+
+import junit.framework.TestCase;
+
+/**
+ * This test verifies that block verification occurs on the datanode
+ */
+public class TestCorruptBlocks extends TestCase {
+  
+  private static boolean corruptReplicaGS(
+      Block block, int datanodeIndex, MiniDFSCluster cluster)
+      throws IOException {
+    Block newBlock = new Block(block);
+    newBlock.setGenerationStamp(block.getGenerationStamp() + 1);
+    int bytesPerChecksum = cluster.conf.getInt(
+        "io.bytes.per.checksum", FSConstants.DEFAULT_BYTES_PER_CHECKSUM);
+    boolean corrupted = false;
+    for (int i = datanodeIndex*2; i < datanodeIndex*2+2; i++) {
+      File blockFile = new File(cluster.getBlockDirectory("data" + (i+1)),
+          block+".meta");
+      if (blockFile.exists()) {
+        blockFile.renameTo(new File(
+            cluster.getBlockDirectory("data" + (i+1)), newBlock+".meta"));
+        corrupted = true;
+        continue;
+      }
+      File blockFileInlineChecksum = new File(cluster.getBlockDirectory("data"
+          + (i + 1)), BlockInlineChecksumWriter.getInlineChecksumFileName(
+          block, FSConstants.CHECKSUM_TYPE, bytesPerChecksum));
+      if (blockFileInlineChecksum.exists()) {
+        blockFileInlineChecksum.renameTo(new File(
+            cluster.getBlockDirectory("data" + (i + 1)),
+            BlockInlineChecksumWriter.getInlineChecksumFileName(
+                newBlock, FSConstants.CHECKSUM_TYPE, bytesPerChecksum)));
+        corrupted = true;
+        continue;
+      }
+    }
+    return corrupted;
+  }
+
+  public void testMismatchedBlockGS() throws IOException {
+    Configuration conf = new Configuration();
+    final short REPLICATION_FACTOR = 1;
+    MiniDFSCluster cluster = new MiniDFSCluster(
+        conf, REPLICATION_FACTOR, true, null);
+    try {
+      cluster.waitActive();
+
+      FileSystem fs = cluster.getFileSystem();
+      Path file1 = new Path("/tmp/file1");
+
+      // create a file
+      DFSTestUtil.createFile(fs, file1, 10, REPLICATION_FACTOR, 0);
+
+      // corrupt its generation stamp
+      Block block = DFSTestUtil.getFirstBlock(fs, file1);
+      corruptReplicaGS(block, 0, cluster);
+
+      // stop and start the cluster
+      cluster.shutdown();
+      cluster = new MiniDFSCluster(
+          conf, REPLICATION_FACTOR, false, null, false);
+      cluster.waitActive();
+      assertTrue(cluster.getNameNode().setSafeMode(SafeModeAction.SAFEMODE_GET));
+      cluster.getNameNode().setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
+
+      // Verify that there is a missing block
+      assertEquals(1, 
+          cluster.getNameNode().getNamesystem().getMissingBlocksCount());
+    } finally {
+      cluster.shutdown();
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/TestCrcCorruption.java b/src/test/org/apache/hadoop/hdfs/TestCrcCorruption.java
index 5079493e..c34e10aa 100644
--- a/src/test/org/apache/hadoop/hdfs/TestCrcCorruption.java
+++ b/src/test/org/apache/hadoop/hdfs/TestCrcCorruption.java
@@ -29,6 +29,7 @@
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.ChecksumException;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.io.IOUtils;
 
 /**
@@ -249,7 +250,7 @@ private void doTestEntirelyCorruptFile(int numDataNodes) throws Exception {
       DFSTestUtil.createFile(fs, file, fileSize, (short)numDataNodes, 12345L /*seed*/);
       DFSTestUtil.waitReplication(fs, file, (short)numDataNodes);
 
-      String block = DFSTestUtil.getFirstBlock(fs, file).getBlockName();
+      Block block = DFSTestUtil.getFirstBlock(fs, file);
       cluster.corruptBlockOnDataNodes(block);
 
       try {
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSClientMetrics.java b/src/test/org/apache/hadoop/hdfs/TestDFSClientMetrics.java
index a25be13e..fe81b5a3 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDFSClientMetrics.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSClientMetrics.java
@@ -7,7 +7,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.DFSClient.DFSDataInputStream;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.metrics.DFSClientMetrics;
 import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 import org.apache.hadoop.conf.Configuration;
@@ -28,6 +28,7 @@ private static Path getTestPath(String dirName) {
 	}
 	@Override
 	protected void setUp() throws Exception{
+	  CONF.setBoolean("dfs.client.metrics.enable", true);
 		cluster = new MiniDFSCluster(CONF, 1, true, null);
 		cluster.waitActive();
 		fs = (DistributedFileSystem) cluster.getFileSystem();
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSClientMetricsSync.java b/src/test/org/apache/hadoop/hdfs/TestDFSClientMetricsSync.java
new file mode 100644
index 00000000..0606bd5d
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSClientMetricsSync.java
@@ -0,0 +1,84 @@
+package org.apache.hadoop.hdfs;
+
+import java.lang.reflect.Method;
+
+import junit.framework.TestCase;
+
+import org.apache.hadoop.hdfs.metrics.DFSClientMetrics;
+
+public class TestDFSClientMetricsSync extends TestCase {
+
+	private static final int THREAD_COUNT = 20;
+	private static final int OPERATIONS_PER_THREAD = 100;
+	private static final long PREAD_SIZE_VALUE = 3;
+	private static final long PREAD_TIME_VALUE = 5;
+	private static final long READ_TIME_VALUE = 7;
+	private static final long SYNC_TIME_VALUE = 11;
+	private static final long WRITE_SIZE_VALUE = 13;
+	private static final long READ_SIZE_VALUE = 17;
+
+	public void testSync() throws Exception{
+		Thread[] threads = new Thread[THREAD_COUNT];
+		final DFSClientMetrics metrics = new DFSClientMetrics(true);
+		for(int i = 0; i < threads.length; i++) {
+			threads[i] = new Thread(new Runnable() {
+
+				@Override
+				public void run() {
+					for(int i = 0; i < OPERATIONS_PER_THREAD; i++) {
+						metrics.incLsCalls();
+						metrics.incNumCreateDirOps();
+						metrics.incNumCreateFileOps();
+						metrics.incPreadOps();
+						metrics.incPreadSize(PREAD_SIZE_VALUE);
+						metrics.incPreadTime(PREAD_TIME_VALUE);
+						metrics.incReadOps();
+						metrics.incReadsFromLocalFile();
+						metrics.incReadSize(READ_SIZE_VALUE);
+						metrics.incReadTime(READ_TIME_VALUE);
+						metrics.incSyncTime(SYNC_TIME_VALUE);
+						metrics.incWriteOps();
+						metrics.incWriteSize(WRITE_SIZE_VALUE);
+					}
+				}
+			});
+		}
+		for(int i = 0; i < threads.length; i++) {
+			threads[i].start();
+		}
+		for(int i = 0; i < threads.length; i++) {
+			threads[i].join();
+		}
+
+    // This is dependent to DFSClientMetrics private API; used to obtain value
+    // of lsCalls.
+    Method privateStringMethod = DFSClientMetrics.class
+        .getDeclaredMethod("getAndResetLsCalls");
+    privateStringMethod.setAccessible(true);
+
+		long returnValue = (Long) privateStringMethod.invoke(metrics);
+		assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD, returnValue);
+		
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD,
+        metrics.numCreateDirOps.getCurrentIntervalValue());
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD,
+        metrics.numCreateFileOps.getCurrentIntervalValue());
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD,
+        metrics.preadOps.getCurrentIntervalValue());
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD * PREAD_SIZE_VALUE,
+        metrics.preadSize.getCurrentIntervalValue());
+		assertEquals(PREAD_TIME_VALUE, metrics.preadLatency.getMinTime());
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD,
+        metrics.readOps.getCurrentIntervalValue());
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD,
+        metrics.readsFromLocalFile.getCurrentIntervalValue());
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD * READ_SIZE_VALUE,
+        metrics.readSize.getCurrentIntervalValue());
+		assertEquals(READ_TIME_VALUE, metrics.readLatency.getMinTime());
+		assertEquals(SYNC_TIME_VALUE, metrics.syncLatency.getMinTime());
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD,
+        metrics.writeOps.getCurrentIntervalValue());
+    assertEquals(THREAD_COUNT * OPERATIONS_PER_THREAD * WRITE_SIZE_VALUE,
+        metrics.writeSize.getCurrentIntervalValue());
+	}
+}
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSClientRetries.java b/src/test/org/apache/hadoop/hdfs/TestDFSClientRetries.java
index c1f0572a..bcd53179 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDFSClientRetries.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSClientRetries.java
@@ -28,7 +28,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.protocol.*;
 import org.apache.hadoop.hdfs.protocol.FSConstants.UpgradeAction;
 import org.apache.hadoop.hdfs.server.common.*;
@@ -207,6 +207,10 @@ public void concat(String trg, String[] srcs, boolean restricted) throws IOExcep
 
     public boolean hardLink(String src, String dst) throws IOException { return false; }
 
+    public String[] getHardLinkedFiles(String src) throws IOException {
+      return new String[] {};
+    }
+
     public boolean rename(String src, String dst) throws IOException { return false; }
 
     public boolean delete(String src) throws IOException { return false; }
@@ -246,6 +250,8 @@ public void renewLease(String clientName) throws IOException {}
     public void saveNamespace() throws IOException {}
     public void saveNamespace(boolean force, boolean uncompressed) throws IOException {}
 
+    public void rollEditLogAdmin() throws IOException {}
+    
     public boolean restoreFailedStorage(String arg) throws AccessControlException { return false; }
 
     public void refreshNodes() throws IOException {}
@@ -409,67 +415,77 @@ public void testFailuresArePerOperation() throws Exception
     Path file = new Path("/testFile");
 
     Configuration conf = new Configuration();
-    MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
-
     int maxBlockAcquires = DFSClient.getMaxBlockAcquireFailures(conf);
     assertTrue(maxBlockAcquires > 0);
-
-    try {
-      cluster.waitActive();
-      FileSystem fs = cluster.getFileSystem();
-      NameNode preSpyNN = cluster.getNameNode();
-      NameNode spyNN = spy(preSpyNN);
-      
-      DFSClient client = new DFSClient(null, spyNN, conf, null);
-
-      DFSTestUtil.createFile(fs, file, fileSize, (short)1, 12345L /*seed*/);
-
-      // If the client will retry maxBlockAcquires times, then if we fail
-      // any more than that number of times, the operation should entirely
-      // fail.
-      doAnswer(new FailNTimesAnswer(preSpyNN, maxBlockAcquires + 1))
-        .when(spyNN).openAndFetchMetaInfo(anyString(), anyLong(), anyLong());
+    int[] numDataNodes = new int[] {1, maxBlockAcquires, maxBlockAcquires + 1};
+    
+    for (int numDataNode : numDataNodes) {
+      MiniDFSCluster cluster = null;
       try {
+        cluster = new MiniDFSCluster(conf, numDataNode, true, null);
+        cluster.waitActive();
+        FileSystem fs = cluster.getFileSystem();
+        NameNode preSpyNN = cluster.getNameNode();
+        NameNode spyNN = spy(preSpyNN);
+        
+        DFSClient client = new DFSClient(null, spyNN, conf, null);
+  
+        DFSTestUtil.createFile(fs, file, fileSize, 
+            (short)numDataNode, 12345L /*seed*/);
+  
+        // If the client will retry maxBlockAcquires times, then if we fail
+        // any more than that number of times, the operation should entirely
+        // fail.
+        doAnswer(new FailNTimesAnswer(preSpyNN, numDataNode,
+            Math.min(maxBlockAcquires, numDataNode) + 1))
+          .when(spyNN).openAndFetchMetaInfo(anyString(), anyLong(), anyLong());
+        try {
+          IOUtils.copyBytes(client.open(file.toString()), new IOUtils.NullOutputStream(), conf,
+                            true);
+          fail("Didn't get exception");
+        } catch (IOException ioe) {
+          DFSClient.LOG.info("Got expected exception", ioe);
+        }
+  
+        // If we fail exactly that many times, then it should succeed.
+        doAnswer(new FailNTimesAnswer(preSpyNN, numDataNode,
+            Math.min(maxBlockAcquires, numDataNode)))
+          .when(spyNN).openAndFetchMetaInfo(anyString(), anyLong(), anyLong());
         IOUtils.copyBytes(client.open(file.toString()), new IOUtils.NullOutputStream(), conf,
                           true);
-        fail("Didn't get exception");
-      } catch (IOException ioe) {
-        DFSClient.LOG.info("Got expected exception", ioe);
+  
+        DFSClient.LOG.info("Starting test case for failure reset");
+  
+        // Now the tricky case - if we fail a few times on one read, then succeed,
+        // then fail some more on another read, it shouldn't fail.
+        doAnswer(new FailNTimesAnswer(preSpyNN, numDataNode,
+            Math.min(maxBlockAcquires, numDataNode)))
+          .when(spyNN).openAndFetchMetaInfo(anyString(), anyLong(), anyLong());
+        DFSInputStream is = client.open(file.toString());
+        byte buf[] = new byte[10];
+        IOUtils.readFully(is, buf, 0, buf.length);
+  
+        DFSClient.LOG.info("First read successful after some failures.");
+  
+        // Further reads at this point will succeed since it has the good block locations.
+        // So, force the block locations on this stream to be refreshed from bad info.
+        // When reading again, it should start from a fresh failure count, since
+        // we're starting a new operation on the user level.
+        doAnswer(new FailNTimesAnswer(preSpyNN, numDataNode,
+            Math.min(maxBlockAcquires, numDataNode)))
+          .when(spyNN).openAndFetchMetaInfo(anyString(), anyLong(), anyLong());
+        is.openInfo();
+        // Seek to beginning forces a reopen of the BlockReader - otherwise it'll
+        // just keep reading on the existing stream and the fact that we've poisoned
+        // the block info won't do anything.
+        is.seek(0);
+        IOUtils.readFully(is, buf, 0, buf.length);
+  
+      } finally {
+        if (null != cluster) {
+          cluster.shutdown();
+        }
       }
-
-      // If we fail exactly that many times, then it should succeed.
-      doAnswer(new FailNTimesAnswer(preSpyNN, maxBlockAcquires))
-        .when(spyNN).openAndFetchMetaInfo(anyString(), anyLong(), anyLong());
-      IOUtils.copyBytes(client.open(file.toString()), new IOUtils.NullOutputStream(), conf,
-                        true);
-
-      DFSClient.LOG.info("Starting test case for failure reset");
-
-      // Now the tricky case - if we fail a few times on one read, then succeed,
-      // then fail some more on another read, it shouldn't fail.
-      doAnswer(new FailNTimesAnswer(preSpyNN, maxBlockAcquires))
-        .when(spyNN).openAndFetchMetaInfo(anyString(), anyLong(), anyLong());
-      DFSInputStream is = client.open(file.toString());
-      byte buf[] = new byte[10];
-      IOUtils.readFully(is, buf, 0, buf.length);
-
-      DFSClient.LOG.info("First read successful after some failures.");
-
-      // Further reads at this point will succeed since it has the good block locations.
-      // So, force the block locations on this stream to be refreshed from bad info.
-      // When reading again, it should start from a fresh failure count, since
-      // we're starting a new operation on the user level.
-      doAnswer(new FailNTimesAnswer(preSpyNN, maxBlockAcquires))
-        .when(spyNN).openAndFetchMetaInfo(anyString(), anyLong(), anyLong());
-      is.openInfo();
-      // Seek to beginning forces a reopen of the BlockReader - otherwise it'll
-      // just keep reading on the existing stream and the fact that we've poisoned
-      // the block info won't do anything.
-      is.seek(0);
-      IOUtils.readFully(is, buf, 0, buf.length);
-
-    } finally {
-      cluster.shutdown();
     }
   }
 
@@ -481,10 +497,12 @@ public void testFailuresArePerOperation() throws Exception
   private static class FailNTimesAnswer implements Answer<LocatedBlocks> {
     private int failuresLeft;
     private NameNode realNN;
+    private int numDataNode;
 
-    public FailNTimesAnswer(NameNode realNN, int timesToFail) {
+    public FailNTimesAnswer(NameNode realNN, int numDataNode, int timesToFail) {
       failuresLeft = timesToFail;
       this.realNN = realNN;
+      this.numDataNode = numDataNode;
     }
 
     public LocatedBlocksWithMetaInfo answer(InvocationOnMock invocation) throws IOException {
@@ -504,11 +522,14 @@ public LocatedBlocksWithMetaInfo answer(InvocationOnMock invocation) throws IOEx
 
     private LocatedBlocksWithMetaInfo makeBadBlockList(LocatedBlocksWithMetaInfo goodBlockList) {
       LocatedBlock goodLocatedBlock = goodBlockList.get(0);
+      DatanodeInfo[] datanodes = new DatanodeInfo[numDataNode];
+      for (int i = 0; i < numDataNode; i++) {
+        datanodes[i] = new DatanodeInfo(new DatanodeID("255.255.255.255:" + (234 - i)));
+      }
+      
       LocatedBlock badLocatedBlock = new LocatedBlock(
         goodLocatedBlock.getBlock(),
-        new DatanodeInfo[] {
-          new DatanodeInfo(new DatanodeID("255.255.255.255:234"))
-        },
+        datanodes,
         goodLocatedBlock.getStartOffset(),
         false);
 
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSClientUpdateNameNodeSignature.java b/src/test/org/apache/hadoop/hdfs/TestDFSClientUpdateNameNodeSignature.java
index 1fd0e7e8..cadd0e0b 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDFSClientUpdateNameNodeSignature.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSClientUpdateNameNodeSignature.java
@@ -20,8 +20,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.MiniDFSCluster.DataNodeProperties;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.ClientProtocol;
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSFinalize.java b/src/test/org/apache/hadoop/hdfs/TestDFSFinalize.java
index 37d5d460..4ff7827e 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDFSFinalize.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSFinalize.java
@@ -18,7 +18,9 @@
 package org.apache.hadoop.hdfs;
 
 import java.io.File;
-import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,6 +29,9 @@
 import static org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType.DATA_NODE;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.datanode.NameSpaceSliceStorage;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil;
+
+import com.google.common.collect.Lists;
 
 /**
  * This test ensures the appropriate response from the system when 
@@ -38,7 +43,7 @@ public class TestDFSFinalize extends TestCase {
                                                    "org.apache.hadoop.hdfs.TestDFSFinalize");
   private Configuration conf;
   private int testCounter = 0;
-  private MiniDFSCluster cluster = null;
+  private static MiniDFSCluster cluster = null;
     
   /**
    * Writes an INFO log message containing the parameters.
@@ -58,14 +63,17 @@ void log(String label, int numDirs) {
    * because its removal is asynchronous therefore we have no reliable
    * way to know when it will happen.  
    */
-  void checkResult(String[] nameNodeDirs, String[] dataNodeDirs) throws IOException {
+  static void checkResult(String[] nameNodeDirs, String[] dataNodeDirs) throws Exception {
+    List<File> dirs = Lists.newArrayList();
     for (int i = 0; i < nameNodeDirs.length; i++) {
-      assertTrue(new File(nameNodeDirs[i],"current").isDirectory());
-      assertTrue(new File(nameNodeDirs[i],"current/VERSION").isFile());
-      assertTrue(new File(nameNodeDirs[i],"current/edits").isFile());
-      assertTrue(new File(nameNodeDirs[i],"current/fsimage").isFile());
-      assertTrue(new File(nameNodeDirs[i],"current/fstime").isFile());
+      File curDir = new File(nameNodeDirs[i], "current");
+      dirs.add(curDir);
+      FSImageTestUtil.assertReasonableNameCurrentDir(curDir);
     }
+    
+    FSImageTestUtil.assertParallelFilesAreIdentical(
+        dirs, Collections.<String>emptySet());
+    
     for (int i = 0; i < dataNodeDirs.length; i++) {
       assertEquals(
                    UpgradeUtilities.checksumContents(
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSRollback.java b/src/test/org/apache/hadoop/hdfs/TestDFSRollback.java
index bae7ec31..526b9a04 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDFSRollback.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSRollback.java
@@ -19,6 +19,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32,8 +35,11 @@
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.StorageInfo;
 import org.apache.hadoop.hdfs.server.datanode.NameSpaceSliceStorage;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil;
 import org.apache.hadoop.fs.FileUtil;
 
+import com.google.common.collect.Lists;
+
 /**
 * This test ensures the appropriate response (successful or failure) from
 * the system when the system is rolled back under various storage state and
@@ -61,37 +67,36 @@ void log(String label, int numDirs) {
    * Verify that the new current directory is the old previous.  
    * It is assumed that the server has recovered and rolled back.
    */
-  void checkResult(NodeType nodeType, String[] baseDirs) throws IOException {
-    switch (nodeType) {
-    case NAME_NODE:
-      for (int i = 0; i < baseDirs.length; i++) {
-        assertTrue(new File(baseDirs[i],"current").isDirectory());
-        assertTrue(new File(baseDirs[i],"current/VERSION").isFile());
-        assertTrue(new File(baseDirs[i],"current/edits").isFile());
-        assertTrue(new File(baseDirs[i],"current/fsimage").isFile());
-        assertTrue(new File(baseDirs[i],"current/fstime").isFile());
+  void checkResult(NodeType nodeType, String[] baseDirs) throws Exception {
+    List<File> curDirs = Lists.newArrayList();
+    for (String baseDir : baseDirs) {
+      File curDir = new File(baseDir, "current");
+      curDirs.add(curDir);
+      switch (nodeType) {
+      case NAME_NODE:
+        FSImageTestUtil.assertReasonableNameCurrentDir(curDir);
+        break;
+      case DATA_NODE:
+        for (int i = 0; i < baseDirs.length; i++) {
+          assertEquals(
+                       UpgradeUtilities.checksumContents(
+                                                         nodeType, new File(baseDirs[i],"current")),
+                       UpgradeUtilities.checksumMasterContents(nodeType));
+          File nsBaseDir= NameSpaceSliceStorage.getNsRoot(UpgradeUtilities.getCurrentNamespaceID(cluster), new File(baseDirs[i], "current"));
+          assertEquals(
+                       UpgradeUtilities.checksumContents(nodeType, new File(nsBaseDir,
+                           MiniDFSCluster.FINALIZED_DIR_NAME)), 
+                       UpgradeUtilities.checksumDatanodeNSStorageContents());
+        }
+        break;
       }
-      break;
-    case DATA_NODE:
-      for (int i = 0; i < baseDirs.length; i++) {
-        assertEquals(
-                     UpgradeUtilities.checksumContents(
-                                                       nodeType, new File(baseDirs[i],"current")),
-                     UpgradeUtilities.checksumMasterContents(nodeType));
-        File nsBaseDir= NameSpaceSliceStorage.getNsRoot(UpgradeUtilities.getCurrentNamespaceID(cluster), new File(baseDirs[i], "current"));
-        assertEquals(
-                     UpgradeUtilities.checksumContents(nodeType, new File(nsBaseDir,
-                         MiniDFSCluster.FINALIZED_DIR_NAME)), 
-                     UpgradeUtilities.checksumDatanodeNSStorageContents());
-      }
-      break;
     }
+    
+    FSImageTestUtil.assertParallelFilesAreIdentical(
+        curDirs, Collections.<String>emptySet());
+
     for (int i = 0; i < baseDirs.length; i++) {
       assertFalse(new File(baseDirs[i],"previous").isDirectory());
-      if (nodeType == DATA_NODE) {
-        File nsBaseDir= NameSpaceSliceStorage.getNsRoot(UpgradeUtilities.getCurrentNamespaceID(cluster), new File(baseDirs[i], "current"));
-        assertFalse(new File(nsBaseDir, "previous").isDirectory());
-      }
     }
   }
  
@@ -213,18 +218,14 @@ public void testRollback() throws Exception {
       log("NameNode rollback with no edits file", numDirs);
       UpgradeUtilities.createStorageDirs(NAME_NODE, nameNodeDirs, "current");
       baseDirs = UpgradeUtilities.createStorageDirs(NAME_NODE, nameNodeDirs, "previous");
-      for (File f : baseDirs) { 
-        FileUtil.fullyDelete(new File(f,"edits"));
-      }
+      deleteMatchingFiles(baseDirs, "edits.*");
       startNameNodeShouldFail(StartupOption.ROLLBACK);
       UpgradeUtilities.createEmptyDirs(nameNodeDirs);
       
       log("NameNode rollback with no image file", numDirs);
       UpgradeUtilities.createStorageDirs(NAME_NODE, nameNodeDirs, "current");
       baseDirs = UpgradeUtilities.createStorageDirs(NAME_NODE, nameNodeDirs, "previous");
-      for (File f : baseDirs) { 
-        FileUtil.fullyDelete(new File(f,"fsimage")); 
-      }
+      deleteMatchingFiles(baseDirs, "fsimage_.*");
       startNameNodeShouldFail(StartupOption.ROLLBACK);
       UpgradeUtilities.createEmptyDirs(nameNodeDirs);
       
@@ -248,6 +249,16 @@ public void testRollback() throws Exception {
       UpgradeUtilities.createEmptyDirs(nameNodeDirs);
     } // end numDir loop
   }
+  
+  private void deleteMatchingFiles(File[] baseDirs, String regex) {
+    for (File baseDir : baseDirs) {
+      for (File f : baseDir.listFiles()) {
+        if (f.getName().matches(regex)) {
+          f.delete();
+        }
+      }
+    }
+  }
  
   protected void tearDown() throws Exception {
     LOG.info("Shutting down MiniDFSCluster");
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSShell.java b/src/test/org/apache/hadoop/hdfs/TestDFSShell.java
index 5e571235..cf930eff 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDFSShell.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSShell.java
@@ -20,6 +20,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -46,6 +48,7 @@
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.fs.shell.Count;
 import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumReader;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.FSDataset;
 import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
@@ -108,7 +111,7 @@ static File createLocalFile(File f) throws IOException {
     assertTrue(f.isFile());
     return f;
   }
-
+  
   static void show(String s) {
     System.out.println(Thread.currentThread().getStackTrace()[2] + " " + s);
   }
@@ -361,6 +364,7 @@ public void testDu() throws IOException {
     }
 
   }
+
   public void testPut() throws IOException {
     Configuration conf = new Configuration();
     MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
@@ -781,7 +785,8 @@ public void testURIPaths() throws Exception {
     Configuration dstConf = new Configuration();
     MiniDFSCluster srcCluster =  null;
     MiniDFSCluster dstCluster = null;
-    String bak = System.getProperty("test.build.data");
+    String bak = "/tmp/sdong";
+//    String bak = System.getProperty("test.build.data");
     try{
       srcCluster = new MiniDFSCluster(srcConf, 2, true, null);
       File nameDir = new File(new File(bak), "dfs_tmp_uri/");
@@ -868,6 +873,84 @@ public void testURIPaths() throws Exception {
     }
   }
 
+  public void testHardLink() throws Exception {
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fs = null;
+    try {
+      cluster = new MiniDFSCluster(conf, 2, true, null);
+      fs = cluster.getFileSystem();
+      String topDir = "/testHardLink";
+      DFSTestUtil util = new DFSTestUtil(topDir, 10, 1, 1024);
+      util.createFiles(fs, topDir);
+      String[] fileNames = util.getFileNames(topDir);
+
+      FsShell shell = new FsShell(conf);
+
+      String dir = "/somedirectoryforhardlinktesting";
+      fs.mkdirs(new Path(dir));
+
+
+      String[] cmd = { "-hardlink", fileNames[0], fileNames[0] + "hardlink" };
+      assertEquals(0, ToolRunner.run(shell, cmd));
+
+      String[] cmd0 = { "-hardlink", fileNames[0], fileNames[0] + "hardlink1" };
+      assertEquals(0, ToolRunner.run(shell, cmd0));
+
+      String[] getFilesCmd = { "-showlinks", fileNames[0] };
+      assertEquals(0, ToolRunner.run(shell, getFilesCmd));
+
+      String[] getFilesCmd1 = { "-showlinks", "/nonexistentfile" };
+      assertEquals(-1, ToolRunner.run(shell, getFilesCmd1));
+
+      String[] getFilesCmd2 = { "-showlinks" };
+      assertEquals(-1, ToolRunner.run(shell, getFilesCmd2));
+
+      String[] getFilesCmd3 = { "-showlinks", dir };
+      assertEquals(-1, ToolRunner.run(shell, getFilesCmd3));
+
+      String[] getFilesCmd4 = { "-showlinks", fileNames[0], fileNames[1],
+          fileNames[0] + "hardlink" };
+      assertEquals(0, ToolRunner.run(shell, getFilesCmd4));
+
+      FileStatusExtended stat1 = cluster.getNameNode().namesystem
+          .getFileInfoExtended(fileNames[0]);
+      FileStatusExtended stat2 = cluster.getNameNode().namesystem
+          .getFileInfoExtended(fileNames[0] + "hardlink");
+      assertTrue(Arrays.equals(stat1.getBlocks(), stat2.getBlocks()));
+      assertEquals(stat1.getAccessTime(), stat2.getAccessTime());
+      assertEquals(stat1.getBlockSize(), stat2.getBlockSize());
+      assertEquals(stat1.getGroup(), stat2.getGroup());
+      assertEquals(stat1.getLen(), stat2.getLen());
+      assertEquals(stat1.getModificationTime(), stat2.getModificationTime());
+      assertEquals(stat1.getOwner(), stat2.getOwner());
+      assertEquals(stat1.getReplication(), stat2.getReplication());
+
+      String[] cmd1 = { "-hardlink", fileNames[0], fileNames[1] };
+      assertEquals(-1, ToolRunner.run(shell, cmd1));
+
+      String[] cmd2 = { "-hardlink", fileNames[0], dir};
+      assertEquals(-1, ToolRunner.run(shell, cmd2));
+
+      String[] cmd3 = { "-hardlink", fileNames[0], null };
+      assertEquals(-1, ToolRunner.run(shell, cmd3));
+
+      String[] cmd4 = { "-hardlink", fileNames[0], fileNames[1], fileNames[2] };
+      assertEquals(-1, ToolRunner.run(shell, cmd4));
+
+      String[] cmd5 = { "-hardlink", fileNames[0] };
+      assertEquals(-1, ToolRunner.run(shell, cmd5));
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+      if (fs != null) {
+        fs.close();
+      }
+    }
+
+  }
+
   public void testText() throws Exception {
     Configuration conf = new Configuration();
     MiniDFSCluster cluster = null;
@@ -1262,7 +1345,7 @@ public void testTouch() throws IOException, ParseException {
       // Verify that touch sets current time by default
       runCmd(shell, "-touch", "" + file1);
       assertTimesCorrect("-touch didn't set current time", fs, file1, null, null);
-
+      
       // Verify that "-c" works correctly
       Path file2 = new Path("/tmp/file2.txt");
       int exitCode = runCmd(shell, "-touch", "-c", "" + file2);
@@ -1293,6 +1376,10 @@ public void testTouch() throws IOException, ParseException {
       assertTimesCorrect("Option -m didn't work", fs, file2, oldFile2Atime, d1);
       runCmd(shell, "-touch", "-a", "--date", date2, "" + file2);
       assertTimesCorrect("Option -a didn't work", fs, file2, d2, d1);
+      runCmd(shell, "-touch", "-au", Long.toString(d1.getTime()), "" + file2);
+      assertTimesCorrect("Option -a and -u didn't work", fs, file2, d1, d1);
+      runCmd(shell, "-touch", "-amu", Long.toString(d2.getTime()), "" + file2);
+      assertTimesCorrect("Option -a, -m and -u didn't work", fs, file2, d2, d2);
     } finally {
       try {
         fs.close();
@@ -1564,13 +1651,15 @@ static List<File> getBlockFiles(MiniDFSCluster cluster) throws IOException {
 
   static void corrupt(List<File> files) throws IOException {
     for(File f : files) {
-      StringBuilder content = new StringBuilder(DFSTestUtil.readFile(f));
-      char c = content.charAt(0);
-      content.setCharAt(0, ++c);
-      PrintWriter out = new PrintWriter(f);
-      out.print(content);
-      out.flush();
-      out.close();
+      byte[] buffer = new byte[(int) f.length()];
+      FileInputStream fis = new FileInputStream(f);
+      fis.read(buffer, 0, buffer.length);
+      fis.close();
+      buffer[BlockInlineChecksumReader.getHeaderSize()]++;
+      
+      FileOutputStream fos = new FileOutputStream(f);
+      fos.write(buffer, 0, buffer.length);
+      fos.close();
     }
   }
 
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java b/src/test/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java
index 2ce679d2..82583465 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java
@@ -26,6 +26,7 @@
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.datanode.NameSpaceSliceStorage;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil;
 
 import static org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType.NAME_NODE;
 import static org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType.DATA_NODE;
@@ -157,9 +158,9 @@ void checkResult(NodeType nodeType, String[] baseDirs,
         for (int i = 0; i < baseDirs.length; i++) {
           assertTrue(new File(baseDirs[i],"current").isDirectory());
           assertTrue(new File(baseDirs[i],"current/VERSION").isFile());
-          assertTrue(new File(baseDirs[i],"current/edits").isFile());
-          assertTrue(new File(baseDirs[i],"current/fsimage").isFile());
-          assertTrue(new File(baseDirs[i],"current/fstime").isFile());
+          assertNotNull(FSImageTestUtil.findNewestImageFile(
+              baseDirs[i] + "/current"));
+          assertTrue(new File(baseDirs[i],"current/seen_txid").isFile());
         }
       }
       break;
diff --git a/src/test/org/apache/hadoop/hdfs/TestDFSUpgrade.java b/src/test/org/apache/hadoop/hdfs/TestDFSUpgrade.java
index 1da3b984..5f26c7a2 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDFSUpgrade.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDFSUpgrade.java
@@ -38,6 +38,7 @@
 import org.apache.hadoop.hdfs.server.common.StorageInfo;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.NameSpaceSliceStorage;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil;
 import org.apache.hadoop.fs.FileUtil;
 
 /**
@@ -92,11 +93,7 @@ void checkResult(NodeType nodeType, String[] baseDirs, int nnIndex
     switch (nodeType) {
     case NAME_NODE:
       for (int i = 0; i < baseDirs.length; i++) {
-        assertTrue(new File(baseDirs[i],"current").isDirectory());
-        assertTrue(new File(baseDirs[i],"current/VERSION").isFile());
-        assertTrue(new File(baseDirs[i],"current/edits").isFile());
-        assertTrue(new File(baseDirs[i],"current/fsimage").isFile());
-        assertTrue(new File(baseDirs[i],"current/fstime").isFile());
+        FSImageTestUtil.assertReasonableNameCurrentDir(new File(baseDirs[i], "current"));
       }
       break;
     case DATA_NODE:
@@ -423,17 +420,13 @@ public void testUpgrade() throws Exception {
 
       log("NameNode upgrade with no edits file", numDirs);
       baseDirs = UpgradeUtilities.createStorageDirs(NAME_NODE, nameNodeDirs, "current");
-      for (File f : baseDirs) { 
-        FileUtil.fullyDelete(new File(f,"edits"));
-      }
+      deleteStorageFilesWithPrefix(nameNodeDirs, "edits_");
       startNameNodeShouldFail(StartupOption.UPGRADE);
       UpgradeUtilities.createEmptyDirs(nameNodeDirs);
       
       log("NameNode upgrade with no image file", numDirs);
       baseDirs = UpgradeUtilities.createStorageDirs(NAME_NODE, nameNodeDirs, "current");
-      for (File f : baseDirs) { 
-        FileUtil.fullyDelete(new File(f,"fsimage")); 
-      }
+      deleteStorageFilesWithPrefix(nameNodeDirs, "fsimage_");
       startNameNodeShouldFail(StartupOption.UPGRADE);
       UpgradeUtilities.createEmptyDirs(nameNodeDirs);
       
@@ -487,6 +480,19 @@ public static void main(String[] args) throws Exception {
     new TestDFSUpgrade().testUpgrade();
   }
   
+  private void deleteStorageFilesWithPrefix(String[] nameNodeDirs, String prefix)
+  throws Exception {
+    for (String baseDirStr : nameNodeDirs) {
+      File baseDir = new File(baseDirStr);
+      File currentDir = new File(baseDir, "current");
+      for (File f : currentDir.listFiles()) {
+        if (f.getName().startsWith(prefix)) {
+          assertTrue("Deleting " + f, f.delete());
+        }
+      }
+    }
+  }
+  
 }
 
 
diff --git a/src/test/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java b/src/test/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
index ee1b9d5b..db228f43 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
@@ -32,11 +32,14 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumWriter;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.util.DataChecksum;
 
 import junit.framework.TestCase;
 
@@ -128,22 +131,36 @@ public void testDatanodeBlockScanner() throws IOException {
     
     cluster.shutdown();
   }
+  
+  public static void corruptFile(File file, Random random) throws IOException {
+    // Corrupt replica by writing random bytes into replica
+    RandomAccessFile raFile = new RandomAccessFile(file, "rw");
+    FileChannel channel = raFile.getChannel();
+    String badString = "BADBAD";
+    int rand = random.nextInt((int)channel.size()/2);
+    raFile.seek(rand);
+    raFile.write(badString.getBytes());
+    raFile.close();    
+  }
 
-  public static boolean corruptReplica(String blockName, int replica, MiniDFSCluster cluster) throws IOException {
+  public static boolean corruptReplica(Block block, int replica, MiniDFSCluster cluster) throws IOException {
     Random random = new Random();
     boolean corrupted = false;
     for (int i=replica*2; i<replica*2+2; i++) {
-      File blockFile = new File(cluster.getBlockDirectory("data" + (i+1)), blockName);
+      File blockFile = new File(cluster.getBlockDirectory("data" + (i+1)), block.getBlockName());
       if (blockFile.exists()) {
-        // Corrupt replica by writing random bytes into replica
-        RandomAccessFile raFile = new RandomAccessFile(blockFile, "rw");
-        FileChannel channel = raFile.getChannel();
-        String badString = "BADBAD";
-        int rand = random.nextInt((int)channel.size()/2);
-        raFile.seek(rand);
-        raFile.write(badString.getBytes());
-        raFile.close();
+        corruptFile(blockFile, random);
+        corrupted = true;
+        continue;
+      }
+      File blockFileInlineChecksum = new File(cluster.getBlockDirectory("data"
+          + (i + 1)), BlockInlineChecksumWriter.getInlineChecksumFileName(
+          block, FSConstants.CHECKSUM_TYPE, cluster.conf.getInt(
+              "io.bytes.per.checksum", FSConstants.DEFAULT_BYTES_PER_CHECKSUM)));
+      if (blockFileInlineChecksum.exists()) {
+        corruptFile(blockFileInlineChecksum, random);
         corrupted = true;
+        continue;
       }
     }
     return corrupted;
@@ -164,7 +181,7 @@ public void testBlockCorruptionPolicy() throws IOException {
     fs = cluster.getFileSystem();
     Path file1 = new Path("/tmp/testBlockVerification/file1");
     DFSTestUtil.createFile(fs, file1, 1024, (short)3, 0);
-    String block = DFSTestUtil.getFirstBlock(fs, file1).getBlockName();
+    Block block = DFSTestUtil.getFirstBlock(fs, file1);
     
     dfsClient = new DFSClient(new InetSocketAddress("localhost", 
                                         cluster.getNameNodePort()), conf);
@@ -278,7 +295,6 @@ private void blockCorruptionRecoveryPolicy(int numDataNodes,
     Path file1 = new Path("/tmp/testBlockCorruptRecovery/file");
     DFSTestUtil.createFile(fs, file1, 1024, numReplicas, 0);
     Block blk = DFSTestUtil.getFirstBlock(fs, file1);
-    String block = blk.getBlockName();
     
     dfsClient = new DFSClient(new InetSocketAddress("localhost", 
                                         cluster.getNameNodePort()), conf);
@@ -303,7 +319,7 @@ private void blockCorruptionRecoveryPolicy(int numDataNodes,
     // Corrupt numCorruptReplicas replicas of block 
     int[] corruptReplicasDNIDs = new int[numCorruptReplicas];
     for (int i=0, j=0; (j != numCorruptReplicas) && (i < numDataNodes); i++) {
-      if (corruptReplica(block, i, cluster)) 
+      if (corruptReplica(blk, i, cluster)) 
         corruptReplicasDNIDs[j++] = i;
     }
     
diff --git a/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath.java b/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath.java
index dd67fde8..1313740f 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath.java
@@ -89,8 +89,7 @@ public void run() {
         try {
           System.out.println("Workload processing file " + filename);
           FSDataOutputStream stm = createFile(fs, filename, replication);
-          DFSClient.DFSOutputStream dfstream = (DFSClient.DFSOutputStream)
-                                                 (stm.getWrappedStream());
+          DFSOutputStream dfstream = (DFSOutputStream)(stm.getWrappedStream());
           dfstream.setArtificialSlowdown(1000);
           writeFile(stm, myseed);
           stm.close();
@@ -357,8 +356,7 @@ private void simpleTest(int datanodeToKill) throws IOException {
       // create a file and write one block of data
       System.out.println("SimpleTest creating file " + filename);
       FSDataOutputStream stm = createFile(fs, filename, repl);
-      DFSClient.DFSOutputStream dfstream = (DFSClient.DFSOutputStream)
-                                             (stm.getWrappedStream());
+      DFSOutputStream dfstream = (DFSOutputStream)(stm.getWrappedStream());
 
       // these are test settings
       dfstream.setChunksPerPacket(5);
diff --git a/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath2.java b/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath2.java
index 7afac45d..ac21cc08 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath2.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath2.java
@@ -149,12 +149,12 @@ private void runTestDatanodeRemovedFromPipeline(
     );
   }
 
-  private DFSClient.DFSOutputStream writeAndSyncFile(
+  private DFSOutputStream writeAndSyncFile(
     String file, boolean append
   ) throws IOException {
     DistributedFileSystem distributedFileSystem = (DistributedFileSystem) fileSystem;
-    DFSClient.DFSOutputStream out =
-      (DFSClient.DFSOutputStream) distributedFileSystem
+    DFSOutputStream out =
+      (DFSOutputStream) distributedFileSystem
       .getClient()
       .create(file, true);
 
@@ -162,7 +162,7 @@ private DFSClient.DFSOutputStream writeAndSyncFile(
       out.write(DFSTestUtil.generateSequentialBytes(0, 1024));
       out.close();
       out =
-        (DFSClient.DFSOutputStream) distributedFileSystem
+        (DFSOutputStream) distributedFileSystem
           .getClient()
           .append(file, 0, null); // bufferSize ingored, progessable can be null
     }
diff --git a/src/test/org/apache/hadoop/hdfs/TestDatanodeUpgrade.java b/src/test/org/apache/hadoop/hdfs/TestDatanodeUpgrade.java
index c4cfa426..64c209d5 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDatanodeUpgrade.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDatanodeUpgrade.java
@@ -13,7 +13,7 @@
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.DFSTestUtil;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
diff --git a/src/test/org/apache/hadoop/hdfs/TestDecommission.java b/src/test/org/apache/hadoop/hdfs/TestDecommission.java
index d19f84b6..2a6c21e4 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDecommission.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDecommission.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -59,6 +60,15 @@ public class TestDecommission {
   FileSystem localFileSys;
   Configuration conf;
   MiniDFSCluster cluster = null;
+  
+  private void cleanFile(Path p) throws IOException {
+    File f = new File(p.toUri().getPath());
+    f.getParentFile().mkdirs();
+    if (f.exists()) {
+      f.delete();
+    }
+    f.createNewFile();
+  }
 
   @Before
   public void setup() throws IOException {
@@ -66,10 +76,11 @@ public void setup() throws IOException {
     // Set up the hosts/exclude files.
     localFileSys = FileSystem.getLocal(conf);
     Path workingDir = localFileSys.getWorkingDirectory();
-    Path dir = new Path(workingDir, "build/test/data/work-dir/decommission");
+    Path dir = new Path(workingDir, "build/test/data/work-dir/decommission/");
     hostsFile = new Path(dir, "hosts");
     excludeFile = new Path(dir, "exclude");
-    
+    cleanFile(hostsFile);
+    cleanFile(excludeFile); 
     // Setup conf
     conf.setBoolean("dfs.replication.considerLoad", false);
     conf.set("dfs.hosts.exclude", excludeFile.toUri().getPath());
diff --git a/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java b/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
index dd9767b5..516e08bc 100644
--- a/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
+++ b/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
@@ -22,6 +22,8 @@
 import java.net.URI;
 import java.util.Random;
 
+import junit.framework.TestCase;
+
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -29,7 +31,10 @@
 import org.apache.hadoop.fs.FileChecksum;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.log4j.Level;
+import org.junit.Assert;
 
 public class TestDistributedFileSystem extends junit.framework.TestCase {
   private static final Random RAN = new Random();
@@ -117,75 +122,102 @@ public void testDFSClient() throws Exception {
       if (cluster != null) {cluster.shutdown();}
     }
   }
-  
+
   public void testFileChecksum() throws IOException {
-    ((Log4JLogger)HftpFileSystem.LOG).getLogger().setLevel(Level.ALL);
-
-    final long seed = RAN.nextLong();
-    System.out.println("seed=" + seed);
-    RAN.setSeed(seed);
-
-    final Configuration conf = new Configuration();
-    conf.set("slave.host.name", "localhost");
-
-    final MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
-    final FileSystem hdfs = cluster.getFileSystem();
-    final String hftpuri = "hftp://" + conf.get("dfs.http.address");
-    System.out.println("hftpuri=" + hftpuri);
-    final FileSystem hftp = new Path(hftpuri).getFileSystem(conf);
-
-    final String dir = "/filechecksum";
-    final int block_size = 1024;
-    final int buffer_size = conf.getInt("io.file.buffer.size", 4096);
-    conf.setInt("io.bytes.per.checksum", 512);
-
-    //try different number of blocks
-    for(int n = 0; n < 5; n++) {
-      //generate random data
-      final byte[] data = new byte[RAN.nextInt(block_size/2-1)+n*block_size+1];
-      RAN.nextBytes(data);
-      System.out.println("data.length=" + data.length);
-  
-      //write data to a file
-      final Path foo = new Path(dir, "foo" + n);
-      {
-        final FSDataOutputStream out = hdfs.create(foo, false, buffer_size,
-            (short)2, block_size);
-        out.write(data);
-        out.close();
-      }
-      
-      //compute checksum
-      final FileChecksum hdfsfoocs = hdfs.getFileChecksum(foo);
-      System.out.println("hdfsfoocs=" + hdfsfoocs);
-      
-      final FileChecksum hftpfoocs = hftp.getFileChecksum(foo);
-      System.out.println("hftpfoocs=" + hftpfoocs);
+    testFileChecksumInternal(false);
+  }
 
-      final Path qualified = new Path(hftpuri + dir, "foo" + n);
-      final FileChecksum qfoocs = hftp.getFileChecksum(qualified);
-      System.out.println("qfoocs=" + qfoocs);
+  public void testFileChecksumInlineChecksum() throws IOException {
+    testFileChecksumInternal(true);
+  }
 
-      //write another file
-      final Path bar = new Path(dir, "bar" + n);
-      {
-        final FSDataOutputStream out = hdfs.create(bar, false, buffer_size,
-            (short)2, block_size);
-        out.write(data);
-        out.close();
+  private void testFileChecksumInternal(boolean inlineChecksum) throws IOException {
+    MiniDFSCluster cluster = null; 
+    try {
+      ((Log4JLogger)HftpFileSystem.LOG).getLogger().setLevel(Level.ALL);
+  
+      final long seed = RAN.nextLong();
+      System.out.println("seed=" + seed);
+      RAN.setSeed(seed);
+  
+      final Configuration conf = new Configuration();
+      conf.set("slave.host.name", "localhost");
+      conf.setBoolean("dfs.use.inline.checksum", inlineChecksum);
+   
+      cluster = new MiniDFSCluster(conf, 2, true, null);;
+      final FileSystem hdfs = cluster.getFileSystem();
+      final String hftpuri = "hftp://" + conf.get("dfs.http.address");
+      System.out.println("hftpuri=" + hftpuri);
+      final FileSystem hftp = new Path(hftpuri).getFileSystem(conf);
+
+      final String dir = "/filechecksum";
+      final int block_size = 1024;
+      final int buffer_size = conf.getInt("io.file.buffer.size", 4096);
+      conf.setInt("io.bytes.per.checksum", 512);
+
+      // Check non-existent file
+      final Path nonExistentPath = new Path("/non_existent");
+      assertFalse(hdfs.exists(nonExistentPath));
+      try {
+        hdfs.getFileChecksum(nonExistentPath);
+        Assert.fail("GetFileChecksum should fail on non-existent file");
+      } catch (IOException e) {
+        assertTrue(e.getMessage().startsWith(
+          "Null block locations, mostly because non-existent file"));
       }
+      //try different number of blocks
+      for(int n = 0; n < 5; n++) {
+        //generate random data
+        final byte[] data = new byte[RAN.nextInt(block_size/2-1)+n*block_size+1];
+        RAN.nextBytes(data);
+        System.out.println("data.length=" + data.length);
   
-      { //verify checksum
-        final FileChecksum barcs = hdfs.getFileChecksum(bar);
-        final int barhashcode = barcs.hashCode();
-        assertEquals(hdfsfoocs.hashCode(), barhashcode);
-        assertEquals(hdfsfoocs, barcs);
-
-        assertEquals(hftpfoocs.hashCode(), barhashcode);
-        assertEquals(hftpfoocs, barcs);
-
-        assertEquals(qfoocs.hashCode(), barhashcode);
-        assertEquals(qfoocs, barcs);
+        //write data to a file
+        final Path foo = new Path(dir, "foo" + n);
+        {
+          final FSDataOutputStream out = hdfs.create(foo, false, buffer_size,
+               (short)2, block_size);
+          out.write(data);
+          out.close();
+        }
+      
+        //compute checksum
+        final FileChecksum hdfsfoocs = hdfs.getFileChecksum(foo);
+        System.out.println("hdfsfoocs=" + hdfsfoocs);
+
+        final FileChecksum hftpfoocs = hftp.getFileChecksum(foo);
+        System.out.println("hftpfoocs=" + hftpfoocs);
+
+
+        final Path qualified = new Path(hftpuri + dir, "foo" + n);
+        final FileChecksum qfoocs = hftp.getFileChecksum(qualified);
+        System.out.println("qfoocs=" + qfoocs);
+
+        // write another file
+        final Path bar = new Path(dir, "bar" + n);
+        {
+          final FSDataOutputStream out = hdfs.create(bar, false, buffer_size,
+              (short) 2, block_size);
+          out.write(data);
+          out.close();
+        }
+
+        { // verify checksum
+          final FileChecksum barcs = hdfs.getFileChecksum(bar);
+          final int barhashcode = barcs.hashCode();
+          assertEquals(hdfsfoocs.hashCode(), barhashcode);
+          assertEquals(hdfsfoocs, barcs);
+
+          assertEquals(hftpfoocs.hashCode(), barhashcode);
+          assertEquals(hftpfoocs, barcs);
+
+          assertEquals(qfoocs.hashCode(), barhashcode);
+          assertEquals(qfoocs, barcs);
+        }
+      }
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
       }
     }
   }
diff --git a/src/test/org/apache/hadoop/hdfs/TestFastCopyCleanShutdown.java b/src/test/org/apache/hadoop/hdfs/TestFastCopyCleanShutdown.java
index 4157c8a4..8bbf68cc 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFastCopyCleanShutdown.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFastCopyCleanShutdown.java
@@ -1,7 +1,6 @@
 package org.apache.hadoop.hdfs;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
@@ -10,7 +9,6 @@
 import org.apache.hadoop.hdfs.tools.FastCopy;
 
 import org.junit.AfterClass;
-import static org.junit.Assert.*;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -28,38 +26,6 @@ public class TestFastCopyCleanShutdown {
   private static long MAX_FILE_SIZE = MAX_BLOCKS * BLOCK_SIZE;
   private static Set<Thread> threadsBefore;
 
-  // A list of threads that might hang around (maybe due to a JVM bug).
-  private static final String[] excludedThreads = { "SunPKCS11" };
-
-  private static boolean isExcludedThread(Thread th) {
-    for (String badThread : excludedThreads) {
-      if (th.getName().contains(badThread)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private static void checkRemainingThreads(Set<Thread> old) throws Exception {
-    Thread.sleep(15000);
-
-    Set<Thread> threads = Thread.getAllStackTraces().keySet();
-    threads.removeAll(old);
-    if (threads.size() != 0) {
-      System.out.println("Following threads are not clean up:");
-      Iterator<Thread> it = threads.iterator();
-      while (it.hasNext()) {
-        Thread th = it.next();
-        if (isExcludedThread(th)) {
-          it.remove();
-          continue;
-        }
-        System.out.println("Thread: " + th.getName());
-      }
-    }
-    assertTrue("This is not a clean shutdown", threads.size() == 0);
-  }
-
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
     threadsBefore = new HashSet<Thread>(Thread.getAllStackTraces()
@@ -75,7 +41,7 @@ public static void setUpBeforeClass() throws Exception {
   public static void tearDownAfterClass() throws Exception {
     fs.close();
     cluster.shutdown();
-    checkRemainingThreads(threadsBefore);
+    DFSTestThreadUtil.checkRemainingThreads(threadsBefore);
   }
   
   @Test
diff --git a/src/test/org/apache/hadoop/hdfs/TestFastCopyWithoutHardLink.java b/src/test/org/apache/hadoop/hdfs/TestFastCopyWithoutHardLink.java
index e5ab11ba..50ff7b63 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFastCopyWithoutHardLink.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFastCopyWithoutHardLink.java
@@ -17,8 +17,14 @@
  */
 package org.apache.hadoop.hdfs;
 
+import java.util.Arrays;
+
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.tools.FastCopy;
 
+import static org.junit.Assert.*;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -62,4 +68,35 @@ public void testInterFileSystemFastCopyMultiple() throws Exception {
   public void testInterFileSystemFastCopyShellMultiple() throws Exception {
     super.testInterFileSystemFastCopyShellMultiple(false, new String[0]);
   }
+
+  private DatanodeInfo get(String name) {
+    return new DatanodeInfo(new DatanodeID(name));
+  }
+
+  @Test
+  public void testAlignDatanodes() {
+    DatanodeInfo[] dst = new DatanodeInfo[] { get("c"), get("a"), get("b") };
+    DatanodeInfo[] src = new DatanodeInfo[] { get("a"), get("c"), get("b") };
+    FastCopy.alignDatanodes(dst, src);
+    assertTrue(Arrays.equals(dst, src));
+  }
+
+  @Test
+  public void testAlignDatanodes1() {
+    DatanodeInfo[] dst = new DatanodeInfo[] { get("c"), get("a"), get("b") };
+    DatanodeInfo[] src = new DatanodeInfo[] { get("c"), get("b") };
+    FastCopy.alignDatanodes(dst, src);
+    assertEquals("c", dst[0].getName(), src[0].getName());
+    assertEquals("b", dst[1].getName(), src[1].getName());
+  }
+
+  @Test
+  public void testAlignDatanodes2() {
+    DatanodeInfo[] dst = new DatanodeInfo[] { get("d"), get("a"), get("b") };
+    DatanodeInfo[] src = new DatanodeInfo[] { get("c"), get("d"), get("z") };
+    FastCopy.alignDatanodes(dst, src);
+    assertEquals("d", dst[0].getName(), src[0].getName());
+    assertEquals("a", dst[1].getName());
+    assertEquals("b", dst[2].getName());
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java b/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java
index 29fb7a73..f52af8a6 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java
@@ -32,9 +32,13 @@
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocksWithMetaInfo;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumReader;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumWriter;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.FSDataset;
 import org.apache.hadoop.hdfs.server.protocol.BlockMetaDataInfo;
+import org.apache.hadoop.util.DataChecksum;
+import org.apache.hadoop.util.PureJavaCrc32;
 
 /** This class implements some of tests posted in HADOOP-2658. */
 public class TestFileAppend3 extends junit.framework.TestCase {
@@ -174,7 +178,16 @@ public void testTC7() throws Exception {
     int nsId = cluster.getNameNode().getNamespaceID();
     final RandomAccessFile raf = new RandomAccessFile(data.getBlockFile(nsId, blk), "rw");
     AppendTestUtil.LOG.info("dn=" + dn + ", blk=" + blk + " (length=" + blk.getNumBytes() + ")");
-    assertEquals(len1, raf.length());
+    if (!dn.useInlineChecksum) {
+      assertEquals(len1, raf.length());
+    } else {
+      int bytesPerChecksum = conf.getInt("io.bytes.per.checksum", 512);
+      int checksumSize = DataChecksum.newDataChecksum(DataChecksum.CHECKSUM_CRC32,
+          bytesPerChecksum,
+          new PureJavaCrc32()).getChecksumSize();
+      assertEquals(raf.length(), BlockInlineChecksumReader.getFileLengthFromBlockSize(
+          len1, bytesPerChecksum, checksumSize));
+    }
     raf.setLength(0);
     raf.close();
 
diff --git a/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java b/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java
index c3823408..3f5e6961 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java
@@ -18,11 +18,12 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.MiniDFSCluster.DataNodeProperties;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.hdfs.server.datanode.BlockWithChecksumFileWriter;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.DataStorage;
 import org.apache.hadoop.hdfs.server.datanode.FSDataset;
@@ -249,11 +250,12 @@ private void corruptDataNode(int dnNumber, CorruptionType type) throws Exception
           blockFile.close();
 
           RandomAccessFile metaFile = new RandomAccessFile(
-              FSDataset.findMetaFile(block), "rw");
+              BlockWithChecksumFileWriter.findMetaFile(block), "rw");
           metaFile.setLength(0);
           metaFile.close();
         } else if (type == CorruptionType.TRUNCATE_BLOCK_HALF) {
-          FSDatasetTestUtil.truncateBlockFile(block, block.length() / 2);
+          FSDatasetTestUtil.truncateBlockFile(block, block.length() / 2, false,
+              conf.getInt("io.bytes.per.checksum", 512));
         } else {
           assert false;
         }
@@ -991,7 +993,13 @@ public void testDummyTest() throws IOException {
    */
   public void testTruncatedPrimaryDN() throws Exception {
     LOG.info("START");
-    runDNRestartCorruptType(CorruptionType.TRUNCATE_BLOCK_TO_ZERO);
+    boolean oldInlineChecksum = conf.getBoolean("dfs.use.inline.checksum", true);
+    conf.setBoolean("dfs.use.inline.checksum", false);
+    try {
+      runDNRestartCorruptType(CorruptionType.TRUNCATE_BLOCK_TO_ZERO);
+    } finally {
+      conf.setBoolean("dfs.use.inline.checksum", oldInlineChecksum);
+    }
   }
 
   /**
@@ -1001,7 +1009,13 @@ public void testTruncatedPrimaryDN() throws Exception {
    */
   public void testHalfLengthPrimaryDN() throws Exception {
     LOG.info("START");
-    runDNRestartCorruptType(CorruptionType.TRUNCATE_BLOCK_HALF);
+    boolean oldInlineChecksum = conf.getBoolean("dfs.use.inline.checksum", true);
+    conf.setBoolean("dfs.use.inline.checksum", false);
+    try {
+      runDNRestartCorruptType(CorruptionType.TRUNCATE_BLOCK_HALF);
+    } finally {
+      conf.setBoolean("dfs.use.inline.checksum", oldInlineChecksum);
+    }
   }
 
   private void runDNRestartCorruptType(CorruptionType corrupt) throws Exception {
@@ -1045,6 +1059,8 @@ private void runDNRestartCorruptType(CorruptionType corrupt) throws Exception {
   }
 
   public void testFullClusterPowerLoss() throws Exception {
+    boolean oldInlineChecksum = conf.getBoolean("dfs.use.inline.checksum", true);
+    conf.setBoolean("dfs.use.inline.checksum", false);
     cluster = new MiniDFSCluster(conf, 2, true, null);
     FileSystem fs1 = cluster.getFileSystem();
     try {
@@ -1081,7 +1097,9 @@ public void testFullClusterPowerLoss() throws Exception {
       cluster.waitForDNHeartbeat(1, 10000);
 
       // Recover the lease
-      FileSystem fs2 = AppendTestUtil.createHdfsWithDifferentUsername(fs1.getConf());
+      Configuration conf1 = fs1.getConf();
+      conf1.setBoolean("dfs.use.inline.checksum", false);
+      FileSystem fs2 = AppendTestUtil.createHdfsWithDifferentUsername(conf1);
       recoverFile(fs2);
 
       assertFileSize(fs2, 512);
@@ -1089,6 +1107,7 @@ public void testFullClusterPowerLoss() throws Exception {
     } finally {
       // explicitly do not shut down fs1, since it's been frozen up by
       // killing the DataStreamer and not allowing recovery
+      conf.setBoolean("dfs.use.inline.checksum", oldInlineChecksum);
       cluster.shutdown();
     }
   }
@@ -1155,6 +1174,21 @@ public void testNotPrematurelyCompleteWithFailure() throws Exception {
       stm = fs1.create(file1, true, (int)BLOCK_SIZE*2, rep, BLOCK_SIZE);
       AppendTestUtil.write(stm, 0, halfBlock);
       stm.close();
+      
+      // Wait for all blocks reported to namenode
+      long startTime = System.currentTimeMillis();
+      while(true) {
+        if (((DistributedFileSystem) fs1).dfs
+            .getLocatedBlocks(file1.toString(), 0, 1).getLocatedBlocks().get(0)
+            .getLocations().length == rep) {
+          break;
+        }
+        if (System.currentTimeMillis() - startTime > 2000) {
+          TestCase.fail();
+        } else {
+          Thread.sleep(50);
+        }
+      }
 
       NameNode nn = cluster.getNameNode();
       LOG.info("======== Appending");
diff --git a/src/test/org/apache/hadoop/hdfs/TestFileCorruption.java b/src/test/org/apache/hadoop/hdfs/TestFileCorruption.java
index 60ed349f..0d73b7d7 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFileCorruption.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFileCorruption.java
@@ -46,6 +46,7 @@
 import org.apache.hadoop.hdfs.protocol.ClientProtocol;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.server.common.GenerationStamp;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumReader;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
@@ -193,25 +194,35 @@ private Block getBlock(File dataDir) {
 
     int idx = 0;
     String blockFileName = null;
+    boolean isInlineChecksum = false;
     for (; idx < blocks.length; idx++) {
       blockFileName = blocks[idx].getName();
-      if (blockFileName.startsWith("blk_") && !blockFileName.endsWith(".meta")) {
+      if (Block.isInlineChecksumBlockFilename(blockFileName)) {
+        isInlineChecksum = true;
+        break;
+      } else if (blockFileName.startsWith("blk_") && !blockFileName.endsWith(".meta")) {
         break;
       }
     }
     if (blockFileName == null) {
       return null;
     }
-    long blockId = Long.parseLong(blockFileName.substring("blk_".length()));
+    long blockId = Long.parseLong(blockFileName.substring("blk_".length())
+        .split("_")[0]);
     long blockTimeStamp = GenerationStamp.WILDCARD_STAMP;
-    for (idx=0; idx < blocks.length; idx++) {
-      String fileName = blocks[idx].getName();
-      if (fileName.startsWith(blockFileName) && fileName.endsWith(".meta")) {
-        int startIndex = blockFileName.length()+1;
-        int endIndex = fileName.length() - ".meta".length();
-        blockTimeStamp = Long.parseLong(fileName.substring(startIndex, endIndex));
-        break;
+    if (!isInlineChecksum) {
+      for (int idx1 = 0; idx1 < blocks.length; idx1++) {
+        String fileName = blocks[idx].getName();
+        if (fileName.startsWith(blockFileName) && fileName.endsWith(".meta")) {
+          int startIndex = blockFileName.length() + 1;
+          int endIndex = fileName.length() - ".meta".length();
+          blockTimeStamp = Long.parseLong(fileName.substring(startIndex,
+              endIndex));
+          break;
+        }
       }
+    } else {
+      blockTimeStamp = Long.parseLong(blockFileName.split("_")[2]);
     }
     return new Block(blockId, blocks[idx].length(), blockTimeStamp);
   }
@@ -321,10 +332,6 @@ public void test2CorruptFilesWithSameName() throws Exception {
         dirs[1] = dir2;
         for (File dir: dirs) {
           File[] blockFiles = dir.listFiles();
-          if ((blockFiles == null) || (blockFiles.length == 0)) {
-            throw 
-              new IOException("no blocks found in data node's data directory");
-          }
 
           for (File blockFile: blockFiles) {
             if ((blockFile.getName().
diff --git a/src/test/org/apache/hadoop/hdfs/TestFileCreation.java b/src/test/org/apache/hadoop/hdfs/TestFileCreation.java
index 3c82c4ed..015f9de8 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFileCreation.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFileCreation.java
@@ -592,7 +592,7 @@ public void xxxtestFileCreationNamenodeRestart() throws IOException {
       int blocksMinusPiece = numBlocks * blockSize - remainingPiece;
       writeFile(stm, blocksMinusPiece);
       stm.sync();
-      int actualRepl = ((DFSClient.DFSOutputStream)(stm.getWrappedStream())).
+      int actualRepl = ((DFSOutputStream)(stm.getWrappedStream())).
                         getNumCurrentReplicas();
       // if we sync on a block boundary, actualRepl will be 0
       assertTrue(file1 + " should be replicated to 1 datanodes, not " + actualRepl,
@@ -663,12 +663,11 @@ public void xxxtestFileCreationNamenodeRestart() throws IOException {
 
       // instruct the dfsclient to use a new filename when it requests
       // new blocks for files that were renamed.
-      DFSClient.DFSOutputStream dfstream = (DFSClient.DFSOutputStream)
-                                                 (stm.getWrappedStream());
+      DFSOutputStream dfstream = (DFSOutputStream)(stm.getWrappedStream());
       dfstream.setTestFilename(file1.toString());
-      dfstream = (DFSClient.DFSOutputStream) (stm3.getWrappedStream());
+      dfstream = (DFSOutputStream) (stm3.getWrappedStream());
       dfstream.setTestFilename(file3new.toString());
-      dfstream = (DFSClient.DFSOutputStream) (stm4.getWrappedStream());
+      dfstream = (DFSOutputStream) (stm4.getWrappedStream());
       dfstream.setTestFilename(file4new.toString());
 
       // write 1 byte to file.  This should succeed because the 
@@ -791,6 +790,7 @@ public void testLeaseExpireHardLimit() throws Exception {
     Configuration conf = new Configuration();
     conf.setInt("heartbeat.recheck.interval", 1000);
     conf.setInt("dfs.heartbeat.interval", 1);
+    conf.setBoolean("dfs.use.inline.checksum", false);
 
     // create cluster
     MiniDFSCluster cluster = new MiniDFSCluster(conf, DATANODE_NUM, true, null);
@@ -805,7 +805,7 @@ public void testLeaseExpireHardLimit() throws Exception {
       FSDataOutputStream out = TestFileCreation.createFile(dfs, fpath, DATANODE_NUM);
       out.write("something".getBytes());
       out.sync();
-      int actualRepl = ((DFSClient.DFSOutputStream)(out.getWrappedStream())).
+      int actualRepl = ((DFSOutputStream)(out.getWrappedStream())).
                         getNumCurrentReplicas();
       assertTrue(f + " should be replicated to " + DATANODE_NUM + " datanodes.",
                  actualRepl == DATANODE_NUM);
@@ -826,7 +826,7 @@ public void testLeaseExpireHardLimit() throws Exception {
         DataNode datanode = cluster.getDataNode(datanodeinfo.ipcPort);
         FSDataset dataset = (FSDataset)datanode.data;
         Block b = dataset.getStoredBlock(nsId, locatedblock.getBlock().getBlockId());
-        File blockfile = dataset.findBlockFile(nsId, b.getBlockId());
+        File blockfile = dataset.getReplicaToRead(nsId, b).getDataFileToRead();
         System.out.println("blockfile=" + blockfile);
         if (blockfile != null) {
           BufferedReader in = new BufferedReader(new FileReader(blockfile));
diff --git a/src/test/org/apache/hadoop/hdfs/TestFileHardLink.java b/src/test/org/apache/hadoop/hdfs/TestFileHardLink.java
index b7431ef5..599b905f 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFileHardLink.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFileHardLink.java
@@ -18,215 +18,605 @@
 package org.apache.hadoop.hdfs;
 
 import java.io.IOException;
+import java.util.List;
 
 import junit.framework.Assert;
 
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsAction;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.protocol.DSQuotaExceededException;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.NSQuotaExceededException;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
 import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.log4j.Level;
 
-  public class TestFileHardLink extends junit.framework.TestCase {
+public class TestFileHardLink extends junit.framework.TestCase {
     {
       ((Log4JLogger)NameNode.stateChangeLog).getLogger().setLevel(Level.ALL);
       ((Log4JLogger)LeaseManager.LOG).getLogger().setLevel(Level.ALL);
       ((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
     }
 
-    /**
-     * mkdir /user/dir1/
-     * du /user/dir1/ -> dirOverhead
-     * 
-     * open /user/dir1/file1 and write
-     * du /user/dir1 -> dirLength1
-     * du /user/dir1/file1 -> fileLength1
-     * dirLenght1 = fileLenght1 + dirOverhead
-     * 
-     * mkdir /user/dir2/
-     * ln /user/dir1/file1 /user/dir2/file2
-     * verify file1 is identical to file2
-     * 
-     * du /user/dir2 -> dirLength2
-     * du /user/dir2/file2 -> fileLength2
-     * dirLength2 == dirLenght1
-     * fileLenght2 == fileLength1
-     * 
-     * ln /user/dir1/file1 /user/dir2/file2
-     * Client can retry the hardlink operation without problems
-     * ln /user/dir2/file2 /user/dir3/file3 [error dir3 is not existed]
-     * 
-     * mkdir /user/dir3
-     * ln /user/dir2/file2 /user/dir3/file3 
-     * verify file3 is identical to file2 and file1
-     * 
-     * du /user/dir3 -> dirLength3
-     * du /user/dir3/file3 -> fileLength3
-     * dirLength3 == dirLenght2
-     * fileLenght3 == fileLength2
-     * 
-     * delete /user/dir1/file1
-     * verify no file1 anymore and verify there is no change for file2 and file3
-     * 
-     * delete /user/dir2/
-     * verify no file2 or dir2 any more and verify there is no change for file3
-     * 
-     * delete /user/dir3/
-     * verify no file3 or dir3 any more
-     */
-    public void testHardLinkFiles() throws IOException {
-      Configuration conf = new Configuration();
-      final int MAX_IDLE_TIME = 2000; // 2s
-      conf.setInt("ipc.client.connection.maxidletime", MAX_IDLE_TIME);
-      conf.setInt("heartbeat.recheck.interval", 1000);
-      conf.setInt("dfs.heartbeat.interval", 1);
-      conf.setInt("dfs.safemode.threshold.pct", 1);
-      conf.setBoolean("dfs.support.append", true);
+  public void testHardLinkFiles() throws IOException {
+    Configuration conf = new Configuration();
+    final int MAX_IDLE_TIME = 2000; // 2s
+    conf.setInt("ipc.client.connection.maxidletime", MAX_IDLE_TIME);
+    conf.setInt("heartbeat.recheck.interval", 1000);
+    conf.setInt("dfs.heartbeat.interval", 1);
+    conf.setInt("dfs.safemode.threshold.pct", 1);
+    conf.setBoolean("dfs.support.append", true);
 
-      // create cluster
-      MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
-      //final DFSClient dfsClient = new DFSClient(NameNode.getAddress(conf), conf);
-      FileSystem fs = null;
-      long dirOverHead = 0;
-      boolean result;
+    // create cluster
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
+    //final DFSClient dfsClient = new DFSClient(NameNode.getAddress(conf), conf);
+    FileSystem fs = null;
+    long dirOverHead = 0;
+    boolean result;
+    NameNode nameNode = cluster.getNameNode();
+    try {
+      cluster.waitActive();
+      fs = cluster.getFileSystem();
+
+      try {
+        cluster.getNameNode().namesystem.dir.getHardLinkId("/nonexistentfile");
+        fail("Did not throw exception for getHardLinkId() on nonexistent file");
+      } catch (IOException ie) {
+        System.out.println("Expected exception : " + ie);
+      }
+
+      // open /user/dir1/file1 and write
+      Path dir1 = new Path("/user/dir1");
+      fs.mkdirs(dir1);
+      dirOverHead = fs.getContentSummary(dir1).getLength();
+      System.out.println("The dir overhead is " + dirOverHead);
+      
+      // write file into file1
+      Path file1 = new Path(dir1, "file1");
+      FSDataOutputStream stm1 = TestFileCreation.createFile(fs, file1, 1);
+      byte[] content = TestFileCreation.writeFile(stm1);
+      stm1.sync();
+      stm1.close();
+      
       try {
-        cluster.waitActive();
-        fs = cluster.getFileSystem();
+        cluster.getNameNode().namesystem.dir.getHardLinkId(file1.toUri()
+            .getPath());
+        fail("Did not throw exception for getHardLinkId() on non hardlinked file file");
+      } catch (IOException ie) {
+        System.out.println("Expected exception : " + ie);
+      }
+
+      // Verify links.
+      String[] links = fs.getHardLinkedFiles(file1);
+      Assert.assertEquals(0, links.length);
+
+      /* du /user/dir1 -> dirLength1
+       * du /user/dir1/file1 -> fileLength1
+       * dirLenght1 = fileLenght1 + dirOverhead 
+       */
+      long dirLength1 = fs.getContentSummary(dir1).getLength();
+      long fileLength1 = fs.getContentSummary(file1).getLength();
+      Assert.assertEquals(dirOverHead, dirLength1 - fileLength1);
+      FileStatus fStatus1 = fs.getFileStatus(file1);
+      Assert.assertTrue(fStatus1.getBlockSize() > 0 );
+      System.out.println("dir1 length: " + dirLength1 + " file1 length: " + fileLength1 +
+          " block size " + fStatus1.getBlockSize());
+      
+      // create /user/dir2
+      Path dir2 = new Path("/user/dir2");
+      fs.mkdirs(dir2);
+      Path file2 = new Path(dir2, "file2");
+      // ln /user/dir1/ /user/dir2/ [error: cannot hard link a directory]
+      result = fs.hardLink(dir1, dir2);
+      Assert.assertFalse(result);
+      
+      // ln /user/dir1/file1 /user/dir2/file2
+      result = fs.hardLink(file1, file2);
+
+      // Verify links.
+      links = fs.getHardLinkedFiles(file1);
+      Assert.assertEquals(1, links.length);
+      Assert.assertEquals(file2, new Path(links[0]));
+
+      Assert.assertTrue(result);
+      verifyLinkedFileIdenticial(fs, nameNode, fStatus1, fs.getFileStatus(file1), content);
+      // Verify all the linked files shared the same file properties such as modification time
+      long current = System.currentTimeMillis();
+      String testUserName = "testUser";
+      String testGroupName = "testGroupName";
+      FsPermission pemission = new FsPermission(FsAction.READ_WRITE,
+          FsAction.READ_WRITE, FsAction.READ_WRITE);
+      short newReplication = (short) (fs.getFileStatus(file1).getReplication() + 1);
+      
+      fs.setTimes(file2, current, current);
+      fs.setOwner(file2, testUserName, testGroupName);
+      fs.setPermission(file1, pemission);
+      fs.setReplication(file2, newReplication);
+
+      fStatus1 = fs.getFileStatus(file1);
+      FileStatus fStatus2 = fs.getFileStatus(file2);
+      
+      assertEquals(current, fStatus1.getModificationTime());
+      assertEquals(current, fStatus2.getModificationTime());
+      
+      assertEquals(testUserName, fStatus1.getOwner());
+      assertEquals(testUserName, fStatus2.getOwner());
+      
+      assertEquals(testGroupName, fStatus1.getGroup());
+      assertEquals(testGroupName, fStatus2.getGroup());
+      
+      assertEquals(pemission, fStatus1.getPermission());
+      assertEquals(pemission, fStatus2.getPermission());
+      
+      assertEquals(newReplication, fStatus1.getReplication());
+      assertEquals(newReplication, fStatus2.getReplication());
+      
+      /* 
+       * du /user/dir2 -> dirLength2
+       * du /user/dir2/file2 -> fileLength2
+       * dirLength2 == dirLenght1
+       * fileLenght2 == fileLength1 
+       */
+      Assert.assertTrue(fStatus2.getBlockSize() > 0 );
+      long dirLength2 = fs.getContentSummary(dir2).getLength();
+      long fileLength2 = fs.getContentSummary(file2).getLength();
+      Assert.assertEquals(dirOverHead, dirLength2 - fileLength2);
+      Assert.assertEquals(fileLength1, fileLength2);
+      Assert.assertEquals(dirLength1, dirLength2);
+      // verify file1 and file2 are identical
+      verifyLinkedFileIdenticial(fs, nameNode, fStatus1, fStatus2, content);
+      System.out.println("dir2 length: " + dirLength2 + " file2 length: " + fileLength2);
+      
+      // ln /user/dir1/file1 /user/dir2/file2 
+      // client can retry the hardlink operation without error
+      result = fs.hardLink(file1, file2);
+      Assert.assertTrue(result);
+      
+      Path dir3= new Path("/user/dir3/dir33/dir333");
+      Path file3 = new Path(dir3, "file3");
+      
+      // ln /user/dir2/file2 /user/dir3/dir33/dir333/file3 [create the intermediate dirs on the fly]
+      result = fs.hardLink(file2, file3);
+      Assert.assertTrue(result);
+ 
+      // ln /user/dir2/file2 /user/dir3/file3
+      fs.mkdirs(dir3);
+      result = fs.hardLink(file2, file3);
+
+      // Verify links, now 3 links file1, file2, file3
+      links = fs.getHardLinkedFiles(file1);
+      Assert.assertEquals(2, links.length);
+      for (String link : links) {
+        if (!(file2.equals(new Path(link)) || file3.equals(new Path(link)))) {
+          fail("Could not find " + file1 + " or " + file2
+              + " in the list of links");
+        }
+      }
+
+      Assert.assertTrue(result);
+      FileStatus fStatus3 = fs.getFileStatus(file3);
+      
+      long dirLength3 = fs.getContentSummary(dir3).getLength();
+      long fileLength3 = fs.getContentSummary(file3).getLength();
+      Assert.assertEquals(dirOverHead, dirLength3 - fileLength3);
+      Assert.assertEquals(fileLength2, fileLength3);
+      Assert.assertEquals(dirLength2, dirLength3);
+      
+      // verify that file3 is identical to file 2 and file 1
+      Assert.assertTrue(fStatus3.getBlockSize() > 0 );
+      verifyLinkedFileIdenticial(fs, nameNode, fStatus1, fStatus3, content);
+      verifyLinkedFileIdenticial(fs, nameNode, fStatus2, fStatus3, content);
+      System.out.println("dir3 length: " + dirLength3 + " file3 length: " + fileLength3);
+      
+      /*  
+       * du /user -> totalDU  
+       * totalDU = du1 + du2 + du3 - file1 - file2  
+       * totalDU = 3 * dirOverhead + file1  
+       */ 
+      long totalDU = fs.getContentSummary(new Path("/user")).getLength(); 
+      System.out.println("Total DU for /user is " + totalDU); 
+      Assert.assertEquals(totalDU, dirLength3 + dirLength2 + dirLength1 
+          - fileLength1 - fileLength2 );  
+      Assert.assertEquals(totalDU, 3 * dirOverHead + fileLength1);
+      
+      /* start to test the delete operation
+      * delete /user/dir1/file1
+      * verify no file1 any more and verify there is no change for file2 and file3
+      */
+      fs.delete(file1, true);
 
-        // open /user/dir1/file1 and write
-        Path dir1 = new Path("/user/dir1");
-        fs.mkdirs(dir1);
-        dirOverHead = fs.getContentSummary(dir1).getLength();
-        System.out.println("The dir overhead is " + dirOverHead);
+      // Verify links, now 2 links file2, file3
+      links = fs.getHardLinkedFiles(file2);
+      Assert.assertEquals(1, links.length);
+      Assert.assertEquals(file3, new Path(links[0]));
+
+      Assert.assertFalse(fs.exists(file1)) ;
+      Assert.assertEquals(dirOverHead, fs.getContentSummary(dir1).getLength());
+      Assert.assertEquals(fileLength2, fs.getContentSummary(file2).getLength());
+      Assert.assertEquals(fileLength3, fs.getContentSummary(file3).getLength());
+      Assert.assertEquals(dirLength2, fs.getContentSummary(dir2).getLength());
+      Assert.assertEquals(dirLength3, fs.getContentSummary(dir3).getLength());
+      verifyLinkedFileIdenticial(fs, nameNode, fStatus2, fs.getFileStatus(file2), content);
+      verifyLinkedFileIdenticial(fs, nameNode, fStatus3, fs.getFileStatus(file3), content);
+      
+      /* 
+      * delete /user/dir2/
+      * verify no file2 or dir2 any more and verify there is no change for file3
+      */
+      fs.delete(dir2, true);
+      // Verify links, now only 1 links file3
+      links = fs.getHardLinkedFiles(file3);
+      Assert.assertEquals(0, links.length);
+
+      Assert.assertFalse(fs.exists(file2));
+      Assert.assertFalse(fs.exists(dir2));
+      Assert.assertEquals(fileLength3, fs.getContentSummary(file3).getLength());
+      Assert.assertEquals(dirLength3, fs.getContentSummary(dir3).getLength());
+      verifyLinkedFileIdenticial(fs, nameNode, fStatus3, fs.getFileStatus(file3), content);
+      
+      /* 
+       * delete /user/dir3/
+       * verify no file3 or dir3 any more and verify the total DU
+       */
+       fs.delete(dir3, true);
+       Assert.assertFalse(fs.exists(file3));
+       Assert.assertFalse(fs.exists(dir3));
+       totalDU = fs.getContentSummary(new Path("/user")).getLength();  
+       Assert.assertEquals(totalDU, dirOverHead);
+    } finally {
+      fs.close();
+      cluster.shutdown();
+    }
+  }
+
+  public void testHardLinkWithDirDeletion() throws Exception {  
+    final Configuration conf = new Configuration(); 
+    final MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null); 
+    final FileSystem fs = cluster.getFileSystem();  
+    assertTrue("Not a HDFS: "+ fs.getUri(), fs instanceof DistributedFileSystem); 
+    final DistributedFileSystem dfs = (DistributedFileSystem)fs;  
+    final int NUM_FILES = 1000; 
+    try { 
+      // 1: create directories: /root/dir1 and /root/dir2 
+      final Path root = new Path("/root/"); 
+      assertTrue(dfs.mkdirs(root)); 
         
-        // write file into file1
-        Path file1 = new Path(dir1, "file1");
-        FSDataOutputStream stm1 = TestFileCreation.createFile(fs, file1, 1);
-        System.out.println("testFileCreationDeleteParent: "
-            + "Created file " + file1);
-        byte[] content = TestFileCreation.writeFile(stm1);
-        stm1.sync();
-        stm1.close();
+      final Path dir1 = new Path(root, "dir1"); 
+      assertTrue(dfs.mkdirs(dir1)); 
+      final Path dir2 = new Path(root, "dir2"); 
+      assertTrue(dfs.mkdirs(dir2)); 
         
-        /* du /user/dir1 -> dirLength1
-         * du /user/dir1/file1 -> fileLength1
-         * dirLenght1 = fileLenght1 + dirOverhead 
-         */
-        long dirLength1 = fs.getContentSummary(dir1).getLength();
-        long fileLength1 = fs.getContentSummary(file1).getLength();
-        Assert.assertEquals(dirOverHead, dirLength1 - fileLength1);
-        FileStatus fStatus1 = fs.getFileStatus(file1);
-        Assert.assertTrue(fStatus1.getBlockSize() > 0 );
-        System.out.println("dir1 length: " + dirLength1 + " file1 length: " + fileLength1 +
-            " block size " + fStatus1.getBlockSize());
+      ContentSummary rootSummary, c1, c2; 
+      rootSummary = dfs.getContentSummary(root);  
+      Assert.assertEquals(0, rootSummary.getFileCount()); 
+      Assert.assertEquals(3, rootSummary.getDirectoryCount());  
+      // There are 4 directories left: root, dir1, dir2 and HDFS's root directory.  
+      Assert.assertEquals(4, cluster.getNameNode().getNamesystem().getFilesAndDirectoriesTotal());  
         
-        // create /user/dir2
-        Path dir2 = new Path("/user/dir2");
-        fs.mkdirs(dir2);
-        Path file2 = new Path(dir2, "file2");
-        // ln /user/dir1/ /user/dir2/ [error: cannot hard link a directory]
-        result = fs.hardLink(dir1, dir2);
-        Assert.assertFalse(result);
+      // 2: create NUM_FILES files under dir1 and create their hardlink files in both dir1 and dir2.  
+      // And check the files count as well. 
+      for (int i = 1; i <= NUM_FILES; i++) {  
+        final Path target = new Path(dir1, "file-" + i);  
+        final Path hardLink1 = new Path(dir1, "hardlink-file-" + i);  
+        final Path hardLink2 = new Path(dir2, "hardlink-file-" + i);  
+          
+        DFSTestUtil.createFile(dfs, target, 1L, (short)3, 0L);  
+        fs.hardLink(target, hardLink1); 
+        fs.hardLink(target, hardLink2); 
+          
+        c1 = dfs.getContentSummary(dir1); 
+        Assert.assertEquals(2 * i, c1.getFileCount());  
+          
+        c2 = dfs.getContentSummary(dir2); 
+        Assert.assertEquals(i, c2.getFileCount());  
+      } 
         
-        // ln /user/dir1/file1 /user/dir2/file2
-        result = fs.hardLink(file1, file2);
-        Assert.assertTrue(result);
-        verifyLinkedFileIdenticial(fs, fStatus1, fs.getFileStatus(file1), content);
+      rootSummary = dfs.getContentSummary(root);  
+      Assert.assertEquals(3 * NUM_FILES, rootSummary.getFileCount()); 
+      Assert.assertEquals(3, rootSummary.getDirectoryCount());  
         
-        /* 
-         * du /user/dir2 -> dirLength2
-         * du /user/dir2/file2 -> fileLength2
-         * dirLength2 == dirLenght1
-         * fileLenght2 == fileLength1 
-         */
-        FileStatus fStatus2 = fs.getFileStatus(file2);
-        Assert.assertTrue(fStatus2.getBlockSize() > 0 );
-        long dirLength2 = fs.getContentSummary(dir2).getLength();
-        long fileLength2 = fs.getContentSummary(file2).getLength();
-        Assert.assertEquals(dirOverHead, dirLength2 - fileLength2);
-        Assert.assertEquals(fileLength1, fileLength2);
-        Assert.assertEquals(dirLength1, dirLength2);
-        // verify file1 and file2 are identical
-        verifyLinkedFileIdenticial(fs, fStatus1, fStatus2, content);
-        System.out.println("dir2 length: " + dirLength2 + " file2 length: " + fileLength2);
+      // 3: delete dir1 directly (skipping trash) and check the files count again 
+      dfs.getClient().delete(dir1.toUri().getPath(), true); 
         
-        // ln /user/dir1/file1 /user/dir2/file2 
-        // client can retry the hardlink operation without error
-        result = fs.hardLink(file1, file2);
-        Assert.assertTrue(result);
+      c2 = dfs.getContentSummary(dir2); 
+      Assert.assertEquals(NUM_FILES, c2.getFileCount());  
         
-        Path dir3= new Path("/user/dir3");
-        Path file3 = new Path(dir3, "file3");
+      rootSummary = dfs.getContentSummary(root);  
+      Assert.assertEquals(NUM_FILES, rootSummary.getFileCount()); 
+      Assert.assertEquals(2, rootSummary.getDirectoryCount());  
         
-        // ln /user/dir2/file2 /user/dir3/file3 [error: dir3 does not exist]
-        result = fs.hardLink(file2, file3);
-        Assert.assertFalse(result);
-   
-        // ln /user/dir2/file2 /user/dir3/file3
-        fs.mkdirs(dir3);
-        result = fs.hardLink(file2, file3);
+      // There are 3 directories left: root, dir1 and HDFS's root directory.  
+      Assert.assertEquals(NUM_FILES + 3,  
+          cluster.getNameNode().getNamesystem().getFilesAndDirectoriesTotal()); 
+    } finally { 
+      cluster.shutdown(); 
+    } 
+  }
+  
+  public void testHardLinkWithFileOverwite() throws Exception {
+    final Configuration conf = new Configuration();
+    final MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
+    final FileSystem fs = cluster.getFileSystem();
+    assertTrue("Not a HDFS: "+ fs.getUri(), fs instanceof DistributedFileSystem);
+    final DistributedFileSystem dfs = (DistributedFileSystem)fs;
+    try {
+      // 1: create the root dir
+      ContentSummary c;
+      final Path root = new Path("/root/");
+      assertTrue(dfs.mkdirs(root));
+      
+      // 2: create file1 and its hardlink file: file1-hardlink-orig
+      final Path file1 =  new Path(root, "file1");
+      DFSTestUtil.createFile(dfs, file1, 1L, (short)3, 0L);
+      
+      final Path file1HardLinkOrig =  new Path(root, "file1-hardlink-orig");
+      fs.hardLink(file1, file1HardLinkOrig);
+      Assert.assertEquals(1, fs.getHardLinkedFiles(file1).length);
+      
+      c = dfs.getContentSummary(root);
+      Assert.assertEquals(2, c.getFileCount());
+      Assert.assertEquals(4, cluster.getNameNode().getNamesystem().getFilesAndDirectoriesTotal());
+      
+      // 3: overwrite the file1
+      DFSTestUtil.createFile(dfs, file1, 2L, (short)3, 0L);
+      Assert.assertEquals(0, fs.getHardLinkedFiles(file1).length);
+      Assert.assertEquals(0, fs.getHardLinkedFiles(file1HardLinkOrig).length);
+      
+      c = dfs.getContentSummary(root);
+      Assert.assertEquals(2, c.getFileCount());
+      Assert.assertEquals(4, cluster.getNameNode().getNamesystem().getFilesAndDirectoriesTotal());
+      
+      // 4: create a new hardlink file for the file1: file1-hardlink-new
+      final Path file1HardLinkNew =  new Path(root, "file1-hardlink-new");
+      fs.hardLink(file1, file1HardLinkNew);
+      Assert.assertEquals(1, fs.getHardLinkedFiles(file1).length);
+      Assert.assertEquals(1, fs.getHardLinkedFiles(file1HardLinkNew).length);
+      Assert.assertEquals(0, fs.getHardLinkedFiles(file1HardLinkOrig).length);
+      
+      c = dfs.getContentSummary(root);
+      Assert.assertEquals(3, c.getFileCount());
+      Assert.assertEquals(5, cluster.getNameNode().getNamesystem().getFilesAndDirectoriesTotal());
+    } finally {
+      cluster.shutdown();
+    }
+  }
+  
+  public void testHardLinkWithNNRestart() throws Exception {
+    final Configuration conf = new Configuration();
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
+    FileSystem fs = cluster.getFileSystem();
+    NameNode nameNode = cluster.getNameNode();
+    assertTrue("Not a HDFS: "+ fs.getUri(), fs instanceof DistributedFileSystem);
+    try {
+      // Create a new file
+      Path root = new Path("/user/");
+      Path file10 = new Path(root, "file1");
+      FSDataOutputStream stm1 = TestFileCreation.createFile(fs, file10, 1);
+      byte[] content = TestFileCreation.writeFile(stm1);
+      stm1.close();
+      
+      Path file11 =  new Path(root, "file-11");
+      Path file12 =  new Path(root, "file-12");
+      fs.hardLink(file10, file11);
+      fs.hardLink(file11, file12);
+      
+      verifyLinkedFileIdenticial(fs, nameNode, fs.getFileStatus(file10), fs.getFileStatus(file11),
+          content);
+      verifyLinkedFileIdenticial(fs, nameNode, fs.getFileStatus(file10), fs.getFileStatus(file12),
+          content);
+      
+      // Restart the cluster
+      cluster.restartNameNode();
+      nameNode = cluster.getNameNode();
+      
+      // Verify all the linked files are the same
+      verifyLinkedFileIdenticial(fs, nameNode, fs.getFileStatus(file10), fs.getFileStatus(file11),
+          content);
+      verifyLinkedFileIdenticial(fs, nameNode, fs.getFileStatus(file10), fs.getFileStatus(file12),
+          content);
+      
+      // Delete file10
+      fs.delete(file10, true);
+      assertFalse(fs.exists(file10));
+      assertTrue(fs.exists(file11));
+      assertTrue(fs.exists(file12));
+      
+      // Restart the cluster
+      cluster.restartNameNode();
+      nameNode = cluster.getNameNode();
+      
+      // Verify the deleted files
+      assertFalse(fs.exists(file10));
+      assertTrue(fs.exists(file11));
+      assertTrue(fs.exists(file12));
+      verifyLinkedFileIdenticial(fs, nameNode, fs.getFileStatus(file11), fs.getFileStatus(file12),
+          content);
+      
+      // Delete file11
+      fs.delete(file11, true);
+      assertFalse(fs.exists(file11));
+      assertTrue(fs.exists(file12));
+      
+      // Restart the cluster
+      cluster.restartNameNode();
+      assertFalse(fs.exists(file11));
+      assertTrue(fs.exists(file12));
+    } finally {
+      cluster.shutdown();
+    }
+  }
+  
+  public void testHardLinkWithNSQuota() throws Exception {
+    final Configuration conf = new Configuration();
+    final MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
+    final FileSystem fs = cluster.getFileSystem();
+    assertTrue("Not a HDFS: "+ fs.getUri(), fs instanceof DistributedFileSystem);
+    final DistributedFileSystem dfs = (DistributedFileSystem)fs;
+    try {
+      // 1: create directories
+      final Path root = new Path("/user/");
+      final Path dir1 = new Path("/user/dir1/");
+      final Path dir2 = new Path("/user/dir1/dir2/");
+      assertTrue(dfs.mkdirs(dir2));
+      
+      // 2: set the ns quota 
+      dfs.setQuota(root, 6, FSConstants.QUOTA_DONT_SET);
+      dfs.setQuota(dir1, 4, FSConstants.QUOTA_DONT_SET);
+      dfs.setQuota(dir2, 2, FSConstants.QUOTA_DONT_SET);
+      
+      verifyNSQuotaSetting(dfs, root, 6, 3);
+      verifyNSQuotaSetting(dfs, dir1, 4, 2);
+      verifyNSQuotaSetting(dfs, dir2, 2, 1);
+      
+      // 3: create a regular file: /user/dir1/dir2/file-10 and check the ns quota
+      final Path file10 =  new Path(dir2, "file-10");
+      DFSTestUtil.createFile(dfs, file10, 1L, (short)3, 0L);
+      verifyNSQuotaSetting(dfs, root, 6 ,4);
+      verifyNSQuotaSetting(dfs, dir1, 4 ,3);
+      verifyNSQuotaSetting(dfs, dir2, 2, 2);
+      
+      // 4: create a regular file: /user/dir1/dir2/file-11 and catch the NSQuotaExceededException
+      final Path file11 =  new Path(dir2, "file-11");
+      try {
+        DFSTestUtil.createFile(dfs, file11, 1L, (short)3, 0L);
+        Assert.fail("Expect an NSQuotaExceededException thrown out");
+      } catch (NSQuotaExceededException e) {}
 
-        Assert.assertTrue(result);
-        FileStatus fStatus3 = fs.getFileStatus(file3);
-        
-        long dirLength3 = fs.getContentSummary(dir3).getLength();
-        long fileLength3 = fs.getContentSummary(file3).getLength();
-        Assert.assertEquals(dirOverHead, dirLength3 - fileLength3);
-        Assert.assertEquals(fileLength2, fileLength3);
-        Assert.assertEquals(dirLength2, dirLength3);
-        
-        // verify that file3 is identical to file 2 and file 1
-        Assert.assertTrue(fStatus3.getBlockSize() > 0 );
-        verifyLinkedFileIdenticial(fs, fStatus1, fStatus3, content);
-        verifyLinkedFileIdenticial(fs, fStatus2, fStatus3, content);
-        System.out.println("dir3 length: " + dirLength3 + " file3 length: " + fileLength3);
-        
-        
-        /* start to test the delete operation
-        * delete /user/dir1/file1
-        * verify no file1 any more and verify there is no change for file2 and file3
-        */
-        fs.delete(file1, true);
-        Assert.assertFalse(fs.exists(file1)) ;
-        Assert.assertEquals(dirOverHead, fs.getContentSummary(dir1).getLength());
-        Assert.assertEquals(fileLength2, fs.getContentSummary(file2).getLength());
-        Assert.assertEquals(fileLength3, fs.getContentSummary(file3).getLength());
-        Assert.assertEquals(dirLength2, fs.getContentSummary(dir2).getLength());
-        Assert.assertEquals(dirLength3, fs.getContentSummary(dir3).getLength());
-        verifyLinkedFileIdenticial(fs, fStatus2, fs.getFileStatus(file2), content);
-        verifyLinkedFileIdenticial(fs, fStatus3, fs.getFileStatus(file3), content);
-        
-        /* 
-        * delete /user/dir2/
-        * verify no file2 or dir2 any more and verify there is no change for file3
-        */
-        fs.delete(dir2, true);
-        Assert.assertFalse(fs.exists(file2));
-        Assert.assertFalse(fs.exists(dir2));
-        Assert.assertEquals(fileLength3, fs.getContentSummary(file3).getLength());
-        Assert.assertEquals(dirLength3, fs.getContentSummary(dir3).getLength());
-        verifyLinkedFileIdenticial(fs, fStatus3, fs.getFileStatus(file3), content);
-        
-        /* 
-         * delete /user/dir3/
-         * verify no file3 or dir3 any more and verify the total DU
-         */
-         fs.delete(dir3, true);
-         Assert.assertFalse(fs.exists(file3));
-         Assert.assertFalse(fs.exists(dir3));
-      } finally {
-        fs.close();
-        cluster.shutdown();
-      }
+      verifyNSQuotaSetting(dfs, root, 6 ,4);
+      verifyNSQuotaSetting(dfs, dir1, 4 ,3);
+      verifyNSQuotaSetting(dfs, dir2, 2, 2); 
+      
+      // 5: ln /user/dir1/dir2/file-10 /user/dir1/dir2/file-11 and catch the NSQuotaExceededException
+      try {
+        fs.hardLink(file10, file11);
+        Assert.fail("Expect an NSQuotaExceededException thrown out");
+      } catch (NSQuotaExceededException e) {}
+      verifyNSQuotaSetting(dfs, root, 6 ,4);
+      verifyNSQuotaSetting(dfs, dir1, 4 ,3);
+      verifyNSQuotaSetting(dfs, dir2, 2, 2);
+      
+      // 6: ln /user/dir1/dir2/file-10 /user/dir1/file-12 and verify the quota
+      final Path file12 =  new Path(dir1, "file-12");
+      assertTrue(fs.hardLink(file10, file12));
+      verifyNSQuotaSetting(dfs, root, 6 ,5);
+      verifyNSQuotaSetting(dfs, dir1, 4 ,4);
+      verifyNSQuotaSetting(dfs, dir2, 2, 2);
+      
+      // 7: ln /user/dir1/dir2/file-10 /user/dir1/file-13 and catch the NSQuotaExceededException
+      final Path file13 = new Path(dir1, "file-13");
+      try {
+        fs.hardLink(file10, file13);
+        Assert.fail("Expect an NSQuotaExceededException thrown out");
+      } catch (NSQuotaExceededException e) {}
+      verifyNSQuotaSetting(dfs, root, 6 ,5);
+      verifyNSQuotaSetting(dfs, dir1, 4 ,4);
+      verifyNSQuotaSetting(dfs, dir2, 2, 2);
+      
+      // 8: ln /user/dir1/dir2/file-10 /user/file-14 and verify the quota
+      final Path file14 =  new Path(root, "file-14");
+      assertTrue(fs.hardLink(file10, file14));
+      verifyNSQuotaSetting(dfs, root, 6 ,6);
+      verifyNSQuotaSetting(dfs, dir1, 4 ,4);
+      verifyNSQuotaSetting(dfs, dir2, 2, 2);
+      
+      // 9: ln /user/dir1/dir2/file-10 /user/file-15 and catch the NSQuotaExceededException
+      final Path file15 = new Path(root, "file-15");
+      try {
+        fs.hardLink(file10, file15);
+        Assert.fail("Expect an NSQuotaExceededException thrown out");
+      } catch (NSQuotaExceededException e) {}
+      
+      verifyNSQuotaSetting(dfs, root, 6 ,6);
+      verifyNSQuotaSetting(dfs, dir1, 4 ,4);
+      verifyNSQuotaSetting(dfs, dir2, 2, 2);
+    } finally {
+      cluster.shutdown();
     }
-    
-  private void verifyLinkedFileIdenticial(FileSystem fs, FileStatus f1,
+  }
+  
+  public void testHardLinkWithDSQuota() throws Exception {
+    final Configuration conf = new Configuration();
+    final MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
+    final FileSystem fs = cluster.getFileSystem();
+    assertTrue("Not a HDFS: "+ fs.getUri(), fs instanceof DistributedFileSystem);
+    final DistributedFileSystem dfs = (DistributedFileSystem)fs;
+    int fileSize = 256;
+    long diskSize = 0;
+    try {
+      // 1: create directories
+      final Path root = new Path("/user/");
+      final Path dir1 = new Path("/user/dir1/");
+      final Path dir2 = new Path("/user/dir1/dir2/");
+      assertTrue(dfs.mkdirs(dir2));
+      
+      // 2 create the files and get the diskSize
+      final Path file10 =  new Path(dir2, "file-10");
+      DFSTestUtil.createFile(dfs, file10, (long)fileSize, (short)1, 0L);
+      final Path file11 =  new Path(root, "file-11");
+      DFSTestUtil.createFile(dfs, file11, (long)fileSize, (short)1, 0L);
+
+      ContentSummary c1 = dfs.getContentSummary(file10);
+      diskSize = c1.getSpaceConsumed();
+      assertEquals(fileSize, diskSize);
+      ContentSummary c2 = dfs.getContentSummary(file11);
+      diskSize = c2.getSpaceConsumed();
+      assertEquals(fileSize, diskSize);
+      
+      // 3: set the ds quota
+      dfs.setQuota(root, FSConstants.QUOTA_DONT_SET, 3 * diskSize);
+      dfs.setQuota(dir1, FSConstants.QUOTA_DONT_SET, 2 * diskSize);
+      dfs.setQuota(dir2, FSConstants.QUOTA_DONT_SET, 1 * diskSize);
+      
+      verifyDSQuotaSetting(dfs, root, 3 * diskSize, 2 * diskSize);
+      verifyDSQuotaSetting(dfs, dir1, 2 * diskSize, 1 * diskSize);
+      verifyDSQuotaSetting(dfs, dir2, 1 * diskSize, 1 * diskSize);
+
+      // 4: ln /user/dir1/dir2/file-10 /user/dir1/dir2/file-12
+      final Path file12 =  new Path(dir2, "file-12");
+      assertTrue(fs.hardLink(file10, file12));
+      verifyDSQuotaSetting(dfs, root, 3 * diskSize, 2 * diskSize);
+      verifyDSQuotaSetting(dfs, dir1, 2 * diskSize, 1 * diskSize);
+      verifyDSQuotaSetting(dfs, dir2, 1 * diskSize, 1 * diskSize);
+
+      // 6: ln /user/dir1/dir2/file-10 /user/dir1/file-13
+      final Path file13 =  new Path(dir1, "file-13");
+      assertTrue(fs.hardLink(file10, file13));
+      verifyDSQuotaSetting(dfs, root, 3 * diskSize, 2 * diskSize);
+      verifyDSQuotaSetting(dfs, dir1, 2 * diskSize, 1 * diskSize);
+      verifyDSQuotaSetting(dfs, dir2, 1 * diskSize, 1 * diskSize);
+      
+      // 7: ln /user/file-11 /user/dir1/file-14
+      final Path file14 =  new Path(dir1, "file-14");
+      assertTrue(fs.hardLink(file11, file14));
+      verifyDSQuotaSetting(dfs, root, 3 * diskSize, 2 * diskSize);
+      verifyDSQuotaSetting(dfs, dir1, 2 * diskSize, 2 * diskSize);
+      verifyDSQuotaSetting(dfs, dir2, 1 * diskSize, 1 * diskSize);
+      
+      // 8: ln /user/file-11 /user/dir1/dir2/file-15
+      final Path file15 =  new Path(dir2, "file-15");
+      try {
+        fs.hardLink(file11, file15);
+        Assert.fail("Expect a DSQuotaExceededException thrown out");
+      } catch (DSQuotaExceededException e) {}
+      verifyDSQuotaSetting(dfs, root, 3 * diskSize, 2 * diskSize);
+      verifyDSQuotaSetting(dfs, dir1, 2 * diskSize, 2 * diskSize);
+      verifyDSQuotaSetting(dfs, dir2, 1 * diskSize, 1 * diskSize);
+    } finally {
+      cluster.shutdown();
+    }
+  }
+
+  public static void verifyLinkedFileIdenticial(FileSystem fs, NameNode nameNode, FileStatus f1,
       FileStatus f2, byte[] content) throws IOException {
     Assert.assertEquals(f1.getBlockSize(), f2.getBlockSize());
     Assert.assertEquals(f1.getAccessTime(), f2.getAccessTime());
@@ -236,11 +626,23 @@ private void verifyLinkedFileIdenticial(FileSystem fs, FileStatus f1,
     Assert.assertEquals(f1.getReplication(), f2.getReplication());
     Assert.assertEquals(f1.getPermission(), f2.getPermission());
 
+    checkBlocks(
+        nameNode.getBlockLocations(f1.getPath().toUri().getPath(), 0, f1.getLen()).getLocatedBlocks(),
+        nameNode.getBlockLocations(f2.getPath().toUri().getPath(), 0, f2.getLen()).getLocatedBlocks());
+    
     checkFile(fs, f1.getPath(), (int) f1.getLen(), content);
     checkFile(fs, f2.getPath(), (int) f2.getLen(), content);
   }
 
-  private void checkFile(FileSystem fs, Path name, int len, byte[] content)
+  private static void checkBlocks(List<LocatedBlock> blocks1, List<LocatedBlock> blocks2) {
+    Assert.assertEquals(blocks1.size(), blocks2.size());
+    for (int i = 0; i < blocks1.size(); i++) {
+      Assert.assertEquals(blocks1.get(i).getBlock().getBlockId(), 
+                          blocks2.get(i).getBlock().getBlockId());
+    }
+  }
+  
+  private static void checkFile(FileSystem fs, Path name, int len, byte[] content)
       throws IOException {
     FSDataInputStream stm = fs.open(name);
     byte[] actual = new byte[len];
@@ -250,7 +652,7 @@ private void checkFile(FileSystem fs, Path name, int len, byte[] content)
     stm.close();
   }
 
-  private void checkData(byte[] actual, int from, byte[] expected,
+  private static void checkData(byte[] actual, int from, byte[] expected,
       String message) {
     for (int idx = 0; idx < actual.length; idx++) {
       assertEquals(message + " byte " + (from + idx) + " differs. expected "
@@ -259,5 +661,18 @@ private void checkData(byte[] actual, int from, byte[] expected,
       actual[idx] = 0;
     }
   }
-
-}
\ No newline at end of file
+  
+  private static void verifyNSQuotaSetting(DistributedFileSystem dfs, Path path, int nsQuota,
+      int nsComsumed) throws IOException {
+    ContentSummary c = dfs.getContentSummary(path);
+    assertEquals(nsQuota, c.getQuota());
+    assertEquals(nsComsumed, c.getFileCount() + c.getDirectoryCount());
+  }
+  
+  private static void verifyDSQuotaSetting(DistributedFileSystem dfs, Path path, long dsCount,
+      long diskComsumed) throws IOException {
+    ContentSummary c = dfs.getContentSummary(path);
+    assertEquals(dsCount, c.getSpaceQuota());
+    assertEquals(diskComsumed, c.getSpaceConsumed());
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/TestFileLocalRead.java b/src/test/org/apache/hadoop/hdfs/TestFileLocalRead.java
index 8577bcf1..a1f492b6 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFileLocalRead.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFileLocalRead.java
@@ -171,6 +171,9 @@ static void checkFullFile(FileSystem fs, Path name) throws IOException {
   public void testFileLocalRead() throws IOException {
     Configuration conf = new Configuration();
     conf.setBoolean("dfs.read.shortcircuit", true);
+    conf.setBoolean("dfs.read.shortcircuit.fallbackwhenfail", false);
+    conf.setBoolean("dfs.use.inline.checksum", false);
+
     if (simulatedStorage) {
       conf.setBoolean(SimulatedFSDataset.CONFIG_PROPERTY_SIMULATED, true);
     }
diff --git a/src/test/org/apache/hadoop/hdfs/TestFileStatusExtended.java b/src/test/org/apache/hadoop/hdfs/TestFileStatusExtended.java
index 20ba617b..8a18e7c3 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFileStatusExtended.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFileStatusExtended.java
@@ -53,12 +53,12 @@ public void tearDownAfterClass() throws Exception {
   @Test
   public void testRandomFiles() throws Exception {
     String topDir = "testRandomFiles";
-    DFSTestUtil util = new DFSTestUtil(topDir, 50, 10, MAX_FILE_SIZE);
+    DFSTestUtil util = new DFSTestUtil(topDir, 100, 10, MAX_FILE_SIZE);
     util.createFiles(fs, topDir);
     NameNode nn = cluster.getNameNode();
-    List<FileStatusExtended> stats = nn.getRandomFiles(20);
+    List<FileStatusExtended> stats = nn.getRandomFilesSample(0.4);
     assertNotNull(stats);
-    assertTrue(20 >= stats.size());
+    assertTrue(stats.size() >= 10);
     for (FileStatusExtended stat : stats) {
       fs.exists(stat.getPath());
       assertEquals("", stat.getHolder());
@@ -77,8 +77,8 @@ public void testRandomFiles() throws Exception {
   }
 
   private List<FileStatusExtended> dumpRandomFileInfo(String fileName,
-      int maxFiles, NameNode nn) throws IOException {
-    List<FileStatusExtended> stats = nn.getRandomFiles(maxFiles);
+      double percentage, NameNode nn) throws IOException {
+    List<FileStatusExtended> stats = nn.getRandomFilesSample(percentage);
     DataOutputStream out = new DataOutputStream(new FileOutputStream(fileName));
     try {
       // Write the number of entries.
@@ -100,7 +100,7 @@ public void testDump() throws Exception {
     File fileName = new File(cluster.getBaseDataDir(), "dumpMeta");
     NameNode nn = cluster.getNameNode();
     List<FileStatusExtended> stats = dumpRandomFileInfo(
-        fileName.getAbsolutePath(), 20, nn);
+        fileName.getAbsolutePath(), 0.4, nn);
     DataInputStream in = new DataInputStream(new FileInputStream(
         fileName.getAbsolutePath()));
     int nFiles = in.readInt();
@@ -112,24 +112,14 @@ public void testDump() throws Exception {
     }
   }
 
-  @Test
-  public void testMaxVisit() throws Exception {
-    String topDir = "testMaxVisit";
-    DFSTestUtil util = new DFSTestUtil(topDir, 5, 10, MAX_FILE_SIZE);
-    util.createFiles(fs, topDir);
-    NameNode nn = cluster.getNameNode();
-    List<FileStatusExtended> stats = nn.getRandomFiles(10);
-    assertEquals(5, stats.size());
-  }
-
   @Test
   public void testPercentBasedSample() throws Exception {
     String topDir = "testPercentBasedSample";
-    DFSTestUtil util = new DFSTestUtil(topDir, 100, 10, MAX_FILE_SIZE);
+    DFSTestUtil util = new DFSTestUtil(topDir, 200, 10, MAX_FILE_SIZE);
     util.createFiles(fs, topDir);
     NameNode nn = cluster.getNameNode();
-    List<FileStatusExtended> stats = nn.getRandomFilesSample(0.1f);
-    assertTrue(10 >= stats.size());
+    List<FileStatusExtended> stats = nn.getRandomFilesSample(0.1);
+    assertTrue(stats.size() >= 5);
   }
 
   @Test
@@ -138,14 +128,14 @@ public void testPercentBasedSampleFull() throws Exception {
     DFSTestUtil util = new DFSTestUtil(topDir, 15, 10, MAX_FILE_SIZE);
     util.createFiles(fs, topDir);
     NameNode nn = cluster.getNameNode();
-    List<FileStatusExtended> stats = nn.getRandomFilesSample(1.0f);
+    List<FileStatusExtended> stats = nn.getRandomFilesSample(1.0);
     assertTrue(15 >= stats.size());
   }
 
   @Test
   public void testInvalidPercentBasedSample1() throws Exception {
     try {
-      cluster.getNameNode().getRandomFilesSample(0.0f);
+      cluster.getNameNode().getRandomFilesSample(0.0);
       fail("Did not throw : " + IllegalArgumentException.class);
     } catch (IllegalArgumentException e) {
       LOG.info("Expected exception : ", e);
@@ -155,7 +145,7 @@ public void testInvalidPercentBasedSample1() throws Exception {
   @Test
   public void testInvalidPercentBasedSample2() throws Exception {
     try {
-      cluster.getNameNode().getRandomFilesSample(1.1f);
+      cluster.getNameNode().getRandomFilesSample(1.1);
       fail("Did not throw : " + IllegalArgumentException.class);
     } catch (IllegalArgumentException e) {
       LOG.info("Expected exception : ", e);
@@ -165,7 +155,7 @@ public void testInvalidPercentBasedSample2() throws Exception {
   @Test
   public void testInvalidPercentBasedSample3() throws Exception {
     try {
-      cluster.getNameNode().getRandomFilesSample(-0.5f);
+      cluster.getNameNode().getRandomFilesSample(-0.5);
       fail("Did not throw : " + IllegalArgumentException.class);
     } catch (IllegalArgumentException e) {
       LOG.info("Expected exception : ", e);
@@ -182,7 +172,7 @@ public void testFileUnderConstruction() throws Exception {
     out.sync();
 
     NameNode nn = cluster.getNameNode();
-    List<FileStatusExtended> stats = nn.getRandomFiles(1);
+    List<FileStatusExtended> stats = nn.getRandomFilesSample(1);
     assertEquals(1, stats.size());
     assertEquals(((DistributedFileSystem) fs).getClient().clientName, stats
         .get(0).getHolder());
diff --git a/src/test/org/apache/hadoop/hdfs/TestFileSync.java b/src/test/org/apache/hadoop/hdfs/TestFileSync.java
index e51ab51c..b4c533bb 100644
--- a/src/test/org/apache/hadoop/hdfs/TestFileSync.java
+++ b/src/test/org/apache/hadoop/hdfs/TestFileSync.java
@@ -51,7 +51,7 @@ public void testFileForceSync() throws Exception {
     String filename = "/testFileForceSync";
     boolean forceSync = true;
     DFSClient dfsClient = ((DistributedFileSystem) fileSystem).getClient();
-    DFSClient.DFSOutputStream out = (DFSClient.DFSOutputStream)dfsClient.create(
+    DFSOutputStream out = (DFSOutputStream)dfsClient.create(
         filename, FsPermission.getDefault(), true, true, REPLICATION_NUM, BLOCK_SIZE,
         new Progressable() {
           @Override
@@ -102,7 +102,7 @@ public void testFileParallelWrites() throws Exception {
     String filename = "/testFileParallelWrite";
     boolean doParallelWrites = true;
     DFSClient dfsClient = ((DistributedFileSystem) fileSystem).getClient();
-    DFSClient.DFSOutputStream out = (DFSClient.DFSOutputStream)dfsClient.create(
+    DFSOutputStream out = (DFSOutputStream)dfsClient.create(
         filename, FsPermission.getDefault(), true, true, REPLICATION_NUM, BLOCK_SIZE,
         new Progressable() {
           @Override
diff --git a/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java b/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java
index d74fe4e2..94d11f7a 100644
--- a/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java
+++ b/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java
@@ -18,8 +18,16 @@
 
 package org.apache.hadoop.hdfs;
 
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Random;
+
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileSystemContractBaseTest;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.security.UnixUserGroupInformation;
 
 public class TestHDFSFileSystemContract extends FileSystemContractBaseTest {
@@ -46,5 +54,63 @@ protected void tearDown() throws Exception {
   protected String getDefaultWorkingDirectory() {
     return defaultWorkingDirectory;
   }
-  
+
+  /**
+   * Tested semantics: if file is being written by one client and deleted by
+   * other client, the file shall be removed (according to definition of
+   * FileSystem.delete()) and writing client shall not be able to recreate file
+   * by performing operations on FSDataOutputStream object, that was retrieved
+   * before deletion. Moreover second client shall be able to create file with
+   * the same path using FileSystem.create() method with unset overwrite flag.
+   * @throws Throwable
+   */
+  public void testDeleteFileBeingWrittenTo() throws Throwable {
+    final int blockSize = getBlockSize();
+    final int len = blockSize * 2;
+    byte[] data = new byte[len];
+    (new Random()).nextBytes(data);
+
+    Path path = path("/test/hadoop/file");
+
+    fs.mkdirs(path.getParent());
+
+    FSDataOutputStream out = fs.create(path, false,
+        fs.getConf().getInt("io.file.buffer.size", 4096), (short) 1,
+        getBlockSize());
+    out.write(data, 0, blockSize);
+    out.sync();
+
+    assertTrue("File does not exist", fs.exists(path));
+    assertEquals("Wrong file length", blockSize,
+        fs.getFileStatus(path).getLen());
+
+    FileSystem fs2 = cluster.getUniqueFileSystem();
+    assertTrue("Delete failed", fs2.delete(path, false));
+
+    assertFalse("File still exists", fs.exists(path));
+
+    try {
+      out.write(data, blockSize, len - blockSize);
+      out.close();
+      fail("Client wrote another block to deleted file.");
+    } catch (IOException e) {
+      // expected
+    }
+
+    assertFalse("File recreated", fs.exists(path));
+
+    FSDataOutputStream out2 = fs2.create(path, false,
+        fs2.getConf().getInt("io.file.buffer.size", 4096), (short) 1,
+        getBlockSize());
+    out2.write(data, 0, len);
+    out2.close();
+
+    FSDataInputStream in = fs.open(path);
+    byte[] buf = new byte[len];
+    in.readFully(0, buf);
+    in.close();
+
+    assertTrue("File content does not match", Arrays.equals(data, buf));
+  }
+
 }
diff --git a/src/test/org/apache/hadoop/hdfs/TestHDFSTrash.java b/src/test/org/apache/hadoop/hdfs/TestHDFSTrash.java
index c6cb1d64..d6eb9055 100644
--- a/src/test/org/apache/hadoop/hdfs/TestHDFSTrash.java
+++ b/src/test/org/apache/hadoop/hdfs/TestHDFSTrash.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs;
 
+import java.io.File;
 import java.io.IOException;
 
 import junit.framework.Test;
@@ -25,6 +26,7 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.TestTrash;
 
@@ -37,6 +39,10 @@ public class TestHDFSTrash extends TestTrash {
   public static Test suite() {
     TestSetup setup = new TestSetup(new TestSuite(TestHDFSTrash.class)) {
       protected void setUp() throws Exception {
+        File testDir = new File(TEST_DIR.toUri().getPath());
+        FileUtil.fullyDelete(testDir);
+        testDir.mkdirs();    
+        
         Configuration conf = new Configuration();
         cluster = new MiniDFSCluster(conf, 2, true, null);
       }
diff --git a/src/test/org/apache/hadoop/hdfs/TestHttpServerShutdown.java b/src/test/org/apache/hadoop/hdfs/TestHttpServerShutdown.java
new file mode 100644
index 00000000..aaa05b0c
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/TestHttpServerShutdown.java
@@ -0,0 +1,85 @@
+package org.apache.hadoop.hdfs;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.tools.DFSck;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.http.HttpServer;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class TestHttpServerShutdown {
+
+  private static MiniDFSCluster cluster;
+  private static Configuration conf;
+  private static final Log LOG = LogFactory
+      .getLog(TestHttpServerShutdown.class);
+  private static Set<Thread> oldThreads;
+  private volatile boolean fsckCalled = false;
+
+  private class TestHandler extends InjectionHandler {
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.NAMENODE_FSCK_START) {
+        fsckCalled = true;
+        while (true) {
+          try {
+            Thread.sleep(1000);
+          } catch (InterruptedException ie) {
+          }
+        }
+      }
+    }
+  }
+
+  private class FsckThread extends Thread {
+
+    public void run() {
+      try {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        PrintStream ps = new PrintStream(os);
+        new DFSck(conf, ps).run(new String[] { "/" });
+      } catch (Exception e) {
+      }
+    }
+  }
+
+  @Test(timeout = 180000)
+  public void testShutdown() throws Exception {
+    oldThreads = Thread.getAllStackTraces().keySet();
+    conf = new Configuration();
+    conf.setInt(HttpServer.HTTP_THREADPOOL_MAX_STOP_TIME, 3000);
+    cluster = new MiniDFSCluster(conf, 0, true, null);
+
+    InjectionHandler.set(new TestHandler());
+    Thread fsck = new FsckThread();
+    fsck.setDaemon(true);
+    fsck.start();
+
+    while (!fsckCalled) {
+      Thread.sleep(1000);
+      LOG.info("Waiting for fsck to hit NN");
+    }
+    cluster.shutdown();
+
+    LOG.info("Alive Non Daemon threads : ");
+    for (Map.Entry<Thread, StackTraceElement[]> entry : Thread
+        .getAllStackTraces().entrySet()) {
+      Thread t = entry.getKey();
+      if (!t.isDaemon() && !oldThreads.contains(t)) {
+        LOG.info("Thread : " + t.getName());
+        for (StackTraceElement e : entry.getValue()) {
+          LOG.info(e);
+        }
+        fail("Thread : " + t.getName() + " is not a daemon thread");
+      }
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java b/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java
index cce16cdc..eb4ce921 100644
--- a/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java
+++ b/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java
@@ -91,7 +91,7 @@ public void testForClientLeak() throws Exception {
       DistributedFileSystem fileSystem = (DistributedFileSystem) cluster.getFileSystem();
       int initialRefCount = ClientAdapter.getRefCount(client);
       String filename = "/file1";
-      DFSClient.DFSOutputStream out = (DFSClient.DFSOutputStream)
+      DFSOutputStream out = (DFSOutputStream)
         ((DistributedFileSystem) fileSystem).getClient().create(
           filename, FsPermission.getDefault(), true, (short) 5, 1024,
           new Progressable() {
@@ -105,7 +105,7 @@ public void progress() {
       out.sync();
 
       DatanodeInfo[] dataNodeInfos =
-        ((DFSClient.DFSOutputStream)out).getPipeline();
+        ((DFSOutputStream)out).getPipeline();
 
       // killing one DN in the pipe and doing a write triggers lease recovery
       // and will result in the refcount being adjusted; if there's a lease
@@ -121,11 +121,17 @@ public void progress() {
       out.close();
   }
   
+  public void testBlockSynchronizationInlineChecksum() throws Exception {
+    runTestBlockSynchronization(false, true);
+  }
+  public void testBlockSynchronizationWithZeroBlockInlineChecksum() throws Exception {
+    runTestBlockSynchronization(true, true);
+  }
   public void testBlockSynchronization() throws Exception {
-    runTestBlockSynchronization(false);
+    runTestBlockSynchronization(false, false);
   }
   public void testBlockSynchronizationWithZeroBlock() throws Exception {
-    runTestBlockSynchronization(true);
+    runTestBlockSynchronization(true, false);
   }
 
 
@@ -135,9 +141,12 @@ public void testBlockSynchronizationWithZeroBlock() throws Exception {
    * Finally, it triggers block synchronization to synchronize all stored block.
    * @param forceOneBlockToZero if true, will truncate one block to 0 length
    */
-  public void runTestBlockSynchronization(boolean forceOneBlockToZero)
-  throws Exception {
+  public void runTestBlockSynchronization(boolean forceOneBlockToZero,
+      boolean useInlineChecksum)  throws Exception {
     final int ORG_FILE_SIZE = 3000; 
+    for (DataNode dn : cluster.getDataNodes()) {
+      dn.useInlineChecksum = useInlineChecksum;
+    }
 
       //create a file
       DistributedFileSystem dfs = (DistributedFileSystem)cluster.getFileSystem();
@@ -186,7 +195,8 @@ public void runTestBlockSynchronization(boolean forceOneBlockToZero)
       Block[] newblocks = new Block[REPLICATION_NUM];
       for(int i = 0; i < REPLICATION_NUM; i++) {
         DataNode dn = datanodes[i];
-        FSDatasetTestUtil.truncateBlock(dn, lastblock, newblocksizes[i], namespaceId);
+      FSDatasetTestUtil.truncateBlock(dn, lastblock, newblocksizes[i],
+          namespaceId, useInlineChecksum);
         newblocks[i] = new Block(lastblock.getBlockId(), newblocksizes[i],
             lastblock.getGenerationStamp());
         checkMetaInfo(namespaceId, newblocks[i], idps[i]);
diff --git a/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery4.java b/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery4.java
index 32fae4ce..a2e1d071 100644
--- a/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery4.java
+++ b/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery4.java
@@ -36,7 +36,9 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.server.protocol.BlockAlreadyCommittedException;
 import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
@@ -98,7 +100,7 @@ public void testConcurrentLeaseRecovery() throws Exception {
       FSDataOutputStream out = TestFileCreation.createFile(dfs, fpath, DATANODE_NUM);
       out.write("something".getBytes());
       out.sync();
-      int actualRepl = ((DFSClient.DFSOutputStream)(out.getWrappedStream())).
+      int actualRepl = ((DFSOutputStream)(out.getWrappedStream())).
                         getNumCurrentReplicas();
       assertTrue(f + " should be replicated to " + DATANODE_NUM + " datanodes.",
                  actualRepl == DATANODE_NUM);
@@ -134,4 +136,59 @@ public void testConcurrentLeaseRecovery() throws Exception {
     }
     System.out.println("testLeaseExpireHardLimit successful");
   } 
+  /**
+   * Create a file, write something, commit the block through namenode and
+   * try to triger a block recover. Make sure it fails in the way expected. 
+   */
+  public void testAlreadyCommittedBlockException() throws Exception {
+    System.out.println("testAlreadyCommittedBlockException");
+    final int DATANODE_NUM = 3;
+
+    Configuration conf = new Configuration();
+
+    // create cluster
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, DATANODE_NUM, true, null);
+    DistributedFileSystem dfs = null;
+    try {
+      cluster.waitActive();
+      dfs = (DistributedFileSystem)cluster.getFileSystem();
+
+      // create a new file.
+      final String f = "/testAlreadyCommittedBlockException";
+      final Path fpath = new Path(f);
+      FSDataOutputStream out = TestFileCreation.createFile(dfs, fpath, DATANODE_NUM);
+      out.write("something".getBytes());
+      out.sync();
+
+      LocatedBlocks locations = dfs.dfs.namenode.getBlockLocations(
+          f, 0, Long.MAX_VALUE);
+      assertEquals(1, locations.locatedBlockCount());
+      LocatedBlock locatedblock = locations.getLocatedBlocks().get(0);
+
+      // Force commit the block
+      cluster.getNameNode().commitBlockSynchronization(locatedblock.getBlock(),
+          locatedblock.getBlock().getGenerationStamp(),
+          locatedblock.getBlockSize(), true, false, new DatanodeID[0]);
+      
+      // Force block recovery from the ongoing stream
+      for(DatanodeInfo datanodeinfo: locatedblock.getLocations()) {
+        DataNode datanode = cluster.getDataNode(datanodeinfo.ipcPort);        
+        datanode.shutdown();
+        break;
+      }
+      // Close the file and make sure the failure thrown is BlockAlreadyCommittedException 
+      try {
+        out.close();
+        TestCase.fail();
+      } catch (BlockAlreadyCommittedException e) {
+        TestCase
+        .assertTrue(((DFSOutputStream) out.getWrappedStream()).lastException instanceof BlockAlreadyCommittedException);
+      }
+    } finally {
+      IOUtils.closeStream(dfs);
+      cluster.shutdown();
+    }
+    System.out.println("testAlreadyCommittedBlockException successful");
+  } 
+
 }
diff --git a/src/test/org/apache/hadoop/hdfs/TestLookasideCache.java b/src/test/org/apache/hadoop/hdfs/TestLookasideCache.java
index 1c779e1e..e190c4ed 100644
--- a/src/test/org/apache/hadoop/hdfs/TestLookasideCache.java
+++ b/src/test/org/apache/hadoop/hdfs/TestLookasideCache.java
@@ -63,7 +63,8 @@ public void testCache() throws IOException {
     conf.setLong(LookasideCache.CACHESIZE, maxSize);
     conf.setLong(LookasideCache.CACHEEVICT_PERCENT,  evictPercent);
     LookasideCache cache = new LookasideCache(conf);
-    LocalMetrics metrics = cache.getLocalMetrics();
+    LocalMetrics metrics = LookasideCache.getLocalMetrics();
+    metrics.reset();
 
     assertTrue(cache.getCacheMaxSize() == maxSize);
     assertTrue(cache.getCacheSize() == 0);
diff --git a/src/test/org/apache/hadoop/hdfs/TestMissingBlocksAlert.java b/src/test/org/apache/hadoop/hdfs/TestMissingBlocksAlert.java
index 3ab7cd6b..690d7970 100644
--- a/src/test/org/apache/hadoop/hdfs/TestMissingBlocksAlert.java
+++ b/src/test/org/apache/hadoop/hdfs/TestMissingBlocksAlert.java
@@ -28,6 +28,7 @@
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.server.namenode.JspHelper;
 
 import junit.framework.TestCase;
@@ -69,8 +70,8 @@ public void testMissingBlocksAlert() throws IOException,
 
 
       // Corrupt the block
-      String block = DFSTestUtil.getFirstBlock(dfs, corruptFile).getBlockName();
-      assertTrue(TestDatanodeBlockScanner.corruptReplica(block, 0, cluster));
+      assertTrue(TestDatanodeBlockScanner.corruptReplica(
+          DFSTestUtil.getFirstBlock(dfs, corruptFile), 0, cluster));
 
       // read the file so that the corrupt block is reported to NN
       FSDataInputStream in = dfs.open(corruptFile); 
diff --git a/src/test/org/apache/hadoop/hdfs/TestNameNodeIdempotence.java b/src/test/org/apache/hadoop/hdfs/TestNameNodeIdempotence.java
index 49e85a80..98ace714 100644
--- a/src/test/org/apache/hadoop/hdfs/TestNameNodeIdempotence.java
+++ b/src/test/org/apache/hadoop/hdfs/TestNameNodeIdempotence.java
@@ -19,8 +19,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSInputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.MiniDFSCluster.DataNodeProperties;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.ClientProtocol;
diff --git a/src/test/org/apache/hadoop/hdfs/TestNameNodeRestart.java b/src/test/org/apache/hadoop/hdfs/TestNameNodeRestart.java
index 04f68dbf..c3d5f28a 100644
--- a/src/test/org/apache/hadoop/hdfs/TestNameNodeRestart.java
+++ b/src/test/org/apache/hadoop/hdfs/TestNameNodeRestart.java
@@ -18,7 +18,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.MiniDFSCluster.DataNodeProperties;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
diff --git a/src/test/org/apache/hadoop/hdfs/TestParallelRBW.java b/src/test/org/apache/hadoop/hdfs/TestParallelRBW.java
index bed047f9..a31d7a2a 100644
--- a/src/test/org/apache/hadoop/hdfs/TestParallelRBW.java
+++ b/src/test/org/apache/hadoop/hdfs/TestParallelRBW.java
@@ -13,7 +13,7 @@
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
+import org.apache.hadoop.hdfs.DFSOutputStream;
 import org.apache.hadoop.hdfs.DFSTestUtil;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
diff --git a/src/test/org/apache/hadoop/hdfs/TestQuota.java b/src/test/org/apache/hadoop/hdfs/TestQuota.java
index 954da830..81efa1b6 100644
--- a/src/test/org/apache/hadoop/hdfs/TestQuota.java
+++ b/src/test/org/apache/hadoop/hdfs/TestQuota.java
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs;
 
+import java.io.IOException;
 import java.io.OutputStream;
 
 import org.apache.hadoop.conf.Configuration;
@@ -24,7 +25,8 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
-import org.apache.hadoop.hdfs.protocol.QuotaExceededException;
+import org.apache.hadoop.hdfs.server.namenode.FSDirectory;
+import org.apache.hadoop.hdfs.server.namenode.INodeDirectoryWithQuota;
 import org.apache.hadoop.hdfs.tools.DFSAdmin;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.security.UnixUserGroupInformation;
@@ -422,51 +424,37 @@ public void testNamespaceCommands() throws Exception {
     }
   }
   
-  /**
-   * Test HDFS operations that change disk space consumed by a directory tree.
-   * namely create, rename, delete, append, and setReplication.
-   * 
-   * This is based on testNamespaceCommands() above.
-   */
-  public void testSpaceCommands() throws Exception {
-    final Configuration conf = new Configuration();
-    // set a smaller block size so that we can test with smaller 
-    // diskspace quotas
-    conf.set("dfs.block.size", "512");
-    conf.setBoolean("dfs.support.append", true);
-    final MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
-    final FileSystem fs = cluster.getFileSystem();
-    assertTrue("Not a HDFS: "+fs.getUri(),
-                fs instanceof DistributedFileSystem);
-    final DistributedFileSystem dfs = (DistributedFileSystem)fs;
-
-    try {
-      int fileLen = 1024;
+	public void generateFiles(DistributedFileSystem dfs, INodeDirectoryWithQuota rootDir,
+			int fileLen, int blockSize) throws IOException {
       short replication = 3;
       int fileSpace = fileLen * replication;
+      int blockPerFile = (fileLen - 1) / blockSize + 1;
+      int consFileSpace = blockPerFile * blockSize * replication;
+      
+      dfs.dfs.delete("/nqdir0", true);
       
       // create directory /nqdir0/qdir1/qdir20/nqdir30
       assertTrue(dfs.mkdirs(new Path("/nqdir0/qdir1/qdir20/nqdir30")));
 
       // set the quota of /nqdir0/qdir1 to 4 * fileSpace 
       final Path quotaDir1 = new Path("/nqdir0/qdir1");
-      dfs.setQuota(quotaDir1, FSConstants.QUOTA_DONT_SET, 4 * fileSpace);
+      dfs.setQuota(quotaDir1, FSConstants.QUOTA_DONT_SET, 4 * consFileSpace);
       ContentSummary c = dfs.getContentSummary(quotaDir1);
-      assertEquals(c.getSpaceQuota(), 4 * fileSpace);
+      assertEquals(c.getSpaceQuota(), 4 * consFileSpace);
       
       // set the quota of /nqdir0/qdir1/qdir20 to 6 * fileSpace 
       final Path quotaDir20 = new Path("/nqdir0/qdir1/qdir20");
-      dfs.setQuota(quotaDir20, FSConstants.QUOTA_DONT_SET, 6 * fileSpace);
+      dfs.setQuota(quotaDir20, FSConstants.QUOTA_DONT_SET, 6 * consFileSpace);
       c = dfs.getContentSummary(quotaDir20);
-      assertEquals(c.getSpaceQuota(), 6 * fileSpace);
+      assertEquals(c.getSpaceQuota(), 6 * consFileSpace);
 
 
       // Create /nqdir0/qdir1/qdir21 and set its space quota to 2 * fileSpace
       final Path quotaDir21 = new Path("/nqdir0/qdir1/qdir21");
       assertTrue(dfs.mkdirs(quotaDir21));
-      dfs.setQuota(quotaDir21, FSConstants.QUOTA_DONT_SET, 2 * fileSpace);
+      dfs.setQuota(quotaDir21, FSConstants.QUOTA_DONT_SET, 2 * consFileSpace);
       c = dfs.getContentSummary(quotaDir21);
-      assertEquals(c.getSpaceQuota(), 2 * fileSpace);
+      assertEquals(c.getSpaceQuota(), 2 * consFileSpace);
 
       // 5: Create directory /nqdir0/qdir1/qdir21/nqdir32
       Path tempPath = new Path(quotaDir21, "nqdir32");
@@ -477,6 +465,7 @@ public void testSpaceCommands() throws Exception {
                              replication, 0);
       c = dfs.getContentSummary(quotaDir21);
       assertEquals(c.getSpaceConsumed(), fileSpace);
+      assertEquals(rootDir.diskspaceConsumed(), fileSpace);
       
       // Create a larger file /nqdir0/qdir1/qdir21/nqdir33/
       boolean hasException = false;
@@ -491,7 +480,8 @@ public void testSpaceCommands() throws Exception {
       assertTrue(dfs.delete(new Path(quotaDir21, "nqdir33"), true));
       c = dfs.getContentSummary(quotaDir21);
       assertEquals(c.getSpaceConsumed(), fileSpace);
-      assertEquals(c.getSpaceQuota(), 2*fileSpace);
+      assertEquals(rootDir.diskspaceConsumed(), fileSpace);
+      assertEquals(c.getSpaceQuota(), 2 * consFileSpace);
 
       // Verify space before the move:
       c = dfs.getContentSummary(quotaDir20);
@@ -505,6 +495,7 @@ public void testSpaceCommands() throws Exception {
       // verify space after the move
       c = dfs.getContentSummary(quotaDir20);
       assertEquals(c.getSpaceConsumed(), fileSpace);
+      assertEquals(fileSpace, rootDir.diskspaceConsumed());
       // verify space for its parent
       c = dfs.getContentSummary(quotaDir1);
       assertEquals(c.getSpaceConsumed(), fileSpace);
@@ -521,6 +512,7 @@ public void testSpaceCommands() throws Exception {
       assertEquals(c.getSpaceConsumed(), 3 * fileSpace);
       c = dfs.getContentSummary(quotaDir21);
       assertEquals(c.getSpaceConsumed(), 0);
+      assertEquals(3 * fileSpace, rootDir.diskspaceConsumed());
       
       // Reverse: Move /nqdir0/qdir1/qdir20/nqdir30 to /nqdir0/qdir1/qdir21/
       hasException = false;
@@ -546,7 +538,7 @@ public void testSpaceCommands() throws Exception {
       
       // verify space quota
       c = dfs.getContentSummary(quotaDir1);
-      assertEquals(c.getSpaceQuota(), 4 * fileSpace);
+      assertEquals(c.getSpaceQuota(), 4 * consFileSpace);
       
       // verify space before append;
       c = dfs.getContentSummary(dstPath);
@@ -562,9 +554,11 @@ public void testSpaceCommands() throws Exception {
       // verify space after append;
       c = dfs.getContentSummary(dstPath);
       assertEquals(c.getSpaceConsumed(), 4 * fileSpace);
+      assertEquals(4 * fileSpace, rootDir.diskspaceConsumed());
+
       
       // now increase the quota for quotaDir1
-      dfs.setQuota(quotaDir1, FSConstants.QUOTA_DONT_SET, 5 * fileSpace);
+      dfs.setQuota(quotaDir1, FSConstants.QUOTA_DONT_SET, 5 * consFileSpace);
       // Now, appending more than 1 fileLen should result in an error
       out = dfs.append(file2);
       hasException = false;
@@ -582,7 +576,8 @@ public void testSpaceCommands() throws Exception {
       
       // verify space after partial append
       c = dfs.getContentSummary(dstPath);
-      assertEquals(c.getSpaceConsumed(), 5 * fileSpace);
+      assertEquals(c.getSpaceConsumed(), fileSpace + 4 * consFileSpace);
+      assertEquals(fileSpace + 4 * consFileSpace, rootDir.diskspaceConsumed());
       
       // Test set replication :
       
@@ -591,7 +586,10 @@ public void testSpaceCommands() throws Exception {
       
       // verify that space is reduced by file2Len
       c = dfs.getContentSummary(dstPath);
-      assertEquals(c.getSpaceConsumed(), 5 * fileSpace - file2Len);
+      assertEquals(c.getSpaceConsumed(), fileSpace + 4 * consFileSpace
+        / replication * (replication - 1));
+      assertEquals(fileSpace + 4 * consFileSpace / replication
+        * (replication - 1), rootDir.diskspaceConsumed());
       
       // now try to increase the replication and and expect an error.
       hasException = false;
@@ -604,7 +602,10 @@ public void testSpaceCommands() throws Exception {
 
       // verify space consumed remains unchanged.
       c = dfs.getContentSummary(dstPath);
-      assertEquals(c.getSpaceConsumed(), 5 * fileSpace - file2Len);
+      assertEquals(c.getSpaceConsumed(), fileSpace + 4 * consFileSpace
+          / replication * (replication - 1));
+      assertEquals(fileSpace + 4 * consFileSpace / replication
+          * (replication - 1), rootDir.diskspaceConsumed());
       
       // now increase the quota for quotaDir1 and quotaDir20
       dfs.setQuota(quotaDir1, FSConstants.QUOTA_DONT_SET, 10 * fileSpace);
@@ -614,8 +615,37 @@ public void testSpaceCommands() throws Exception {
       dfs.setReplication(file2, (short)(replication+1));
       // verify increase in space
       c = dfs.getContentSummary(dstPath);
-      assertEquals(c.getSpaceConsumed(), 5 * fileSpace + file2Len);
-      
+      assertEquals(c.getSpaceConsumed(), fileSpace + 4 * consFileSpace
+          / replication * (replication + 1));
+      assertEquals(fileSpace + 4 * consFileSpace / replication
+          * (replication + 1), rootDir.diskspaceConsumed());
+
+  }
+  
+  /**
+   * Test HDFS operations that change disk space consumed by a directory tree.
+   * namely create, rename, delete, append, and setReplication.
+   * 
+   * This is based on testNamespaceCommands() above.
+   */
+  public void testSpaceCommands() throws Exception {
+    final Configuration conf = new Configuration();
+    // set a smaller block size so that we can test with smaller 
+    // diskspace quotas
+    conf.set("dfs.block.size", "512");
+    conf.setBoolean("dfs.support.append", true);
+    final MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
+    final FileSystem fs = cluster.getFileSystem();
+    assertTrue("Not a HDFS: "+fs.getUri(),
+                fs instanceof DistributedFileSystem);
+
+    final DistributedFileSystem dfs = (DistributedFileSystem)fs;
+    FSDirectory fsd = cluster.getNameNode().namesystem.dir;
+		INodeDirectoryWithQuota rootDir = (INodeDirectoryWithQuota) (fsd
+				.getExistingPathINodes("/")[0]);
+    try {
+      generateFiles(dfs, rootDir, 1024, 512);
+      generateFiles(dfs, rootDir, 1019, 512);
     } finally {
       cluster.shutdown();
     }
diff --git a/src/test/org/apache/hadoop/hdfs/TestRbwReportSafeMode.java b/src/test/org/apache/hadoop/hdfs/TestRbwReportSafeMode.java
new file mode 100644
index 00000000..159e3d97
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/TestRbwReportSafeMode.java
@@ -0,0 +1,95 @@
+package org.apache.hadoop.hdfs;
+
+import java.util.Random;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSOutputStream;
+import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+
+import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestRbwReportSafeMode {
+
+  private static Configuration conf;
+  private static MiniDFSCluster cluster;
+  private static FileSystem fs;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    conf = new Configuration();
+    conf.setInt("dfs.block.size", 1024);
+    conf.setFloat("dfs.safemode.threshold.pct", 1.5f);
+    cluster = new MiniDFSCluster(conf, 1, true, null, false);
+    cluster.getNameNode().setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
+    fs = cluster.getFileSystem();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    fs.close();
+    cluster.shutdown();
+  }
+
+  private void waitForBlocks() throws Exception {
+    FSNamesystem namesystem = cluster.getNameNode().namesystem;
+    long totalBlocks = namesystem.getBlocksTotal();
+    long safeBlocks = namesystem.getSafeBlocks();
+    while (totalBlocks > safeBlocks) {
+      System.out.println("Waiting for blocks, total : " + totalBlocks
+          + " safe : " + safeBlocks);
+      Thread.sleep(1000);
+      totalBlocks = namesystem.getBlocksTotal();
+      safeBlocks = namesystem.getSafeBlocks();
+    }
+  }
+
+  @Test
+  public void testRBW() throws Exception {
+    String fileName = "/testRBW";
+    FSDataOutputStream out = fs.create(new Path(fileName));
+    // Create RBW.
+    byte[] buffer = new byte[1024 * 10 + 100];
+    Random r = new Random();
+    r.nextBytes(buffer);
+    out.write(buffer);
+    out.sync();
+
+    cluster.restartNameNode(0, new String[] {}, false);
+    ((DFSOutputStream) out.getWrappedStream()).abortForTests();
+
+    // Send multiple RBW reports.
+    waitForBlocks();
+    cluster.restartDataNodes();
+    Thread.sleep(10000);
+
+    System.out.println("Restarts done");
+    FSNamesystem namesystem = cluster.getNameNode().namesystem;
+
+    long totalBlocks = namesystem.getBlocksTotal();
+    long safeBlocks = namesystem.getSafeBlocks();
+    long startTime = System.currentTimeMillis();
+    while (totalBlocks != safeBlocks
+        && (System.currentTimeMillis() - startTime < 15000)) {
+      Thread.sleep(1000);
+      System.out.println("Waiting for blocks, Total : " + totalBlocks
+          + " Safe : " + safeBlocks);
+      totalBlocks = namesystem.getBlocksTotal();
+      safeBlocks = namesystem.getSafeBlocks();
+    }
+
+    assertEquals(11, totalBlocks);
+    assertEquals(totalBlocks, safeBlocks);
+    for (DataNode dn : cluster.getDataNodes()) {
+      assertEquals(1, dn.data.getBlocksBeingWrittenReport(cluster.getNameNode()
+          .getNamespaceID()).length);
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/TestReadShortCircuit.java b/src/test/org/apache/hadoop/hdfs/TestReadShortCircuit.java
index 9fe3b5c1..5abe4828 100644
--- a/src/test/org/apache/hadoop/hdfs/TestReadShortCircuit.java
+++ b/src/test/org/apache/hadoop/hdfs/TestReadShortCircuit.java
@@ -19,10 +19,12 @@
 
 import junit.framework.TestCase;
 import java.io.*;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
 
 /**
  * This class tests the DFS class via the FileSystem interface in a single node
@@ -33,17 +35,9 @@ public class TestReadShortCircuit extends TestCase {
   private MiniDFSCluster cluster = null;
   private FileSystem fileSystem = null;
   private Path file = null;
-
-  protected void setUp() throws IOException {    
-    Configuration conf = new Configuration();
-    conf.setBoolean("dfs.read.shortcircuit", true);
-    conf.setInt("dfs.block.size", 2048);
-    
-    cluster = new MiniDFSCluster(conf, 1, true, null);
-    fileSystem = cluster.getFileSystem();
-    fileSystem.clearOsBuffer(true);
-    
-    file = new Path("testfile.txt");
+  private Path fileNonInline = null;
+  
+  private void writeFile(Path file) throws IOException {
     DataOutputStream outputStream = fileSystem.create(file);
     
     // Fill the file with 10,000 bytes of the repeated string
@@ -57,6 +51,27 @@ protected void setUp() throws IOException {
       outputStream.write(buffer);      
     }
     outputStream.close();
+
+  }
+
+  protected void setUp() throws IOException {    
+    Configuration conf = new Configuration();
+    conf.setBoolean("dfs.read.shortcircuit", true);
+    conf.setInt("dfs.block.size", 2048);
+    
+    cluster = new MiniDFSCluster(conf, 1, true, null);
+    fileSystem = cluster.getFileSystem();
+    fileSystem.clearOsBuffer(true);
+    file = new Path("testfile.txt");
+    writeFile(file);
+    fileNonInline = new Path("testfile_non_inline.txt");
+    for (DataNode dn : cluster.getDataNodes()) {
+      dn.useInlineChecksum = false;
+    }
+    writeFile(fileNonInline);
+    for (DataNode dn : cluster.getDataNodes()) {
+      dn.useInlineChecksum = true;
+    }
   }
   
   protected void tearDown() {    
@@ -67,14 +82,48 @@ protected void tearDown() {
   }
   
   public void testVariousPositional() throws IOException {
-    readFrom(0, 10);
-    readFrom(5, 10);
-    readFrom(512 + 5, 10);
-    readFrom(2048 + 512 + 5, 10);
-    readFrom(512 - 5, 10);
-    readFrom(512 - 5, 512 * 2 + 5);
+    readFrom(null, 0, 10);
+    readFrom(null, 5, 10);
+    readFrom(null, 512 + 5, 10);
+    readFrom(null, 2048 + 512 + 5, 10);
+    readFrom(null, 512 - 5, 10);
+    readFrom(null, 512 - 5, 512 * 2 + 5);
     complexSkipAndReadSequence();
     
+    fileSystem.setVerifyChecksum(false);
+    FSDataInputStream inputStream = fileSystem.open(fileNonInline);
+    readFrom(inputStream, 0, 10);
+    readFrom(inputStream, 5, 10);
+    readFrom(inputStream, 512 + 5, 10);
+    readFrom(inputStream, 2048 + 512 + 5, 10);
+    readFrom(inputStream, 512 - 5, 10);
+    readFrom(inputStream, 512 - 5, 512 * 2 + 5);
+    readFrom(inputStream, 512 - 5, 512 * 4 + 5);
+    readFrom(inputStream, 2048 + 512 + 5, 10);
+    readFrom(inputStream, 5, 10);
+    readFrom(inputStream, 512 + 5, 10);
+    // Read to the last partial chunk
+    readFrom(inputStream, 100 * 100 - 7, 7);
+    readFrom(inputStream, 100 * 100 - 1024 - 7, 1024 + 7);
+    inputStream.close();
+    fileSystem.setVerifyChecksum(true);
+
+    inputStream = fileSystem.open(fileNonInline);
+    readFrom(inputStream, 0, 10);
+    readFrom(inputStream, 5, 10);
+    readFrom(inputStream, 512 + 5, 10);
+    readFrom(inputStream, 2048 + 512 + 5, 10);
+    readFrom(inputStream, 512 - 5, 10);
+    readFrom(inputStream, 512 - 5, 512 * 2 + 5);
+    readFrom(inputStream, 512 - 5, 512 * 4 + 5);
+    readFrom(inputStream, 2048 + 512 + 5, 10);
+    readFrom(inputStream, 5, 10);
+    readFrom(inputStream, 512 + 5, 10);
+    // Read to the last partial chunk
+    readFrom(inputStream, 100 * 100 - 7, 7);
+    readFrom(inputStream, 100 * 100 - 1024 - 7, 1024 + 7);
+    inputStream.close();
+    
     // This one changes the state of the fileSystem, so do it
     // last.
     readFullWithoutChecksum();
@@ -129,8 +178,10 @@ private void readFullWithoutChecksum() throws IOException {
    * @param length - number of bytes to read
    * @throws IOException
    */
-  private void readFrom(int position, int length) throws IOException {
-    FSDataInputStream inputStream = fileSystem.open(file);
+  private void readFrom(FSDataInputStream userInputStream, int position,
+      int length) throws IOException {
+    FSDataInputStream inputStream = (userInputStream != null) ? userInputStream
+        : fileSystem.open((position > 0) ? fileNonInline : file);
     byte[] buffer = createBuffer(10 + length);
     if (position > 0) {
       inputStream.read(position, buffer, 10, length);
@@ -138,7 +189,9 @@ private void readFrom(int position, int length) throws IOException {
       inputStream.read(buffer, 10, length);
     }
     assertBufferHasCorrectData(position, buffer, 10, length);
-    inputStream.close();
+    if (userInputStream == null) {
+      inputStream.close();
+    }
   }
   
   private static byte[] createBuffer(int size) {
diff --git a/src/test/org/apache/hadoop/hdfs/TestReadSlowDataNode.java b/src/test/org/apache/hadoop/hdfs/TestReadSlowDataNode.java
index 0095497e..18e3dd02 100644
--- a/src/test/org/apache/hadoop/hdfs/TestReadSlowDataNode.java
+++ b/src/test/org/apache/hadoop/hdfs/TestReadSlowDataNode.java
@@ -35,8 +35,8 @@
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.BlockLocation;
-import org.apache.hadoop.hdfs.DFSClient.BlockReader;
-import org.apache.hadoop.hdfs.DFSClient.DFSInputStream;
+import org.apache.hadoop.hdfs.BlockReader;
+import org.apache.hadoop.hdfs.DFSInputStream;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
diff --git a/src/test/org/apache/hadoop/hdfs/TestReplication.java b/src/test/org/apache/hadoop/hdfs/TestReplication.java
index fd13f913..4ee1541d 100644
--- a/src/test/org/apache/hadoop/hdfs/TestReplication.java
+++ b/src/test/org/apache/hadoop/hdfs/TestReplication.java
@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.hdfs;
 
-import junit.framework.TestCase;
 import java.io.*;
 import java.util.Iterator;
 import java.util.Random;
@@ -26,33 +25,74 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.ClientProtocol;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumWriter;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
+import org.apache.hadoop.hdfs.server.namenode.BlockPlacementPolicy;
+import org.apache.hadoop.hdfs.server.namenode.BlockPlacementPolicyConfigurable;
+import org.apache.hadoop.hdfs.server.namenode.BlockPlacementPolicyDefault;
+import org.apache.hadoop.net.StaticMapping;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.BlockLocation;
 
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
 /**
  * This class tests the replication of a DFS file.
  */
-public class TestReplication extends TestCase {
+public class TestReplication {
   private static final long seed = 0xDEADBEEFL;
   private static final int blockSize = 8192;
   private static final int fileSize = 16384;
   private static final String racks[] = new String[] {
-    "/d1/r1", "/d1/r1", "/d1/r2", "/d1/r2", "/d1/r2", "/d2/r3", "/d2/r3"
+    "/d1/r1", "/d1/r1", "/d1/r2", "/d1/r2", "/d1/r2", "/d2/r3", "/d2/r3",
+    "/d2/r3"
   };
   private static final int numDatanodes = racks.length;
   private static final Log LOG = LogFactory.getLog(
                                        "org.apache.hadoop.hdfs.TestReplication");
   
+  private static final String[] hosts4 = new String[] { "h1", "h2", "h3", "h4" };
+  private static final String[] hosts7 = new String[] { "h1", "h2", "h3", "h4", "h5", "h6", "h7" };
+  private static final String[] hosts8 = new String[] { "h1", "h2", "h3", "h4", "h5", "h6", "h7",
+      "h8" };
+  
+  @BeforeClass
+  public static void setUpBeforeClass() {
+    for (int i = 0; i < numDatanodes; i++) {
+      StaticMapping.addNodeToRack(hosts8[i], racks[i]);
+    }
+  }
+
+  private File createHostsFile(Configuration conf) throws IOException {
+    File baseDir = MiniDFSCluster.getBaseDirectory(conf);
+    baseDir.mkdirs();
+    File hostsFile = new File(baseDir, "hosts");
+    FileOutputStream out = new FileOutputStream(hostsFile);
+    out.write("h1\n".getBytes());
+    out.write("h2\n".getBytes());
+    out.write("h3\n".getBytes());
+    out.write("h4\n".getBytes());
+    out.write("h5\n".getBytes());
+    out.write("h6\n".getBytes());
+    out.write("h7\n".getBytes());
+    out.write("h8\n".getBytes());
+    out.close();
+    hostsFile.deleteOnExit();
+    return hostsFile;
+  }
+
   private void writeFile(FileSystem fileSys, Path name, int repl)
     throws IOException {
     // create and write a file that contains three blocks of data
@@ -130,7 +170,16 @@ private void checkFile(FileSystem fileSys, Path name, int repl)
       if (!isOnSameRack || !isNotOnSameRack) break;
     }
     assertTrue(isOnSameRack);
-    assertTrue(isNotOnSameRack);
+    if (conf.getClass("dfs.block.replicator.classname", null,
+        BlockPlacementPolicy.class).equals(
+        BlockPlacementPolicyConfigurable.class)
+        && repl == 2) {
+      // For BlockPlacementPolicyConfigurable we do in rack replication for r =
+      // 2.
+      assertFalse(isNotOnSameRack);
+    } else {
+      assertTrue(isNotOnSameRack);
+    }
   }
   
   private void cleanupFile(FileSystem fileSys, Path name) throws IOException {
@@ -142,6 +191,7 @@ private void cleanupFile(FileSystem fileSys, Path name) throws IOException {
   /* 
    * Test if Datanode reports bad blocks during replication request
    */
+  @Test
   public void testBadBlockReportOnTransfer() throws Exception {
     Configuration conf = new Configuration();
     FileSystem fs = null;
@@ -160,7 +210,7 @@ public void testBadBlockReportOnTransfer() throws Exception {
     DFSTestUtil.waitReplication(fs, file1, (short)1);
   
     // Corrupt the block belonging to the created file
-    String block = DFSTestUtil.getFirstBlock(fs, file1).getBlockName();
+    Block block = DFSTestUtil.getFirstBlock(fs, file1);
     cluster.corruptBlockOnDataNodes(block);
   
     // Increase replication factor, this should invoke transfer request
@@ -187,23 +237,32 @@ public void testBadBlockReportOnTransfer() throws Exception {
   /**
    * Tests replication in DFS.
    */
-  public void runReplication(boolean simulated) throws IOException {
+  private void runReplication(boolean simulated,
+      Class<? extends BlockPlacementPolicy> clazz) throws IOException {
     Configuration conf = new Configuration();
+    conf.setClass("dfs.block.replicator.classname", clazz,
+        BlockPlacementPolicy.class);
     conf.setBoolean("dfs.replication.considerLoad", false);
     if (simulated) {
       conf.setBoolean(SimulatedFSDataset.CONFIG_PROPERTY_SIMULATED, true);
-    }
-    MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, true, racks);
-    cluster.waitActive();
-    
-    InetSocketAddress addr = new InetSocketAddress("localhost",
-                                                   cluster.getNameNodePort());
-    DFSClient client = new DFSClient(addr, conf);
-    
-    DatanodeInfo[] info = client.datanodeReport(DatanodeReportType.LIVE);
-    assertEquals("Number of Datanodes ", numDatanodes, info.length);
-    FileSystem fileSys = cluster.getFileSystem();
+    }    
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
     try {
+      conf.set("dfs.hosts", this.createHostsFile(conf).getAbsolutePath());
+      cluster = new MiniDFSCluster(conf, numDatanodes, racks, hosts8,
+          true, true);
+      cluster.waitActive();
+      cluster.getNameNode().namesystem.refreshNodes(conf);
+      
+      InetSocketAddress addr = new InetSocketAddress("localhost",
+                                                     cluster.getNameNodePort());
+      DFSClient client = new DFSClient(addr, conf);
+      
+      DatanodeInfo[] info = client.datanodeReport(DatanodeReportType.LIVE);
+      assertEquals("Number of Datanodes ", numDatanodes, info.length);
+      fileSys = cluster.getFileSystem();
+
       Path file1 = new Path("/smallblocktest.dat");
       writeFile(fileSys, file1, 3);
       checkFile(fileSys, file1, 3);
@@ -221,19 +280,32 @@ public void runReplication(boolean simulated) throws IOException {
       checkFile(fileSys, file1, 2);
       cleanupFile(fileSys, file1);
     } finally {
-      fileSys.close();
-      cluster.shutdown();
+      if(fileSys != null)
+        fileSys.close();
+      if (cluster != null)
+        cluster.shutdown();
     }
   }
 
 
-  public void testReplicationSimulatedStorag() throws IOException {
-    runReplication(true);
+  @Test
+  public void testReplicationSimulatedStoragDefault() throws IOException {
+    runReplication(true, BlockPlacementPolicyDefault.class);
+  }
+
+  @Test
+  public void testReplicationDefault() throws IOException {
+    runReplication(false, BlockPlacementPolicyDefault.class);
+  }
+
+  @Test
+  public void testReplicationSimulatedStoragConfigurable() throws IOException {
+    runReplication(true, BlockPlacementPolicyConfigurable.class);
   }
   
-  
-  public void testReplication() throws IOException {
-    runReplication(false);
+  @Test
+  public void testReplicationConfigurable() throws IOException {
+    runReplication(false, BlockPlacementPolicyConfigurable.class);
   }
   
   // Waits for all of the blocks to have expected replication
@@ -294,6 +366,24 @@ private void waitForBlockReplication(String filename,
       } catch (InterruptedException ignored) {}
     }
   }
+
+  /*
+   * This test makes sure that NameNode retries all the available blocks for
+   * under replicated blocks.
+   *
+   * It creates a file with one block and replication of 4. It corrupts two of
+   * the blocks and removes one of the replicas. Expected behaviour is that
+   * missing replica will be copied from one valid source.
+   */
+  @Test
+  public void testPendingReplicationRetryDefault() throws IOException {
+    runPendingReplicationRetry(BlockPlacementPolicyDefault.class);
+  }
+
+  @Test
+  public void testPendingReplicationRetryConfigurable() throws IOException {
+    runPendingReplicationRetry(BlockPlacementPolicyConfigurable.class);
+  }
   
   /* This test makes sure that NameNode retries all the available blocks 
    * for under replicated blocks. 
@@ -302,7 +392,19 @@ private void waitForBlockReplication(String filename,
    * two of the blocks and removes one of the replicas. Expected behaviour is
    * that missing replica will be copied from one valid source.
    */
-  public void testPendingReplicationRetry() throws IOException {
+  private void runPendingReplicationRetry(
+      Class<? extends BlockPlacementPolicy> clazz) throws IOException {
+    pendingReplicationRetryInternal(false, clazz);
+  }
+
+  @Test
+  public void testPendingReplicationRetryInlineChecksum() throws IOException {
+    pendingReplicationRetryInternal(true, BlockPlacementPolicyDefault.class);
+  }
+  
+  private void pendingReplicationRetryInternal(boolean inlineChecksum,
+    Class<? extends BlockPlacementPolicy> clazz)
+      throws IOException {
     
     MiniDFSCluster cluster = null;
     int numDataNodes = 4;
@@ -316,11 +418,17 @@ public void testPendingReplicationRetry() throws IOException {
     
     try {
       Configuration conf = new Configuration();
+      conf.setClass("dfs.block.replicator.classname", clazz,
+          BlockPlacementPolicy.class);
       conf.set("dfs.replication", Integer.toString(numDataNodes));
       //first time format
-      cluster = new MiniDFSCluster(0, conf, numDataNodes, true,
-                                   true, null, null);
+      conf.set("dfs.hosts", this.createHostsFile(conf).getAbsolutePath());
+      cluster = new MiniDFSCluster(conf, numDataNodes, null, hosts4, true, true);
+
       cluster.waitActive();
+      for (DataNode dn : cluster.getDataNodes()) {
+        dn.useInlineChecksum = inlineChecksum;
+      }
       DFSClient dfsClient = new DFSClient(new InetSocketAddress("localhost",
                                             cluster.getNameNodePort()),
                                             conf);
@@ -332,12 +440,21 @@ public void testPendingReplicationRetry() throws IOException {
       waitForBlockReplication(testFile, dfsClient.namenode, numDataNodes, -1);
 
       // get first block of the file.
-      String block = dfsClient.namenode.
+      Block block = dfsClient.namenode.
                        getBlockLocations(testFile, 0, Long.MAX_VALUE).
-                       get(0).getBlock().getBlockName();
+                       get(0).getBlock();
       File[] blockFiles = new File[6];
       for (int i=0; i<6; i++) {
-        blockFiles[i] = new File(cluster.getBlockDirectory("data" + (i+1)), block);
+        String fileName;
+        if (!inlineChecksum) {
+          fileName = block.getBlockName();
+        } else {
+          fileName = BlockInlineChecksumWriter.getInlineChecksumFileName(block,
+              FSConstants.CHECKSUM_TYPE, cluster.conf.getInt(
+                  "io.bytes.per.checksum",
+                  FSConstants.DEFAULT_BYTES_PER_CHECKSUM));
+        }
+        blockFiles[i] = new File(cluster.getBlockDirectory("data" + (i+1)), fileName);
       }
       cluster.shutdown();
       cluster = null;
@@ -383,13 +500,18 @@ public void testPendingReplicationRetry() throws IOException {
       
       LOG.info("Restarting minicluster after deleting a replica and corrupting 2 crcs");
       conf = new Configuration();
+      conf.setClass("dfs.block.replicator.classname", clazz,
+          BlockPlacementPolicy.class);
+      conf.set("dfs.hosts", this.createHostsFile(conf).getAbsolutePath());
+      // first time format
       conf.set("dfs.replication", Integer.toString(numDataNodes));
       conf.set("dfs.replication.pending.timeout.sec", Integer.toString(2));
       conf.set("dfs.datanode.block.write.timeout.sec", Integer.toString(5));
       conf.set("dfs.safemode.threshold.pct", "0.75f"); // only 3 copies exist
+      conf.setBoolean("dfs.use.inline.checksum", !inlineChecksum);
       
-      cluster = new MiniDFSCluster(0, conf, numDataNodes*2, false,
-                                   true, null, null);
+      cluster = new MiniDFSCluster(conf, numDataNodes * 2, null, hosts8, true,
+          true, false);
       cluster.waitActive();
       
       dfsClient = new DFSClient(new InetSocketAddress("localhost",
@@ -404,26 +526,45 @@ public void testPendingReplicationRetry() throws IOException {
       }
     }  
   }
-  
-  /**
-   * Test if replication can detect mismatched length on-disk blocks
-   * @throws Exception
-   */
-  public void testReplicateLenMismatchedBlock() throws Exception {
-    MiniDFSCluster cluster = new MiniDFSCluster(new Configuration(), 2, true, null);
+
+  private void testReplicateLenMismatchedBlockInternal(boolean inlineChecksum)
+      throws Exception {
+    Configuration conf = new Configuration();
+    conf.setBoolean("dfs.use.inline.checksum", inlineChecksum);
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
     try {
       cluster.waitActive();
       // test truncated block
-      changeBlockLen(cluster, -1);
+      changeBlockLen(cluster, -1, inlineChecksum);
       // test extended block
-      changeBlockLen(cluster, 1);
+      changeBlockLen(cluster, 1, inlineChecksum);
     } finally {
       cluster.shutdown();
     }
   }
+
   
-  private void changeBlockLen(MiniDFSCluster cluster, 
-      int lenDelta) throws IOException, InterruptedException {
+  /**
+   * Test if replication can detect mismatched length on-disk blocks
+   * @throws Exception
+   */
+  @Test
+  public void testReplicateLenMismatchedBlock() throws Exception {
+    testReplicateLenMismatchedBlockInternal(false);
+  }
+
+  /**
+   * Test if replication can detect mismatched length on-disk blocks
+   * @throws Exception
+   */
+  @Test
+  public void testReplicateLenMismatchedBlockInlineChecksum() throws Exception {
+    testReplicateLenMismatchedBlockInternal(true);
+  }
+  
+  private void changeBlockLen(MiniDFSCluster cluster,
+      int lenDelta, boolean isInlineChecksum) throws IOException,
+      InterruptedException {
     final Path fileName = new Path("/file1");
     final short REPLICATION_FACTOR = (short)1;
     final FileSystem fs = cluster.getFileSystem();
@@ -431,7 +572,15 @@ private void changeBlockLen(MiniDFSCluster cluster,
     DFSTestUtil.createFile(fs, fileName, fileLen, REPLICATION_FACTOR, 0);
     DFSTestUtil.waitReplication(fs, fileName, REPLICATION_FACTOR);
 
-    String block = DFSTestUtil.getFirstBlock(fs, fileName).getBlockName();
+    String block;
+    if (!isInlineChecksum) {
+      block = DFSTestUtil.getFirstBlock(fs, fileName).getBlockName();
+    } else {
+      block = BlockInlineChecksumWriter.getInlineChecksumFileName(DFSTestUtil
+          .getFirstBlock(fs, fileName), FSConstants.CHECKSUM_TYPE, cluster.conf
+          .getInt("io.bytes.per.checksum",
+              FSConstants.DEFAULT_BYTES_PER_CHECKSUM));
+    }
 
     // Change the length of a replica
     for (int i=0; i<cluster.getDataNodes().size(); i++) {
@@ -476,6 +625,7 @@ private void changeBlockLen(MiniDFSCluster cluster,
    * two of the blocks and removes one of the replicas. Expected behaviour is
    * that missing replica will be copied from one valid source.
    */
+  @Test
   public void testBlockReplicationInUCF() throws IOException {
     
     MiniDFSCluster cluster = null;
diff --git a/src/test/org/apache/hadoop/hdfs/TestScatterGather.java b/src/test/org/apache/hadoop/hdfs/TestScatterGather.java
index db599663..a8d9fe1e 100644
--- a/src/test/org/apache/hadoop/hdfs/TestScatterGather.java
+++ b/src/test/org/apache/hadoop/hdfs/TestScatterGather.java
@@ -220,6 +220,7 @@ private void cleanupFile(FileSystem fileSys, Path name) throws IOException {
    */
   public void testPreadDFS() throws IOException {
     Configuration conf = new Configuration();
+    conf.setBoolean("dfs.use.inline.checksum", false);
     conf.setLong("dfs.block.size", 4096);
     conf.setLong("dfs.read.prefetch.size", 4096);
     if (simulatedStorage) {
diff --git a/src/test/org/apache/hadoop/hdfs/TestTotalFiles.java b/src/test/org/apache/hadoop/hdfs/TestTotalFiles.java
index afb8fc93..82ab463f 100644
--- a/src/test/org/apache/hadoop/hdfs/TestTotalFiles.java
+++ b/src/test/org/apache/hadoop/hdfs/TestTotalFiles.java
@@ -40,15 +40,18 @@ public void tearDown() throws Exception {
     cluster.shutdown();
   }
 
+  private long getFilesTotal() throws Exception {
+    return fs.getContentSummary(new Path("/")).getFileCount();
+  }
+
   @Test
   public void testBasic() throws Exception {
     String topDir = "testBasic";
     DFSTestUtil util = new DFSTestUtil(topDir, 100, 10, MAX_FILE_SIZE);
     util.createFiles(fs, topDir);
     FSNamesystem namesystem = cluster.getNameNode().namesystem;
-    assertEquals(100, namesystem.getFilesTotal());
-    assertTrue(namesystem.getFilesAndDirectoriesTotal() > namesystem
-        .getFilesTotal());
+    assertEquals(100, getFilesTotal());
+    assertTrue(namesystem.getFilesAndDirectoriesTotal() > getFilesTotal());
   }
 
   @Test
@@ -57,15 +60,13 @@ public void testRestart() throws Exception {
     DFSTestUtil util = new DFSTestUtil(topDir, 100, 10, MAX_FILE_SIZE);
     util.createFiles(fs, topDir);
     FSNamesystem namesystem = cluster.getNameNode().namesystem;
-    assertEquals(100, namesystem.getFilesTotal());
-    assertTrue(namesystem.getFilesAndDirectoriesTotal() > namesystem
-        .getFilesTotal());
+    assertEquals(100, getFilesTotal());
+    assertTrue(namesystem.getFilesAndDirectoriesTotal() > getFilesTotal());
 
     cluster.restartNameNodes();
     namesystem = cluster.getNameNode().namesystem;
-    assertEquals(100, namesystem.getFilesTotal());
-    assertTrue(namesystem.getFilesAndDirectoriesTotal() > namesystem
-        .getFilesTotal());
+    assertEquals(100, getFilesTotal());
+    assertTrue(namesystem.getFilesAndDirectoriesTotal() > getFilesTotal());
   }
 
   private int deleteFiles(DFSTestUtil util, String topDir) throws Exception {
@@ -105,14 +106,13 @@ public void testRestartWithSaveNamespace() throws Exception {
         cluster.getNameNode().saveNamespace(true, false);
       }
       namesystem = cluster.getNameNode().namesystem;
-      assertEquals(totalFiles, namesystem.getFilesTotal());
+      assertEquals(totalFiles, getFilesTotal());
       cluster.restartNameNodes();
       namesystem = cluster.getNameNode().namesystem;
-      assertEquals(totalFiles, namesystem.getFilesTotal());
+      assertEquals(totalFiles, getFilesTotal());
     }
 
-    assertTrue(namesystem.getFilesAndDirectoriesTotal() > namesystem
-        .getFilesTotal());
+    assertTrue(namesystem.getFilesAndDirectoriesTotal() > getFilesTotal());
   }
 
   @Test
@@ -121,9 +121,8 @@ public void testDeletes() throws Exception {
     DFSTestUtil util = new DFSTestUtil(topDir, 100, 10, MAX_FILE_SIZE);
     util.createFiles(fs, topDir);
     FSNamesystem namesystem = cluster.getNameNode().namesystem;
-    assertEquals(100, namesystem.getFilesTotal());
-    assertTrue(namesystem.getFilesAndDirectoriesTotal() > namesystem
-        .getFilesTotal());
+    assertEquals(100, getFilesTotal());
+    assertTrue(namesystem.getFilesAndDirectoriesTotal() > getFilesTotal());
     int deleted = 0;
     for (String fileName : util.getFileNames(topDir)) {
       if (random.nextBoolean()) {
@@ -131,7 +130,7 @@ public void testDeletes() throws Exception {
         fs.delete(new Path(fileName), false);
       }
     }
-    assertEquals(100 - deleted, namesystem.getFilesTotal());
+    assertEquals(100 - deleted, getFilesTotal());
   }
 
   @Test
@@ -140,15 +139,75 @@ public void testConcat() throws Exception {
     DFSTestUtil util = new DFSTestUtil(topDir, 100, 1, MAX_FILE_SIZE);
     util.createFiles(fs, topDir);
     FSNamesystem namesystem = cluster.getNameNode().namesystem;
-    assertEquals(100, namesystem.getFilesTotal());
-    assertTrue(namesystem.getFilesAndDirectoriesTotal() > namesystem
-        .getFilesTotal());
+    assertEquals(100, getFilesTotal());
+    assertTrue(namesystem.getFilesAndDirectoriesTotal() > getFilesTotal());
     String[] files = util.getFileNames(topDir);
     for (int i = 0; i < files.length; i += 10) {
       String target = files[i];
       String[] srcs = Arrays.copyOfRange(files, i + 1, i + 10);
       cluster.getNameNode().concat(target, srcs, false);
     }
-    assertEquals(10, namesystem.getFilesTotal());
+    assertEquals(10, getFilesTotal());
+  }
+
+  @Test
+  public void testHardLink() throws Exception {
+    String topDir = "/testHardLink";
+    DFSTestUtil util = new DFSTestUtil(topDir, 10, 1, MAX_FILE_SIZE);
+    util.createFiles(fs, topDir);
+    FSNamesystem namesystem = cluster.getNameNode().namesystem;
+    assertEquals(10, getFilesTotal());
+    assertTrue(namesystem.getFilesAndDirectoriesTotal() > getFilesTotal());
+    String[] files = util.getFileNames(topDir);
+    int expectedFiles = 10;
+    for (int i = 0; i < files.length; i++) {
+      for (int j = 0; j < 3; j++) {
+        String target = files[i] + "hardlink" + j;
+        cluster.getNameNode().hardLink(files[i], target);
+        expectedFiles++;
+        if (random.nextBoolean()) {
+          cluster.getNameNode().delete(target, false);
+          expectedFiles--;
+        }
+      }
+    }
+    assertEquals(expectedFiles, getFilesTotal());
+  }
+  
+  @Test
+  public void testHardLinkDirectoryDeletes() throws Exception {
+    String topDir = "/testHardLink";
+    int nFiles = 10;
+    int nLinks = 10;
+
+    DFSTestUtil util = new DFSTestUtil(topDir, nFiles, 1, MAX_FILE_SIZE);
+    util.createFiles(fs, topDir);
+    String[] files = util.getFileNames(topDir);
+    for (String file : files) {
+      for (int i = 0; i < nLinks; i++) {
+        cluster.getNameNode().hardLink(file, file + "_h_" + i);
+      }
+    }
+
+    int root = 1;
+    FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+    assertEquals(root + 1 + nFiles * (nLinks + 1),
+        namesystem.getFilesAndDirectoriesTotal());
+    assertEquals(nFiles * (nLinks + 1), getFilesTotal());
+
+    // save namespace should succeed
+    cluster.getNameNode().saveNamespace(true, false);
+
+    // delete the top directory
+    cluster.getNameNode().delete(topDir, true);
+
+    // one directory left
+    assertEquals(root, namesystem.getFilesAndDirectoriesTotal());
+
+    // save namespace should succeed
+    cluster.getNameNode().saveNamespace(true, false);
+
+    // one directory left
+    assertEquals(root, namesystem.getFilesAndDirectoriesTotal());
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java b/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java
index 970f29cb..2c5b1682 100644
--- a/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java
+++ b/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java
@@ -53,6 +53,7 @@
 import org.apache.hadoop.hdfs.server.datanode.DataStorage;
 import org.apache.hadoop.hdfs.server.datanode.NameSpaceSliceStorage;
 import org.apache.hadoop.hdfs.server.namenode.FSImage;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 
 /**
@@ -447,7 +448,7 @@ public static File[] createVersionFile(NodeType nodeType, File[] parent,
       FileUtil.fullyDelete(versionFile);
       switch (nodeType) {
       case NAME_NODE:
-        storage = new FSImage(version);
+        storage = new NNStorage(version);
         break;
       case DATA_NODE:
         storage = new DataStorage(version, "doNotCare", null);
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/FSDatasetTestUtil.java b/src/test/org/apache/hadoop/hdfs/server/datanode/FSDatasetTestUtil.java
index f59c1243..19652f48 100644
--- a/src/test/org/apache/hadoop/hdfs/server/datanode/FSDatasetTestUtil.java
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/FSDatasetTestUtil.java
@@ -21,6 +21,7 @@
 import java.io.File;
 
 import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.util.DataChecksum;
 
 public abstract class FSDatasetTestUtil {
 
@@ -31,23 +32,38 @@ public abstract class FSDatasetTestUtil {
   public static void truncateBlock(DataNode dn,
                                    Block block,
                                    long newLength,
-                                   int namespaceId)
+                                   int namespaceId,
+                                   boolean useInlineChecksum)
     throws IOException {
     FSDataset ds = (FSDataset) dn.data;
 
-    File blockFile = ds.findBlockFile(namespaceId,block.getBlockId());
+    File blockFile = ds.getReplicaToRead(namespaceId,block).getDataFileToRead();
     if (blockFile == null) {
       throw new IOException("Can't find block file for block " +
         block + " on DN " + dn);
     }
-    File metaFile = FSDataset.findMetaFile(blockFile);
-    FSDataset.truncateBlock(blockFile, metaFile, blockFile.length(), newLength);
-    ds.getDatanodeBlockInfo(namespaceId, block).syncInMemorySize();
+    if (useInlineChecksum) {
+      new BlockInlineChecksumWriter(blockFile, DataChecksum.CHECKSUM_CRC32,
+          dn.conf.getInt("io.bytes.per.checksum", 512))
+          .truncateBlock(newLength);
+    } else {
+      File metaFile = BlockWithChecksumFileWriter.findMetaFile(blockFile);
+      new BlockWithChecksumFileWriter(blockFile, metaFile).truncateBlock(
+        blockFile.length(), newLength);
+    }
+    ((DatanodeBlockInfo) (ds.getReplicaToRead(namespaceId, block)))
+        .syncInMemorySize();
   }
 
-  public static void truncateBlockFile(File blockFile, long newLength)
-    throws IOException {
-    File metaFile = FSDataset.findMetaFile(blockFile);
-    FSDataset.truncateBlock(blockFile, metaFile, blockFile.length(), newLength);
+  public static void truncateBlockFile(File blockFile, long newLength,
+      boolean useInlineChecksum, int bytesPerChecksum)    throws IOException {
+    if (useInlineChecksum) {
+      new BlockInlineChecksumWriter(blockFile, DataChecksum.CHECKSUM_CRC32,
+          bytesPerChecksum).truncateBlock(newLength);
+    } else {
+      File metaFile = BlockWithChecksumFileWriter.findMetaFile(blockFile);
+      new BlockWithChecksumFileWriter(blockFile, metaFile).truncateBlock(
+        blockFile.length(), newLength);
+    }
   }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java b/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
index e3a6e6cd..ffaf561a 100644
--- a/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
@@ -28,8 +28,8 @@
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
 import javax.management.StandardMBean;
-import javax.naming.OperationNotSupportedException;
 
+import org.apache.commons.lang.NotImplementedException;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.protocol.Block;
@@ -56,7 +56,7 @@
  * Note the synchronization is coarse grained - it is at each method. 
  */
 
-public class SimulatedFSDataset  implements FSConstants, FSDatasetInterface, Configurable{
+public class SimulatedFSDataset implements FSConstants, FSDatasetInterface, Configurable{
   
   public static final String CONFIG_PROPERTY_SIMULATED =
                                     "dfs.datanode.simulateddatastorage";
@@ -77,19 +77,26 @@ public class SimulatedFSDataset  implements FSConstants, FSDatasetInterface, Con
                               CHECKSUM_NULL, 16*1024 );
     byte[] nullCrcHeader = checksum.getHeader();
     nullCrcFileData =  new byte[2 + nullCrcHeader.length];
-    nullCrcFileData[0] = (byte) ((FSDataset.METADATA_VERSION >>> 8) & 0xff);
-    nullCrcFileData[1] = (byte) (FSDataset.METADATA_VERSION & 0xff);
+    nullCrcFileData[0] = (byte) ((FSDataset.FORMAT_VERSION_NON_INLINECHECKSUM >>> 8) & 0xff);
+    nullCrcFileData[1] = (byte) (FSDataset.FORMAT_VERSION_NON_INLINECHECKSUM & 0xff);
     for (int i = 0; i < nullCrcHeader.length; i++) {
       nullCrcFileData[i+2] = nullCrcHeader[i];
     }
   }
   
-  private class BInfo implements ReplicaBeingWritten{ // information about a single block
+  private class BInfo implements ReplicaBeingWritten, ReplicaToRead { // information about a single block
     Block theBlock;
     private boolean finalized = false; // if not finalized => ongoing creation
     SimulatedOutputStream oStream = null;
-    BInfo(int namespaceId, Block b, boolean forWriting) throws IOException {
+    private int checksumType;
+    private int bytesPerChecksum;
+
+    BInfo(int namespaceId, Block b, boolean forWriting, int checksumType,
+        int bytesPerChecksum) throws IOException {
       theBlock = new Block(b);
+      this.checksumType = checksumType;
+      this.bytesPerChecksum = bytesPerChecksum;
+
       if (theBlock.getNumBytes() < 0) {
         theBlock.setNumBytes(0);
       }
@@ -132,6 +139,10 @@ synchronized void setlength(long length) {
         theBlock.setNumBytes(length);
       }
     }
+    
+    @Override
+    public void setBytesReceived(long length) {
+    }
 
     @Override
     public void setBytesOnDisk(long length) {
@@ -146,9 +157,13 @@ public void setBytesAcked(long length) {
     synchronized SimulatedInputStream getIStream() throws IOException {
       if (!finalized) {
         // throw new IOException("Trying to read an unfinalized block");
-         return new SimulatedInputStream(oStream.getLength(), DEFAULT_DATABYTE);
+         return new SimulatedInputStream(oStream.getLength(), DEFAULT_DATABYTE, true);
       } else {
-        return new SimulatedInputStream(theBlock.getNumBytes(), DEFAULT_DATABYTE);
+        return new SimulatedInputStream(
+            BlockInlineChecksumReader.getFileLengthFromBlockSize(
+                theBlock.getNumBytes(), bytesPerChecksum,
+                DataChecksum.getChecksumSizeByType(checksumType)),
+            DEFAULT_DATABYTE, true);
       }
     }
     
@@ -186,14 +201,40 @@ synchronized void finalizeBlock(int namespaceId, long finalSize) throws IOExcept
       oStream = null;
       return;
     }
-    
-    SimulatedInputStream getMetaIStream() {
-      return new SimulatedInputStream(nullCrcFileData);  
-    }
 
     synchronized boolean isFinalized() {
       return finalized;
     }
+
+    @Override
+    public File getDataFileToRead() {
+      return null;
+    }
+
+    @Override
+    public boolean isInlineChecksum() {
+      return true;
+    }
+    
+    @Override
+    public long getBytesVisible() throws IOException {
+      return getlength();
+    }
+
+    @Override
+    public long getBytesWritten() throws IOException {
+      return getlength();
+    }
+
+    @Override
+    public int getChecksumType() {
+      return this.checksumType;
+    }
+
+    @Override
+    public int getBytesPerChecksum() {
+      return bytesPerChecksum;
+    }
   }
   
   static private class SimulatedNSStorage {
@@ -322,7 +363,8 @@ public synchronized void injectBlocks(int namespaceId, Block[] injectBlocks)
         blockMap.put(namespaceId, blkMap);
       }
       for (Block b: injectBlocks) {
-          BInfo binfo = new BInfo(namespaceId, b, false);
+        BInfo binfo = new BInfo(namespaceId, b, false,
+            DataChecksum.CHECKSUM_NULL, 512);
           blkMap.put(b, binfo);
       }
     }
@@ -495,9 +537,25 @@ public String toString() {
     return getStorageInfo();
   }
 
-  public synchronized BlockWriteStreams writeToBlock(int namespaceId, Block b, 
+  static class SimulatedBlockInlineChecksumFileWriter extends
+      BlockInlineChecksumWriter {
+    SimulatedBlockInlineChecksumFileWriter(OutputStream dataOut,
+        Block block, int checksumType, int bytesPerChecksum) {
+      super(null, checksumType, bytesPerChecksum);
+      this.dataOut = dataOut;
+      this.block = block;
+    }
+    
+    public OutputStream getDataOutputStream() {   
+      return dataOut; 
+    }
+  }
+
+  public synchronized DatanodeBlockWriter writeToBlock(int namespaceId, Block b, 
                                             boolean isRecovery,
-                                            boolean isReplicationRequest)
+                                            boolean isReplicationRequest,
+                                            int checksumType,
+                                            int bytesPerChecksum)
                                             throws IOException {
     if (isValidBlock(namespaceId, b, false)) {
           throw new BlockAlreadyExistsException("Block " + b + 
@@ -507,10 +565,30 @@ public synchronized BlockWriteStreams writeToBlock(int namespaceId, Block b,
         throw new BlockAlreadyExistsException("Block " + b + 
             " is being written, and cannot be written to.");
     }
-      BInfo binfo = new BInfo(namespaceId, b, true);
-      getBlockMap(namespaceId).put(b, binfo);
-      SimulatedOutputStream crcStream = new SimulatedOutputStream();
-      return new BlockWriteStreams(binfo.oStream, crcStream);
+    BInfo binfo = new BInfo(namespaceId, b, true, DataChecksum.CHECKSUM_NULL,
+        bytesPerChecksum);
+    getBlockMap(namespaceId).put(b, binfo);
+    return new SimulatedBlockInlineChecksumFileWriter(binfo.oStream, b,
+        checksumType, bytesPerChecksum) {
+      @Override
+      public void setChannelPosition(long dataOffset)
+          throws IOException {
+        BInfo binfo = getBlockMap(namespaceId).get(block);
+        if (binfo == null) {
+          throw new IOException("No such Block " + block);
+        }
+        binfo.setlength(dataOffset);
+      }
+
+      @Override
+      public long getChannelPosition() throws IOException {
+        BInfo binfo = getBlockMap(namespaceId).get(block);
+        if (binfo == null) {
+          throw new IOException("No such Block " + block);
+        }
+        return binfo.getlength();
+      }
+    };
   }
 
   public synchronized InputStream getBlockInputStream(int namespaceId, Block b)
@@ -531,94 +609,21 @@ public synchronized InputStream getBlockInputStream(int namespaceId, Block b, lo
     return result;
   }
 
-  /** Not supported */
-  public BlockInputStreams getTmpInputStreams(int namespaceId, Block b, long blkoff, long ckoff
-      ) throws IOException {
-    throw new IOException("Not supported");
-  }
-
   /** No-op */
   public void validateBlockMetadata(int namespaceId, Block b) {
   }
 
-  /**
-   * Returns metaData of block b as an input stream
-   * @param b - the block for which the metadata is desired
-   * @return metaData of block b as an input stream
-   * @throws IOException - block does not exist or problems accessing
-   *  the meta file
-   */
-  private synchronized InputStream getMetaDataInStream(int namespaceId, Block b)
-                                              throws IOException {
-    BInfo binfo = getBlockMap(namespaceId).get(b);
-    if (binfo == null) {
-      throw new IOException("No such Block " + b );  
-    }
-    if (!binfo.finalized) {
-      throw new IOException("Block " + b + 
-          " is being written, its meta cannot be read");
-    }
-    return binfo.getMetaIStream();
-  }
-
-  public synchronized long getMetaDataLength(int namespaceId, Block b) throws IOException {
-    BInfo binfo = getBlockMap(namespaceId).get(b);
-    if (binfo == null) {
-      throw new IOException("No such Block " + b );  
-    }
-    if (!binfo.finalized) {
-      throw new IOException("Block " + b +
-          " is being written, its metalength cannot be read");
-    }
-    return binfo.getMetaIStream().getLength();
-  }
-  
-  public MetaDataInputStream getMetaDataInputStream(int namespaceId, Block b)
-  throws IOException {
-
-       return new MetaDataInputStream(getMetaDataInStream(namespaceId, b),
-                                                getMetaDataLength(namespaceId, b));
-  }
-
-  public synchronized boolean metaFileExists(int namespaceId, Block b) throws IOException {
-    if (!isValidBlock(namespaceId, b, false)) {
-          throw new IOException("Block " + b +
-              " is valid, and cannot be written to.");
-      }
-    return true; // crc exists for all valid blocks
-  }
-
   public void checkDataDir() throws DiskErrorException {
     // nothing to check for simulated data set
   }
 
-  public synchronized long getChannelPosition(int namespaceId, Block b, 
-                                              BlockWriteStreams stream)
-                                              throws IOException {
-    BInfo binfo = getBlockMap(namespaceId).get(b);
-    if (binfo == null) {
-      throw new IOException("No such Block " + b );
-    }
-    return binfo.getlength();
-  }
-
-  public synchronized void setChannelPosition(int namespaceId, Block b, BlockWriteStreams stream, 
-                                              long dataOffset, long ckOffset)
-                                              throws IOException {
-    BInfo binfo = getBlockMap(namespaceId).get(b);
-    if (binfo == null) {
-      throw new IOException("No such Block " + b );
-    }
-    binfo.setlength(dataOffset);
-  }
-
   /** 
    * Simulated input and output streams
    *
    */
   static private class SimulatedInputStream extends java.io.InputStream {
     
-
+    boolean inlineChecksum = false;
     byte theRepeatedData = 7;
     long length; // bytes
     int currentPos = 0;
@@ -629,36 +634,23 @@ static private class SimulatedInputStream extends java.io.InputStream {
      * @param l
      * @param iRepeatedData
      */
-    SimulatedInputStream(long l, byte iRepeatedData) {
+    SimulatedInputStream(long l, byte iRepeatedData, boolean ic) {
       length = l;
       theRepeatedData = iRepeatedData;
-    }
-    
-    /**
-     * An input stream of of the supplied data
-     * 
-     * @param iData
-     */
-    SimulatedInputStream(byte[] iData) {
-      data = iData;
-      length = data.length;
-      
-    }
-    
-    /**
-     * 
-     * @return the lenght of the input stream
-     */
-    long getLength() {
-      return length;
+      inlineChecksum = ic;
     }
 
     @Override
     public int read() throws IOException {
+      int headerLength = inlineChecksum ? BlockInlineChecksumReader
+          .getHeaderSize() : nullCrcFileData.length;
       if (currentPos >= length)
         return -1;
-      if (data !=null) {
-        return data[currentPos++];
+      if (currentPos < headerLength) {
+        return nullCrcFileData[currentPos++];
+      }
+      if (data != null) {
+        return data[currentPos++ - headerLength];
       } else {
         currentPos++;
         return theRepeatedData;
@@ -678,10 +670,20 @@ public int read(byte[] b) throws IOException {
         return -1;
       }
       int bytesRead = (int) Math.min(b.length, length-currentPos);
+      int needCopyHeader = 0;
+      if (currentPos < nullCrcFileData.length) {
+        needCopyHeader = Math.min(nullCrcFileData.length - currentPos, b.length);
+        System.arraycopy(nullCrcFileData, currentPos, b, 0, needCopyHeader);
+        currentPos += needCopyHeader;
+        if (currentPos < nullCrcFileData.length) {
+          return bytesRead;
+        }
+      }
       if (data != null) {
-        System.arraycopy(data, currentPos, b, 0, bytesRead);
+        System.arraycopy(data, currentPos - nullCrcFileData.length, b, 0,
+            bytesRead - needCopyHeader);
       } else { // all data is zero
-        for (int i : b) {  
+        for (int i = needCopyHeader; i < b.length; i++) {  
           b[i] = theRepeatedData;
         }
       }
@@ -824,4 +826,20 @@ public long size(int namespaceId) {
     HashMap<Block, BInfo> map = blockMap.get(namespaceId);
     return map != null ? map.size() : 0;
   }
+
+  @Override
+  public DatanodeBlockInfo getDatanodeBlockInfo(int namespaceId, Block block) {
+    throw new NotImplementedException();
+  }
+
+  @Override
+  public ReplicaToRead getReplicaToRead(int namespaceId, Block block){
+    try {
+      return getBlockMap(namespaceId).get(block);
+    } catch (IOException e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
+      return null;
+    }
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java b/src/test/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
index 45873185..2d415e2d 100644
--- a/src/test/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
@@ -94,6 +94,9 @@ public void testBlockReplacement() throws IOException {
           CONF, REPLICATION_FACTOR, true, INITIAL_RACKS );
     try {
       cluster.waitActive();
+      for (DataNode dn: cluster.getDataNodes()) {
+        dn.useInlineChecksum = false;
+      }
       int namespaceId = cluster.getNameNode().getNamespaceID();
       
       FileSystem fs = cluster.getFileSystem();
@@ -119,6 +122,9 @@ public void testBlockReplacement() throws IOException {
       // add a new datanode to the cluster
       cluster.startDataNodes(CONF, 1, true, null, NEW_RACKS);
       cluster.waitActive();
+      for (DataNode dn: cluster.getDataNodes()) {
+        dn.useInlineChecksum = false;
+      }
       
       DatanodeInfo[] datanodes = client.datanodeReport(DatanodeReportType.ALL);
 
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataNodeInitWithDirConfig.java b/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataNodeInitWithDirConfig.java
new file mode 100644
index 00000000..cb8d8a71
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataNodeInitWithDirConfig.java
@@ -0,0 +1,129 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestDataNodeInitWithDirConfig {
+
+    final private int block_size = 512;
+    MiniDFSCluster cluster = null;
+    int block_num = 10;
+    File dataDir = null;
+    Configuration conf = null;
+
+    @Before
+    public void setUp() throws Exception {
+      conf = new Configuration();
+      conf.setLong("dfs.block.size", 512);
+      conf.setInt("dfs.datanode.failed.volumes.tolerated", 0);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+
+    // Verify that the datanode will start up without any config path value 
+    @Test
+    public void testNodeInitWithNoDFSDataDirConfPath() throws IOException{
+      cluster = new MiniDFSCluster(conf, 1, true, null);
+      cluster.waitActive();
+      assertTrue(cluster.isDataNodeUp());
+    }
+
+    // Verify that the datanode can start up with a null path 
+    @Test
+    public void testNodeInitWithEmptyDFSDataDirConfPath() throws IOException{
+      conf.setStrings("dfs.datadir.confpath", "");
+      cluster = new MiniDFSCluster(conf, 1, true, null);
+      cluster.waitActive();
+      assertTrue(cluster.isDataNodeUp());
+    }
+
+    // Verify that the datanode can start up without a correct path 
+    @Test
+    public void testNodeInitWithWrongDFSDataDirConfPath() throws IOException {
+      conf.setStrings("dfs.datadir.confpath", "this/doesnt/exist");
+      cluster = new MiniDFSCluster(conf, 1, true, null);
+      cluster.waitActive();
+      assertTrue(cluster.isDataNodeUp());
+    }
+
+    /* Verify that the datanode is up with a true config file with mounts */
+    @Test
+    public void testNodeInitWithDFSDataDirConfPath() throws IOException {
+      File testFile = new File("/tmp/testfile.conf");
+      BufferedWriter out = new BufferedWriter(new FileWriter(testFile));
+      out.write("/tmp/mnt/dtest0,/tmp/mnt/dtest1");
+      out.close();
+      // This will delete any temporary directories from previous runs and 
+      // make new directories.
+      deleteDir(new File("/tmp/mnt/dtest0"));
+      File mnt1 = new File("/tmp/mnt/dtest0");
+      mnt1.mkdir();
+      deleteDir(new File("/tmp/mnt/dtest1"));
+      File mnt2 = new File("/tmp/mnt/dtest1");
+      mnt2.mkdir();
+      conf.setStrings("dfs.data.dir", "");
+      conf.setStrings("dfs.datadir.confpath", testFile.getAbsolutePath());
+      cluster = new MiniDFSCluster(conf, 1, true, null);
+      cluster.waitActive();
+
+      boolean mnt1InUse = true;
+      boolean mnt2InUse = true;
+      String[] files = mnt1.list();
+      System.out.println("The number of files in mnt1 is " + files.length);
+      String[] files2 = mnt2.list();
+      System.out.println("The number of files in mnt2 is " + files2.length);
+      if(files.length == 0) {
+        mnt1InUse = false;
+      }
+      if(files2.length == 0) {
+        mnt2InUse = false;
+      } 
+      assertTrue("mnt1 is not in use currently by MiniDFSCluster", mnt1InUse);
+      assertTrue("mnt2 is not in use currently by MiniDFSCluster", mnt2InUse);
+    }
+
+    private static boolean deleteDir(File dir) {
+      if (dir.isDirectory()) {
+        String[] children = dir.list();
+        for (int i=0; i<children.length; i++) {
+          boolean success = deleteDir(new File(dir, children[i]));
+          if (!success) {
+            return false;
+          }
+        }
+      }
+      // The directory is now empty so delete it
+      return dir.delete();
+    }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeRefresh.java b/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeRefresh.java
index 03929294..dbfcc2fa 100644
--- a/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeRefresh.java
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeRefresh.java
@@ -26,8 +26,11 @@
 import org.apache.hadoop.conf.ReconfigurationException;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.DFSTestUtil;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.*;
+import org.apache.hadoop.hdfs.protocol.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,6 +46,7 @@ public class TestDataNodeVolumeRefresh {
   public void setUp() throws Exception {
     Configuration conf = new Configuration();
     conf.setLong("dfs.block.size", block_size);
+    conf.setInt("dfs.datanode.failed.volumes.tolerated", 1);
     cluster = new MiniDFSCluster(conf, 1, true, null);
     cluster.waitActive();
   }
@@ -113,4 +117,73 @@ public void testVolumeAddRefresh() throws IOException,ReconfigurationException {
     assertTrue("data4NS was not formatted successfully, no current dir.",
         dir4current2.isDirectory());
   }
+
+  @Test
+  public void testVolumeRemoveRefresh() throws Exception,ReconfigurationException {
+    System.out.println("Now checking if a volume can be removed from the datanode.");
+    FileSystem fs = cluster.getFileSystem();
+    DistributedFileSystem dfs = (DistributedFileSystem) fs;
+    short REPLICATION_FACTOR = (short)1;
+    long blocksize =  dfs.getDefaultBlockSize();
+    dataDir = new File(cluster.getDataDirectory());
+    System.out.println("==Data dir: is " +  dataDir.getPath());
+    DataNode datanode = cluster.getDataNodes().get(0);
+    //get the list of valid mounts from the datanode.
+    String origDataDir = datanode.getConf().get("dfs.data.dir");
+    String[] listOfDataDirs = datanode.getConf().getStrings("dfs.data.dir");
+    File dir1 = new File(listOfDataDirs[0] + "/current");
+    File dir2 = new File(listOfDataDirs[1] + "/current");
+    boolean nodeDirectories = 
+        ((FSDataset)datanode.data).isValidVolume(dir1) && 
+        ((FSDataset)datanode.data).isValidVolume(dir2);
+    assertTrue("Dir 1 and Dir 2 are not both originally valid volumes", nodeDirectories);
+    Path file1 = new Path("/tfile1");
+    Path file2 = new Path("/tfile2");
+    Path file3 = new Path("/tfile3");
+    Path file4 = new Path("/tfile4");
+    DFSTestUtil.createFile(fs, file1, blocksize, REPLICATION_FACTOR, 0);
+    DFSTestUtil.waitReplication(fs, file1, REPLICATION_FACTOR);
+    DFSTestUtil.createFile(fs, file2, blocksize, REPLICATION_FACTOR, 0);
+    DFSTestUtil.waitReplication(fs, file2, REPLICATION_FACTOR);
+    assertEquals("There are currently no unreplicated blocks", 
+                        dfs.getMissingBlocksCount(), 0);
+    System.out.println("==Reconfigure Data dir from " +  origDataDir + " to " + 
+
+                                                                listOfDataDirs[0]);
+    datanode.reconfigureProperty("dfs.data.dir", listOfDataDirs[0]);
+    System.out.println("==Done Reconfiguration");
+    System.out.println("==Namespaces:");
+    assertTrue("Dir 2 should not be a directory but is: " + dir2, 
+        !((FSDataset)datanode.data).isValidVolume(dir2));
+    assertTrue("Dir 1 should be a directory but it is not: " + dir1,
+        ((FSDataset)datanode.data).isValidVolume(dir1));
+    System.out.println("===First-Reconfiguration passed ===");
+    Thread.sleep(3000);
+    long urBlocks = dfs.getMissingBlocksCount();
+    assertEquals("There should be missing blocks but the value is : " + urBlocks, 1, urBlocks);
+    System.out.println("===Missing blocks after a successful refresh===");
+    System.out.println("Writing another block to the datanode");
+    DFSTestUtil.createFile(fs, file3, blocksize, REPLICATION_FACTOR, 0);
+    DFSTestUtil.waitReplication(fs, file3, REPLICATION_FACTOR);
+    //make new test dir
+    File dir3 = new File(dataDir, "data3");
+    dir3.mkdir();
+    String newDirectory = dataDir.getAbsolutePath() + "/data3";
+    System.out.println("==Reconfigure Data dir from " + listOfDataDirs[0] + 
+                                                    " to " + listOfDataDirs[1] + ',' + newDirectory);
+    datanode.reconfigureProperty("dfs.data.dir", listOfDataDirs[1] + "," + newDirectory);
+    System.out.println("==Done with Second Reconfiguration==");
+    Thread.sleep(3000);
+    urBlocks = dfs.getMissingBlocksCount();
+    assertEquals("There should be three missing blocks but the value is : " + urBlocks, 2, urBlocks);
+    datanode.reconfigureProperty("dfs.data.dir", newDirectory);
+    // make the datanode report blocks to namespace
+    datanode.scheduleNSBlockReport(0L);
+    Thread.sleep(3000);
+    urBlocks = dfs.getMissingBlocksCount();
+    DFSTestUtil.createFile(fs, file4, blocksize, REPLICATION_FACTOR, 0);
+    DFSTestUtil.waitReplication(fs, file4, REPLICATION_FACTOR);
+    assertEquals("There should still be missing blocks", 3, urBlocks);
+    System.out.println("Volume Removal was successful");
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/TestDatanodeFilesFormat.java b/src/test/org/apache/hadoop/hdfs/server/datanode/TestDatanodeFilesFormat.java
new file mode 100644
index 00000000..cd041542
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/TestDatanodeFilesFormat.java
@@ -0,0 +1,162 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumReader.GenStampAndChecksum;
+import org.junit.Test;
+
+public class TestDatanodeFilesFormat {
+
+  public static final Log LOG = LogFactory
+      .getLog(TestDatanodeFilesFormat.class);
+
+  // blk_1000 - old format block
+  final static String bname = Block.BLOCK_FILE_PREFIX + "1000";
+  // blk_1000_2000.meta
+  final static String cname = Block.BLOCK_FILE_PREFIX + "1000_2000.meta";
+  // blk_1000_2000_2_1_512
+  final static String iname = Block.BLOCK_FILE_PREFIX + "1000_2000_2_1_512";
+
+  @Test
+  public void testSeparateFiles() {
+    String[] filenames = new String[2];
+
+    assertTrue(Block.isSeparateChecksumBlockFilename(bname));
+    assertFalse(Block.isSeparateChecksumBlockFilename(cname));
+    assertFalse(Block.isSeparateChecksumBlockFilename(iname));
+
+    filenames[0] = bname;
+    filenames[1] = cname;
+
+    // parse generation stamp
+    long genStamp = BlockWithChecksumFileReader
+        .getGenerationStampFromSeperateChecksumFile(filenames, filenames[0]);
+    assertEquals(2000, genStamp);
+  }
+
+  @Test
+  public void testToDelete() {
+    String pref = FSDataset.DELETE_FILE_EXT;
+    // old format
+    assertFalse(Block.isSeparateChecksumBlockFilename(pref + bname));
+    assertFalse(Block.isSeparateChecksumBlockFilename(pref + cname));
+    assertFalse(Block.isSeparateChecksumBlockFilename(pref + iname));
+
+    // inline format
+    assertFalse(Block.isInlineChecksumBlockFilename(pref + bname));
+    assertFalse(Block.isInlineChecksumBlockFilename(pref + cname));
+    assertFalse(Block.isInlineChecksumBlockFilename(pref + iname));
+  }
+
+  @Test
+  public void testInlineFiles() throws Exception {
+
+    assertFalse(Block.isInlineChecksumBlockFilename(bname));
+    assertFalse(Block.isInlineChecksumBlockFilename(cname));
+    assertTrue(Block.isInlineChecksumBlockFilename(iname));
+
+    // parse filename
+    GenStampAndChecksum sac = BlockInlineChecksumReader
+        .getGenStampAndChecksumFromInlineChecksumFile(iname);
+    assertEquals(2000, sac.generationStamp);
+    assertEquals(512, sac.bytesPerChecksum);
+    assertEquals(1, sac.checksumType);
+
+    // try to parse old format
+    checkErrorParseInlineFile(bname);
+    checkErrorParseInlineFile(cname);
+    String longiname = Block.BLOCK_FILE_PREFIX + "1000_2000_2_1_512_00";
+    String shortiname = Block.BLOCK_FILE_PREFIX + "1000_2000_2_1";
+    checkErrorParseInlineFile(longiname);
+    checkErrorParseInlineFile(shortiname);
+
+  }
+
+  @Test
+  public void testBlockReport() throws Exception {
+    File baseDir = new File(MiniDFSCluster.getBaseDirectory(new Configuration()), "test");
+    FileUtil.fullyDelete(baseDir);
+    baseDir.mkdirs();
+
+    // block files (2 valid blocks)
+    createFile(baseDir, bname);
+    createFile(baseDir, cname);
+    createFile(baseDir, iname);
+    
+    // toDelete. files (invalid)
+    String pref = FSDataset.DELETE_FILE_EXT;
+    createFile(baseDir, pref + bname);
+    createFile(baseDir, pref + cname);
+    createFile(baseDir, pref + iname);
+    
+    // sth else (invalid)
+    createFile(baseDir, "something");
+ 
+    File blockFiles[] = baseDir.listFiles();
+    String[] blockFilesNames = FSDataset.getFileNames(blockFiles);
+    
+    List<Block> list = new ArrayList<Block>();
+    for (int i = 0; i < blockFiles.length; i++) {
+      Block b = FSDataset.getBlockFromNames(blockFiles, blockFilesNames, i);
+      if (b != null) {
+        LOG.info("Found block: " + b);
+        list.add(b);
+      }
+    }
+    assertEquals(2, list.size());
+    for(Block b : list) {
+      assertEquals(1000, b.getBlockId());
+      assertEquals(2000, b.getGenerationStamp());
+      assertEquals(0, b.getNumBytes());
+    }
+
+  }
+  
+  private void createFile(File baseDir, String name) throws IOException {
+    File f = new File(baseDir, name);
+    f.delete();
+    f.createNewFile();
+  }
+
+  private void checkErrorParseInlineFile(String name) {
+    try {
+      BlockInlineChecksumReader
+          .getGenStampAndChecksumFromInlineChecksumFile(bname);
+      fail("should fail here");
+    } catch (Exception e) {
+      LOG.info("Expected exception", e);
+    }
+  }
+
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/TestDatanodeRestart.java b/src/test/org/apache/hadoop/hdfs/server/datanode/TestDatanodeRestart.java
index c28a7217..2551061a 100644
--- a/src/test/org/apache/hadoop/hdfs/server/datanode/TestDatanodeRestart.java
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/TestDatanodeRestart.java
@@ -97,8 +97,12 @@ private void testRbwReplicas(MiniDFSCluster cluster, boolean isCorrupt)
       for (FSVolume volume : ((FSDataset) dn.data).volumes.getVolumes()) {
         File rbwDir = volume.getRbwDir(nsInfo.getNamespaceID());
         for (File file : rbwDir.listFiles()) {
-          if (isCorrupt && Block.isBlockFilename(file.getName())) {
-            new RandomAccessFile(file, "rw").setLength(fileLen - 1); // corrupt
+          if (isCorrupt) {
+            if (Block.isSeparateChecksumBlockFilename(file.getName())) {
+              new RandomAccessFile(file, "rw").setLength(fileLen - 1); // corrupt
+            } else if (Block.isInlineChecksumBlockFilename(file.getName())) {
+              new RandomAccessFile(file, "rw").setLength(file.length() - 1); // corrupt
+            }
           }
         }
       }
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/TestRefreshNamenodes.java b/src/test/org/apache/hadoop/hdfs/server/datanode/TestRefreshNamenodes.java
index b03f27c3..4cd702be 100644
--- a/src/test/org/apache/hadoop/hdfs/server/datanode/TestRefreshNamenodes.java
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/TestRefreshNamenodes.java
@@ -92,7 +92,9 @@ public void testRefreshNamenodes() throws Exception {
       waitDataNodeInitialized(dn);
       compareAddress(cluster, dn, nns);
     } finally {
-      cluster.shutdown();
+      if (cluster != null) {
+        cluster.shutdown();
+      }
     }
   }
 
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java b/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java
index 2b2c858f..9e459355 100644
--- a/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java
@@ -63,7 +63,8 @@ int addSomeBlocks(FSDatasetInterface fsdataset, int startingBlockId) throws IOEx
     int bytesAdded = 0;
     for (int i = startingBlockId; i < startingBlockId+NUMBLOCKS; ++i) {
       Block b = new Block(i, 0, 0); // we pass expected len as zero, - fsdataset should use the sizeof actual data written
-      OutputStream dataOut  = fsdataset.writeToBlock(0, b, false, false).dataOut;
+      OutputStream dataOut = ((SimulatedFSDataset.SimulatedBlockInlineChecksumFileWriter) fsdataset
+          .writeToBlock(0, b, false, false, -1, -1)).getDataOutputStream();
       assertEquals(0, fsdataset.getFinalizedBlockLength(0,b));
       for (int j=1; j <= blockIdToLen(i); ++j) {
         dataOut.write(j);
@@ -81,27 +82,6 @@ int addSomeBlocks(FSDatasetInterface fsdataset ) throws IOException {
     return addSomeBlocks(fsdataset, 1);
   }
 
-  public void testGetMetaData() throws IOException {
-    FSDatasetInterface fsdataset = new SimulatedFSDataset(conf); 
-    Block b = new Block(1, 5, 0);
-    try {
-      assertFalse(fsdataset.metaFileExists(0,b));
-      assertTrue("Expected an IO exception", false);
-    } catch (IOException e) {
-      // ok - as expected
-    }
-    addSomeBlocks(fsdataset); // Only need to add one but ....
-    b = new Block(1, 0, 0);
-    InputStream metaInput = fsdataset.getMetaDataInputStream(0,b);
-    DataInputStream metaDataInput = new DataInputStream(metaInput);
-    short version = metaDataInput.readShort();
-    assertEquals(FSDataset.METADATA_VERSION, version);
-    DataChecksum checksum = DataChecksum.newDataChecksum(metaDataInput);
-    assertEquals(DataChecksum.CHECKSUM_NULL, checksum.getChecksumType());
-    assertEquals(0, checksum.getChecksumSize());  
-  }
-
-
   public void testStorageUsage() throws IOException {
     FSDatasetInterface fsdataset = new SimulatedFSDataset(conf); 
     assertEquals(fsdataset.getDfsUsed(), 0);
@@ -119,7 +99,11 @@ void  checkBlockDataAndSize(FSDatasetInterface fsdataset,
     InputStream input = fsdataset.getBlockInputStream(0,b);
     long lengthRead = 0;
     int data;
+    int count = 0;
     while ((data = input.read()) != -1) {
+      if (count++ < BlockInlineChecksumReader.getHeaderSize()) {
+        continue;
+      }
       assertEquals(SimulatedFSDataset.DEFAULT_DATABYTE, data);
       lengthRead++;
     }
diff --git a/src/test/org/apache/hadoop/hdfs/server/datanode/TestTransferBlock.java b/src/test/org/apache/hadoop/hdfs/server/datanode/TestTransferBlock.java
new file mode 100644
index 00000000..b1b47f41
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/datanode/TestTransferBlock.java
@@ -0,0 +1,227 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.BlockPathInfo;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
+import org.apache.log4j.Level;
+import org.junit.Before;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+import junit.framework.TestCase;
+
+
+/**
+ * This class tests the code path of transferring blocks
+ */
+public class TestTransferBlock extends junit.framework.TestCase {
+
+  {
+    ((Log4JLogger) LeaseManager.LOG).getLogger().setLevel(Level.ALL);
+    ((Log4JLogger) FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
+    ((Log4JLogger) DFSClient.LOG).getLogger().setLevel(Level.ALL);
+  }
+
+  static final int blockSize = 8192;
+  private MiniDFSCluster cluster;
+  private FileSystem fileSystem;
+
+
+  @Before
+  protected void setUp() throws Exception {
+    super.setUp();
+    final Configuration conf = new Configuration();
+    init(conf);
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    cluster.shutdown();
+    super.tearDown();
+  }
+
+  private void init(Configuration conf) throws IOException {
+    if (cluster != null) {
+      cluster.shutdown();
+    }
+    cluster = new MiniDFSCluster(conf, 2, true, null);
+    cluster.waitClusterUp();
+    fileSystem = cluster.getFileSystem();
+  }
+
+  public void testTransferZeroChecksumFile() throws IOException {
+    for (DataNode dn : cluster.getDataNodes()) {
+      dn.useInlineChecksum = false;
+    }
+    
+    // create a new file in the root, write data, do no close
+    String filestr = "/testTransferZeroChecksumFile";
+    DistributedFileSystem dfs = (DistributedFileSystem) fileSystem;
+
+    DFSTestUtil.createFile(dfs, new Path(filestr), 9L, (short)1, 0L);
+
+    BlockPathInfo blockPathInfo = DFSTestUtil.getBlockPathInfo(filestr,
+        cluster, dfs.getClient());
+    
+    // Delete the checksum file
+    RandomAccessFile meta = new RandomAccessFile(blockPathInfo.getMetaPath(), "rw");
+    meta.setLength(0);
+    meta.close();
+
+    RandomAccessFile block = new RandomAccessFile(blockPathInfo.getBlockPath(), "rw");
+    block.setLength(0);
+    block.close();
+    
+    int ns = cluster.getNameNode().getNamespaceID();
+    DataNode dnWithBlk = null, dnWithoutBlk = null;
+    for (DataNode dn : cluster.getDataNodes()) {
+      FSDataset fds = (FSDataset) dn.data;
+      DatanodeBlockInfo dbi = fds.getDatanodeBlockInfo(ns, blockPathInfo);
+     if (dbi != null) {
+        dbi.syncInMemorySize();
+        dnWithBlk = dn;
+      } else {
+        dnWithoutBlk = dn;
+      }
+    }
+    if (dnWithoutBlk == null || dnWithBlk == null) {
+      TestCase.fail();
+    }
+    DatanodeInfo[] list = new DatanodeInfo[1];
+    for (DatanodeInfo di : dfs.getClient().datanodeReport(DatanodeReportType.LIVE)) {
+      if (dnWithoutBlk.getPort() == di.getPort()) {
+        list[0] = di;
+        break;
+      }
+    }
+    blockPathInfo.setNumBytes(0);
+    dnWithBlk.transferBlocks(ns, new Block[] {blockPathInfo}, new DatanodeInfo[][] {list});
+    
+    long size = -1;
+    for (int i = 0; i < 3; i++) {
+      try {
+        size = ((FSDataset) dnWithoutBlk.data).getFinalizedBlockLength(ns,
+            blockPathInfo);
+        if (size == 0) {
+          break;
+        }
+      } catch (IOException ioe) {
+      }
+
+      if (i != 2) {
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException e) {
+          e.printStackTrace();
+        }
+      } else {
+        TestCase.fail();
+      }
+    }
+    TestCase.assertEquals(0, size);
+  }
+
+  public void testTransferZeroChecksumFileInlineChecksum() throws IOException {
+    for (DataNode dn : cluster.getDataNodes()) {
+      dn.useInlineChecksum = true;
+    }
+    
+    // create a new file in the root, write data, do no close
+    String filestr = "/testTransferZeroChecksumFile";
+    DistributedFileSystem dfs = (DistributedFileSystem) fileSystem;
+
+    DFSTestUtil.createFile(dfs, new Path(filestr), 9L, (short)1, 0L);
+    
+    LocatedBlocks locations = cluster.getNameNode().getBlockLocations(filestr, 0,
+        Long.MAX_VALUE);
+    LocatedBlock locatedblock = locations.getLocatedBlocks().get(0);
+
+    
+    int ns = cluster.getNameNode().getNamespaceID();
+    DataNode dnWithBlk = null, dnWithoutBlk = null;
+    for (DataNode dn : cluster.getDataNodes()) {
+      FSDataset fds = (FSDataset) dn.data;
+      DatanodeBlockInfo dbi = fds.getDatanodeBlockInfo(ns,
+          locatedblock.getBlock());
+      
+      if (dbi != null) {
+        RandomAccessFile block = new RandomAccessFile(dbi.file.toString(), "rw");
+        block.setLength(0);
+        block.close();
+
+        dbi.syncInMemorySize();
+        dnWithBlk = dn;
+      } else {
+        dnWithoutBlk = dn;
+      }
+    }
+    if (dnWithoutBlk == null || dnWithBlk == null) {
+      TestCase.fail();
+    }
+    DatanodeInfo[] list = new DatanodeInfo[1];
+    for (DatanodeInfo di : dfs.getClient().datanodeReport(DatanodeReportType.LIVE)) {
+      if (dnWithoutBlk.getPort() == di.getPort()) {
+        list[0] = di;
+        break;
+      }
+    }
+    locatedblock.getBlock().setNumBytes(0);
+    dnWithBlk.transferBlocks(ns, new Block[] { locatedblock.getBlock() },
+        new DatanodeInfo[][] { list });
+    
+    long size = -1;
+    for (int i = 0; i < 3; i++) {
+      try {
+        size = ((FSDataset) dnWithoutBlk.data).getFinalizedBlockLength(ns,
+            locatedblock.getBlock());
+        if (size == 0) {
+          break;
+        }
+      } catch (IOException ioe) {
+      }
+
+      if (i != 2) {
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException e) {
+          e.printStackTrace();
+        }
+      } else {
+        TestCase.fail();
+      }
+    }
+    TestCase.assertEquals(0, size);
+  }
+
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/BlockPlacementBenchmark.java b/src/test/org/apache/hadoop/hdfs/server/namenode/BlockPlacementBenchmark.java
new file mode 100644
index 00000000..3efccec8
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/BlockPlacementBenchmark.java
@@ -0,0 +1,62 @@
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.util.ArrayList;
+import java.util.Random;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.*;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+
+import org.junit.After;
+import org.junit.Test;
+
+public class BlockPlacementBenchmark {
+
+  private static MiniDFSCluster cluster;
+  private static Configuration conf;
+  private static final long totalRuns = 10000000;
+  private static final int BLOCK_SIZE = 1024;
+
+  public void setUp(boolean configurable) throws Exception {
+    conf = new Configuration();
+    conf.setInt("dfs.block.size", BLOCK_SIZE);
+    if (configurable) {
+      conf.setClass("dfs.block.replicator.classname",
+          BlockPlacementPolicyConfigurable.class, BlockPlacementPolicy.class);
+      cluster = new MiniDFSCluster(conf, 10, null, null, true, true);
+    } else {
+      cluster = new MiniDFSCluster(conf, 10, true, null);
+    }
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    cluster.shutdown();
+  }
+
+  private void runBenchmark(String testname) {
+    BlockPlacementPolicy policy = cluster.getNameNode().namesystem.replicator;
+    Random r = new Random();
+    ArrayList <DatanodeDescriptor> dns = cluster.getNameNode().namesystem
+      .getDatanodeListForReport(DatanodeReportType.ALL);
+    long start = System.currentTimeMillis();
+    for (long i = 0; i < totalRuns; i++) {
+      policy.chooseTarget("", 3, dns.get(r.nextInt(dns.size())), BLOCK_SIZE);
+    }
+    System.out.println("TOTAL TIME FOR " + totalRuns + " runs : of " + testname
+        + " : " + (System.currentTimeMillis() - start));
+  }
+
+  @Test
+  public void runBenchmarkDefault() throws Exception {
+    setUp(false);
+    runBenchmark("BlockPlacementPolicyDefault");
+  }
+
+  @Test
+  public void runBenchmarkConfigurable() throws Exception {
+    setUp(false);
+    runBenchmark("BlockPlacementPolicyConfigurable");
+  }
+
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java b/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
index 1300d25e..e07bb510 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
@@ -25,6 +25,7 @@
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.server.common.GenerationStamp;
 import org.apache.hadoop.hdfs.server.common.Storage;
+import org.apache.hadoop.hdfs.server.common.Util;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 
 /**
@@ -195,12 +196,10 @@ public static void main(String[] args) throws IOException {
       }
     }
   
-    FSImage fsImage = new FSImage(new File(edits_dir));
+    FSImage fsImage = new FSImage(Util.stringAsURI(edits_dir));
     FileNameGenerator nameGenerator = new FileNameGenerator(BASE_PATH, 100);
 
-
-    FSEditLog editLog = fsImage.getEditLog();
-    editLog.createEditLogFile(fsImage.getFsEditName());
+    FSEditLog editLog = FSImageTestUtil.createStandaloneEditLog(editsLogDir);
     editLog.open();
     addFiles(editLog, numFiles, replication, numBlocksPerFile, startingBlockId,
              nameGenerator);
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java b/src/test/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java
new file mode 100644
index 00000000..bc4c882e
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java
@@ -0,0 +1,514 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirType;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.FileJournalManager.EditLogFile;
+import org.apache.hadoop.hdfs.server.namenode.FSImageStorageInspector.FSImageFile;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.MD5FileUtils;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.mockito.Mockito;
+import org.mockito.Matchers;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.io.Files;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Utility functions for testing fsimage storage.
+ */
+public abstract class FSImageTestUtil {
+  
+  final static Log LOG = LogFactory.getLog(FSImageTestUtil.class);
+  
+  /**
+   * The position in the fsimage header where the txid is
+   * written.
+   */
+  private static final long IMAGE_TXID_POS = 24;
+
+  /**
+   * This function returns a md5 hash of a file.
+   * 
+   * @param file input file
+   * @return The md5 string
+   */
+  public static String getFileMD5(File file) throws IOException {
+    return MD5FileUtils.computeMd5ForFile(file).toString();
+  }
+  
+  /**
+   * Calculate the md5sum of an image after zeroing out the transaction ID
+   * field in the header. This is useful for tests that want to verify
+   * that two checkpoints have identical namespaces.
+   */
+  public static String getImageFileMD5IgnoringTxId(File imageFile)
+      throws IOException {
+    File tmpFile = File.createTempFile("hadoop_imagefile_tmp", "fsimage");
+    tmpFile.deleteOnExit();
+    try {
+      Files.copy(imageFile, tmpFile);
+      RandomAccessFile raf = new RandomAccessFile(tmpFile, "rw");
+      try {
+        raf.seek(IMAGE_TXID_POS);
+        raf.writeLong(0);
+      } finally {
+        IOUtils.closeStream(raf);
+      }
+      return getFileMD5(tmpFile);
+    } finally {
+      tmpFile.delete();
+    }
+  }
+  
+  public static StorageDirectory mockStorageDirectory(
+      File currentDir, NameNodeDirType type) {
+    // Mock the StorageDirectory interface to just point to this file
+    StorageDirectory sd = Mockito.mock(StorageDirectory.class);
+    Mockito.doReturn(type)
+      .when(sd).getStorageDirType();
+    Mockito.doReturn(currentDir).when(sd).getCurrentDir();
+    Mockito.doReturn(currentDir).when(sd).getRoot();
+    Mockito.doReturn(mockFile(true)).when(sd).getVersionFile();
+    Mockito.doReturn(mockFile(false)).when(sd).getPreviousDir();
+    return sd;
+  }
+  
+  /**
+   * Make a mock storage directory that returns some set of file contents.
+   * @param type type of storage dir
+   * @param previousExists should we mock that the previous/ dir exists?
+   * @param fileNames the names of files contained in current/
+   */
+  static StorageDirectory mockStorageDirectory(
+      StorageDirType type,
+      boolean previousExists,
+      String...  fileNames) {
+    StorageDirectory sd = mock(StorageDirectory.class);
+    
+    doReturn(type).when(sd).getStorageDirType();
+  
+    // Version file should always exist
+    doReturn(mockFile(true)).when(sd).getVersionFile();
+    doReturn(mockFile(true)).when(sd).getRoot();
+
+    // Previous dir optionally exists
+    doReturn(mockFile(previousExists))
+      .when(sd).getPreviousDir();   
+  
+    // Return a mock 'current' directory which has the given paths
+    File[] files = new File[fileNames.length];
+    for (int i = 0; i < fileNames.length; i++) {
+      files[i] = new File(fileNames[i]);
+    }
+    
+    File mockDir = Mockito.spy(new File("/dir/current"));
+    doReturn(files).when(mockDir).listFiles();
+    doReturn(mockDir).when(sd).getCurrentDir();
+    
+
+    return sd;
+  }
+  
+  static File mockFile(boolean exists) {
+    File mockFile = mock(File.class);
+    doReturn(exists).when(mockFile).exists();
+    return mockFile;
+  }
+  
+  public static FSImageTransactionalStorageInspector inspectStorageDirectory(
+      File dir, NameNodeDirType dirType) throws IOException {
+    FSImageTransactionalStorageInspector inspector =
+      new FSImageTransactionalStorageInspector();
+    inspector.inspectDirectory(mockStorageDirectory(dir, dirType));
+    return inspector;
+  }
+
+  
+  /**
+   * Return a standalone instance of FSEditLog that will log into the given
+   * log directory. The returned instance is not yet opened.
+   */
+  public static FSEditLog createStandaloneEditLog(File logDir)
+      throws IOException {
+    assertTrue(logDir.mkdirs() || logDir.exists());
+    Files.deleteDirectoryContents(logDir);
+    NNStorage storage = Mockito.mock(NNStorage.class);
+    StorageDirectory sd 
+      = FSImageTestUtil.mockStorageDirectory(logDir, NameNodeDirType.EDITS);
+    List<StorageDirectory> sds = Lists.newArrayList(sd);
+    Mockito.doReturn(sds).when(storage).dirIterable(NameNodeDirType.EDITS);
+    Mockito.doReturn(sd).when(storage)
+      .getStorageDirectory(Matchers.<URI>anyObject());
+
+    return new FSEditLog(new Configuration(), 
+                         storage,
+                         ImmutableList.of(logDir.toURI()));
+  }
+  
+  /**
+   * Assert that all of the given directories have the same newest filename
+   * for fsimage that they hold the same data.
+   */
+  public static void assertSameNewestImage(List<File> dirs) throws Exception {
+    if (dirs.size() < 2) return;
+    
+    long imageTxId = -1;
+    
+    List<File> imageFiles = new ArrayList<File>();
+    for (File dir : dirs) {
+      FSImageTransactionalStorageInspector inspector =
+        inspectStorageDirectory(dir, NameNodeDirType.IMAGE);
+      FSImageFile latestImage = inspector.getLatestImage();
+      assertNotNull("No image in " + dir, latestImage);      
+      long thisTxId = latestImage.getCheckpointTxId();
+      if (imageTxId != -1 && thisTxId != imageTxId) {
+        fail("Storage directory " + dir + " does not have the same " +
+            "last image index " + imageTxId + " as another");
+      }
+      imageTxId = thisTxId;
+      imageFiles.add(inspector.getLatestImage().getFile());
+    }
+    
+    assertFileContentsSame(imageFiles.toArray(new File[0]));
+  }
+  
+  /**
+   * Given a list of directories, assert that any files that are named
+   * the same thing have the same contents. For example, if a file
+   * named "fsimage_1" shows up in more than one directory, then it must
+   * be the same.
+   * @throws Exception 
+   */
+  public static void assertParallelFilesAreIdentical(List<File> dirs,
+      Set<String> ignoredFileNames) throws Exception {
+    HashMap<String, List<File>> groupedByName = new HashMap<String, List<File>>();
+    for (File dir : dirs) {
+      for (File f : dir.listFiles()) {
+        if (ignoredFileNames.contains(f.getName())) {
+          continue;
+        }
+        
+        List<File> fileList = groupedByName.get(f.getName());
+        if (fileList == null) {
+          fileList = new ArrayList<File>();
+          groupedByName.put(f.getName(), fileList);
+        }
+        fileList.add(f);
+      }
+    }
+    
+    for (List<File> sameNameList : groupedByName.values()) {
+      if (sameNameList.get(0).isDirectory()) {
+        // recurse
+        assertParallelFilesAreIdentical(sameNameList, ignoredFileNames);
+      } else {
+        if ("VERSION".equals(sameNameList.get(0).getName())) {
+          assertPropertiesFilesSame(sameNameList.toArray(new File[0]));
+        } else {
+          assertFileContentsSame(sameNameList.toArray(new File[0]));
+        }
+      }
+    }  
+  }
+  
+  /**
+   * Assert that a set of properties files all contain the same data.
+   * We cannot simply check the md5sums here, since Properties files
+   * contain timestamps -- thus, two properties files from the same
+   * saveNamespace operation may actually differ in md5sum.
+   * @param propFiles the files to compare
+   * @throws IOException if the files cannot be opened or read
+   * @throws AssertionError if the files differ
+   */
+  public static void assertPropertiesFilesSame(File[] propFiles)
+      throws IOException {
+    Set<Map.Entry<Object, Object>> prevProps = null;
+    
+    for (File f : propFiles) {
+      Properties props;
+      FileInputStream is = new FileInputStream(f);
+      try {
+        props = new Properties();
+        props.load(is);
+      } finally {
+        IOUtils.closeStream(is);
+      }
+      if (prevProps == null) {
+        prevProps = props.entrySet();
+      } else {
+        Set<Entry<Object,Object>> diff =
+          Sets.symmetricDifference(prevProps, props.entrySet());
+        if (!diff.isEmpty()) {
+          fail("Properties file " + f + " differs from " + propFiles[0]);
+        }
+      }
+    }
+  }
+
+  /**
+   * Assert that all of the given paths have the exact same
+   * contents 
+   */
+  public static void assertFileContentsSame(File... files) throws Exception {
+    if (files.length < 2) return;
+    
+    Map<File, String> md5s = getFileMD5s(files);
+    if (Sets.newHashSet(md5s.values()).size() > 1) {
+      fail("File contents differed:\n  " +
+          Joiner.on("\n  ")
+            .withKeyValueSeparator("=")
+            .join(md5s));
+    }
+  }
+  
+  /**
+   * Assert that the given files are not all the same, and in fact that
+   * they have <code>expectedUniqueHashes</code> unique contents.
+   */
+  public static void assertFileContentsDifferent(
+      int expectedUniqueHashes,
+      File... files) throws Exception
+  {
+    Map<File, String> md5s = getFileMD5s(files);
+    if (Sets.newHashSet(md5s.values()).size() != expectedUniqueHashes) {
+      fail("Expected " + expectedUniqueHashes + " different hashes, got:\n  " +
+          Joiner.on("\n  ")
+            .withKeyValueSeparator("=")
+            .join(md5s));
+    }
+  }
+  
+  public static Map<File, String> getFileMD5s(File... files) throws Exception {
+    Map<File, String> ret = Maps.newHashMap();
+    for (File f : files) {
+      assertTrue("Must exist: " + f, f.exists());
+      ret.put(f, getFileMD5(f));
+    }
+    return ret;
+  }
+
+  /**
+   * @return a List which contains the "current" dir for each storage
+   * directory of the given type. 
+   */
+  public static List<File> getCurrentDirs(NNStorage storage,
+      NameNodeDirType type) {
+    List<File> ret = Lists.newArrayList();
+    for (StorageDirectory sd : storage.dirIterable(type)) {
+      ret.add(sd.getCurrentDir());
+    }
+    return ret;
+  }
+
+  /**
+   * @return the fsimage file with the most recent transaction ID in the
+   * given storage directory.
+   */
+  public static File findLatestImageFile(StorageDirectory sd)
+  throws IOException {
+    FSImageTransactionalStorageInspector inspector =
+      new FSImageTransactionalStorageInspector();
+    inspector.inspectDirectory(sd);
+    
+    return inspector.getLatestImage().getFile();
+  }
+
+  /**
+   * @return the fsimage file with the most recent transaction ID in the
+   * given 'current/' directory.
+   */
+  public static File findNewestImageFile(String currentDirPath) throws IOException {
+    StorageDirectory sd = FSImageTestUtil.mockStorageDirectory(
+        new File(currentDirPath), NameNodeDirType.IMAGE);
+
+    FSImageTransactionalStorageInspector inspector =
+      new FSImageTransactionalStorageInspector();
+    inspector.inspectDirectory(sd);
+
+    FSImageFile latestImage = inspector.getLatestImage();
+    return (latestImage == null) ? null : latestImage.getFile();
+  }
+
+  /**
+   * Assert that the NameNode has checkpoints at the expected
+   * transaction IDs.
+   */
+  static void assertNNHasCheckpoints(MiniDFSCluster cluster,
+      List<Integer> txids) {
+
+    for (File nameDir : getNameNodeCurrentDirs(cluster)) {
+      // Should have fsimage_N for the three checkpoints
+      for (long checkpointTxId : txids) {
+        File image = new File(nameDir,
+                              NNStorage.getImageFileName(checkpointTxId));
+        assertTrue("Expected non-empty " + image, image.length() > 0);
+      }
+    }
+  }
+
+  static List<File> getNameNodeCurrentDirs(MiniDFSCluster cluster) {
+    List<File> nameDirs = Lists.newArrayList();
+    for (File f : cluster.getNameDirs(0)) {
+      nameDirs.add(new File(f, "current"));
+    }
+    return nameDirs;
+  }
+
+  /**
+   * @return the latest edits log, finalized or otherwise, from the given
+   * storage directory.
+   */
+  public static EditLogFile findLatestEditsLog(StorageDirectory sd)
+  throws IOException {
+    File currentDir = sd.getCurrentDir();
+    List<EditLogFile> foundEditLogs 
+      = Lists.newArrayList(FileJournalManager.matchEditLogs(currentDir.listFiles()));
+    return Collections.max(foundEditLogs, EditLogFile.COMPARE_BY_START_TXID);
+  }
+
+  /**
+   * Corrupt the given VERSION file by replacing a given
+   * key with a new value and re-writing the file.
+   * 
+   * @param versionFile the VERSION file to corrupt
+   * @param key the key to replace
+   * @param value the new value for this key
+   */
+  public static void corruptVersionFile(File versionFile, String key, String value)
+      throws IOException {
+    Properties props = new Properties();
+    FileInputStream fis = new FileInputStream(versionFile);
+    FileOutputStream out = null;
+    try {
+      props.load(fis);
+      IOUtils.closeStream(fis);
+  
+      props.setProperty(key, value);
+      
+      out = new FileOutputStream(versionFile);
+      props.store(out, null);
+      
+    } finally {
+      IOUtils.cleanup(null, fis, out);
+    }    
+  }
+
+  public static void assertReasonableNameCurrentDir(File curDir)
+      throws IOException {
+    assertTrue(curDir.isDirectory());
+    assertTrue(new File(curDir, "VERSION").isFile());
+    assertTrue(new File(curDir, "seen_txid").isFile());
+    File image = findNewestImageFile(curDir.toString());
+    assertNotNull(image);
+  }
+
+  public static void logStorageContents(Log LOG, NNStorage storage) {
+    LOG.info("current storages and corresponding sizes:");
+    for (StorageDirectory sd : storage.dirIterable(null)) {
+      File curDir = sd.getCurrentDir();
+      LOG.info("In directory " + curDir);
+      File[] files = curDir.listFiles();
+      Arrays.sort(files);
+      for (File f : files) {
+        LOG.info("  file " + f.getAbsolutePath() + "; len = " + f.length());  
+      }
+    }
+  }
+  
+  /** get the fsImage*/
+  public static FSImage getFSImage(NameNode node) {
+    return node.getFSImage();
+  }
+
+  /**
+   * get NameSpace quota.
+   */
+  public static long getNSQuota(FSNamesystem ns) {
+    return ns.dir.rootDir.getNsQuota();
+  }
+  
+  public static class CheckpointTrigger {
+    volatile boolean triggerCheckpoint = false;
+    volatile boolean checkpointDone = false;
+    volatile IOException e;
+
+    private volatile CountDownLatch ckptLatch = new CountDownLatch(0);
+
+    public void checkpointDone(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.STANDBY_EXIT_CHECKPOINT) {
+        ckptLatch.countDown();
+      }
+      if (event == InjectionEvent.STANDBY_EXIT_CHECKPOINT_EXCEPTION) {
+        e = (IOException) args[0];
+        ckptLatch.countDown();
+      }
+    }
+
+    public boolean triggerCheckpoint(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.STANDBY_CHECKPOINT_TRIGGER
+          && ckptLatch.getCount() > 0) {
+        return true;
+      }
+      return false;
+    }
+
+    public void doCheckpoint() throws IOException {
+      e = null;
+      ckptLatch = new CountDownLatch(1);
+      try {
+        ckptLatch.await();
+      } catch (InterruptedException e) {
+        throw new IOException("Interruption received");
+      }
+      if (e!=null)
+        throw e;
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java b/src/test/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java
index 82aba948..8e4a6153 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java
@@ -35,8 +35,11 @@
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeDirType;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeFile;
+import org.apache.hadoop.hdfs.server.namenode.FileJournalManager.EditLogFile;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 
 /**
  * OfflineEditsViewerHelper is a helper class for TestOfflineEditsViewer,
@@ -59,8 +62,12 @@ public class OfflineEditsViewerHelper {
    * @param dfsDir DFS directory (where to setup MiniDFS cluster)
    * @param editsFilename where to copy the edits
    */
-  public String generateEdits() throws IOException {
+  public void generateEdits() throws IOException {
     runOperations();
+    
+  }
+  
+  public String getEditsName() throws IOException {
     return getEditsFilename();
   }
 
@@ -73,9 +80,14 @@ private String getEditsFilename() throws IOException {
     FSImage image = cluster.getNameNode().getFSImage();
     // it was set up to only have ONE StorageDirectory
     Iterator<StorageDirectory> it
-      = image.dirIterator(NameNodeDirType.EDITS);
+      = image.storage.dirIterator(NameNodeDirType.EDITS);
     StorageDirectory sd = it.next();
-    File ret = FSImage.getImageFile(sd, NameNodeFile.EDITS);
+    EditLogFile elf = FSImageTestUtil.findLatestEditsLog(sd);
+    File ret = null;
+    if(elf.getFirstTxId() == elf.getLastTxId())
+      ret = NNStorage.getInProgressEditsFile(sd, elf.getFirstTxId());
+    else
+      ret = NNStorage.getFinalizedEditsFile(sd, elf.getFirstTxId(), elf.getLastTxId());
     assert ret.exists() : "expected " + ret + " exists";
     return ret.getAbsolutePath();
   }
@@ -88,12 +100,13 @@ private String getEditsFilename() throws IOException {
    */
   public void startCluster(String dfsDir, boolean simulateEditLogCrash) 
       throws IOException {
-
+    OfflineEditsViewerInjectionHandler h = new OfflineEditsViewerInjectionHandler();
+    h.simulateEditLogCrash = simulateEditLogCrash;
+    InjectionHandler.set(h);
     conf = new Configuration();
     conf.set("dfs.secondary.http.address", "0.0.0.0:0");
-    conf.setBoolean("dfs.simulate.editlog.crash", simulateEditLogCrash);
     cluster = new MiniDFSCluster(conf, 3, true, null);
-    cluster.waitClusterUp();
+    cluster.waitActive(true);
   }
 
   /**
@@ -103,6 +116,7 @@ public void shutdownCluster() throws IOException {
     if (cluster != null) {
       cluster.shutdown();
     }
+    InjectionHandler.clear();
   }
   
   /**
@@ -179,9 +193,27 @@ private void runOperations() throws IOException {
     DFSTestUtil.createFile(dfs, pathConcatFiles[0], length, replication, seed);
     DFSTestUtil.createFile(dfs, pathConcatFiles[1], length, replication, seed);
     dfs.concat(pathConcatTarget, pathConcatFiles, false);
-
+    
+    // OP_HARDLINK 25
+    Path hardLinkDstFile = new Path("/file_hardlink_target");
+    dfs.hardLink(pathConcatTarget, hardLinkDstFile);
+    
     // sync to disk, otherwise we parse partial edits
     cluster.getNameNode().getFSImage().getEditLog().logSync();
     dfs.close();
   }
+  
+  class OfflineEditsViewerInjectionHandler extends InjectionHandler {
+    boolean simulateEditLogCrash = false;
+
+    public boolean _trueCondition(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.FSNAMESYSTEM_CLOSE_DIRECTORY
+          && simulateEditLogCrash) {
+        LOG.warn("Simulating edit log crash, not closing edit log cleanly as"
+            + "part of shutdown");
+        return false;
+      }
+      return true;
+    }
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
index 5b1f7dfe..db98c693 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
@@ -19,36 +19,65 @@
 
 import junit.framework.TestCase;
 import java.io.*;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Iterator;
 import java.util.Random;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.DFSTestUtil;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
-import org.apache.hadoop.hdfs.server.common.Storage;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeFile;
-import org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.ErrorSimulator;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.common.StorageInfo;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
 import org.apache.hadoop.hdfs.tools.DFSAdmin;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
+import org.junit.After;
+import org.junit.Before;
+import org.mockito.Mockito;
+
+import com.google.common.base.Joiner;
 
 /**
  * This class tests the creation and validation of a checkpoint.
  */
 public class TestCheckpoint extends TestCase {
+  
+  final static Log LOG = LogFactory.getLog(TestCheckpoint.class);
+  
   static final long seed = 0xDEADBEEFL;
   static final int blockSize = 4096;
   static final int fileSize = 8192;
   static final int numDatanodes = 3;
   short replication = 3;
+  
+  @After
+  public void tearDown() {
+    File dir = new File(System.getProperty("test.build.data"));
+    LOG.info("Cleanup directory: " + dir);
+    try {
+      FileUtil.fullyDelete(dir);
+    } catch (IOException e) {
+      LOG.info("Could not remove: " + dir, e);
+    }
+  }
 
   private void writeFile(FileSystem fileSys, Path name, int repl)
     throws IOException {
@@ -78,68 +107,51 @@ private void cleanupFile(FileSystem fileSys, Path name)
     assertTrue(!fileSys.exists(name));
   }
 
-  /**
-   * put back the old namedir
-   */
-  private void resurrectNameDir(File namedir) 
-    throws IOException {
-    String parentdir = namedir.getParent();
-    String name = namedir.getName();
-    File oldname =  new File(parentdir, name + ".old");
-    if (!oldname.renameTo(namedir)) {
-      assertTrue(false);
-    }
-  }
-
-  /**
-   * remove one namedir
-   */
-  private void removeOneNameDir(File namedir) 
-    throws IOException {
-    String parentdir = namedir.getParent();
-    String name = namedir.getName();
-    File newname =  new File(parentdir, name + ".old");
-    if (!namedir.renameTo(newname)) {
-      assertTrue(false);
-    }
-  }
-
   /*
    * Verify that namenode does not startup if one namedir is bad.
    */
-  private void testNamedirError(Configuration conf, Collection<File> namedirs) 
-    throws IOException {
-    System.out.println("Starting testNamedirError");
-    MiniDFSCluster cluster = null;
-
-    if (namedirs.size() <= 1) {
-      return;
-    }
+  public void testNameDirError() throws IOException {
+    LOG.info("Starting testNameDirError");
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 0, true, null);
     
-    //
-    // Remove one namedir & Restart cluster. This should fail.
-    //
-    File first = namedirs.iterator().next();
-    removeOneNameDir(first);
-    try {
-      cluster = new MiniDFSCluster(conf, 0, false, null);
-      cluster.shutdown();
-      assertTrue(false);
-    } catch (Throwable t) {
-      // no nothing
+    Collection<File> nameDirs = cluster.getNameDirs(0);
+    cluster.shutdown();
+    cluster = null;
+    
+    for (File dir : nameDirs) {    
+      try {
+        // Simulate the mount going read-only
+        dir.setWritable(false);
+        cluster = new MiniDFSCluster(conf,0 ,false ,null);
+        fail("NN should have failed to start with " + dir + " set unreadable");
+      } catch (IOException ioe) {
+        GenericTestUtils.assertExceptionContains(
+            "storage directory does not exist or is not accessible",
+            ioe);
+      } finally {
+        if (cluster != null) {
+          cluster.shutdown();
+          cluster = null;
+        }
+        dir.setWritable(true);
+      }
     }
-    resurrectNameDir(first); // put back namedir
   }
 
   /*
    * Simulate namenode crashing after rolling edit log.
    */
-  private void testSecondaryNamenodeError1(Configuration conf)
+  public void testSecondaryNamenodeError1()
     throws IOException {
+    Configuration conf = new Configuration();
+    TestCheckpointInjectionHandler h = new TestCheckpointInjectionHandler();
+    InjectionHandler.set(h);
+    
     System.out.println("Starting testSecondaryNamenodeError 1");
     Path file1 = new Path("checkpointxx.dat");
     MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, 
-                                                false, null);
+                                                true, null);
     cluster.waitActive();
     FileSystem fileSys = cluster.getFileSystem();
     try {
@@ -148,14 +160,14 @@ private void testSecondaryNamenodeError1(Configuration conf)
       // Make the checkpoint fail after rolling the edits log.
       //
       SecondaryNameNode secondary = startSecondaryNameNode(conf);
-      ErrorSimulator.setErrorSimulation(0);
+      h.setSimulationPoint(InjectionEvent.SECONDARYNAMENODE_CHECKPOINT0);
 
       try {
         secondary.doCheckpoint();  // this should fail
         assertTrue(false);
       } catch (IOException e) {
       }
-      ErrorSimulator.clearErrorSimulation(0);
+      h.clearHandler();
       secondary.shutdown();
 
       //
@@ -179,19 +191,11 @@ private void testSecondaryNamenodeError1(Configuration conf)
     // Also check that the edits file is empty here
     // and that temporary checkpoint files are gone.
     FSImage image = cluster.getNameNode().getFSImage();
+    long txid = image.storage.getMostRecentCheckpointTxId();
     for (Iterator<StorageDirectory> it = 
              image.dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
       StorageDirectory sd = it.next();
-      assertFalse(FSImage.getImageFile(sd, NameNodeFile.IMAGE_NEW).exists());
-    }
-    for (Iterator<StorageDirectory> it = 
-            image.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-      StorageDirectory sd = it.next();
-      assertFalse(image.getEditNewFile(sd).exists());
-      File edits = image.getEditFile(sd);
-      assertTrue(edits.exists()); // edits should exist and be empty
-      long editsLen = edits.length();
-      assertTrue(editsLen == Integer.SIZE/Byte.SIZE);
+      assertFalse(NNStorage.getStorageFile(sd, NameNodeFile.IMAGE_NEW, txid).exists());
     }
     
     fileSys = cluster.getFileSystem();
@@ -210,12 +214,16 @@ private void testSecondaryNamenodeError1(Configuration conf)
   /*
    * Simulate a namenode crash after uploading new image
    */
-  private void testSecondaryNamenodeError2(Configuration conf)
+  public void testSecondaryNamenodeError2()
     throws IOException {
+    Configuration conf = new Configuration();
+    TestCheckpointInjectionHandler h = new TestCheckpointInjectionHandler();
+    InjectionHandler.set(h);
+    
     System.out.println("Starting testSecondaryNamenodeError 21");
     Path file1 = new Path("checkpointyy.dat");
     MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, 
-                                                false, null);
+                                                true, null);
     cluster.waitActive();
     FileSystem fileSys = cluster.getFileSystem();
     try {
@@ -224,14 +232,14 @@ private void testSecondaryNamenodeError2(Configuration conf)
       // Make the checkpoint fail after uploading the new fsimage.
       //
       SecondaryNameNode secondary = startSecondaryNameNode(conf);
-      ErrorSimulator.setErrorSimulation(1);
+      h.setSimulationPoint(InjectionEvent.SECONDARYNAMENODE_CHECKPOINT1);
 
       try {
         secondary.doCheckpoint();  // this should fail
         assertTrue(false);
       } catch (IOException e) {
       }
-      ErrorSimulator.clearErrorSimulation(1);
+      h.clearHandler();
       secondary.shutdown();
 
       //
@@ -268,12 +276,16 @@ private void testSecondaryNamenodeError2(Configuration conf)
   /*
    * Simulate a secondary namenode crash after rolling the edit log.
    */
-  private void testSecondaryNamenodeError3(Configuration conf)
+  public void testSecondaryNamenodeError3()
     throws IOException {
+    Configuration conf = new Configuration();
+    TestCheckpointInjectionHandler h = new TestCheckpointInjectionHandler();
+    InjectionHandler.set(h);
+    
     System.out.println("Starting testSecondaryNamenodeError 31");
     Path file1 = new Path("checkpointzz.dat");
     MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, 
-                                                false, null);
+                                                true, null);
     cluster.waitActive();
     FileSystem fileSys = cluster.getFileSystem();
     try {
@@ -282,14 +294,14 @@ private void testSecondaryNamenodeError3(Configuration conf)
       // Make the checkpoint fail after rolling the edit log.
       //
       SecondaryNameNode secondary = startSecondaryNameNode(conf);
-      ErrorSimulator.setErrorSimulation(0);
+      h.setSimulationPoint(InjectionEvent.SECONDARYNAMENODE_CHECKPOINT0);
 
       try {
         secondary.doCheckpoint();  // this should fail
         assertTrue(false);
       } catch (IOException e) {
       }
-      ErrorSimulator.clearErrorSimulation(0);
+      h.clearHandler();
       secondary.shutdown(); // secondary namenode crash!
 
       // start new instance of secondary and verify that 
@@ -336,12 +348,16 @@ private void testSecondaryNamenodeError3(Configuration conf)
    * back to the name-node.
    * Used to truncate primary fsimage file.
    */
-  void testSecondaryFailsToReturnImage(Configuration conf)
+  public void testSecondaryFailsToReturnImage()
     throws IOException {
+    Configuration conf = new Configuration();
+    TestCheckpointInjectionHandler h = new TestCheckpointInjectionHandler();
+    InjectionHandler.set(h);
+    
     System.out.println("Starting testSecondaryFailsToReturnImage");
     Path file1 = new Path("checkpointRI.dat");
     MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, 
-                                                false, null);
+                                                true, null);
     cluster.waitActive();
     FileSystem fileSys = cluster.getFileSystem();
     FSImage image = cluster.getNameNode().getFSImage();
@@ -352,12 +368,12 @@ void testSecondaryFailsToReturnImage(Configuration conf)
                 image.dirIterator(NameNodeDirType.IMAGE); it.hasNext();)
          sd = it.next();
       assertTrue(sd != null);
-      long fsimageLength = FSImage.getImageFile(sd, NameNodeFile.IMAGE).length();
+      long fsimageLength = NNStorage.getStorageFile(sd, NameNodeFile.IMAGE).length();
       //
       // Make the checkpoint
       //
       SecondaryNameNode secondary = startSecondaryNameNode(conf);
-      ErrorSimulator.setErrorSimulation(2);
+      h.setSimulationPoint(InjectionEvent.TRANSFERFSIMAGE_GETFILESERVER0);
 
       try {
         secondary.doCheckpoint();  // this should fail
@@ -366,12 +382,12 @@ void testSecondaryFailsToReturnImage(Configuration conf)
         System.out.println("testSecondaryFailsToReturnImage: doCheckpoint() " +
             "failed predictably - " + e);
       }
-      ErrorSimulator.clearErrorSimulation(2);
+      h.clearHandler();
 
       // Verify that image file sizes did not change.
       for (Iterator<StorageDirectory> it = 
-              image.dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
-        assertTrue(FSImage.getImageFile(it.next(), 
+              image.storage.dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
+        assertTrue(NNStorage.getStorageFile(it.next(), 
                                 NameNodeFile.IMAGE).length() == fsimageLength);
       }
 
@@ -383,40 +399,65 @@ void testSecondaryFailsToReturnImage(Configuration conf)
   }
   
   /**
-   * Simulate namenode failing to send the whole file
-   * secondary namenode sometimes assumed it received all of it
+   * Simulate 2NN failing to send the whole file (error type 3)
+   * The length header in the HTTP transfer should prevent
+   * this from corrupting the NN.
    */
-  @SuppressWarnings("deprecation")
-  void testNameNodeImageSendFail(Configuration conf)
-    throws IOException {
-    System.out.println("Starting testNameNodeImageSendFail");
-    Path file1 = new Path("checkpointww.dat");
+  public void testNameNodeImageSendFailWrongSize()
+      throws IOException {
+    System.out.println("Starting testNameNodeImageSendFailWrongSize");
+    doSendFailTest(InjectionEvent.TRANSFERFSIMAGE_GETFILESERVER1, "is not of the advertised size");
+  }
+
+  /**
+   * Simulate 2NN sending a corrupt image (error type 4)
+   * The digest header in the HTTP transfer should prevent
+   * this from corrupting the NN.
+   */
+  public void testNameNodeImageSendFailWrongDigest()
+      throws IOException {
+    System.out.println("Starting testNameNodeImageSendFailWrongDigest");
+    doSendFailTest(InjectionEvent.TRANSFERFSIMAGE_GETFILESERVER2, "does not match advertised digest");
+  }
+  
+  /**
+   * Run a test where the 2NN runs into some kind of error when
+   * sending the checkpoint back to the NN.
+   * @param errorType the ErrorSimulator type to trigger
+   * @param exceptionSubstring an expected substring of the triggered exception
+   */
+  private void doSendFailTest(InjectionEvent errorType, String exceptionSubstring)
+      throws IOException {
+    Configuration conf = new Configuration();
+    TestCheckpointInjectionHandler h = new TestCheckpointInjectionHandler();
+    InjectionHandler.set(h);
+    
+    Path file1 = new Path("checkpoint-doSendFailTest-" + errorType + ".dat");
     MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, 
-                                                false, null);
+                                                true, null);
     cluster.waitActive();
     FileSystem fileSys = cluster.getFileSystem();
+    
     try {
       assertTrue(!fileSys.exists(file1));
       //
       // Make the checkpoint fail after rolling the edit log.
       //
       SecondaryNameNode secondary = startSecondaryNameNode(conf);
-      ErrorSimulator.setErrorSimulation(3);
+      h.setSimulationPoint(errorType);
 
       try {
         secondary.doCheckpoint();  // this should fail
         fail("Did not get expected exception");
       } catch (IOException e) {
         // We only sent part of the image. Have to trigger this exception
-        assertTrue(e.getMessage().contains("is not of the advertised size"));
+        System.out.println(StringUtils.stringifyException(e));
+        assertTrue(e.getMessage().contains(exceptionSubstring));
       }
-      ErrorSimulator.clearErrorSimulation(3);
+      h.clearHandler();
       secondary.shutdown(); // secondary namenode crash!
 
-      // start new instance of secondary and verify that 
-      // a new rollEditLog suceedes inspite of the fact that 
-      // edits.new already exists.
-      //
+      // start new instance of secondary 
       secondary = startSecondaryNameNode(conf);
       secondary.doCheckpoint();  // this should work correctly
       secondary.shutdown();
@@ -431,6 +472,8 @@ void testNameNodeImageSendFail(Configuration conf)
       cluster.shutdown();
     }
   }
+  
+
 
   /**
    * Test different startup scenarios.
@@ -449,21 +492,38 @@ void testNameNodeImageSendFail(Configuration conf)
    * <li> Complete failed checkpoint for secondary node.
    * </ol>
    */
-  void testStartup(Configuration conf) throws IOException {
+  public void testStartup() throws IOException {
+    
+    Configuration conf = new Configuration();
+    
     System.out.println("Startup of the name-node in the checkpoint directory.");
+    
+    
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 3, true, null);
+    cluster.waitActive();
+    
+    SecondaryNameNode secondary = startSecondaryNameNode(conf);
+    secondary.doCheckpoint();
+    secondary.shutdown();
+    
+    cluster.shutdown();
+    
+    LOG.info("Regular checkpoint DONE");
+    
     String primaryDirs = conf.get("dfs.name.dir");
     String primaryEditsDirs = conf.get("dfs.name.edits.dir");
     String checkpointDirs = conf.get("fs.checkpoint.dir");
     String checkpointEditsDirs = conf.get("fs.checkpoint.edits.dir");
+    
     NameNode nn = startNameNode(conf, checkpointDirs, checkpointEditsDirs,
                                  StartupOption.REGULAR);
-
+    
     // Starting secondary node in the same directory as the primary
     System.out.println("Startup of secondary in the same dir as the primary.");
-    SecondaryNameNode secondary = null;
+    secondary = null;
     try {
       secondary = startSecondaryNameNode(conf);
-      assertFalse(secondary.getFSImage().isLockSupported(0));
+      assertFalse(secondary.getFSImage().storage.isLockSupported(0));
       secondary.shutdown();
     } catch (IOException e) { // expected to fail
       assertTrue(secondary == null);
@@ -488,7 +548,7 @@ void testStartup(Configuration conf) throws IOException {
     try {
       nn = startNameNode(conf, checkpointDirs, checkpointEditsDirs,
                           StartupOption.REGULAR);
-      assertFalse(nn.getFSImage().isLockSupported(0));
+      assertFalse(nn.getFSImage().storage.isLockSupported(0));
       nn.stop(); nn = null;
     } catch (IOException e) { // expected to fail
       assertTrue(nn == null);
@@ -502,7 +562,7 @@ void testStartup(Configuration conf) throws IOException {
     SecondaryNameNode secondary2 = null;
     try {
       secondary2 = startSecondaryNameNode(conf);
-      assertFalse(secondary2.getFSImage().isLockSupported(0));
+      assertFalse(secondary2.getFSImage().storage.isLockSupported(0));
       secondary2.shutdown();
     } catch (IOException e) { // expected to fail
       assertTrue(secondary2 == null);
@@ -520,75 +580,56 @@ void testStartup(Configuration conf) throws IOException {
       assertTrue(nn == null);
     }
     
+    
     // Remove current image and import a checkpoint.
     System.out.println("Import a checkpoint with existing primary image.");
-    List<File> nameDirs = (List<File>)FSNamesystem.getNamespaceDirs(conf);
-    List<File> nameEditsDirs = (List<File>)FSNamesystem.
-                                  getNamespaceEditsDirs(conf);
+    List<File> nameDirs = (List<File>)DFSTestUtil.getFileStorageDirs(
+        NNStorageConfiguration.getNamespaceDirs(conf));
+    List<File> nameEditsDirs = (List<File>)DFSTestUtil.getFileStorageDirs(
+        NNStorageConfiguration.getNamespaceEditsDirs(conf));
     long fsimageLength = new File(new File(nameDirs.get(0), "current"), 
                                         NameNodeFile.IMAGE.getName()).length();
     for(File dir : nameDirs) {
       if(dir.exists())
-        if(!(FileUtil.fullyDelete(dir)))
+        if(!(FileUtil.fullyDelete(dir))) {
           throw new IOException("Cannot remove directory: " + dir);
+        } else {
+          LOG.info("Deleted: " + dir);
+        }
       if (!dir.mkdirs())
         throw new IOException("Cannot create directory " + dir);
     }
 
     for(File dir : nameEditsDirs) {
       if(dir.exists())
-        if(!(FileUtil.fullyDelete(dir)))
+        if(!(FileUtil.fullyDelete(dir))) {
           throw new IOException("Cannot remove directory: " + dir);
+        } else {
+          LOG.info("Deleted: " + dir);
+        }
       if (!dir.mkdirs())
         throw new IOException("Cannot create directory " + dir);
     }
     
+    LOG.info("Starting primary with name dirs: " + primaryDirs 
+        + " edit dirs: " + primaryEditsDirs);
     nn = startNameNode(conf, primaryDirs, primaryEditsDirs,
                         StartupOption.IMPORT);
     // Verify that image file sizes did not change.
     FSImage image = nn.getFSImage();
     for (Iterator<StorageDirectory> it = 
-            image.dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
-      assertTrue(FSImage.getImageFile(it.next(), 
+            image.storage.dirIterator(NameNodeDirType.IMAGE); it.hasNext();) {
+      assertTrue(NNStorage.getStorageFile(it.next(), 
                           NameNodeFile.IMAGE).length() == fsimageLength);
     }
     nn.stop();
-
-    // recover failed checkpoint
-    nn = startNameNode(conf, primaryDirs, primaryEditsDirs,
-                        StartupOption.REGULAR);
-    Collection<File> secondaryDirs = FSImage.getCheckpointDirs(conf, null);
-    for(File dir : secondaryDirs) {
-      Storage.rename(new File(dir, "current"), 
-                     new File(dir, "lastcheckpoint.tmp"));
-    }
-    secondary = startSecondaryNameNode(conf);
-    secondary.shutdown();
-    for(File dir : secondaryDirs) {
-      assertTrue(new File(dir, "current").exists()); 
-      assertFalse(new File(dir, "lastcheckpoint.tmp").exists());
-    }
-    
-    // complete failed checkpoint
-    for(File dir : secondaryDirs) {
-      Storage.rename(new File(dir, "previous.checkpoint"), 
-                     new File(dir, "lastcheckpoint.tmp"));
-    }
-    secondary = startSecondaryNameNode(conf);
-    secondary.shutdown();
-    for(File dir : secondaryDirs) {
-      assertTrue(new File(dir, "current").exists()); 
-      assertTrue(new File(dir, "previous.checkpoint").exists()); 
-      assertFalse(new File(dir, "lastcheckpoint.tmp").exists());
-    }
-    nn.stop(); nn = null;
     
     // Check that everything starts ok now.
-    MiniDFSCluster cluster = new MiniDFSCluster(conf, numDatanodes, false, null);
-    cluster.waitActive();
-    cluster.shutdown();
+    nn = startNameNode(conf, primaryDirs, primaryEditsDirs,
+        StartupOption.REGULAR);
+    nn.stop();
   }
-
+  
   NameNode startNameNode( Configuration conf,
                           String imageDirs,
                           String editsDirs,
@@ -599,7 +640,6 @@ NameNode startNameNode( Configuration conf,
     conf.set("dfs.name.edits.dir", editsDirs);
     String[] args = new String[]{start.getName()};
     NameNode nn = NameNode.createNameNode(args, conf);
-    assertTrue(nn.isInSafeMode());
     return nn;
   }
 
@@ -642,7 +682,6 @@ public void testCheckpoint() throws IOException {
       // Take a checkpoint
       //
       SecondaryNameNode secondary = startSecondaryNameNode(conf);
-      ErrorSimulator.initializeErrorSimulationEvent(4);
       secondary.doCheckpoint();
       secondary.shutdown();
     } finally {
@@ -693,15 +732,6 @@ public void testCheckpoint() throws IOException {
       fileSys.close();
       cluster.shutdown();
     }
-
-    // file2 is left behind.
-    testNameNodeImageSendFail(conf);
-    testSecondaryNamenodeError1(conf);
-    testSecondaryNamenodeError2(conf);
-    testSecondaryNamenodeError3(conf);
-    testNamedirError(conf, namedirs);
-    testSecondaryFailsToReturnImage(conf);
-    testStartup(conf);
   }
 
   /**
@@ -712,7 +742,7 @@ public void testSaveNamespace() throws IOException {
     DistributedFileSystem fs = null;
     try {
       Configuration conf = new Configuration();
-      cluster = new MiniDFSCluster(conf, numDatanodes, false, null);
+      cluster = new MiniDFSCluster(conf, numDatanodes, true, null);
       cluster.waitActive();
       fs = (DistributedFileSystem)(cluster.getFileSystem());
 
@@ -730,10 +760,13 @@ public void testSaveNamespace() throws IOException {
       Path file = new Path("namespace.dat");
       writeFile(fs, file, replication);
       checkFile(fs, file, replication);
+
       // verify that the edits file is NOT empty
-      Collection<File> editsDirs = cluster.getNameEditsDirs();
+      Collection<File> editsDirs = cluster.getNameEditsDirs(0);
       for(File ed : editsDirs) {
-        assertTrue(new File(ed, "current/edits.new").length() > Integer.SIZE/Byte.SIZE);
+        assertTrue(new File(ed, "current/"
+                            + NNStorage.getInProgressEditsFileName(0))
+                   .length() > Integer.SIZE/Byte.SIZE);
       }
 
       // Saving image in safe mode should succeed
@@ -743,26 +776,36 @@ public void testSaveNamespace() throws IOException {
       } catch(Exception e) {
         throw new IOException(e);
       }
-      // verify that the edits file is empty
-      for(File ed : editsDirs) {
-        assertTrue(new File(ed, "current/edits").length() == Integer.SIZE/Byte.SIZE);
-      }
-      fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
-
-      // Saving image with -force option
-      Path filenew = new Path("namespacenew.dat"); // create new file
-      writeFile(fs, filenew, replication);
-      // verify that the edits file is NOT empty
-      editsDirs = cluster.getNameEditsDirs();
+      
+      // the following steps should have happened:
+      //   edits_inprogress_0 -> edits_0-6  (finalized)
+      //   fsimage_6 created
+      //   edits_inprogress_7 created
+      //
       for(File ed : editsDirs) {
-        assertTrue(new File(ed, "current/edits").length() > Integer.SIZE/Byte.SIZE);
+        File curDir = new File(ed, "current");
+        LOG.info("Files in " + curDir + ":\n  " +
+            Joiner.on("\n  ").join(curDir.list()));
+        // Verify that the first edits file got finalized
+        File originalEdits = new File(curDir,
+                                      NNStorage.getInProgressEditsFileName(0));
+        assertFalse(originalEdits.exists());
+        File finalizedEdits = new File(curDir,
+            NNStorage.getFinalizedEditsFileName(0,6));
+        assertTrue("Finalized edits: " + finalizedEdits + " does not exist",
+            finalizedEdits.exists());
+        assertTrue(finalizedEdits.length() > Integer.SIZE/Byte.SIZE);
+
+        assertTrue(new File(ed, "current/"
+                       + NNStorage.getInProgressEditsFileName(7)).exists());
       }
-      admin = new DFSAdmin(conf);
-      args = new String[]{"-saveNamespace", "force"};
-      try {
-        admin.run(args);
-      } catch (Exception e) {
-        throw new IOException(e);
+      
+      Collection<File> imageDirs = cluster.getNameDirs(0);
+      for (File imageDir : imageDirs) {
+        File savedImage = new File(imageDir, "current/"
+                                   + NNStorage.getImageFileName(6));
+        assertTrue("Should have saved image at " + savedImage,
+            savedImage.exists());        
       }
 
       // restart cluster and verify file exists
@@ -774,8 +817,188 @@ public void testSaveNamespace() throws IOException {
       fs = (DistributedFileSystem)(cluster.getFileSystem());
       checkFile(fs, file, replication);
     } finally {
-      if(fs != null) fs.close();
-      if(cluster!= null) cluster.shutdown();
+      try {
+        if(fs != null) fs.close();
+        if(cluster!= null) cluster.shutdown();
+      } catch (Throwable t) {
+        System.out.println("Failed to shutdown" + t);
+      }
+    }
+  }
+  
+  /**
+   * Test that the primary NN will not serve any files to a 2NN who doesn't
+   * share its namespace ID, and also will not accept any files from one.
+   */
+  public void testNamespaceVerifiedOnFileTransfer() throws Exception {
+    MiniDFSCluster cluster = null;
+    
+    Configuration conf = new Configuration();
+    try {
+      cluster = new MiniDFSCluster(conf, numDatanodes, true, null);
+      cluster.waitActive();
+      
+      NameNode nn = cluster.getNameNode();
+      String fsName = NameNode.getHostPortString(
+          cluster.getNameNode().getHttpAddress());
+
+      // Make a finalized log on the server side. 
+      nn.rollEditLog();      
+      NNStorage dstStorage = Mockito.mock(NNStorage.class);
+      Collection<URI> dirs = new ArrayList<URI>();
+      dirs.add(new URI("file:/tmp/dir"));     
+      dstStorage.setStorageDirectories(dirs, dirs);
+      Mockito.doReturn(new File[] { new File("/wont-be-written")})
+        .when(dstStorage).getFiles(
+            Mockito.<NameNodeDirType>anyObject(), Mockito.anyString());
+      Mockito.doReturn(new StorageInfo(1, 1, 1).toColonSeparatedString())
+        .when(dstStorage).toColonSeparatedString();
+      FSImage dstImage = Mockito.mock(FSImage.class);
+      dstImage.storage = dstStorage;
+
+      File[] dstFiles = new File[1];
+      dstFiles[0] = new File("/tmp/temp");
+      
+      Mockito.doReturn(new File[] { new File("/wont-be-written")})
+      .when(dstStorage).getFiles(Mockito.<NameNodeDirType>anyObject(), Mockito.anyString());
+
+      try {
+        TransferFsImage.downloadImageToStorage(fsName, 0L, dstImage.storage, false);
+        fail("Storage info was not verified");
+      } catch (IOException ioe) {
+        String msg = StringUtils.stringifyException(ioe);
+        assertTrue(msg, msg.contains("but the secondary expected"));
+      }
+
+      try {
+        TransferFsImage.downloadEditsToStorage(fsName, new RemoteEditLog(), dstImage.storage);
+        fail("Storage info was not verified");
+      } catch (IOException ioe) {
+        String msg = StringUtils.stringifyException(ioe);
+        assertTrue(msg, msg.contains("but the secondary expected"));
+      }
+
+      try {
+        InetSocketAddress fakeAddr = new InetSocketAddress(1);
+        TransferFsImage.uploadImageFromStorage(fsName, fakeAddr.getHostName(), 
+            fakeAddr.getPort(), dstImage.storage, 0);
+        fail("Storage info was not verified");
+      } catch (IOException ioe) {
+        String msg = StringUtils.stringifyException(ioe);
+        assertTrue(msg, msg.contains("but the secondary expected"));
+      }
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }  
+  }
+  
+  /* Test case to test CheckpointSignature */
+  public void testCheckpointSignature() throws IOException {
+
+    MiniDFSCluster cluster = null;
+    Configuration conf = new Configuration();
+
+    cluster = new MiniDFSCluster(conf, numDatanodes, true, null);
+    NameNode nn = cluster.getNameNode();
+
+    SecondaryNameNode secondary = startSecondaryNameNode(conf);
+    // prepare checkpoint image
+    secondary.doCheckpoint();
+    CheckpointSignature sig = nn.rollEditLog();
+    // manipulate the CheckpointSignature fields
+    sig.namespaceID--;
+
+    try {
+      sig.validateStorageInfo(nn.getFSImage().storage); // this should fail
+      assertTrue("This test is expected to fail.", false);
+    } catch (Exception ignored) {
+    }
+
+    secondary.shutdown();
+    cluster.shutdown();
+  }
+  
+  /**
+   * Checks that an IOException in NNStorage.writeTransactionIdFile is handled
+   * correctly (by removing the storage directory)
+   * See https://issues.apache.org/jira/browse/HDFS-2011
+   */
+  public void testWriteTransactionIdHandlesIOE() throws Exception {
+    LOG.info("Check IOException handled correctly by writeTransactionIdFile");
+    ArrayList<URI> fsImageDirs = new ArrayList<URI>();
+    ArrayList<URI> editsDirs = new ArrayList<URI>();
+    File filePath1 =
+      new File(System.getProperty("test.build.data","/tmp"), "storageDirToCheck1");
+    File filePath2 =
+        new File(System.getProperty("test.build.data","/tmp"), "storageDirToCheck2");
+    assertTrue("Couldn't create directory storageDirToCheck1",
+               filePath1.exists() || filePath1.mkdirs());
+    assertTrue("Couldn't create directory storageDirToCheck2",
+              filePath2.exists() || filePath2.mkdirs());
+    
+    File current1 = new File(filePath1, "current");
+    File current2 = new File(filePath2, "current");
+    
+    assertTrue("Couldn't create directory storageDirToCheck1/current",
+        current1.exists() || current1.mkdirs());
+    assertTrue("Couldn't create directory storageDirToCheck2/current",
+        current2.exists() || current2.mkdirs());
+    
+    fsImageDirs.add(filePath1.toURI());
+    editsDirs.add(filePath1.toURI());
+    fsImageDirs.add(filePath2.toURI());
+    editsDirs.add(filePath2.toURI());
+    NNStorage nnStorage = new NNStorage(new Configuration(),
+      fsImageDirs, editsDirs);
+    try {
+      assertTrue(
+          "List of storage directories didn't have storageDirToCheck1.",
+          nnStorage.getEditsDirectories().toString()
+              .indexOf("storageDirToCheck1") != -1);
+      assertTrue(
+          "List of storage directories didn't have storageDirToCheck2.",
+          nnStorage.getEditsDirectories().toString()
+              .indexOf("storageDirToCheck2") != -1);
+      assertTrue("List of removed storage directories wasn't empty", nnStorage
+          .getRemovedStorageDirs().isEmpty());
+    } finally {
+      // Delete storage directory to cause IOException in writeTransactionIdFile
+      FileUtil.fullyDelete(filePath1);
+    }
+    // Just call writeTransactionIdFile using any random number
+    nnStorage.writeTransactionIdFileToStorage(1);
+    List<StorageDirectory> listRsd = nnStorage.getRemovedStorageDirs();
+    assertTrue("Removed directory wasn't what was expected",
+               listRsd.size() > 0 && listRsd.get(listRsd.size() - 1).getRoot().
+               toString().indexOf("storageDirToCheck1") != -1);
+  }
+  
+  class TestCheckpointInjectionHandler extends InjectionHandler {
+
+    private InjectionEvent simulationPoint = null;
+    
+    void setSimulationPoint(InjectionEvent p) {
+      simulationPoint = p;
+    }
+    
+    void clearHandler() {
+      simulationPoint = null;
+    }
+
+    protected void _processEventIO(InjectionEvent event, Object... args)
+        throws IOException {
+      if (event == simulationPoint) {
+          throw new IOException("Simulating failure " + event);
+      }
+    }
+    
+    protected boolean _falseCondition(InjectionEvent event, Object... args) {
+      if (event == simulationPoint){
+        return true;
+      }
+      return false;
     }
   }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestCorruptFilesJsp.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestCorruptFilesJsp.java
index 817f2122..838c9b49 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestCorruptFilesJsp.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestCorruptFilesJsp.java
@@ -79,9 +79,8 @@ public void testCorruptFilesJsp() throws Exception {
 
       // Now corrupt all the files except for the last one
       for (int idx = 0; idx < filepaths.length - 1; idx++) {
-        String blockName = DFSTestUtil.getFirstBlock(fs, filepaths[idx])
-            .getBlockName();
-        TestDatanodeBlockScanner.corruptReplica(blockName, 0, cluster);
+        TestDatanodeBlockScanner.corruptReplica(
+            DFSTestUtil.getFirstBlock(fs, filepaths[idx]), 0, cluster);
 
         // read the file so that the corrupt block is reported to NN
         FSDataInputStream in = fs.open(filepaths[idx]);
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestDeprioritizeSlowDatanodes.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestDeprioritizeSlowDatanodes.java
new file mode 100644
index 00000000..68d81505
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestDeprioritizeSlowDatanodes.java
@@ -0,0 +1,177 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.namenode.DatanodeDescriptor;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.security.UnixUserGroupInformation;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class TestDeprioritizeSlowDatanodes {
+
+  private static MiniDFSCluster cluster;
+  private static Configuration conf;
+  private static final int BLOCK_SIZE = 1024;
+  private static final int BLOCKS = 10;
+  private static final int FILE_SIZE = BLOCKS * BLOCK_SIZE;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    conf = new Configuration();
+    conf.setInt("dfs.block.size", BLOCK_SIZE);
+    conf.setLong("dfs.heartbeat.timeout.millis", 10000); // 10 sec
+    System.setProperty("test.build.data", "build/test/data1");
+    cluster = new MiniDFSCluster(conf, 6, true, new String[] { "/r1", "/r1",
+        "/r1", "/r2", "/r2", "/r2" }, new String[] { "h1", "h2", "h3", "h4",
+        "h5", "h6" });
+    cluster.waitActive(true);
+    updateDatanodeMap(cluster);
+  }
+  
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    cluster.shutdown();
+  }
+
+  private static DatanodeID createDataNodeID(DataNode dn) {
+    String ipAddr = dn.getSelfAddr().getAddress().getHostAddress();
+    int port = dn.getPort();
+    String storageID = dn.getStorageID();
+
+    DatanodeID dnId = new DatanodeID(ipAddr + ":" + port);
+    dnId.setStorageID(storageID);
+    return dnId;
+  }
+
+  /**
+   * Does a lot of hacks to change namenode and datanode datastructures to
+   * identify datanodes by the machine name rather than the IP address. This is
+   * done since we can give each datanode a different hostname in a unit test
+   * but not a different ip address.
+   * 
+   * @param cluster
+   *          the {@link MiniDFSCluster} to operate on
+   * @throws Exception
+   */
+  private static void updateDatanodeMap(MiniDFSCluster cluster)
+      throws Exception {
+    FSNamesystem namesystem = cluster.getNameNode().namesystem;
+    for (DataNode node : cluster.getDataNodes()) {
+      // Get old descriptor.
+      DatanodeID dnId = createDataNodeID(node);
+      DatanodeDescriptor dnDs = namesystem.getDatanode(dnId);
+
+      // Create new id and descriptor.
+      DatanodeID newId = new DatanodeID(node.getMachineName(),
+          dnDs.getStorageID(), dnDs.getInfoPort(), dnDs.getIpcPort());
+      DatanodeDescriptor newDS = new DatanodeDescriptor(newId,
+          dnDs.getNetworkLocation(), dnDs.getHostName(), dnDs.getCapacity(),
+          dnDs.getDfsUsed(), dnDs.getRemaining(), dnDs.getNamespaceUsed(),
+          dnDs.getXceiverCount());
+      
+      newDS.isAlive = true;
+      // Overwrite NN maps with new descriptor.
+      namesystem.writeLock();
+      namesystem.clusterMap.remove(dnDs);
+      namesystem.resolveNetworkLocation(newDS);
+      namesystem.unprotectedAddDatanode(newDS);
+      namesystem.clusterMap.add(newDS);
+      namesystem.writeUnlock();
+      // Overwrite DN map with new registration.
+      node.setRegistrationName(node.getMachineName());
+    }
+  }
+  
+  @Test
+  public void testDepriotizeSlowDatanodes() throws Exception {
+    // Create source file.
+    String fileName = "/testDepriotizeSlowDatanodes";
+    DFSTestUtil.createFile(cluster.getFileSystem(), new Path(fileName),
+        (long) FILE_SIZE, (short) 3, (long) 0);
+
+    // Create RPC connections
+    ClientProtocol srcNamenode = DFSClient.createRPCNamenode(
+        NameNode.getAddress(cluster.getFileSystem().getUri().getAuthority()),
+        conf, UnixUserGroupInformation.login(conf, true)).getProxy();
+
+    // Create destination file.
+    LocatedBlocks lbksBeforeKill = srcNamenode.getBlockLocations(fileName, 0,
+        Long.MAX_VALUE);
+    LocatedBlock blkBeforeKill = lbksBeforeKill.get(0); // choose one block
+    DatanodeInfo[] locsBeforeKill = blkBeforeKill.getLocations();
+    DatanodeInfo toKill = locsBeforeKill[0];
+    
+    // kill datanode
+    Thread.sleep(10000); // 10 sec
+    
+    LocatedBlocks lbksAfterKill = srcNamenode.getBlockLocations(fileName, 0,
+        Long.MAX_VALUE);
+    LocatedBlock blkAfterKill = lbksAfterKill.get(0); // choose one block
+    DatanodeInfo[] locsAfterKill = blkAfterKill.getLocations();
+    
+    assert(locsAfterKill.length == locsBeforeKill.length);
+    assert(locsAfterKill.length > 1);
+    // assert the the killed node is now at the bottom
+    assert(locsAfterKill[locsAfterKill.length - 1].equals(toKill));
+    
+    fileName = "/testDepriotizeSlowDatanodes-2";
+    DFSTestUtil.createFile(cluster.getFileSystem(), new Path(fileName),
+        (long) FILE_SIZE, (short) 3, (long) 0);
+    LocatedBlocks lbks = srcNamenode.getBlockLocations(fileName, 0,
+        Long.MAX_VALUE);
+    for (LocatedBlock lbk : lbks.getLocatedBlocks()) {
+      DatanodeInfo[] locs = lbk.getLocations();
+      for (DatanodeInfo dstloc : locs) {
+        assert(!dstloc.equals(toKill));
+      }
+    }
+    
+    // assert that toKill was still not decommissioned
+    // A failed assertion does not signify a bug. It just
+    // means that our test may not have tested the correct 
+    // behavior because the dataNode was considered dead by NN.
+    DatanodeInfo[] deadDataNodes = 
+        srcNamenode.getDatanodeReport(DatanodeReportType.DEAD);
+    assert(!Arrays.<DatanodeInfo>asList(deadDataNodes).contains(toKill));
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
index 7a2e04cd..d3f712f8 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
@@ -19,153 +19,1054 @@
 
 import junit.framework.TestCase;
 import java.io.*;
+import java.net.URI;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.Random;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.ChecksumException;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.*;
 
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.io.ArrayWritable;
-import org.apache.hadoop.io.UTF8;
-import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
 import org.apache.hadoop.hdfs.server.namenode.EditLogFileInputStream;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeDirType;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeFile;
+import org.apache.hadoop.hdfs.server.namenode.JournalStream.JournalType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage;
+
+import org.apache.hadoop.test.GenericTestUtils;
+import org.apache.hadoop.util.StringUtils;
+import org.apache.log4j.Level;
+
+
+import org.mockito.Mockito;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.io.Files;
+
 
 /**
  * This class tests the creation and validation of a checkpoint.
  */
 public class TestEditLog extends TestCase {
-  static final int numDatanodes = 1;
+  
+  static {
+    ((Log4JLogger)FSEditLog.LOG).getLogger().setLevel(Level.ALL);
+  }
+  
+  static final Log LOG = LogFactory.getLog(TestEditLog.class);
+  
+  static final int NUM_DATA_NODES = 0;
+
+  // This test creates NUM_THREADS threads and each thread does
+  // 2 * NUM_TRANSACTIONS Transactions concurrently.
+  static final int NUM_TRANSACTIONS = 100;
+  static final int NUM_THREADS = 100;
+  
+  static final File TEST_DIR = new File(
+    System.getProperty("test.build.data","build/test/data"));
 
-  // This test creates numThreads threads and each thread does
-  // 3 * numberTransactions Transactions concurrently.
-  int numberTransactions = 100;
-  int numThreads = 100;
-  static final Object transactionLock = new Object();
+  /** An edits log with 3 edits from 0.20 - the result of
+   * a fresh namesystem followed by hadoop fs -touchz /myfile */
+  static final byte[] HADOOP20_SOME_EDITS =
+    StringUtils.hexStringToByte((
+        "ffff ffed 0a00 0000 0000 03fa e100 0000" +
+        "0005 0007 2f6d 7966 696c 6500 0133 000d" +
+        "3132 3932 3331 3634 3034 3138 3400 0d31" +
+        "3239 3233 3136 3430 3431 3834 0009 3133" +
+        "3432 3137 3732 3800 0000 0004 746f 6464" +
+        "0a73 7570 6572 6772 6f75 7001 a400 1544" +
+        "4653 436c 6965 6e74 5f2d 3136 3136 3535" +
+        "3738 3931 000b 3137 322e 3239 2e35 2e33" +
+        "3209 0000 0005 0007 2f6d 7966 696c 6500" +
+        "0133 000d 3132 3932 3331 3634 3034 3138" +
+        "3400 0d31 3239 3233 3136 3430 3431 3834" +
+        "0009 3133 3432 3137 3732 3800 0000 0004" +
+        "746f 6464 0a73 7570 6572 6772 6f75 7001" +
+        "a4ff 0000 0000 0000 0000 0000 0000 0000"
+    ).replace(" ",""));
 
+  
+  static final byte TRAILER_BYTE = FSEditLogOpCodes.OP_INVALID.getOpCode();
+
+  private static final int CHECKPOINT_ON_STARTUP_MIN_TXNS = 100;
   //
   // an object that does a bunch of transactions
   //
   static class Transactions implements Runnable {
+    private int threadid;
     FSNamesystem namesystem;
     int numTransactions;
     short replication = 3;
     long blockSize = 64;
 
-    Transactions(FSNamesystem ns, int num) {
+    Transactions(FSNamesystem ns, int num, int id) {
       namesystem = ns;
       numTransactions = num;
+      threadid = id;
     }
 
     // add a bunch of transactions.
     public void run() {
-      PermissionStatus p = namesystem.createFsOwnerPermissions(new FsPermission((short)0777));
+      PermissionStatus p = namesystem.createFsOwnerPermissions(
+                                          new FsPermission((short)0777));
       FSEditLog editLog = namesystem.getEditLog();
 
       for (int i = 0; i < numTransactions; i++) {
+        INodeFileUnderConstruction inode = new INodeFileUnderConstruction(
+                            p, replication, blockSize, 0, "", "", null);
         try {
-          String filename = "/filename" + i;
-          INodeFileUnderConstruction inode = new INodeFileUnderConstruction(
-                              p, replication, blockSize, 0, "", "", null);
-          // Make sure we don't have multiple threads logging open, close, open.
-          synchronized(transactionLock) {
-            editLog.logOpenFile(filename, inode);
-            editLog.logCloseFile(filename, inode);
-            editLog.logDelete(filename, 0);
-          }
+          editLog.logOpenFile("/filename" + threadid + "-" + i, inode);
+          editLog.logCloseFile("/filename" + threadid + "-" + i, inode);
+          editLog.logDelete("/filename" + threadid + "-" + i, 0);
           editLog.logSync();
         } catch (IOException e) {
-          System.out.println("Transaction " + i + " encountered exception " +
-                             e);
+          throw new RuntimeException(e);
         }
       }
     }
   }
 
+  /**
+   * Test case for an empty edit log from a prior version of Hadoop.
+   */
+  public void testPreTxIdEditLogNoEdits() throws Exception {
+    FSNamesystem namesys = Mockito.mock(FSNamesystem.class);
+    namesys.dir = Mockito.mock(FSDirectory.class);
+    int numEdits = testLoad(
+        StringUtils.hexStringToByte("ffffffed"), // just version number
+        namesys);
+    assertEquals(0, numEdits);
+  }
+  
+  /**
+   * Test case for loading a very simple edit log from a format
+   * prior to the inclusion of edit transaction IDs in the log.
+   */
+  public void testPreTxidEditLogWithEdits() throws Exception {
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+
+    try {
+      cluster = new MiniDFSCluster(conf, 0, true, null);
+      cluster.waitActive();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+
+      int numEdits = testLoad(HADOOP20_SOME_EDITS, namesystem);
+      assertEquals(3, numEdits);
+      // Sanity check the edit
+      HdfsFileStatus fileInfo = namesystem.getHdfsFileInfo("/myfile");
+      assertEquals("supergroup", fileInfo.getGroup());
+      assertEquals(3, fileInfo.getReplication());
+    } finally {
+      if (cluster != null) { cluster.shutdown(); }
+    }
+  }
+  
+  private int testLoad(byte[] data, FSNamesystem namesys) throws IOException {
+    FSEditLogLoader loader = new FSEditLogLoader(namesys);
+    return loader.loadFSEdits(new EditLogByteInputStream(data), 0);
+  }
+
+  /**
+   * Simple test for writing to and rolling the edit log.
+   */
+  public void testSimpleEditLog() throws IOException {
+    // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
+    try {
+      cluster = new MiniDFSCluster(conf, 0, true, null);
+      cluster.waitActive();
+      fileSys = cluster.getFileSystem();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+      FSImage fsimage = namesystem.getFSImage();
+      final FSEditLog editLog = fsimage.getEditLog();
+      
+      assertExistsInStorageDirs(
+          cluster, NameNodeDirType.EDITS, 
+          NNStorage.getInProgressEditsFileName(0));
+      
+
+      editLog.logSetReplication("fakefile", (short) 1);
+      editLog.logSync();
+      
+      editLog.rollEditLog();
+
+      assertExistsInStorageDirs(
+          cluster, NameNodeDirType.EDITS,
+          NNStorage.getFinalizedEditsFileName(0,2));
+      assertExistsInStorageDirs(
+          cluster, NameNodeDirType.EDITS,
+          NNStorage.getInProgressEditsFileName(3));
+
+      
+      editLog.logSetReplication("fakefile", (short) 2);
+      editLog.logSync();
+      
+      editLog.close();
+    } finally {
+      if(fileSys != null) fileSys.close();
+      if(cluster != null) cluster.shutdown();
+    }
+  }
+
   /**
    * Tests transaction logging in dfs.
    */
-  public void testEditLog() throws IOException {
+  public void testMultiThreadedEditLog() throws IOException {
+    testEditLog(2048);
+    // force edit buffer to automatically sync on each log of edit log entry
+    testEditLog(1);
+  }
+  
+  
+  private void assertExistsInStorageDirs(MiniDFSCluster cluster,
+      NameNodeDirType dirType,
+      String filename) {
+    NNStorage storage = cluster.getNameNode().getNamesystem().getFSImage().storage;
+    for (StorageDirectory sd : storage.dirIterable(dirType)) {
+      File f = new File(sd.getCurrentDir(), filename);
+      assertTrue("Expect that " + f + " exists", f.exists());
+    }
+  }
+  
+  /**
+   * Test edit log with different initial buffer size
+   * 
+   * @param initialSize initial edit log buffer size
+   * @throws IOException
+   */
+  private void testEditLog(int initialSize) throws IOException {
 
     // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
 
-    Collection<File> namedirs = null;
-    Collection<File> editsdirs = null;
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+      cluster.waitActive();
+      fileSys = cluster.getFileSystem();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+  
+      for (Iterator<File> it = cluster.getNameDirs(0).iterator(); it.hasNext(); ) {
+        URI uri = it.next().toURI();
+        File dir = new File(uri);
+        System.out.println(dir);
+      }
+  
+      FSImage fsimage = namesystem.getFSImage();
+  
+      // set small size of flush buffer
+      FSEditLog.setBufferCapacity(initialSize);
+      
+      // Roll log so new output buffer size takes effect
+      // we should now be writing to edits_inprogress_2
+      fsimage.rollEditLog();
+    
+      // Create threads and make them run transactions concurrently.
+      Thread threadId[] = new Thread[NUM_THREADS];
+      for (int i = 0; i < NUM_THREADS; i++) {
+        Transactions trans = new Transactions(namesystem, NUM_TRANSACTIONS, i);
+        threadId[i] = new Thread(trans, "TransactionThread-" + i);
+        threadId[i].start();
+      }
+  
+      // wait for all transactions to get over
+      for (int i = 0; i < NUM_THREADS; i++) {
+        try {
+          threadId[i].join();
+        } catch (InterruptedException e) {
+          i--;      // retry 
+        }
+      } 
+      
+      // Roll another time to finalize edits_inprogress_3
+      fsimage.rollEditLog();
+      
+      long expectedTxns = (NUM_THREADS * 3 * NUM_TRANSACTIONS) + 2; // +2 for start/end txns
+   
+      // Verify that we can read in all the transactions that we have written.
+      // If there were any corruptions, it is likely that the reading in
+      // of these transactions will throw an exception.
+      //
+      for (Iterator<StorageDirectory> it = 
+              fsimage.storage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
+        FSEditLogLoader loader = new FSEditLogLoader(namesystem);
+        
+        File editFile = NNStorage.getFinalizedEditsFile(it.next(), 2,
+            2 + expectedTxns - 1);
+        assertTrue("Expect " + editFile + " exists", editFile.exists());
+        
+        System.out.println("Verifying file: " + editFile);
+        int numEdits = loader.loadFSEdits(
+            new EditLogFileInputStream(editFile), 1);
+        int numLeases = namesystem.leaseManager.countLease();
+        System.out.println("Number of outstanding leases " + numLeases);
+        assertEquals(0, numLeases);
+        assertTrue("Verification for " + editFile + " failed. " +
+                   "Expected " + expectedTxns + " transactions. "+
+                   "Found " + numEdits + " transactions.",
+                   numEdits == expectedTxns);
+  
+      }
+    } finally {
+      try {
+        if(fileSys != null) fileSys.close();
+        if(cluster != null) cluster.shutdown();
+      } catch (Throwable t) {
+        LOG.error("Couldn't shut down cleanly", t);
+      }
+    }
+  }
+
+  private void doLogEdit(ExecutorService exec, final FSEditLog log,
+    final String filename) throws Exception
+  {
+    exec.submit(new Callable<Void>() {
+      public Void call() {
+        log.logSetReplication(filename, (short)1);
+        return null;
+      }
+    }).get();
+  }
+  
+  private void doCallLogSync(ExecutorService exec, final FSEditLog log)
+    throws Exception
+  {
+    exec.submit(new Callable<Void>() {
+      public Void call() throws Exception {
+        log.logSync();
+        return null;
+      }
+    }).get();
+  }
+
+  private void doCallLogSyncAll(ExecutorService exec, final FSEditLog log)
+    throws Exception
+  {
+    exec.submit(new Callable<Void>() {
+      public Void call() throws Exception {
+        log.logSyncAll();
+        return null;
+      }
+    }).get();
+  }
+
+  public void testSyncBatching() throws Exception {
+    // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
+    ExecutorService threadA = Executors.newSingleThreadExecutor();
+    ExecutorService threadB = Executors.newSingleThreadExecutor();
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+      cluster.waitActive();
+      fileSys = cluster.getFileSystem();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+
+      FSImage fsimage = namesystem.getFSImage();
+      final FSEditLog editLog = fsimage.getEditLog();
+
+      assertEquals("should start with only the BEGIN_LOG_SEGMENT txn synced",
+        0, editLog.getSyncTxId());
+      
+      // Log an edit from thread A
+      doLogEdit(threadA, editLog, "thread-a 1");
+      assertEquals("logging edit without syncing should do not affect txid",
+        0, editLog.getSyncTxId());
+
+      // Log an edit from thread B
+      doLogEdit(threadB, editLog, "thread-b 1");
+      assertEquals("logging edit without syncing should do not affect txid",
+        0, editLog.getSyncTxId());
+
+      // Now ask to sync edit from B, which should sync both edits.
+      doCallLogSync(threadB, editLog);
+      assertEquals("logSync from second thread should bump txid up to 2",
+        2, editLog.getSyncTxId());
+
+      // Now ask to sync edit from A, which was already batched in - thus
+      // it should increment the batch count metric
+      doCallLogSync(threadA, editLog);
+      assertEquals("logSync from first thread shouldn't change txid",
+        2, editLog.getSyncTxId());
+
+    } finally {
+      threadA.shutdown();
+      threadB.shutdown();
+      if(fileSys != null) fileSys.close();
+      if(cluster != null) cluster.shutdown();
+    }
+  }
+  
+  /**
+   * Test what happens with the following sequence:
+   *
+   *  Thread A writes edit
+   *  Thread B calls logSyncAll
+   *           calls close() on stream
+   *  Thread A calls logSync
+   *
+   * This sequence is legal and can occur if enterSafeMode() is closely
+   * followed by saveNamespace.
+   */
+  public void testBatchedSyncWithClosedLogs() throws Exception {
+    // start a cluster 
     Configuration conf = new Configuration();
-    MiniDFSCluster cluster = new MiniDFSCluster(0, conf, numDatanodes, 
-                                                true, true, null, null);
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
+    ExecutorService threadA = Executors.newSingleThreadExecutor();
+    ExecutorService threadB = Executors.newSingleThreadExecutor();
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+      cluster.waitActive();
+      fileSys = cluster.getFileSystem();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+
+      FSImage fsimage = namesystem.getFSImage();
+      final FSEditLog editLog = fsimage.getEditLog();
+
+      // Log an edit from thread A
+      doLogEdit(threadA, editLog, "thread-a 1");
+      assertEquals("logging edit without syncing should do not affect txid",
+        0, editLog.getSyncTxId());
+
+      // logSyncAll in Thread B
+      doCallLogSyncAll(threadB, editLog);
+      assertEquals("logSyncAll should sync thread A's transaction",
+        1, editLog.getSyncTxId());
+
+      // Close edit log
+      editLog.close();
+
+      // Ask thread A to finish sync (which should be a no-op)
+      doCallLogSync(threadA, editLog);
+    } finally {
+      threadA.shutdown();
+      threadB.shutdown();
+      if(fileSys != null) fileSys.close();
+      if(cluster != null) cluster.shutdown();
+    }
+  }
+  
+  public void testEditChecksum() throws Exception {
+    // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
+    cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
     cluster.waitActive();
-    FileSystem fileSys = cluster.getFileSystem();
+    fileSys = cluster.getFileSystem();
     final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
 
-    int numdirs = 0;
+    FSImage fsimage = namesystem.getFSImage();
+    final FSEditLog editLog = fsimage.getEditLog();
+    fileSys.mkdirs(new Path("/tmp"));
+    StorageDirectory sd = fsimage.storage.dirIterator(NameNodeDirType.EDITS).next();
+    editLog.close();
+    cluster.shutdown();
+
+    File editFile = NNStorage.getFinalizedEditsFile(sd, 0, 2);
+    assertTrue(editFile.exists());
 
+    long fileLen = editFile.length();
+    System.out.println("File name: " + editFile + " len: " + fileLen);
+    RandomAccessFile rwf = new RandomAccessFile(editFile, "rw");
+    rwf.seek(fileLen-4); // seek to checksum bytes
+    int b = rwf.readInt();
+    rwf.seek(fileLen-4);
+    rwf.writeInt(b+1);
+    rwf.close();
+    
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, false, null);
+      fail("should not be able to start");
+    } catch (IOException e) {
+      // expected
+      assertEquals("Cause of exception should be ChecksumException",
+          e.getCause().getClass(), ChecksumException.class);
+    }
+  }
+
+  /**
+   * Test what happens if the NN crashes when it has has started but
+   * had no transactions written.
+   */
+  public void testCrashRecoveryNoTransactions() throws Exception {
+    testCrashRecovery(0);
+  }
+  
+  /**
+   * Test what happens if the NN crashes when it has has started and
+   * had a few transactions written
+   */
+  public void testCrashRecoveryWithTransactions() throws Exception {
+    testCrashRecovery(150);
+  }
+  
+  /**
+   * Do a test to make sure the edit log can recover edits even after
+   * a non-clean shutdown. This does a simulated crash by copying over
+   * the edits directory while the NN is still running, then shutting it
+   * down, and restoring that edits directory.
+   */
+  private void testCrashRecovery(int numTransactions) throws Exception {
+    MiniDFSCluster cluster = null;
+    Configuration conf = new Configuration();
+    conf.setInt("fs.checkpoint.txns",
+        CHECKPOINT_ON_STARTUP_MIN_TXNS);
+    
     try {
-      namedirs = cluster.getNameDirs();
-      editsdirs = cluster.getNameEditsDirs();
+        LOG.info("\n===========================================\n" +
+                 "Starting empty cluster");
+        
+        cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+        cluster.waitActive();
+        
+        FileSystem fs = cluster.getFileSystem();
+        for (int i = 0; i < numTransactions; i++) {
+          fs.mkdirs(new Path("/test" + i));
+        }        
+        
+        // Directory layout looks like:
+        // test/data/dfs/nameN/current/{fsimage_N,edits_...}
+        File nameDir = new File(cluster.getNameDirs(0).iterator().next().getPath());
+        File dfsDir = nameDir.getParentFile();
+        assertEquals(dfsDir.getName(), "dfs"); // make sure we got right dir
+        
+        LOG.info("Copying data directory aside to a hot backup");
+        File backupDir = new File(dfsDir.getParentFile(), "dfs.backup-while-running");
+        LOG.info("copying: " + dfsDir + " to: " + backupDir);
+        if(backupDir.exists()) {
+          FileUtil.fullyDelete(backupDir);
+        }
+        backupDir.mkdir();
+        FileUtils.copyDirectory(dfsDir, backupDir);
+
+        LOG.info("Shutting down cluster #1");
+        cluster.shutdown();
+        cluster = null;
+        
+        // Now restore the backup
+        FileUtils.deleteDirectory(dfsDir);
+        dfsDir.mkdir();
+        backupDir.renameTo(dfsDir);
+        
+        // Directory layout looks like:
+        // test/data/dfs/nameN/current/{fsimage_N,edits_...}
+        File currentDir = new File(nameDir, "current");
+
+        // We should see the file as in-progress
+        File editsFile = new File(currentDir,
+            NNStorage.getInProgressEditsFileName(0));
+        assertTrue("Edits file " + editsFile + " should exist", editsFile.exists());        
+        
+        File imageFile = FSImageTestUtil.findNewestImageFile(
+            currentDir.getAbsolutePath());
+        assertNotNull("No image found in " + nameDir, imageFile);
+        assertEquals(NNStorage.getImageFileName(-1), imageFile.getName());
+        
+        // Try to start a new cluster
+        LOG.info("\n===========================================\n" +
+        "Starting same cluster after simulated crash");
+        cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, false, null);
+        cluster.waitActive();
+        
+        // We should still have the files we wrote prior to the simulated crash
+        fs = cluster.getFileSystem();
+        for (int i = 0; i < numTransactions; i++) {
+          assertTrue(fs.exists(new Path("/test" + i)));
+        }
+
+        long expectedTxId;
+        if (numTransactions > CHECKPOINT_ON_STARTUP_MIN_TXNS) {
+          // It should have saved a checkpoint on startup since there
+          // were more unfinalized edits than configured
+          expectedTxId = numTransactions;
+        } else {
+          // otherwise, it shouldn't have made a checkpoint
+          expectedTxId = -1;
+        }
+        imageFile = FSImageTestUtil.findNewestImageFile(
+            currentDir.getAbsolutePath());
+        assertNotNull("No image found in " + nameDir, imageFile);
+        assertEquals(NNStorage.getImageFileName(expectedTxId),
+                     imageFile.getName());
+        
+        // Started successfully. Shut it down and make sure it can restart.
+        cluster.shutdown();    
+        cluster = null;
+        
+        cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, false, null);
+        cluster.waitActive();
     } finally {
-      fileSys.close();
-      cluster.shutdown();
+      if (cluster != null) {
+        cluster.shutdown();
+      }
     }
+  }
+  
+  public void testCrashRecoveryEmptyLogOneDir() throws Exception {
+    doTestCrashRecoveryEmptyLog(false, true);
+  }
+  
+  public void testCrashRecoveryEmptyLogBothDirs() throws Exception {
+    doTestCrashRecoveryEmptyLog(true, true);
+  }
 
-    for (Iterator it = namedirs.iterator(); it.hasNext(); ) {
-      File dir = (File)it.next();
-      System.out.println(dir);
-      numdirs++;
+  public void testCrashRecoveryEmptyLogOneDirNoUpdateSeenTxId() 
+      throws Exception {
+    doTestCrashRecoveryEmptyLog(false, false);
+  }
+  
+  public void testCrashRecoveryEmptyLogBothDirsNoUpdateSeenTxId()
+      throws Exception {
+    doTestCrashRecoveryEmptyLog(true, false);
+  }
+
+  /**
+   * Test that the NN handles the corruption properly
+   * after it crashes just after creating an edit log
+   * (ie before writing START_LOG_SEGMENT). In the case
+   * that all logs have this problem, it should mark them
+   * as corrupt instead of trying to finalize them.
+   * 
+   * @param inBothDirs if true, there will be a truncated log in
+   * both of the edits directories. If false, the truncated log
+   * will only be in one of the directories. In both cases, the
+   * NN should fail to start up, because it's aware that txid 3
+   * was reached, but unable to find a non-corrupt log starting there.
+   * @param updateTransactionIdFile if true update the seen_txid file.
+   * If false, the it will not be updated. This will simulate a case 
+   * where the NN crashed between creating the new segment and updating
+   * seen_txid. 
+   */
+  private void doTestCrashRecoveryEmptyLog(boolean inBothDirs, 
+                                           boolean updateTransactionIdFile) 
+      throws Exception {
+    // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+    cluster.shutdown();
+    
+    Collection<File> editsDirs = cluster.getNameEditsDirs(0);
+    for (File f : editsDirs) {
+      URI uri = f.toURI();
+      File dir = new File(uri.getPath());
+      File currentDir = new File(dir, "current");
+      // We should start with only the finalized edits_1-2
+      GenericTestUtils.assertGlobEquals(currentDir, "edits_.*",
+          NNStorage.getFinalizedEditsFileName(0, 1));
+      // Make a truncated edits_3_inprogress
+      File log = new File(currentDir,
+          NNStorage.getInProgressEditsFileName(2));
+      NNStorage storage = new NNStorage(conf, 
+                                        Collections.<URI>emptyList(),
+                                        Lists.newArrayList(uri));
+      if (updateTransactionIdFile) {
+        storage.writeTransactionIdFileToStorage(2);
+      }
+      storage.close();
+
+      new EditLogFileOutputStream(log, null).create();
+      if (!inBothDirs) {
+        break;
+      }
     }
+    
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, false, null);
+      fail("Did not fail to start with all-corrupt logs");
+    } catch (IOException ioe) {
+      GenericTestUtils.assertExceptionContains(
+          "No non-corrupt logs for txid 2", ioe);
+    }
+    cluster.shutdown();
+  }
 
-    FSImage fsimage = namesystem.getFSImage();
-    FSEditLog editLog = fsimage.getEditLog();
+  
+  private static class EditLogByteInputStream extends EditLogInputStream {
+    private InputStream input;
+    private long len;
+    private int version;
+    private FSEditLogOp.Reader reader = null;
+    private FSEditLogLoader.PositionTrackingInputStream tracker = null;
 
-    // set small size of flush buffer
-    editLog.setBufferCapacity(2048);
-    editLog.close();
-    editLog.open();
+    public EditLogByteInputStream(byte[] data) throws IOException {
+      len = data.length;
+      input = new ByteArrayInputStream(data);
+
+      BufferedInputStream bin = new BufferedInputStream(input);
+      DataInputStream in = new DataInputStream(bin);      
+      tracker = new FSEditLogLoader.PositionTrackingInputStream(in);
+      in = new DataInputStream(tracker);  
+      version = EditLogFileInputStream.readLogVersion(in);           
+      reader = new FSEditLogOp.Reader(in, version);
+    }
   
-    // Create threads and make them run transactions concurrently.
-    Thread threadId[] = new Thread[numThreads];
-    for (int i = 0; i < numThreads; i++) {
-      Transactions trans = new Transactions(namesystem, numberTransactions);
-      threadId[i] = new Thread(trans, "TransactionThread-" + i);
-      threadId[i].start();
+    @Override
+    public long getFirstTxId() throws IOException {
+      return HdfsConstants.INVALID_TXID;
+    }
+    
+    @Override
+    public long getLastTxId() throws IOException {
+      return HdfsConstants.INVALID_TXID;
+    }
+  
+    @Override
+    public long length() throws IOException {
+      return len;
+    }
+  
+    @Override
+    public long getPosition() {
+      return tracker.getPos();
     }
 
-    // wait for all transactions to get over
-    for (int i = 0; i < numThreads; i++) {
-      try {
-        threadId[i].join();
-      } catch (InterruptedException e) {
-        i--;      // retry 
+    @Override
+    public FSEditLogOp readOp() throws IOException {
+      return reader.readOp();
+    }
+
+    @Override
+    public int getVersion() throws IOException {
+      return version;
+    }
+
+    @Override
+    public void close() throws IOException {
+      input.close();
+    }
+
+    @Override // JournalStream
+    public String getName() {
+      return "AnonEditLogByteInputStream";
+    }
+
+    @Override // JournalStream
+    public JournalType getType() {
+      return JournalType.FILE;
+    }
+
+    @Override
+    public void position(long position) throws IOException {
+    }
+
+    @Override
+    public void refresh(long position) throws IOException {
+    }
+
+    @Override
+    public long getReadChecksum() {
+      return 0;
+    }
+  }
+
+  public void testFailedOpen() throws Exception {
+    File logDir = new File(TEST_DIR, "testFailedOpen");
+    logDir.mkdirs();
+    FSEditLog log = FSImageTestUtil.createStandaloneEditLog(logDir);
+    try {
+      logDir.setWritable(false);
+      log.open();
+      fail("Did no throw exception on only having a bad dir");
+    } catch (IOException ioe) {
+      GenericTestUtils.assertExceptionContains(
+          "no journals successfully started", ioe);
+    } finally {
+      logDir.setWritable(true);
+      log.close();
+    }
+  }
+
+  /**
+   * Tests the getEditLogManifest function using mock storage for a number
+   * of different situations.
+   */
+  public void testEditLogManifestMocks() throws IOException {
+    NNStorage storage;
+    FSEditLog log;
+    // Simple case - different directories have the same
+    // set of logs, with an in-progress one at end
+    storage = mockStorageWithEdits(
+        "[1,100]|[101,200]|[201,]",
+        "[1,100]|[101,200]|[201,]");
+    log = new FSEditLog(storage);
+    assertEquals("[[1,100,true], [101,200,true], [201,201,false]]",
+        log.getEditLogManifest(1).toString());
+    assertEquals("[[101,200,true], [201,201,false]]",
+        log.getEditLogManifest(101).toString());
+
+    // Another simple case, different directories have different
+    // sets of files
+    storage = mockStorageWithEdits(
+        "[1,100]|[101,200]",
+        "[1,100]|[201,300]|[301,400]"); // nothing starting at 101
+    log = new FSEditLog(storage);
+    assertEquals("[[1,100,true], [101,200,true], [201,300,true], [301,400,true]]",
+        log.getEditLogManifest(1).toString());
+    
+    // Case where one directory has an earlier finalized log, followed
+    // by a gap. The returned manifest should start after the gap.
+    storage = mockStorageWithEdits(
+        "[1,100]|[301,400]", // gap from 101 to 300
+        "[301,400]|[401,500]");
+    log = new FSEditLog(storage);
+    assertEquals("[[301,400,true], [401,500,true]]",
+        log.getEditLogManifest(1).toString());
+    
+    // Case where different directories have different length logs
+    // starting at the same txid - should pick the longer one
+    storage = mockStorageWithEdits(
+        "[1,100]|[101,150]", // short log at 101
+        "[1,50]|[101,200]"); // short log at 1
+    log = new FSEditLog(storage);
+    assertEquals("[[1,100,true], [101,200,true]]",
+        log.getEditLogManifest(1).toString());
+    assertEquals("[[101,200,true]]",
+        log.getEditLogManifest(101).toString());
+
+    // Case where the first storage has an inprogress while
+    // the second has finalised that file (i.e. the first failed
+    // recently)
+    storage = mockStorageWithEdits(
+        "[1,100]|[101,]", 
+        "[1,100]|[101,200]"); 
+    log = new FSEditLog(storage);
+    assertEquals("[[1,100,true], [101,200,true]]",
+        log.getEditLogManifest(1).toString());
+    assertEquals("[[101,200,true]]",
+        log.getEditLogManifest(101).toString());
+  }
+  
+  /**
+   * Create a mock NNStorage object with several directories, each directory
+   * holding edit logs according to a specification. Each directory
+   * is specified by a pipe-separated string. For example:
+   * <code>[1,100]|[101,200]</code> specifies a directory which
+   * includes two finalized segments, one from 1-100, and one from 101-200.
+   * The syntax <code>[1,]</code> specifies an in-progress log starting at
+   * txid 1.
+   */
+  private NNStorage mockStorageWithEdits(String... editsDirSpecs) throws IOException {
+    List<StorageDirectory> sds = Lists.newArrayList();
+    List<URI> uris = Lists.newArrayList();
+
+    NNStorage storage = Mockito.mock(NNStorage.class);
+    for (String dirSpec : editsDirSpecs) {
+      List<String> files = Lists.newArrayList();
+      String[] logSpecs = dirSpec.split("\\|");
+      for (String logSpec : logSpecs) {
+        Matcher m = Pattern.compile("\\[(\\d+),(\\d+)?\\]").matcher(logSpec);
+        assertTrue("bad spec: " + logSpec, m.matches());
+        if (m.group(2) == null) {
+          files.add(NNStorage.getInProgressEditsFileName(
+              Long.valueOf(m.group(1))));
+        } else {
+          files.add(NNStorage.getFinalizedEditsFileName(
+              Long.valueOf(m.group(1)),
+              Long.valueOf(m.group(2))));
+        }
+      }
+      StorageDirectory sd = FSImageTestUtil.mockStorageDirectory(
+          NameNodeDirType.EDITS, false,
+          files.toArray(new String[0]));
+      sds.add(sd);
+      URI u = URI.create("file:///storage"+ Math.random());
+      Mockito.doReturn(sd).when(storage).getStorageDirectory(u);
+      uris.add(u);
+    }    
+
+    Mockito.doReturn(sds).when(storage).dirIterable(NameNodeDirType.EDITS);
+    Mockito.doReturn(uris).when(storage).getEditsDirectories();
+    return storage;
+  }
+
+  /** 
+   * Specification for a failure during #setupEdits
+   */
+  static class AbortSpec {
+    final int roll;
+    final int logindex;
+    
+    /**
+     * Construct the failure specification. 
+     * @param roll number to fail after. e.g. 1 to fail after the first roll
+     * @param loginfo index of journal to fail. 
+     */
+    AbortSpec(int roll, int logindex) {
+      this.roll = roll;
+      this.logindex = logindex;
+    }
+  }
+
+  final static int TXNS_PER_ROLL = 10;  
+  final static int TXNS_PER_FAIL = 2;
+    
+  /**
+   * Set up directories for tests. 
+   *
+   * Each rolled file is 10 txns long. 
+   * A failed file is 2 txns long.
+   * 
+   * @param editUris directories to create edit logs in
+   * @param numrolls number of times to roll the edit log during setup
+   * @param abortAtRolls Specifications for when to fail, see AbortSpec
+   */
+  public static NNStorage setupEdits(List<URI> editUris, int numrolls, 
+                                     AbortSpec... abortAtRolls)
+      throws IOException {
+    List<AbortSpec> aborts = new ArrayList<AbortSpec>(Arrays.asList(abortAtRolls));
+    NNStorage storage = new NNStorage(new Configuration(),
+                                      Collections.<URI>emptyList(),
+                                      editUris);
+    storage.format();
+    FSEditLog editlog = new FSEditLog(storage);    
+    // open the edit log and add two transactions
+    // logGenerationStamp is used, simply because it doesn't 
+    // require complex arguments.
+    editlog.open();
+    for (int i = 2; i < TXNS_PER_ROLL; i++) {
+      editlog.logGenerationStamp((long)0);
+    }
+    editlog.logSync();
+    
+    // Go into edit log rolling loop.
+    // On each roll, the abortAtRolls abort specs are 
+    // checked to see if an abort is required. If so the 
+    // the specified journal is aborted. It will be brought
+    // back into rotation automatically by rollEditLog
+    for (int i = 0; i < numrolls; i++) {
+      editlog.rollEditLog();
+      
+      editlog.logGenerationStamp((long)i);
+      editlog.logSync();
+
+      while (aborts.size() > 0 
+             && aborts.get(0).roll == (i+1)) {
+        AbortSpec spec = aborts.remove(0);
+        editlog.getJournals().get(spec.logindex).abort();
+      } 
+      
+      for (int j = 3; j < TXNS_PER_ROLL; j++) {
+        editlog.logGenerationStamp((long)i);
       }
-    } 
+      editlog.logSync();
+    }
+    editlog.close();
+
+    FSImageTestUtil.logStorageContents(LOG, storage);
+    return storage;
+  }
+
+  /** 
+   * Test loading an editlog which has had both its storage fail
+   * on alternating rolls. Two edit log directories are created.
+   * The first on fails on odd rolls, the second on even. Test
+   * that we are able to load the entire editlog regardless.
+   */
+  public void testAlternatingJournalFailure() throws IOException {
+    File f1 = new File(TEST_DIR + "/alternatingjournaltest0");
+    File f2 = new File(TEST_DIR + "/alternatingjournaltest1");
+
+    List<URI> editUris = ImmutableList.of(f1.toURI(), f2.toURI());
     
-    editLog.close();
+    NNStorage storage = setupEdits(editUris, 10,
+                                   new AbortSpec(1, 0),
+                                   new AbortSpec(2, 1),
+                                   new AbortSpec(3, 0),
+                                   new AbortSpec(4, 1),
+                                   new AbortSpec(5, 0),
+                                   new AbortSpec(6, 1),
+                                   new AbortSpec(7, 0),
+                                   new AbortSpec(8, 1),
+                                   new AbortSpec(9, 0),
+                                   new AbortSpec(10, 1));
+    long totaltxnread = 0;
+    FSEditLog editlog = new FSEditLog(storage);
+    long startTxId = 0;
+    Iterable<EditLogInputStream> editStreams = editlog.selectInputStreams(startTxId, 
+                                                                          TXNS_PER_ROLL*11 - 1);
+
+    for (EditLogInputStream edits : editStreams) {
+      FSEditLogLoader.EditLogValidation val = FSEditLogLoader.validateEditLog(edits);
+      long read = val.getNumTransactions();
+      LOG.info("Loading edits " + edits + " read " + read);
+      assertEquals(startTxId, val.getStartTxId());
+      startTxId += read;
+      totaltxnread += read;
+    }
+
+    editlog.close();
+    storage.close();
+    assertEquals(TXNS_PER_ROLL*11, totaltxnread);    
+  }
 
-    // Verify that we can read in all the transactions that we have written.
-    // If there were any corruptions, it is likely that the reading in
-    // of these transactions will throw an exception.
-    //
-    for (Iterator<StorageDirectory> it = 
-            fsimage.dirIterator(NameNodeDirType.EDITS); it.hasNext();) {
-      File editFile = FSImage.getImageFile(it.next(), NameNodeFile.EDITS);
-      // Start from 0 when loading edit logs.
-      editLog.setStartTransactionId(0);
-      System.out.println("Verifying file: " + editFile);
-      EditLogInputStream is = new EditLogFileInputStream(editFile);
-      FSEditLogLoader loader = new FSEditLogLoader(namesystem);
-      int numEdits = loader.loadFSEdits(is, namesystem.getEditLog().getCurrentTxId());
-      int numLeases = namesystem.leaseManager.countLease();
-      System.out.println("Number of outstanding leases " + numLeases);
-      assertEquals(0, numLeases);
-      assertTrue("Verification for " + editFile + " failed. " +
-                 "Expected " + (numThreads * 3 * numberTransactions) + " transactions. "+
-                 "Found " + numEdits + " transactions.",
-                 numEdits == numThreads * 3 * numberTransactions);
+  /** 
+   * Test loading an editlog with gaps. A single editlog directory
+   * is set up. On of the edit log files is deleted. This should
+   * fail when selecting the input streams as it will not be able 
+   * to select enough streams to load up to 4*TXNS_PER_ROLL.
+   * There should be 4*TXNS_PER_ROLL transactions as we rolled 3
+   * times. 
+   */
+  public void testLoadingWithGaps() throws IOException {
+    File f1 = new File(TEST_DIR + "/gaptest0");
+    List<URI> editUris = ImmutableList.of(f1.toURI());
+
+    NNStorage storage = setupEdits(editUris, 3);
+    
+    final long startGapTxId = 1*TXNS_PER_ROLL;
+    final long endGapTxId = 2*TXNS_PER_ROLL - 1;
 
+    File[] files = new File(f1, "current").listFiles(new FilenameFilter() {
+        public boolean accept(File dir, String name) {
+          if (name.startsWith(NNStorage.getFinalizedEditsFileName(startGapTxId, 
+                                  endGapTxId))) {
+            return true;
+          }
+          return false;
+        }
+      });
+    assertEquals(1, files.length);
+    assertTrue(files[0].delete());
+    
+    FSEditLog editlog = new FSEditLog(storage);
+    long startTxId = 0;
+    try {
+      Iterable<EditLogInputStream> editStreams 
+        = editlog.selectInputStreams(startTxId, 4*TXNS_PER_ROLL);
+      
+      fail("Should have thrown exception");
+    } catch (IOException ioe) {
+      GenericTestUtils.assertExceptionContains(
+          "No non-corrupt logs for txid " + startGapTxId, ioe);
     }
   }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog2.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog2.java
index 3d651f51..e69de29b 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog2.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog2.java
@@ -1,364 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.hdfs.server.namenode;
-
-import junit.framework.TestCase;
-import java.io.*;
-import java.util.Iterator;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.permission.*;
-
-import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.server.namenode.EditLogFileInputStream;
-import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
-
-/**
- * This class tests the creation and validation of a checkpoint.
- */
-public class TestEditLog2 extends TestCase {
-  
-  static final Log LOG = LogFactory.getLog(TestEditLog.class);
-  
-  static final int NUM_DATA_NODES = 0;
-
-  // This test creates NUM_THREADS threads and each thread does
-  // 2 * NUM_TRANSACTIONS Transactions concurrently.
-  static final int NUM_TRANSACTIONS = 10;
-  static final int NUM_THREADS = 10;
-  
-
-  //
-  // an object that does a bunch of transactions
-  //
-  static class Transactions implements Runnable {
-    FSNamesystem namesystem;
-    int numTransactions;
-    short replication = 3;
-    long blockSize = 64;
-    int id;
-
-    Transactions(FSNamesystem ns, int num, int i) {
-      namesystem = ns;
-      numTransactions = num;
-      id = i;
-    }
-
-    // add a bunch of transactions.
-    public void run() {
-      PermissionStatus p = namesystem.createFsOwnerPermissions(
-                                          new FsPermission((short)0777));
-      FSEditLog editLog = namesystem.getEditLog();
-
-      try {
-        for (int i = 0; i < numTransactions; i++) {
-          INode inodeDir = new INodeDirectory("/hadoop."+i+"_"+id, p);
-          editLog.logMkDir("/hadoop1."+i+"_"+id, inodeDir);
-          
-          
-          INodeFileUnderConstruction inode1 = new INodeFileUnderConstruction(
-                              p, replication, blockSize, 0, "", "", null);
-          editLog.logOpenFile("/filename1." + i+"_"+id, inode1);
-          editLog.logCloseFile("/filename1." + i+"_"+id, inode1);
-          
-          INodeFileUnderConstruction inode2 = new INodeFileUnderConstruction(
-              p, replication, blockSize, 0, "", "", null);
-          editLog.logOpenFile("/filename2." + i+"_"+id, inode2);
-          editLog.logCloseFile("/filename2." + i+"_"+id, inode2);
-          
-          editLog.logGenerationStamp(i);
-          editLog.logSetOwner("/filename1." + i+"_"+id, "hadoop2", "hadoop2");
-          editLog.logSetPermissions("/filename1." + i+"_"+id, p.getPermission());
-          editLog.logSetQuota("/hadoop1." + i+"_"+id, 100 + i, 100 + i);
-          editLog.logSetReplication("/filename1." + i+"_"+id, (short)2);
-          editLog.logTimes("/filename1." + i+"_"+id, i, i);
-          editLog.logRename("/hadoop1."+i+"_"+id, "/hadoop2."+i+"_"+id, i);
-          
-          editLog.logConcat("/filename1." + i+"_"+id, new String[] {"/filename1." + i+"_"+id, "/filename2." + i+"_"+id}, i);
-          editLog.logDelete("/filename1." + i+"_"+id, i+1);
-          editLog.logDelete("/hadoop1." + i+"_"+id, i+1);
-          editLog.logSync();
-        }
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  /**
-   * Simple test for writing to and rolling the edit log.
-   */
-  public void testSimpleEditLog() throws IOException {
-    // start a cluster 
-    Configuration conf = new Configuration();
-    MiniDFSCluster cluster = null;
-    FileSystem fileSys = null;
-    try {
-      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
-      cluster.waitActive();
-      fileSys = cluster.getFileSystem();
-      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
-      FSImage fsimage = namesystem.getFSImage();
-      final FSEditLog editLog = fsimage.getEditLog();
-
-      editLog.logSetReplication("fakefile", (short) 1);
-      editLog.logSync();
-      editLog.rollEditLog();
-      editLog.logSetReplication("fakefile", (short) 2);
-      editLog.logSync();
-      
-      editLog.close();
-    } finally {
-      if(fileSys != null) fileSys.close();
-      if(cluster != null) cluster.shutdown();
-    }
-  }
-
-  /**
-   * Tests transaction logging in dfs.
-   */
-  public void testMultiThreadedEditLog() throws IOException {
-    testEditLog(2048);
-    // force edit buffer to automatically sync on each log of edit log entry
-    testEditLog(1);
-  }
-  
-  /**
-   * Test edit log with different initial buffer size
-   * 
-   * @param initialSize initial edit log buffer size
-   * @throws IOException
-   */
-  private void testEditLog(int initialSize) throws IOException {
-
-    // start a cluster 
-    Configuration conf = new Configuration();
-    MiniDFSCluster cluster = null;
-    FileSystem fileSys = null;
-
-    try {
-      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
-      cluster.waitActive();
-      fileSys = cluster.getFileSystem();
-      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
-            
-      namesystem.saveNamespace(true, true);  
-      FSImage fsimage = namesystem.getFSImage();
-      FSEditLog editLog = fsimage.getEditLog();
-  
-      // set small size of flush buffer
-      FSEditLog.setBufferCapacity(initialSize);
-      
-      // Roll log so new output buffer size takes effect
-      fsimage.rollEditLog();
-      namesystem.saveNamespace(true, true);
-    
-      // Create threads and make them run transactions concurrently.
-      Thread threadId[] = new Thread[NUM_THREADS];
-      for (int i = 0; i < NUM_THREADS; i++) {
-        Transactions trans = new Transactions(namesystem, NUM_TRANSACTIONS, i);
-        threadId[i] = new Thread(trans, "TransactionThread-" + i);
-        threadId[i].start();
-      }
-  
-      // wait for all transactions to get over
-      for (int i = 0; i < NUM_THREADS; i++) {
-        try {
-          threadId[i].join();
-        } catch (InterruptedException e) {
-          i--;      // retry 
-        }
-      } 
-      
-      namesystem.rollEditLog();
-      
-      
-      
-      long expectedTxns = (NUM_THREADS * NUM_TRANSACTIONS * 15); 
-   
-      // Verify that we can read in all the transactions that we have written.
-      // If there were any corruptions, it is likely that the reading in
-      // of these transactions will throw an exception.
-      //
-      for (Iterator<StorageDirectory> it = 
-              fsimage.dirIterator(); it.hasNext();) {
-        StorageDirectory sd = it.next();      
-        File editFile = namesystem.getFSImage().getEditFile(sd);
-        if(editFile == null)
-          continue;
-        
-        cluster.getNameNode().getFSImage().getEditLog().setStartTransactionId(0);
-        
-        System.out.println("Verifying file: " + editFile);
-        EditLogInputStream is = new EditLogFileInputStream(editFile);
-        FSEditLogLoader loader = new FSEditLogLoader(namesystem);
-        int numEdits = loader.loadFSEdits(is, namesystem.getEditLog().getCurrentTxId());
-        int numLeases = namesystem.leaseManager.countLease();
-        System.out.println("Number of outstanding leases " + numLeases);
-        assertEquals(0, numLeases);
-        assertTrue("Verification for " + editFile + " failed. " +
-                   "Expected " + expectedTxns + " transactions. "+
-                   "Found " + numEdits + " transactions.",
-                   numEdits == expectedTxns);
-  
-      }
-    } finally {
-      try {
-        if(fileSys != null) fileSys.close();
-        if(cluster != null) cluster.shutdown();
-      } catch (Throwable t) {
-        LOG.error("Couldn't shut down cleanly", t);
-      }
-    }
-  }
-
-  private void doLogEdit(ExecutorService exec, final FSEditLog log,
-    final String filename) throws Exception
-  {
-    exec.submit(new Callable<Void>() {
-      public Void call() {
-        log.logSetReplication(filename, (short)1);
-        return null;
-      }
-    }).get();
-  }
-  
-  private void doCallLogSync(ExecutorService exec, final FSEditLog log)
-    throws Exception
-  {
-    exec.submit(new Callable<Void>() {
-      public Void call() {
-        try {
-          log.logSyncAll();
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-        return null;
-      }
-    }).get();
-  }
-
-  private void doCallLogSyncAll(ExecutorService exec, final FSEditLog log)
-    throws Exception
-  {
-    exec.submit(new Callable<Void>() {
-      public Void call() throws Exception {
-        log.logSyncAll();
-        return null;
-      }
-    }).get();
-  }
-
-  public void testSyncBatching() throws Exception {
-    // start a cluster 
-    Configuration conf = new Configuration();
-    MiniDFSCluster cluster = null;
-    FileSystem fileSys = null;
-    ExecutorService threadA = Executors.newSingleThreadExecutor();
-    ExecutorService threadB = Executors.newSingleThreadExecutor();
-    try {
-      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
-      cluster.waitActive();
-      fileSys = cluster.getFileSystem();
-      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
-
-      FSImage fsimage = namesystem.getFSImage();
-      final FSEditLog editLog = fsimage.getEditLog();
-      
-      // Log an edit from thread A
-      doLogEdit(threadA, editLog, "thread-a 1");
-
-      // Log an edit from thread B
-      doLogEdit(threadB, editLog, "thread-b 1");
-      assertEquals("logging edit without syncing should do not affect txid",
-        0, editLog.getLastSyncedTxId());
-
-      // Now ask to sync edit from B, which should sync both edits.
-      doCallLogSync(threadB, editLog);
-      assertEquals("logSync from second thread should bump txid up to 2",
-        2, editLog.getLastSyncedTxId());
-
-      // Now ask to sync edit from A, which was already batched in - thus
-      // it should increment the batch count metric
-      doCallLogSync(threadA, editLog);
-      assertEquals("logSync from first thread shouldn't change txid",
-        2, editLog.getLastSyncedTxId());
-
-    } finally {
-      threadA.shutdown();
-      threadB.shutdown();
-      if(fileSys != null) fileSys.close();
-      if(cluster != null) cluster.shutdown();
-    }
-  }
-  
-  /**
-   * Test what happens with the following sequence:
-   *
-   *  Thread A writes edit
-   *  Thread B calls logSyncAll
-   *           calls close() on stream
-   *  Thread A calls logSync
-   *
-   * This sequence is legal and can occur if enterSafeMode() is closely
-   * followed by saveNamespace.
-   */
-  public void testBatchedSyncWithClosedLogs() throws Exception {
-    // start a cluster 
-    Configuration conf = new Configuration();
-    MiniDFSCluster cluster = null;
-    FileSystem fileSys = null;
-    ExecutorService threadA = Executors.newSingleThreadExecutor();
-    ExecutorService threadB = Executors.newSingleThreadExecutor();
-    try {
-      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
-      cluster.waitActive();
-      fileSys = cluster.getFileSystem();
-      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
-
-      FSImage fsimage = namesystem.getFSImage();
-      final FSEditLog editLog = fsimage.getEditLog();
-
-      // Log an edit from thread A
-      doLogEdit(threadA, editLog, "thread-a 1");
-      assertEquals("logging edit without syncing should do not affect txid",
-        0, editLog.getLastSyncedTxId());
-
-      // logSyncAll in Thread B
-      doCallLogSyncAll(threadB, editLog);
-      assertEquals("logSyncAll should sync thread A's transaction",
-        1, editLog.getLastSyncedTxId());
-      // Close edit log
-      editLog.close();
-
-      // Ask thread A to finish sync (which should be a no-op)
-      doCallLogSync(threadA, editLog);
-    } finally {
-      threadA.shutdown();
-      threadB.shutdown();
-      if(fileSys != null) fileSys.close();
-      if(cluster != null) cluster.shutdown();
-    }
-  }
-}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogBenchmark.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogBenchmark.java
new file mode 100644
index 00000000..249b2966
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogBenchmark.java
@@ -0,0 +1,185 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import junit.framework.TestCase;
+import java.io.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.permission.*;
+
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.Block;
+
+/**
+ * This class tests the creation and validation of a checkpoint.
+ */
+public class TestEditLogBenchmark extends TestCase {
+  
+  static final Log LOG = LogFactory.getLog(TestEditLog.class);
+  
+  static final int NUM_DATA_NODES = 0;
+
+  // This test creates NUM_THREADS threads and each thread does
+  // NUM_LOOPS in which it logs each type of transaction
+  static final int NUM_LOOPS = 100;
+  static final int NUM_THREADS = 10;
+
+  //
+  // an object that does a bunch of transactions
+  //
+  static class Transactions implements Runnable {
+    private boolean syncEachTxn;
+    private int threadid;
+    FSNamesystem namesystem;
+    int numLoops;
+    short replication = 3;
+    long blockSize = 64;
+
+    Transactions(FSNamesystem ns, int num, int id, boolean sync) {
+      namesystem = ns;
+      numLoops = num;
+      threadid = id;
+      syncEachTxn = sync;
+    }
+
+    // add a bunch of transactions.
+    public void run() {
+      PermissionStatus p = namesystem.createFsOwnerPermissions(
+                                          new FsPermission((short)0777));
+      FSEditLog editLog = namesystem.getEditLog();
+
+      for (int i = 0; i < numLoops; i++) {
+        INodeFileUnderConstruction inode = new INodeFileUnderConstruction(
+                            p, replication, blockSize, 0, "", "", null);
+        for(int b = 0; b < 3; b++) {
+          Block block = new Block(NUM_THREADS * threadid + b);
+          BlocksMap.BlockInfo bi = new BlocksMap.BlockInfo(block, 3);
+          inode.addBlock(bi);
+        }
+        FsPermission perm = new FsPermission((short)0);
+        try {
+          String name = "/filename" + threadid + "-" + i;
+          editLog.logOpenFile(name, inode); sync();
+          editLog.logCloseFile(name, inode); sync();
+          editLog.logDelete(name, 0); sync();
+          editLog.logSetReplication(name, (short)3); sync();
+          editLog.logGenerationStamp(i); sync();
+          editLog.logMkDir(name, inode); sync();
+          editLog.logRename(name, name, i); sync();
+          editLog.logSetOwner(name, "hadoop", "hadoop"); sync();
+          editLog.logSetQuota(name, 1, 1); sync();
+          editLog.logTimes(name, 0, 0); sync();
+          editLog.logSetPermissions(name, perm); sync();
+          editLog.logConcat(name, new String[] { name, name, name }, i); sync();         
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+      }
+    }
+    
+    private void sync() {
+      FSEditLog editLog = namesystem.getEditLog();
+      if (syncEachTxn)
+        editLog.logSync();
+      else
+        editLog.logSyncIfNeeded();
+    }
+  }
+
+
+  /**
+   * Tests transaction logging in dfs.
+   */
+  public void testEditLog() throws IOException {
+    // each txn is synced
+    testEditLog(2048, true);
+    
+    // syncs are performed when needed
+    testEditLog(2048, false);
+  }
+  
+  /**
+   * Test edit log with different initial buffer size
+   * 
+   * @param initialSize initial edit log buffer size
+   * @throws IOException
+   */
+  private void testEditLog(int initialSize, boolean syncEachTxn) throws IOException {
+
+    // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
+
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+      cluster.waitActive();
+      fileSys = cluster.getFileSystem();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+      FSImage fsimage = namesystem.getFSImage();
+  
+      // set small size of flush buffer
+      FSEditLog.setBufferCapacity(initialSize);
+      
+      // Roll log so new output buffer size takes effect
+      // we should now be writing to edits_inprogress_2
+      fsimage.rollEditLog();
+    
+      // Create threads and make them run transactions concurrently.
+      Thread.sleep(1000);
+      LOG.info("----------------------------- START -----------------  ");
+      
+      long start = System.currentTimeMillis();
+      Thread threadId[] = new Thread[NUM_THREADS];
+      for (int i = 0; i < NUM_THREADS; i++) {
+        Transactions trans = new Transactions(namesystem, NUM_LOOPS, i,
+            syncEachTxn);
+        threadId[i] = new Thread(trans, "TransactionThread-" + i);
+        threadId[i].start();
+      }
+  
+      // wait for all transactions to get over
+      for (int i = 0; i < NUM_THREADS; i++) {
+        try {
+          threadId[i].join();
+        } catch (InterruptedException e) {
+          i--;      // retry 
+        }
+      }
+      long stop = System.currentTimeMillis();
+      LOG.info("----------------------------- TIME TAKEN ----------------- : "
+          + (stop - start));
+      
+      // Roll another time to finalize edits_inprogress_3
+      fsimage.rollEditLog();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    } finally {
+      try {
+        if(fileSys != null) fileSys.close();
+        if(cluster != null) cluster.shutdown();
+      } catch (Throwable t) {
+        LOG.error("Couldn't shut down cleanly", t);
+      }
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java
index 9448acf3..77a7c152 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogFileOutputStream.java
@@ -18,56 +18,136 @@
 
 package org.apache.hadoop.hdfs.server.namenode;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.channels.FileChannel;
 
+import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.DU;
-import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.fs.permission.PermissionStatus;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogLoader.EditLogValidation;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class TestEditLogFileOutputStream {
+  
+  private final static long PREALLOCATION_LENGTH = (1024 * 1024);
+  private final static int HEADER_LEN = 17;
+  private static final File TEST_EDITS =
+    new File(System.getProperty("test.build.data","/tmp"),
+             "editLogStream.dat");
 
+  @Before
+  public void deleteEditsFile() {
+    TEST_EDITS.delete();
+  }
+  
   @Test
   public void testPreallocation() throws IOException {
     Configuration conf = new Configuration();
-    FileSystem.setDefaultUri(conf, "hdfs://localhost:0");
-    conf.set("dfs.http.address", "127.0.0.1:0");
-    conf.setBoolean("dfs.permissions", false);
-    NameNode.format(conf);
-    NameNode nn = new NameNode(conf);
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 0, true, null);
+
+    StorageDirectory sd = cluster.getNameNode().getFSImage()
+      .storage.getStorageDir(0);
+    File editLog = NNStorage.getInProgressEditsFile(sd, 0);
 
-    File editLog = nn.getFSImage().getEditLog().getFsEditName();
+    EditLogValidation validation = EditLogFileInputStream.validateEditLog(editLog);
+    assertEquals("Edit log should contain a header as valid length",
+        HEADER_LEN, validation.getValidLength());
+    assertEquals(1, validation.getNumTransactions());
+    assertEquals("Edit log should have 1MB pre-allocated",
+        PREALLOCATION_LENGTH, editLog.length());
     
-    assertEquals("Edit log should only be 4 bytes long",
-        4, editLog.length());
 
-    /**
-     * Remove this check for now. Our internal version of DU is
-     * different from a regular DU.
-     */
-    //assertEquals("Edit log disk space used should be one block",
-    //    4096, new DU(editLog, conf).getUsed());
+    cluster.getFileSystem().mkdirs(new Path("/tmp"),
+        new FsPermission((short)777));
+
+    long oldLength = validation.getValidLength();
+    validation = EditLogFileInputStream.validateEditLog(editLog);
+    assertTrue("Edit log should have more valid data after writing a txn " +
+        "(was: " + oldLength + " now: " + validation.getValidLength() + ")",
+        validation.getValidLength() > oldLength);
+    assertEquals(2, validation.getNumTransactions());
+
+    assertEquals("Edit log should be 1MB long, plus 4 bytes for the version number",
+        PREALLOCATION_LENGTH, editLog.length());
+  }
+  
+  @Test
+  public void testClose() throws IOException {
+    String errorMessage = "TESTING: fc.truncate() threw IOE";
+    
+    File testDir = new File(System.getProperty("test.build.data", "/tmp"));
+    assertTrue("could not create test directory", testDir.exists() || testDir.mkdirs());
+    File f = new File(testDir, "edits");
+    assertTrue("could not create test file", f.createNewFile());
+    EditLogFileOutputStream elos = new EditLogFileOutputStream(f, null);
+    
+    FileChannel mockFc = Mockito.spy(elos.getFileChannelForTesting());
+    Mockito.doThrow(new IOException(errorMessage)).when(mockFc).truncate(Mockito.anyLong());
+    elos.setFileChannelForTesting(mockFc);
+    
+    try {
+      elos.close();
+      fail("elos.close() succeeded, but should have thrown");
+    } catch (IOException e) {
+      assertEquals("wrong IOE thrown from elos.close()", e.getMessage(), errorMessage);
+    }
+    
+    assertEquals("fc was not nulled when elos.close() failed", elos.getFileChannelForTesting(), null);
+  }
 
-    nn.getNamesystem().mkdirs("/test",
-      new PermissionStatus("xjin", null, FsPermission.getDefault()));
-    // after format and fresh startup we're writing to edits.new
-    File editLogNew = nn.getFSImage().getEditLog().getFsEditNewName();
-    assertEquals("Edit log should be 1MB bytes long",
-        (1024 * 1024), editLogNew.length());
+  /**
+   * Tests EditLogFileOutputStream doesn't throw NullPointerException on
+   * close/abort sequence. See HDFS-2011.
+   */
+  @Test
+  public void testEditLogFileOutputStreamCloseAbort() throws IOException {
+    // abort after a close should just ignore
+    EditLogFileOutputStream editLogStream =
+      new EditLogFileOutputStream(TEST_EDITS, null);
+    editLogStream.close();
+    editLogStream.abort();
+  }
 
-    /**
-     * Remove this check for now. Our internal version of DU is
-     * different from a regular DU.
-     */
-    // 256 blocks for the 1MB of preallocation space, 1 block for the original
-    // 4 bytes
-    //assertTrue("Edit log disk space used should be at least 257 blocks",
-    //    257 * 4096 <= new DU(editLog, conf).getUsed());
+  /**
+   * Tests EditLogFileOutputStream doesn't throw NullPointerException on
+   * close/close sequence. See HDFS-2011.
+   */
+  @Test
+  public void testEditLogFileOutputStreamCloseClose() throws IOException {
+    // close after a close should result in an IOE
+    EditLogFileOutputStream editLogStream =
+      new EditLogFileOutputStream(TEST_EDITS, null);
+    editLogStream.close();
+    try {
+      editLogStream.close();
+    } catch (IOException ioe) {
+      String msg = StringUtils.stringifyException(ioe);
+      assertTrue(msg, msg.contains("Trying to use aborted output stream"));
+    }
+  }
+  
+  /**
+   * Tests EditLogFileOutputStream doesn't throw NullPointerException on being
+   * abort/abort sequence. See HDFS-2011.
+   */
+  @Test
+  public void testEditLogFileOutputStreamAbortAbort() throws IOException {
+    // abort after a close should just ignore
+    EditLogFileOutputStream editLogStream =
+      new EditLogFileOutputStream(TEST_EDITS, null);
+    editLogStream.abort();
+    editLogStream.abort();
   }
 
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogJournalFailures.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogJournalFailures.java
new file mode 100644
index 00000000..bc52fb14
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogJournalFailures.java
@@ -0,0 +1,358 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.namenode.JournalSet.JournalAndStream;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.internal.verification.api.VerificationMode;
+
+public class TestEditLogJournalFailures {
+
+  private int editsPerformed = 0;
+  private MiniDFSCluster cluster;
+  private FileSystem fs;
+  private Runtime runtime;
+
+  /**
+   * Create the mini cluster for testing and sub in a custom runtime so that
+   * edit log journal failures don't actually cause the JVM to exit.
+   */
+  @Before
+  public void setUpMiniCluster() throws IOException {
+    InjectionHandler.clear();
+    setUpMiniCluster(new Configuration(), true);
+  }
+  
+  public void setUpMiniCluster(Configuration conf, boolean manageNameDfsDirs)
+      throws IOException {
+    cluster = new MiniDFSCluster(conf, 0, 
+        true, null);
+    cluster.waitActive();
+    fs = cluster.getFileSystem();
+    
+    runtime = Runtime.getRuntime();
+    runtime = spy(runtime);
+    doNothing().when(runtime).exit(anyInt());
+    
+    FSEditLog.setRuntimeForTesting(runtime);
+  }
+  
+  @After
+  public void shutDownMiniCluster() throws IOException {
+    if (fs != null)
+      fs.close();
+    if (cluster != null)
+      cluster.shutdown();
+  }
+   
+  @Test
+  public void testSingleFailedEditsDirOnFlush() throws IOException {
+    assertTrue(doAnEdit());
+    // Invalidate one edits journal.
+    invalidateEditsDirAtIndex(0, true, false);
+    // Make sure runtime.exit(...) hasn't been called at all yet.
+    assertExitInvocations(0);
+    assertTrue(doAnEdit());
+    // A single journal failure should not result in a call to runtime.exit(...).
+    assertExitInvocations(0);
+    assertFalse(cluster.getNameNode().isInSafeMode());
+  }
+   
+  @Test
+  public void testAllEditsDirsFailOnFlush() throws IOException {
+    assertTrue(doAnEdit());
+    // Invalidate both edits journals.
+    invalidateEditsDirAtIndex(0, true, false);
+    invalidateEditsDirAtIndex(1, true, false);
+    // Make sure runtime.exit(...) hasn't been called at all yet.
+    assertExitInvocations(0);   
+    assertTrue(doAnEdit());
+    // The previous edit could not be synced to any persistent storage, should
+    // have halted the NN.
+    assertExitInvocations(1);
+  }
+  
+  @Test
+  public void testAllEditsDirFailOnWrite() throws IOException {
+    assertTrue(doAnEdit());
+    // Invalidate both edits journals.
+    invalidateEditsDirAtIndex(0, true, true);
+    invalidateEditsDirAtIndex(1, true, true);
+    // Make sure runtime.exit(...) hasn't been called at all yet.
+    assertExitInvocations(0);
+    assertTrue(doAnEdit());
+    // The previous edit could not be synced to any persistent storage, should
+    // have halted the NN.
+    assertExitInvocations(atLeast(1));
+  }
+  
+  @Test
+  public void testAllEditsDirsFailOnRollEditLog() throws IOException {
+    assertTrue(doAnEdit());
+    InjectionHandler.set(new TestEditLogJournalFailuresInjectionHandler(false));
+    // Make sure runtime.exit(...) hasn't been called at all yet.
+    assertExitInvocations(0); 
+    try {
+      cluster.getNameNode().rollEditLog();
+      fail("This roll should fail");
+    } catch (IOException e) {}
+    // failed roll disables all journals but does not call exit()
+    assertExitInvocations(0);
+    
+    assertTrue(doAnEdit());
+    // The previous edit could not be synced to any persistent storage, should
+    // have halted the NN.
+    assertExitInvocations(1);
+  }
+  
+  @Test
+  public void testSingleRequiredFailedEditsOnRollEditLog() throws IOException {
+    // Set one of the edits dirs to be required.
+    File[] editsDirs = cluster.getNameEditsDirs().toArray(new File[0]);
+    shutDownMiniCluster();
+    Configuration conf = new Configuration();
+    conf.set("dfs.name.edits.dir.required", editsDirs[1].toString());
+    conf.setInt("dfs.name.edits.dir.minimum", 0);
+    setUpMiniCluster(conf, true);
+    
+    assertTrue(doAnEdit());
+    InjectionHandler.set(new TestEditLogJournalFailuresInjectionHandler(true));
+    // Make sure runtime.exit(...) hasn't been called at all yet.
+    assertExitInvocations(0); 
+    try {
+      cluster.getNameNode().rollEditLog();
+      fail("This roll should fail");
+    } catch (IOException e) {}
+    // failed roll disables all journals but does not call exit()
+    assertExitInvocations(0);
+    
+    assertTrue(doAnEdit());
+    // The previous edit could not be synced to any persistent storage, should
+    // have halted the NN.
+    assertExitInvocations(1);
+  }
+  
+  @Test
+  public void testSingleFailedEditsDirOnSetReadyToFlush() throws IOException {
+    assertTrue(doAnEdit());
+    // Invalidate one edits journal.
+    invalidateEditsDirAtIndex(0, false, false);
+    // Make sure runtime.exit(...) hasn't been called at all yet.
+    assertExitInvocations(0);
+    assertTrue(doAnEdit());
+    // A single journal failure should not result in a call to runtime.exit(...).
+    assertExitInvocations(0);
+    assertFalse(cluster.getNameNode().isInSafeMode());
+  }
+  
+  @Test
+  public void testSingleRequiredFailedEditsDirOnSetReadyToFlush()
+      throws IOException {
+    // Set one of the edits dirs to be required.
+    File[] editsDirs = cluster.getNameEditsDirs().toArray(new File[0]);
+    shutDownMiniCluster();
+    Configuration conf = new Configuration();
+    conf.set("dfs.name.edits.dir.required", editsDirs[1].toString());
+    conf.setInt("dfs.name.edits.dir.minimum", 0);
+    setUpMiniCluster(conf, true);
+    
+    assertTrue(doAnEdit());
+    // Invalidated the one required edits journal.
+    invalidateEditsDirAtIndex(1, false, false);
+    // Make sure runtime.exit(...) hasn't been called at all yet.
+    assertExitInvocations(0);
+    
+    // This will actually return true in the tests, since the NN will not in
+    // fact call Runtime.exit();
+    doAnEdit();
+    
+    // A single failure of a required journal should result in a call to
+    // runtime.exit(...).
+    assertExitInvocations(atLeast(1));
+  }
+  
+  @Test
+  public void testMultipleRedundantFailedEditsDirOnSetReadyToFlush()
+      throws IOException {
+    // Set up 4 name/edits dirs.
+    shutDownMiniCluster();
+    Configuration conf = new Configuration();
+    String[] nameDirs = new String[4];
+    for (int i = 0; i < nameDirs.length; i++) {
+      File nameDir = new File(System.getProperty("test.build.data"),
+          "name-dir" + i);
+      nameDir.mkdirs();
+      nameDirs[i] = nameDir.getAbsolutePath();
+    }
+
+    conf.set("dfs.name.edits.dir",
+        StringUtils.join(nameDirs, ","));
+    
+    // Keep running unless there are less than 2 edits dirs remaining.
+    conf.setInt("dfs.name.edits.dir.minimum", 2);
+    
+    setUpMiniCluster(conf, false);
+    
+    // All journals active.
+    assertTrue(doAnEdit());
+    assertExitInvocations(0);
+    
+    // Invalidate 1/4 of the redundant journals.
+    invalidateEditsDirAtIndex(0, false, false);
+    assertTrue(doAnEdit());
+    assertExitInvocations(0);
+
+    // Invalidate 2/4 of the redundant journals.
+    invalidateEditsDirAtIndex(1, false, false);
+    assertTrue(doAnEdit());
+    assertExitInvocations(0);
+    
+    // Invalidate 3/4 of the redundant journals.
+    invalidateEditsDirAtIndex(2, false, false);
+    
+    // This will actually return true in the tests, since the NN will not in
+    // fact call Runtime.exit();
+    doAnEdit();
+    
+    // A failure of more than the minimum number of redundant journals should
+    // result in a call to runtime.exit(...).
+    assertExitInvocations(atLeast(1));
+  }
+
+  /**
+   * Replace the journal at index <code>index</code> with one that throws an
+   * exception on flush.
+   * 
+   * @param index the index of the journal to take offline.
+   * @return the original <code>EditLogOutputStream</code> of the journal.
+   */
+  private EditLogOutputStream invalidateEditsDirAtIndex(int index,
+      boolean failOnFlush, boolean failOnWrite) throws IOException {
+    FSImage fsimage = cluster.getNameNode().getFSImage();
+    FSEditLog editLog = fsimage.getEditLog();
+
+    JournalAndStream jas = editLog.getJournals().get(index);
+    JournalAndStream spyJas = spy(jas);
+    EditLogFileOutputStream elos =
+      (EditLogFileOutputStream) jas.getCurrentStream();
+    EditLogFileOutputStream spyElos = spy(elos);
+    if (failOnWrite) {
+      doThrow(new IOException("fail on write()")).when(spyElos).write(
+          (FSEditLogOp) any());
+    }
+    if (failOnFlush) {
+      doThrow(new IOException("fail on flush()")).when(spyElos).flush();
+    } else { 
+      doThrow(new IOException("fail on setReadyToFlush()")).when(spyElos)
+        .setReadyToFlush();
+    }
+    doNothing().when(spyElos).abort();
+     
+    jas.setCurrentStreamForTests(spyElos);
+     
+    return elos;
+  }
+
+  /**
+   * Restore the journal at index <code>index</code> with the passed
+   * {@link EditLogOutputStream}.
+   * 
+   * @param index index of the journal to restore.
+   * @param elos the {@link EditLogOutputStream} to put at that index.
+   */
+  private void restoreEditsDirAtIndex(int index, EditLogOutputStream elos) {
+    FSImage fsimage = cluster.getNameNode().getFSImage();
+    FSEditLog editLog = fsimage.getEditLog();
+
+    JournalAndStream jas = editLog.getJournals().get(index);
+    jas.setCurrentStreamForTests(elos);
+  }
+
+  /**
+   * Do a mutative metadata operation on the file system.
+   * 
+   * @return true if the operation was successful, false otherwise.
+   */
+  private boolean doAnEdit() throws IOException {
+    return fs.mkdirs(new Path("/tmp", Integer.toString(editsPerformed++)));
+  }
+  
+  /**
+   * Make sure that Runtime.exit(...) has been called exactly
+   * <code>expectedExits<code> number of times.
+   * 
+   * @param expectedExits the exact number of times Runtime.exit(...) should
+   *                      have been called.
+   */
+  private void assertExitInvocations(int expectedExits) {
+    assertExitInvocations(times(expectedExits));
+  }
+
+  /**
+   * Make sure that Runtime.exit(...) has been called
+   * <code>expectedExits<code> number of times.
+   * 
+   * @param expectedExits the number of times Runtime.exit(...) should have been called.
+   */
+  private void assertExitInvocations(VerificationMode expectedExits) {
+    verify(runtime, expectedExits).exit(anyInt());
+  }
+  
+  class TestEditLogJournalFailuresInjectionHandler extends InjectionHandler {
+    boolean failedOnlyRequired = false;
+       
+    public TestEditLogJournalFailuresInjectionHandler(boolean b) {
+      failedOnlyRequired = b;
+    }
+
+    @Override
+    public void _processEventIO(InjectionEvent event, Object... args)
+        throws IOException {
+      if (event == InjectionEvent.JOURNALANDSTREAM_STARTLOGSEGMENT) {
+        boolean isRequired = (Boolean) args[0];
+        if (failedOnlyRequired && !isRequired)
+          return;
+        throw new IOException("Testing failure");
+      }
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java
new file mode 100644
index 00000000..9e0c53c8
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java
@@ -0,0 +1,542 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.apache.commons.logging.Log;
+
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.impl.Log4JLogger;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.security.auth.login.LoginException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.permission.*;
+
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.hdfs.server.namenode.EditLogFileInputStream;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.JournalSet.JournalAndStream;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.security.UnixUserGroupInformation;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.util.StringUtils;
+import org.apache.log4j.Level;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import static org.mockito.Mockito.*;
+
+/**
+ * This class tests various synchronization bugs in FSEditLog rolling
+ * and namespace saving.
+ */
+public class TestEditLogRace {
+  static {
+    ((Log4JLogger)FSEditLog.LOG).getLogger().setLevel(Level.ALL);
+  }
+
+  private static final Log LOG = LogFactory.getLog(TestEditLogRace.class);
+
+  private static final String NAME_DIR =
+      new File(System.getProperty("test.build.data"), "name1").getAbsolutePath();
+
+  // This test creates NUM_THREADS threads and each thread continuously writes
+  // transactions
+  static final int NUM_THREADS = 16;
+
+  /**
+   * The number of times to roll the edit log during the test. Since this
+   * tests for a race condition, higher numbers are more likely to find
+   * a bug if it exists, but the test will take longer.
+   */
+  static final int NUM_ROLLS = 30;
+
+  /**
+   * The number of times to save the fsimage and create an empty edit log.
+   */
+  static final int NUM_SAVE_IMAGE = 30;
+
+  private List<Transactions> workers = new ArrayList<Transactions>();
+
+  private static final int NUM_DATA_NODES = 1;
+
+  /**
+   * Several of the test cases work by introducing a sleep
+   * into an operation that is usually fast, and then verifying
+   * that another operation blocks for at least this amount of time.
+   * This value needs to be significantly longer than the average
+   * time for an fsync() or enterSafeMode().
+   */
+  private static final int BLOCK_TIME = 10;
+  
+  //
+  // an object that does a bunch of transactions
+  //
+  static class Transactions implements Runnable {
+    FSNamesystem namesystem;
+    short replication = 3;
+    long blockSize = 64;
+    volatile boolean stopped = false;
+    volatile Thread thr;
+    AtomicReference<Throwable> caught;
+
+    Transactions(FSNamesystem ns, AtomicReference<Throwable> caught) {
+      namesystem = ns;
+      this.caught = caught;
+    }
+
+    // add a bunch of transactions.
+    public void run() {
+      login();
+      thr = Thread.currentThread();
+      int i = 0;
+      while (!stopped) {
+        try {
+          String dirname = "/thr-" + thr.getId() + "-dir-" + i; 
+          namesystem.mkdirs(dirname, new PermissionStatus("test", "Test",
+              new FsPermission((short)0777)));
+          namesystem.delete(dirname, true);
+        } catch (SafeModeException sme) {
+          // This is OK - the tests will bring NN in and out of safemode
+        } catch (Throwable e) {
+          LOG.warn("Got error in transaction thread", e);
+          caught.compareAndSet(null, e);
+          break;
+        }
+        i++;
+      }
+    }
+
+    public void stop() {
+      stopped = true;
+    }
+
+    public Thread getThread() {
+      return thr;
+    }
+  }
+  
+  private static void login(){
+    try {
+      LOG.info("setting the user");
+      UserGroupInformation.setCurrentUser(UnixUserGroupInformation.login(new Configuration()));
+    } catch (LoginException e) {
+      throw new RuntimeException();
+    }
+  }
+
+  private void startTransactionWorkers(FSNamesystem namesystem,
+                                       AtomicReference<Throwable> caughtErr) {
+    // Create threads and make them run transactions concurrently.
+    for (int i = 0; i < NUM_THREADS; i++) {
+      Transactions trans = new Transactions(namesystem, caughtErr);
+      new Thread(trans, "TransactionThread-" + i).start();
+      workers.add(trans);
+    }
+  }
+
+  private void stopTransactionWorkers() {
+    // wait for all transactions to get over
+    for (Transactions worker : workers) {
+      worker.stop();
+    }
+
+    for (Transactions worker : workers) {
+      Thread thr = worker.getThread();
+      try {
+        if (thr != null) thr.join();
+      } catch (InterruptedException ie) {}
+    }
+  }
+
+  /**
+   * Tests rolling edit logs while transactions are ongoing.
+   */
+  @Test
+  public void testEditLogRolling() throws Exception {
+    // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
+
+
+    AtomicReference<Throwable> caughtErr = new AtomicReference<Throwable>();
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+      cluster.waitActive();
+      fileSys = cluster.getFileSystem();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+
+      FSImage fsimage = namesystem.getFSImage();
+      FSEditLog editLog = fsimage.getEditLog();
+
+      StorageDirectory sd = fsimage.storage.getStorageDir(0);
+
+      startTransactionWorkers(namesystem, caughtErr);
+
+      long previousLogTxId = 0;
+
+      for (int i = 0; i < NUM_ROLLS && caughtErr.get() == null; i++) {
+        try {
+          Thread.sleep(20);
+        } catch (InterruptedException e) {}
+
+        LOG.info("Starting roll " + i + ".");
+        CheckpointSignature sig = namesystem.rollEditLog();
+        
+        long nextLog = sig.curSegmentTxId;
+        String logFileName = NNStorage.getFinalizedEditsFileName(
+            previousLogTxId, nextLog - 1);
+        previousLogTxId += verifyEditLogs(namesystem, fsimage, logFileName, previousLogTxId);
+
+        assertEquals(previousLogTxId, nextLog);
+        
+        File expectedLog = NNStorage.getInProgressEditsFile(sd, previousLogTxId);
+        assertTrue("Expect " + expectedLog + " to exist", expectedLog.exists());
+      }
+    } finally {
+      stopTransactionWorkers();
+      if (caughtErr.get() != null) {
+        throw new RuntimeException(caughtErr.get());
+      }
+
+      if(fileSys != null) fileSys.close();
+      if(cluster != null) cluster.shutdown();
+    }
+  }
+
+  private long verifyEditLogs(FSNamesystem namesystem, FSImage fsimage, 
+                              String logFileName, long startTxId)
+    throws IOException {
+    
+    long numEdits = -1;
+    
+    // Verify that we can read in all the transactions that we have written.
+    // If there were any corruptions, it is likely that the reading in
+    // of these transactions will throw an exception.
+    for (StorageDirectory sd :
+      fsimage.storage.dirIterable(NameNodeDirType.EDITS)) {
+
+      File editFile = new File(sd.getCurrentDir(), logFileName);
+        
+      System.out.println("Verifying file: " + editFile);
+      FSEditLogLoader loader = new FSEditLogLoader(namesystem);
+      int numEditsThisLog = loader.loadFSEdits(new EditLogFileInputStream(editFile), 
+          startTxId -1);
+      
+      System.out.println("Number of edits: " + numEditsThisLog);
+      LOG.info("num edits: " + numEdits + " this log: " + numEditsThisLog);
+      assertTrue(numEdits == -1 || numEditsThisLog == numEdits);
+      numEdits = numEditsThisLog;
+    }
+
+    assertTrue(numEdits != -1);
+    return numEdits;
+  }
+
+  /**
+   * Tests saving fs image while transactions are ongoing.
+   */
+  @Test
+  public void testSaveNamespace() throws Exception {
+    // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
+
+    AtomicReference<Throwable> caughtErr = new AtomicReference<Throwable>();
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+      cluster.waitActive();
+      fileSys = cluster.getFileSystem();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+
+      FSImage fsimage = namesystem.getFSImage();
+      FSEditLog editLog = fsimage.getEditLog();
+
+      startTransactionWorkers(namesystem, caughtErr);
+
+      for (int i = 0; i < NUM_SAVE_IMAGE && caughtErr.get() == null; i++) {
+        try {
+          Thread.sleep(20);
+        } catch (InterruptedException e) {}
+
+
+        LOG.info("Save " + i + ": entering safe mode");
+        namesystem.enterSafeMode();
+
+        // Verify edit logs before the save
+        // They should start with the first edit after the checkpoint
+        long logStartTxId = fsimage.storage.getMostRecentCheckpointTxId() + 1; 
+        verifyEditLogs(namesystem, fsimage,
+            NNStorage.getInProgressEditsFileName(logStartTxId),
+            logStartTxId);
+
+
+        LOG.info("Save " + i + ": saving namespace");
+        namesystem.saveNamespace(false, false);
+        long savedImageTxId = fsimage.storage.getMostRecentCheckpointTxId();
+        
+        // Verify that edit logs post save got finalized and aren't corrupt
+        verifyEditLogs(namesystem, fsimage,
+            NNStorage.getFinalizedEditsFileName(logStartTxId, savedImageTxId),
+            logStartTxId);
+        
+        // The checkpoint id should be 1 less than the last written ID, since
+        // the log roll writes the "BEGIN" transaction to the new log.
+        assertEquals(fsimage.storage.getMostRecentCheckpointTxId(),
+                     editLog.getLastWrittenTxId() - 1);
+
+        namesystem.leaveSafeMode(false);
+        LOG.info("Save " + i + ": complete");
+      }
+    } finally {
+      stopTransactionWorkers();
+      if (caughtErr.get() != null) {
+        throw new RuntimeException(caughtErr.get());
+      }
+      if(fileSys != null) fileSys.close();
+      if(cluster != null) cluster.shutdown();
+    }
+  }
+ 
+  private Configuration getConf() {
+    Configuration conf = new Configuration();
+    conf.setBoolean("dfs.permissions.enabled", false); 
+    return conf;
+  }
+
+
+  /**
+   * The logSync() method in FSEditLog is unsynchronized whiel syncing
+   * so that other threads can concurrently enqueue edits while the prior
+   * sync is ongoing. This test checks that the log is saved correctly
+   * if the saveImage occurs while the syncing thread is in the unsynchronized middle section.
+   * 
+   * This replicates the following manual test proposed by Konstantin:
+   *   I start the name-node in debugger.
+   *   I do -mkdir and stop the debugger in logSync() just before it does flush.
+   *   Then I enter safe mode with another client
+   *   I start saveNamepsace and stop the debugger in
+   *     FSImage.saveFSImage() -> FSEditLog.createEditLogFile()
+   *     -> EditLogFileOutputStream.create() ->
+   *     after truncating the file but before writing LAYOUT_VERSION into it.
+   *   Then I let logSync() run.
+   *   Then I terminate the name-node.
+   *   After that the name-node wont start, since the edits file is broken.
+   */
+  @Test
+  public void testSaveImageWhileSyncInProgress() throws Exception {
+    Configuration conf = getConf();
+    MiniDFSCluster cluster = null;
+
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+      cluster.waitActive();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem(); 
+      FSImage fsimage = namesystem.getFSImage();
+      FSEditLog editLog = fsimage.getEditLog();
+
+      JournalAndStream jas = editLog.getJournals().get(0);
+      EditLogFileOutputStream spyElos =
+          spy((EditLogFileOutputStream)jas.getCurrentStream());
+      jas.setCurrentStreamForTests(spyElos);
+
+      final AtomicReference<Throwable> deferredException =
+          new AtomicReference<Throwable>();
+      final CountDownLatch waitToEnterFlush = new CountDownLatch(1);
+      
+      final Thread doAnEditThread = new Thread() {
+        public void run() {
+          login();
+          try {
+            LOG.info("Starting mkdirs");
+            namesystem.mkdirs("/test",
+                new PermissionStatus("test","test", new FsPermission((short)00755)));
+            LOG.info("mkdirs complete");
+          } catch (Throwable ioe) {
+            deferredException.set(ioe);
+            waitToEnterFlush.countDown();
+          }
+        }
+      };
+      
+      Answer<Void> blockingFlush = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) throws Throwable {
+          LOG.info("Flush called");
+          if (Thread.currentThread().equals(doAnEditThread)) {
+            LOG.info("edit thread: Telling main thread we made it to flush section...");
+            // Signal to main thread that the edit thread is in the racy section
+            waitToEnterFlush.countDown();
+            LOG.info("edit thread: sleeping for " + BLOCK_TIME + "secs");
+            Thread.sleep(BLOCK_TIME*1000);
+            LOG.info("Going through to flush. This will allow the main thread to continue.");
+          }
+          invocation.callRealMethod();
+          LOG.info("Flush complete");
+          return null;
+        }
+      };
+      doAnswer(blockingFlush).when(spyElos).flush();
+      
+      doAnEditThread.start();
+      // Wait for the edit thread to get to the logsync unsynchronized section
+      LOG.info("Main thread: waiting to enter flush...");
+      waitToEnterFlush.await();
+      assertNull(deferredException.get());
+      LOG.info("Main thread: detected that logSync is in unsynchronized section.");
+      LOG.info("Trying to enter safe mode.");
+      LOG.info("This should block for " + BLOCK_TIME + "sec, since flush will sleep that long");
+      
+      long st = System.currentTimeMillis();
+      namesystem.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+      long et = System.currentTimeMillis();
+      assertTrue((et - st) > ((BLOCK_TIME - 1)*1000));
+      LOG.info("Entered safe mode");
+
+      // Once we're in safe mode, save namespace.
+      namesystem.saveNamespace(false, false);
+
+      LOG.info("Joining on edit thread...");
+      doAnEditThread.join();
+      assertNull(deferredException.get());
+
+      // We did 3 edits: begin, txn, and end
+      assertEquals(3, verifyEditLogs(namesystem, fsimage,
+          NNStorage.getFinalizedEditsFileName(0, 2),
+          0));
+      // after the save, just the one "begin"
+      assertEquals(1, verifyEditLogs(namesystem, fsimage,
+          NNStorage.getInProgressEditsFileName(3),
+          3));
+    } finally {
+      LOG.info("Closing namesystem");
+      if(cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+  
+  /**
+   * Most of the FSNamesystem methods have a synchronized section where they
+   * update the name system itself and write to the edit log, and then
+   * unsynchronized, they call logSync. This test verifies that, if an
+   * operation has written to the edit log but not yet synced it,
+   * we wait for that sync before entering safe mode.
+   */
+  @Test
+  public void testSaveRightBeforeSync() throws Exception {
+    Configuration conf = getConf();
+    MiniDFSCluster cluster = null;
+
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+      cluster.waitActive();
+      final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+      FSImage fsimage = namesystem.getFSImage();
+      FSEditLog editLog = spy(fsimage.getEditLog());
+      fsimage.editLog = editLog;
+      
+      final AtomicReference<Throwable> deferredException =
+          new AtomicReference<Throwable>();
+      final CountDownLatch waitToEnterSync = new CountDownLatch(1);
+      
+      final Thread doAnEditThread = new Thread() {
+        public void run() {
+          try {
+            login();
+            LOG.info("Starting mkdirs");
+            namesystem.mkdirs("/test",
+                new PermissionStatus("test","test", new FsPermission((short)00755))
+                );
+            LOG.info("mkdirs complete");
+          } catch (Throwable ioe) {
+            deferredException.set(ioe);
+            waitToEnterSync.countDown();
+          }
+        }
+      };
+      
+      Answer<Void> blockingSync = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) throws Throwable {
+          LOG.info("logSync called");
+          if (Thread.currentThread() == doAnEditThread) {
+            LOG.info("edit thread: Telling main thread we made it just before logSync...");
+            waitToEnterSync.countDown();
+            LOG.info("edit thread: sleeping for " + BLOCK_TIME + "secs");
+            Thread.sleep(BLOCK_TIME*1000);
+            LOG.info("Going through to logSync. This will allow the main thread to continue.");
+          }
+          invocation.callRealMethod();
+          LOG.info("logSync complete");
+          return null;
+        }
+      };
+      doAnswer(blockingSync).when(editLog).logSync(anyBoolean());
+      
+      doAnEditThread.start();
+      LOG.info("Main thread: waiting to just before logSync...");
+      waitToEnterSync.await();
+      assertNull(deferredException.get());
+      LOG.info("Main thread: detected that logSync about to be called.");
+      LOG.info("Trying to enter safe mode.");
+      LOG.info("This should block for " + BLOCK_TIME + "sec, since we have pending edits");
+      
+      long st = System.currentTimeMillis();
+      namesystem.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+      long et = System.currentTimeMillis();
+      LOG.info("Entered safe mode");
+      // Make sure we really waited for the flush to complete!
+      assertTrue(et - st > (BLOCK_TIME - 1)*1000);
+
+      // Once we're in safe mode, save namespace.
+      namesystem.saveNamespace(false, false);
+
+      LOG.info("Joining on edit thread...");
+      doAnEditThread.join();
+      assertNull(deferredException.get());
+
+      // We did 3 edits: begin, txn, and end
+      assertEquals(3, verifyEditLogs(namesystem, fsimage,
+          NNStorage.getFinalizedEditsFileName(0, 2),
+          0));
+      // after the save, just the one "begin"
+      assertEquals(1, verifyEditLogs(namesystem, fsimage,
+          NNStorage.getInProgressEditsFileName(3),
+          3));
+    } finally {
+      LOG.info("Closing namesystem");
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }  
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditsDoubleBuffer.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditsDoubleBuffer.java
new file mode 100644
index 00000000..5e828b65
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditsDoubleBuffer.java
@@ -0,0 +1,81 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.apache.hadoop.io.DataOutputBuffer;
+import org.junit.Test;
+
+public class TestEditsDoubleBuffer {
+  @Test
+  public void testDoubleBuffer() throws IOException {
+    EditsDoubleBuffer buf = new EditsDoubleBuffer(1024);
+    
+    assertTrue(buf.isFlushed());
+    byte[] data = new byte[100];
+    buf.writeRaw(data, 0, data.length);
+    assertEquals("Should count new data correctly",
+        data.length, buf.countBufferedBytes());
+
+    assertTrue("Writing to current buffer should not affect flush state",
+        buf.isFlushed());
+
+    // Swap the buffers
+    buf.setReadyToFlush();
+    assertEquals("Swapping buffers should still count buffered bytes",
+        data.length, buf.countBufferedBytes());
+    assertFalse(buf.isFlushed());
+ 
+    // Flush to a stream
+    DataOutputBuffer outBuf = new DataOutputBuffer();
+    buf.flushTo(outBuf);
+    assertEquals(data.length, outBuf.getLength());
+    assertTrue(buf.isFlushed());
+    assertEquals(0, buf.countBufferedBytes());
+    
+    // Write some more
+    buf.writeRaw(data, 0, data.length);
+    assertEquals("Should count new data correctly",
+        data.length, buf.countBufferedBytes());
+    buf.setReadyToFlush();
+    buf.flushTo(outBuf);
+    
+    assertEquals(data.length * 2, outBuf.getLength());
+    
+    assertEquals(0, buf.countBufferedBytes());
+
+    outBuf.close();
+  }
+  
+  @Test
+  public void shouldFailToCloseWhenUnflushed() throws IOException {
+    EditsDoubleBuffer buf = new EditsDoubleBuffer(1024);
+    buf.writeRaw(new byte[1], 0, 1);
+    try {
+      buf.close();
+      fail("Did not fail to close with unflushed data");
+    } catch (IOException ioe) {
+      if (!ioe.toString().contains("still to be flushed")) {
+        throw ioe;
+      }
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestEmptyAbandonBlock.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEmptyAbandonBlock.java
new file mode 100644
index 00000000..062aa2ff
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestEmptyAbandonBlock.java
@@ -0,0 +1,45 @@
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+
+import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestEmptyAbandonBlock {
+
+  private static MiniDFSCluster cluster;
+  private static Configuration conf;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    conf = new Configuration();
+    cluster = new MiniDFSCluster(conf, 3, true, null);
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    cluster.shutdown();
+  }
+
+  @Test
+  public void testAbandon() throws Exception {
+    NameNode nn = cluster.getNameNode();
+    DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
+    String fileName = "/testAbandon";
+    fs.create(new Path(fileName));
+    LocatedBlock lbk = nn.addBlock(fileName, fs.getClient().getClientName());
+    INodeFileUnderConstruction cons = (INodeFileUnderConstruction) nn.namesystem.dir
+        .getInode(fileName);
+    cons.setTargets(null);
+    nn.abandonBlock(lbk.getBlock(), fileName, fs.getClient().getClientName());
+    assertEquals(0, nn.getBlockLocations(fileName, 0, Long.MAX_VALUE)
+        .locatedBlockCount());
+  }
+
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestFSEditLogLoader.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestFSEditLogLoader.java
new file mode 100644
index 00000000..787a5121
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestFSEditLogLoader.java
@@ -0,0 +1,309 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+import java.util.Map;
+import java.util.SortedMap;
+
+import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLogLoader.EditLogValidation;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.log4j.Level;
+import org.junit.Test;
+
+import com.google.common.collect.Maps;
+import com.google.common.io.Files;
+
+public class TestFSEditLogLoader {
+  
+  static {
+    ((Log4JLogger)FSImage.LOG).getLogger().setLevel(Level.ALL);
+  }
+  
+  private static final File TEST_DIR = new File(
+      System.getProperty("test.build.data","build/test/data"));
+
+  private static final int NUM_DATA_NODES = 0;
+  
+  @Test
+  public void testDisplayRecentEditLogOpCodes() throws IOException {
+    // start a cluster 
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = null;
+    FileSystem fileSys = null;
+    cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, true, null);
+    cluster.waitActive();
+    fileSys = cluster.getFileSystem();
+    final FSNamesystem namesystem = cluster.getNameNode().getNamesystem();
+
+    FSImage fsimage = namesystem.getFSImage();
+    for (int i = 0; i < 20; i++) {
+      fileSys.mkdirs(new Path("/tmp/tmp" + i));
+    }
+    StorageDirectory sd = fsimage.storage.dirIterator(NameNodeDirType.EDITS).next();
+    cluster.shutdown();
+
+    File editFile = FSImageTestUtil.findLatestEditsLog(sd).getFile();
+    assertTrue("Should exist: " + editFile, editFile.exists());
+
+    // Corrupt the edits file.
+    long fileLen = editFile.length();
+    RandomAccessFile rwf = new RandomAccessFile(editFile, "rw");
+    rwf.seek(fileLen - 40);
+    for (int i = 0; i < 20; i++) {
+      rwf.write(FSEditLogOpCodes.OP_DELETE.getOpCode());
+    }
+    rwf.close();
+    
+    String expectedErrorMessage = "^Error replaying edit log at offset \\d+\n";
+    expectedErrorMessage += "Recent opcode offsets: (\\d+\\s*){4}$";
+    try {
+      cluster = new MiniDFSCluster(conf, NUM_DATA_NODES, false, null);
+      fail("should not be able to start");
+    } catch (IOException e) {
+      assertTrue("error message contains opcodes message",
+          e.getMessage().matches(expectedErrorMessage));
+    }
+  }
+  
+  /**
+   * Test that, if the NN restarts with a new minimum replication,
+   * any files created with the old replication count will get
+   * automatically bumped up to the new minimum upon restart.
+   */
+  @Test
+  public void testReplicationAdjusted() throws IOException {
+    // start a cluster 
+    Configuration conf = new Configuration();
+    // Replicate and heartbeat fast to shave a few seconds off test
+    conf.setInt("dfs.replication.interval", 1);
+    conf.setInt("dfs.heartbeat.interval", 1);
+
+    MiniDFSCluster cluster = null;
+    try {
+      cluster = new MiniDFSCluster(conf, 2, true, null);
+      cluster.waitActive();
+      FileSystem fs = cluster.getFileSystem();
+  
+      // Create a file with replication count 1
+      Path p = new Path("/testfile");
+      DFSTestUtil.createFile(fs, p, 10, /*repl*/ (short)1, 1);
+      DFSTestUtil.waitReplication(fs, p, (short)1);
+  
+      // Shut down and restart cluster with new minimum replication of 2
+      cluster.shutdown();
+      cluster = null;
+      
+      conf.setInt("dfs.replication.min", 2);
+      // don't wait for safemode to exit !!!
+      cluster = new MiniDFSCluster(conf, 2, false, null, false);
+      cluster.waitActive();
+      cluster.getNameNode().getNamesystem().leaveSafeMode(false);
+      fs = cluster.getFileSystem();
+      
+      // The file should get adjusted to replication 2 when
+      // the edit log is replayed.
+      DFSTestUtil.waitReplication(fs, p, (short)2);
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+  
+  /**
+   * Test that the valid number of transactions can be counted from a file.
+   * @throws IOException 
+   */
+  @Test
+  public void testCountValidTransactions() throws IOException {
+    File testDir = new File(TEST_DIR, "testCountValidTransactions");
+    File logFile = new File(testDir,
+        NNStorage.getInProgressEditsFileName(0));
+    
+    // Create a log file, and return the offsets at which each
+    // transaction starts.
+    FSEditLog fsel = null;
+    final int NUM_TXNS = 30;
+    SortedMap<Long, Long> offsetToTxId = Maps.newTreeMap();
+    try {
+      fsel = FSImageTestUtil.createStandaloneEditLog(testDir);
+      fsel.open();
+      assertTrue("should exist: " + logFile, logFile.exists());
+      
+      for (int i = 0; i < NUM_TXNS; i++) {
+        long trueOffset = getNonTrailerLength(logFile);
+        long thisTxId = fsel.getLastWrittenTxId() + 1;
+        offsetToTxId.put(trueOffset, thisTxId);
+        System.err.println("txid " + thisTxId + " at offset " + trueOffset);
+        fsel.logDelete("path" + i, i);
+        fsel.logSync();
+      }
+    } finally {
+      if (fsel != null) {
+        fsel.close();
+      }
+    }
+
+    // The file got renamed when the log was closed.
+    logFile = testDir.listFiles()[0];
+    long validLength = getNonTrailerLength(logFile);
+
+    // Make sure that uncorrupted log has the expected length and number
+    // of transactions.
+    EditLogValidation validation = EditLogFileInputStream.validateEditLog(logFile);
+    assertEquals(NUM_TXNS + 2, validation.getNumTransactions());
+    assertEquals(validLength, validation.getValidLength());
+    
+    // Back up the uncorrupted log
+    File logFileBak = new File(testDir, logFile.getName() + ".bak");
+    Files.copy(logFile, logFileBak);
+
+    // Corrupt the log file in various ways for each txn
+    for (Map.Entry<Long, Long> entry : offsetToTxId.entrySet()) {
+      long txOffset = entry.getKey();
+      long txid = entry.getValue();
+      
+      // Restore backup, truncate the file exactly before the txn
+      Files.copy(logFileBak, logFile);
+      truncateFile(logFile, txOffset);
+      validation = EditLogFileInputStream.validateEditLog(logFile);
+      assertEquals("Failed when truncating to length " + txOffset,
+          txid, validation.getNumTransactions());
+      assertEquals(txOffset, validation.getValidLength());
+
+      // Restore backup, truncate the file with one byte in the txn,
+      // also isn't valid
+      Files.copy(logFileBak, logFile);
+      truncateFile(logFile, txOffset + 1);
+      validation = EditLogFileInputStream.validateEditLog(logFile);
+      assertEquals("Failed when truncating to length " + (txOffset + 1),
+          txid, validation.getNumTransactions());
+      assertEquals(txOffset, validation.getValidLength());
+
+      // Restore backup, corrupt the txn opcode
+      Files.copy(logFileBak, logFile);
+      corruptByteInFile(logFile, txOffset);
+      validation = EditLogFileInputStream.validateEditLog(logFile);
+      assertEquals("Failed when corrupting txn opcode at " + txOffset,
+          txid, validation.getNumTransactions());
+      assertEquals(txOffset, validation.getValidLength());
+
+      // Restore backup, corrupt a byte a few bytes into the txn
+      Files.copy(logFileBak, logFile);
+      corruptByteInFile(logFile, txOffset+5);
+      validation = EditLogFileInputStream.validateEditLog(logFile);
+      assertEquals("Failed when corrupting txn data at " + (txOffset+5),
+          txid, validation.getNumTransactions());
+      assertEquals(txOffset, validation.getValidLength());
+    }
+    
+    // Corrupt the log at every offset to make sure that validation itself
+    // never throws an exception, and that the calculated lengths are monotonically
+    // increasing
+    long prevNumValid = 0;
+    for (long offset = 0; offset < validLength; offset++) {
+      Files.copy(logFileBak, logFile);
+      corruptByteInFile(logFile, offset);
+      EditLogValidation val = EditLogFileInputStream.validateEditLog(logFile);
+      assertTrue(val.getNumTransactions() >= prevNumValid);
+      prevNumValid = val.getNumTransactions();
+    }
+  }
+
+  /**
+   * Corrupt the byte at the given offset in the given file,
+   * by subtracting 1 from it.
+   */
+  private void corruptByteInFile(File file, long offset)
+      throws IOException {
+    RandomAccessFile raf = new RandomAccessFile(file, "rw");
+    try {
+      raf.seek(offset);
+      int origByte = raf.read();
+      raf.seek(offset);
+      raf.writeByte(origByte - 1);
+    } finally {
+      IOUtils.closeStream(raf);
+    }
+  }
+
+  /**
+   * Truncate the given file to the given length
+   */
+  private void truncateFile(File logFile, long newLength)
+      throws IOException {
+    RandomAccessFile raf = new RandomAccessFile(logFile, "rw");
+    raf.setLength(newLength);
+    raf.close();
+  }
+
+  /**
+   * Return the length of bytes in the given file after subtracting
+   * the trailer of 0xFF (OP_INVALID)s.
+   * This seeks to the end of the file and reads chunks backwards until
+   * it finds a non-0xFF byte.
+   * @throws IOException if the file cannot be read
+   */
+  private static long getNonTrailerLength(File f) throws IOException {
+    final int chunkSizeToRead = 256*1024;
+    FileInputStream fis = new FileInputStream(f);
+    try {
+      
+      byte buf[] = new byte[chunkSizeToRead];
+  
+      FileChannel fc = fis.getChannel();
+      long size = fc.size();
+      long pos = size - (size % chunkSizeToRead);
+      
+      while (pos >= 0) {
+        fc.position(pos);
+  
+        int readLen = (int) Math.min(size - pos, chunkSizeToRead);
+        IOUtils.readFully(fis, buf, 0, readLen);
+        for (int i = readLen - 1; i >= 0; i--) {
+          if (buf[i] != FSEditLogOpCodes.OP_INVALID.getOpCode()) {
+            return pos + i + 1; // + 1 since we count this byte!
+          }
+        }
+        
+        pos -= chunkSizeToRead;
+      }
+      return 0;
+    } finally {
+      fis.close();
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestFSImageStorageInspector.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestFSImageStorageInspector.java
new file mode 100644
index 00000000..500c5c3c
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestFSImageStorageInspector.java
@@ -0,0 +1,66 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getInProgressEditsFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getFinalizedEditsFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getImageFileName;
+
+import org.apache.hadoop.hdfs.server.namenode.FSImageStorageInspector.FSImageFile;
+import org.junit.Test;
+
+public class TestFSImageStorageInspector {
+  private static final Log LOG = LogFactory.getLog(
+      TestFSImageStorageInspector.class);
+
+  /**
+   * Simple test with image, edits, and inprogress edits
+   */
+  @Test
+  public void testCurrentStorageInspector() throws IOException {
+    FSImageTransactionalStorageInspector inspector = 
+        new FSImageTransactionalStorageInspector();
+    
+    StorageDirectory mockDir = FSImageTestUtil.mockStorageDirectory(
+        NameNodeDirType.IMAGE_AND_EDITS,
+        false,
+        "/foo/current/" + getImageFileName(123),
+        "/foo/current/" + getFinalizedEditsFileName(123, 456),
+        "/foo/current/" + getImageFileName(456),
+        "/foo/current/" + getInProgressEditsFileName(457));
+
+    inspector.inspectDirectory(mockDir);
+    assertEquals(2, inspector.foundImages.size());
+
+    FSImageFile latestImage = inspector.getLatestImage();
+    assertEquals(456, latestImage.txId);
+    assertSame(mockDir, latestImage.sd);
+    assertTrue(inspector.isUpgradeFinalized());
+    
+    assertEquals(new File("/foo/current/"+getImageFileName(456)), 
+        latestImage.getFile());
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
new file mode 100644
index 00000000..a9566b71
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
@@ -0,0 +1,349 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.*;
+
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Iterator;
+
+import java.io.RandomAccessFile;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+
+import org.junit.Test;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
+import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
+import org.apache.hadoop.test.GenericTestUtils;
+
+import static org.apache.hadoop.hdfs.server.namenode.TestEditLog.setupEdits;
+import static org.apache.hadoop.hdfs.server.namenode.TestEditLog.AbortSpec;
+import static org.apache.hadoop.hdfs.server.namenode.TestEditLog.TXNS_PER_ROLL;
+import static org.apache.hadoop.hdfs.server.namenode.TestEditLog.TXNS_PER_FAIL;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.base.Joiner;
+
+public class TestFileJournalManager {
+
+  static final Log LOG = LogFactory.getLog(TestFileJournalManager.class);
+  
+  /** 
+   * Test the normal operation of loading transactions from
+   * file journal manager. 3 edits directories are setup without any
+   * failures. Test that we read in the expected number of transactions.
+   */
+  @Test
+  public void testNormalOperation() throws IOException {
+    File f1 = new File(TestEditLog.TEST_DIR + "/normtest0");
+    File f2 = new File(TestEditLog.TEST_DIR + "/normtest1");
+    File f3 = new File(TestEditLog.TEST_DIR + "/normtest2");
+    
+    List<URI> editUris = ImmutableList.of(f1.toURI(), f2.toURI(), f3.toURI());
+    NNStorage storage = setupEdits(editUris, 5);
+    
+    long numJournals = 0;
+    for (StorageDirectory sd : storage.dirIterable(NameNodeDirType.EDITS)) {
+      FileJournalManager jm = new FileJournalManager(sd);
+      assertEquals(6*TXNS_PER_ROLL, jm.getNumberOfTransactions(0));
+      numJournals++;
+    }
+    assertEquals(3, numJournals);
+  }
+  
+  /** 
+   * Checks the JournalManager.isSegmentInProgress()
+   */
+  @Test
+  public void testInprogressSegment() throws IOException {
+    File f = new File(TestEditLog.TEST_DIR + "/testInprogressSegment");
+    // abort after the 5th roll 
+    NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
+                                   5, new AbortSpec(5, 0));
+    StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
+
+    FileJournalManager jm = new FileJournalManager(sd);
+    assertEquals(5*TXNS_PER_ROLL + TXNS_PER_FAIL, 
+                 jm.getNumberOfTransactions(0));
+    
+    boolean isOneInProgress = false;
+    boolean isOneNotInProgress = false;
+    
+    for (RemoteEditLog rel : jm.getRemoteEditLogs(0)) {
+      if (rel.inProgress()) {
+        isOneInProgress = true;
+        assertTrue(jm.isSegmentInProgress(rel.getStartTxId()));
+      } else {
+        isOneNotInProgress = true;
+        assertFalse(jm.isSegmentInProgress(rel.getStartTxId()));
+      }
+    }
+    assertTrue(isOneInProgress);
+    assertTrue(isOneNotInProgress);
+  }
+
+  /**
+   * Test that inprogress files are handled correct. Set up a single
+   * edits directory. Fail on after the last roll. Then verify that the 
+   * logs have the expected number of transactions.
+   */
+  @Test
+  public void testInprogressRecovery() throws IOException {
+    File f = new File(TestEditLog.TEST_DIR + "/filejournaltest0");
+    // abort after the 5th roll 
+    NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
+                                   5, new AbortSpec(5, 0));
+    StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
+
+    FileJournalManager jm = new FileJournalManager(sd);
+    assertEquals(5*TXNS_PER_ROLL + TXNS_PER_FAIL, 
+                 jm.getNumberOfTransactions(0));
+  }
+
+  /**
+   * Test a mixture of inprogress files and finalised. Set up 3 edits 
+   * directories and fail the second on the last roll. Verify that reading
+   * the transactions, reads from the finalised directories.
+   */
+  @Test
+  public void testInprogressRecoveryMixed() throws IOException {
+    File f1 = new File(TestEditLog.TEST_DIR + "/mixtest0");
+    File f2 = new File(TestEditLog.TEST_DIR + "/mixtest1");
+    File f3 = new File(TestEditLog.TEST_DIR + "/mixtest2");
+    
+    List<URI> editUris = ImmutableList.of(f1.toURI(), f2.toURI(), f3.toURI());
+
+    // abort after the 5th roll 
+    NNStorage storage = setupEdits(editUris,
+                                   5, new AbortSpec(5, 1));
+    Iterator<StorageDirectory> dirs = storage.dirIterator(NameNodeDirType.EDITS);
+    StorageDirectory sd = dirs.next();
+    FileJournalManager jm = new FileJournalManager(sd);
+    assertEquals(6*TXNS_PER_ROLL, jm.getNumberOfTransactions(0));
+    
+    sd = dirs.next();
+    jm = new FileJournalManager(sd);
+    assertEquals(5*TXNS_PER_ROLL + TXNS_PER_FAIL, jm.getNumberOfTransactions(0));
+
+    sd = dirs.next();
+    jm = new FileJournalManager(sd);
+    assertEquals(6*TXNS_PER_ROLL, jm.getNumberOfTransactions(0));
+  }
+
+  /** 
+   * Test that FileJournalManager behaves correctly despite inprogress
+   * files in all its edit log directories. Set up 3 directories and fail
+   * all on the last roll. Verify that the correct number of transaction 
+   * are then loaded.
+   */
+  @Test
+  public void testInprogressRecoveryAll() throws IOException {
+    File f1 = new File(TestEditLog.TEST_DIR + "/failalltest0");
+    File f2 = new File(TestEditLog.TEST_DIR + "/failalltest1");
+    File f3 = new File(TestEditLog.TEST_DIR + "/failalltest2");
+    
+    List<URI> editUris = ImmutableList.of(f1.toURI(), f2.toURI(), f3.toURI());
+    // abort after the 5th roll 
+    NNStorage storage = setupEdits(editUris, 5, 
+                                   new AbortSpec(5, 0),
+                                   new AbortSpec(5, 1),
+                                   new AbortSpec(5, 2));
+    Iterator<StorageDirectory> dirs = storage.dirIterator(NameNodeDirType.EDITS);
+    StorageDirectory sd = dirs.next();
+    FileJournalManager jm = new FileJournalManager(sd);
+    assertEquals(5*TXNS_PER_ROLL + TXNS_PER_FAIL, jm.getNumberOfTransactions(0));
+    
+    sd = dirs.next();
+    jm = new FileJournalManager(sd);
+    assertEquals(5*TXNS_PER_ROLL + TXNS_PER_FAIL, jm.getNumberOfTransactions(0));
+
+    sd = dirs.next();
+    jm = new FileJournalManager(sd);
+    assertEquals(5*TXNS_PER_ROLL + TXNS_PER_FAIL, jm.getNumberOfTransactions(0));
+  }
+
+  /** 
+   * Corrupt an edit log file after the start segment transaction
+   */
+  private void corruptAfterStartSegment(File f) throws IOException {
+    RandomAccessFile raf = new RandomAccessFile(f, "rw");
+    raf.seek(0x16); // skip version and first tranaction and a bit of next transaction
+    for (int i = 0; i < 1000; i++) {
+      raf.writeInt(0xdeadbeef);
+    }
+    raf.close();
+  }
+
+  /** 
+   * Test that we can read from a stream created by FileJournalManager.
+   * Create a single edits directory, failing it on the final roll.
+   * Then try loading from the point of the 3rd roll. Verify that we read 
+   * the correct number of transactions from this point.
+   */
+  @Test 
+  public void testReadFromStream() throws IOException {
+    File f = new File(TestEditLog.TEST_DIR + "/filejournaltest1");
+    // abort after 10th roll
+    NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
+                                   10, new AbortSpec(10, 0));
+    StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
+
+    FileJournalManager jm = new FileJournalManager(sd);
+    long expectedTotalTxnCount = TXNS_PER_ROLL*10 + TXNS_PER_FAIL;
+    assertEquals(expectedTotalTxnCount, jm.getNumberOfTransactions(0));
+
+    long skippedTxns = (3*TXNS_PER_ROLL); // skip first 3 files
+    long startingTxId = skippedTxns; 
+
+    long numTransactionsToLoad = jm.getNumberOfTransactions(startingTxId);
+    long numLoaded = 0;
+    while (numLoaded < numTransactionsToLoad) {
+      EditLogInputStream editIn = jm.getInputStream(startingTxId);
+      FSEditLogLoader.EditLogValidation val = FSEditLogLoader.validateEditLog(editIn);
+      long count = val.getNumTransactions();
+
+      editIn.close();
+      startingTxId += count;
+      numLoaded += count;
+    }
+
+    assertEquals(expectedTotalTxnCount - skippedTxns, numLoaded); 
+  }
+
+  /**
+   * Try to make a request with a start transaction id which doesn't
+   * match the start ID of some log segment. 
+   * This should fail as edit logs must currently be treated as indevisable 
+   * units.
+   */
+  @Test(expected=IOException.class)
+  public void testAskForTransactionsMidfile() throws IOException {
+    File f = new File(TestEditLog.TEST_DIR + "/filejournaltest2");
+    NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), 
+                                   10);
+    StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
+    
+    FileJournalManager jm = new FileJournalManager(sd);
+    jm.getNumberOfTransactions(2);    
+  }
+
+  /** 
+   * Test that we receive the correct number of transactions when we count
+   * the number of transactions around gaps.
+   * Set up a single edits directory, with no failures. Delete the 4th logfile.
+   * Test that getNumberOfTransactions returns the correct number of 
+   * transactions before this gap and after this gap. Also verify that if you
+   * try to count on the gap that an exception is thrown.
+   */
+  @Test
+  public void testManyLogsWithGaps() throws IOException {
+    File f = new File(TestEditLog.TEST_DIR + "/filejournaltest3");
+    NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), 10);
+    StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
+
+    final long startGapTxId = 3*TXNS_PER_ROLL; //30
+    final long endGapTxId = 4*TXNS_PER_ROLL - 1; //39
+    File[] files = new File(f, "current").listFiles(new FilenameFilter() {
+        public boolean accept(File dir, String name) {
+          if (name.startsWith(NNStorage.getFinalizedEditsFileName(startGapTxId, endGapTxId))) {
+            return true;
+          }
+          return false;
+        }
+      });
+    assertEquals(1, files.length);
+    assertTrue(files[0].delete());
+    
+    FileJournalManager jm = new FileJournalManager(sd);
+    assertEquals(startGapTxId, jm.getNumberOfTransactions(0));
+
+    try {
+      jm.getNumberOfTransactions(startGapTxId);
+      fail("Should have thrown an exception by now");
+    } catch (IOException ioe) {
+      assertTrue(true);
+    }
+
+    // rolled 10 times so there should be 11 files.
+    assertEquals(11*TXNS_PER_ROLL - endGapTxId - 1, //110 - 39 - 1 
+                 jm.getNumberOfTransactions(endGapTxId+1));
+  }
+
+  /** 
+   * Test that we can load an edits directory with a corrupt inprogress file.
+   * The corrupt inprogress file should be moved to the side.
+   */
+  @Test
+  public void testManyLogsWithCorruptInprogress() throws IOException {
+    File f = new File(TestEditLog.TEST_DIR + "/filejournaltest5");
+    NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), 10, new AbortSpec(10, 0));
+    StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
+
+    File[] files = new File(f, "current").listFiles(new FilenameFilter() {
+        public boolean accept(File dir, String name) {
+          if (name.startsWith("edits_inprogress")) {
+            return true;
+          }
+          return false;
+        }
+      });
+    assertEquals(files.length, 1);
+    
+    corruptAfterStartSegment(files[0]);
+
+    FileJournalManager jm = new FileJournalManager(sd);
+    assertEquals(10*TXNS_PER_ROLL+1, 
+                 jm.getNumberOfTransactions(0)); 
+  }
+
+  @Test
+  public void testGetRemoteEditLog() throws IOException {
+    StorageDirectory sd = FSImageTestUtil.mockStorageDirectory(
+        NameNodeDirType.EDITS, false,
+        NNStorage.getFinalizedEditsFileName(1, 100),
+        NNStorage.getFinalizedEditsFileName(101, 200),
+        NNStorage.getInProgressEditsFileName(201),
+        NNStorage.getFinalizedEditsFileName(1001, 1100));
+        
+    FileJournalManager fjm = new FileJournalManager(sd);
+    assertEquals("[1,100,true],[101,200,true],[201,201,false],[1001,1100,true]", getLogsAsString(fjm, 1));
+    assertEquals("[101,200,true],[201,201,false],[1001,1100,true]", getLogsAsString(fjm, 101));
+    assertEquals("[201,201,false],[1001,1100,true]", getLogsAsString(fjm, 201));
+    try {
+      assertEquals("[]", getLogsAsString(fjm, 150));
+      fail("Did not throw when asking for a txn in the middle of a log");
+    } catch (IOException ioe) {
+      GenericTestUtils.assertExceptionContains(
+          "150 which is in the middle", ioe);
+    }
+    assertEquals("Asking for a newer log than exists should return empty list",
+        "", getLogsAsString(fjm, 9999));
+  }
+
+  private static String getLogsAsString(
+      FileJournalManager fjm, long firstTxId) throws IOException {
+    return Joiner.on(",").join(fjm.getRemoteEditLogs(firstTxId));
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
index 0a6a064e..819f39de 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
@@ -27,8 +27,11 @@
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.DFSTestUtil;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.CorruptFileBlocks;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.server.datanode.BlockInlineChecksumWriter;
 import org.apache.hadoop.hdfs.tools.DFSck;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.util.ToolRunner;
@@ -167,11 +170,15 @@ public void testFsckMove() throws Exception {
       String[] fileNames = util.getFileNames(topDir);
       DFSClient dfsClient = new DFSClient(new InetSocketAddress("localhost",
         cluster.getNameNodePort()), conf);
-      String block = dfsClient.namenode.
+      Block block = dfsClient.namenode.
         getBlockLocations(fileNames[0], 0, Long.MAX_VALUE).
-        get(0).getBlock().getBlockName();
+        get(0).getBlock();
       for (int i = 0; i < 8; i++) {
-        File blockFile = new File(cluster.getBlockDirectory("data" + (i + 1)), block);
+        File blockFile = new File(cluster.getBlockDirectory("data" + (i + 1)),
+            BlockInlineChecksumWriter.getInlineChecksumFileName(block,
+                FSConstants.CHECKSUM_TYPE, conf.getInt(
+                    "io.bytes.per.checksum",
+                    FSConstants.DEFAULT_BYTES_PER_CHECKSUM)));
         if (blockFile.exists()) {
           assertTrue(blockFile.delete());
         }
@@ -296,7 +303,7 @@ public void testCorruptBlock() throws Exception {
       DFSTestUtil.createFile(fs, file1, 1024, (short) 3, 0);
       // Wait until file replication has completed
       DFSTestUtil.waitReplication(fs, file1, (short) 3);
-      String block = DFSTestUtil.getFirstBlock(fs, file1).getBlockName();
+      Block block = DFSTestUtil.getFirstBlock(fs, file1);
 
       // Make sure filesystem is in healthy state
       outStr = runFsck(conf, 0, true, "/");
@@ -305,7 +312,10 @@ public void testCorruptBlock() throws Exception {
 
       // corrupt replicas 
       for (int i = 0; i < 6; i++) {
-        File blockFile = new File(cluster.getBlockDirectory("data" + (i + 1)), block);
+        File blockFile = new File(cluster.getBlockDirectory("data" + (i + 1)),
+            BlockInlineChecksumWriter.getInlineChecksumFileName(block,
+                FSConstants.CHECKSUM_TYPE, conf.getInt("io.bytes.per.checksum",
+                    FSConstants.DEFAULT_BYTES_PER_CHECKSUM)));
         if (blockFile.exists()) {
           RandomAccessFile raFile = new RandomAccessFile(blockFile, "rw");
           FileChannel channel = raFile.getChannel();
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestGenericJournalConf.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestGenericJournalConf.java
new file mode 100644
index 00000000..1296cd69
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestGenericJournalConf.java
@@ -0,0 +1,181 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mortbay.log.Log;
+
+import static org.mockito.Mockito.mock;
+import static org.junit.Assert.*;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringUtils;
+
+import java.net.URI;
+import java.io.IOException;
+
+public class TestGenericJournalConf {
+  /** 
+   * Test that an exception is thrown if a journal class doesn't exist
+   * in the configuration 
+   */
+  @Test(expected=IllegalArgumentException.class)
+  public void testNotConfigured() throws Exception {
+    MiniDFSCluster cluster = null;
+    Configuration conf = new Configuration();
+
+    conf.set("dfs.name.edits.dir", "dummy://test");
+    try {
+      cluster = new MiniDFSCluster(conf, 0, true, null);
+      cluster.waitActive();
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+
+  /**
+   * Test that an exception is thrown if a journal class doesn't
+   * exist in the classloader.
+   */
+  @Test(expected=IllegalArgumentException.class)
+  public void testClassDoesntExist() throws Exception {
+    MiniDFSCluster cluster = null;
+    Configuration conf = new Configuration();
+
+    conf.set("dfs.name.edits.journal-plugin" + ".dummy",
+             "org.apache.hadoop.nonexistent");
+    conf.set("dfs.name.edits.dir",
+             "dummy://test");
+
+    try {
+      cluster = new MiniDFSCluster(conf, 0, false, null);
+      cluster.waitActive();
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+
+  /**
+   * Test that a implementation of JournalManager without a 
+   * (Configuration,URI) constructor throws an exception
+   */
+  @Test
+  public void testBadConstructor() throws Exception {
+    MiniDFSCluster cluster = null;
+    Configuration conf = new Configuration();
+    
+    conf.set("dfs.name.edits.journal-plugin" + ".dummy",
+        BadConstructorJournalManager.class.getName());
+    conf.set("dfs.name.edits.dir",
+        "dummy://test");
+    
+    try {
+      cluster = new MiniDFSCluster(conf, 0, true, null);
+      cluster.waitActive();
+      fail("Should have failed before this point");
+    } catch (IllegalArgumentException iae) {
+      if (!iae.getMessage().contains("Unable to construct journal")) {
+        fail("Should have failed with unable to construct exception");
+      }
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+
+  /**
+   * Test that a dummy implementation of JournalManager can
+   * be initialized on startup
+   */
+  @Test
+  public void testDummyJournalManager() throws Exception {
+    MiniDFSCluster cluster = null;
+    Configuration conf = new Configuration();
+
+    conf.set("dfs.name.edits.journal-plugin" + ".dummy",
+        DummyJournalManager.class.getName());
+    conf.set("dfs.name.edits.dir",
+        "dummy://test");
+
+    try {
+      cluster = new MiniDFSCluster(conf, 0, true, null);
+      cluster.waitActive();
+    } finally {
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+
+  public static class DummyJournalManager implements JournalManager {
+    public DummyJournalManager(Configuration conf, URI u) {}
+    
+    @Override
+    public EditLogOutputStream startLogSegment(long txId) throws IOException {
+      return mock(EditLogOutputStream.class);
+    }
+    
+    @Override
+    public void finalizeLogSegment(long firstTxId, long lastTxId)
+        throws IOException {
+      // noop
+    }
+
+    @Override
+    public EditLogInputStream getInputStream(long fromTxnId)
+        throws IOException {
+      return null;
+    }
+
+    @Override
+    public long getNumberOfTransactions(long fromTxnId)
+        throws IOException {
+      return 0;
+    }
+
+    @Override
+    public void purgeLogsOlderThan(long minTxIdToKeep)
+        throws IOException {}
+
+    @Override
+    public void recoverUnfinalizedSegments() throws IOException {}
+
+    @Override
+    public void close() throws IOException {}
+
+    @Override
+    public boolean isSegmentInProgress(long startTxId) throws IOException {
+      // TODO Auto-generated method stub
+      return false;
+    }
+  }
+
+  public static class BadConstructorJournalManager extends DummyJournalManager {
+    public BadConstructorJournalManager() {
+      super(null, null);
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java
index 9a22fdaa..f3501a49 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java
@@ -19,11 +19,13 @@
 package org.apache.hadoop.hdfs.server.namenode;
 
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import org.junit.Before;
 
 import junit.framework.TestCase;
 
 public class TestHost2NodesMap extends TestCase {
-  static private Host2NodesMap map = new Host2NodesMap();
+  private Host2NodesMap map;
+  
   private final static DatanodeDescriptor dataNodes[] = new DatanodeDescriptor[] {
     new DatanodeDescriptor(new DatanodeID("h1:5020"), "/d1/r1"),
     new DatanodeDescriptor(new DatanodeID("h2:5020"), "/d1/r1"),
@@ -33,8 +35,10 @@ public class TestHost2NodesMap extends TestCase {
   private final static DatanodeDescriptor NULL_NODE = null; 
   private final static DatanodeDescriptor NODE = 
     new DatanodeDescriptor(new DatanodeID("h3:5040"), "/d1/r4");
-
-  static {
+  
+  @Before
+  public void setUp() {
+    map = new Host2NodesMap();
     for(DatanodeDescriptor node:dataNodes) {
       map.add(node);
     }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestListCorruptFileBlocks.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestListCorruptFileBlocks.java
index 404c60ad..b4c0722b 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestListCorruptFileBlocks.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestListCorruptFileBlocks.java
@@ -57,9 +57,23 @@
 public class TestListCorruptFileBlocks {
   static Log LOG = LogFactory.getLog(TestListCorruptFileBlocks.class);
 
-  /** check if nn.getCorruptFiles() returns a file that has corrupted blocks */
   @Test
   public void testListCorruptFilesCorruptedBlock() throws Exception {
+    testListCorruptFilesCorruptedBlockInternal(false);
+  }
+
+  @Test
+  public void testListCorruptFilesCorruptedBlockInlineChecksum() throws Exception {
+    testListCorruptFilesCorruptedBlockInternal(true);
+  }
+  
+  private boolean shouldSelectFile(String fileName) {
+    return fileName.startsWith("blk_") && fileName.indexOf("_", "blk_".length()) > 0;
+  }
+  
+  /** check if nn.getCorruptFiles() returns a file that has corrupted blocks */
+  private void testListCorruptFilesCorruptedBlockInternal(boolean inlineChecksum)
+      throws Exception {
     MiniDFSCluster cluster = null;
     Random random = new Random();
     
@@ -67,6 +81,7 @@ public void testListCorruptFilesCorruptedBlock() throws Exception {
       Configuration conf = new Configuration();
       conf.setInt("dfs.datanode.directoryscan.interval", 1); // datanode scans directories
       conf.setInt("dfs.blockreport.intervalMsec", 3 * 1000); // datanode sends block reports
+      conf.setBoolean("dfs.use.inline.checksum", inlineChecksum);
       cluster = new MiniDFSCluster(conf, 1, true, null);
       FileSystem fs = cluster.getFileSystem();
 
@@ -87,8 +102,7 @@ public void testListCorruptFilesCorruptedBlock() throws Exception {
       File[] blocks = data_dir.listFiles();
       assertTrue("Blocks do not exist in data-dir", (blocks != null) && (blocks.length > 0));
       for (int idx = 0; idx < blocks.length; idx++) {
-        if (blocks[idx].getName().startsWith("blk_") &&
-            blocks[idx].getName().endsWith(".meta")) {
+        if (shouldSelectFile(blocks[idx].getName())) {
           //
           // shorten .meta file
           //
@@ -130,12 +144,24 @@ public void testListCorruptFilesCorruptedBlock() throws Exception {
     }
   }
 
+  @Test
+  public void testListCorruptFileBlocksInSafeMode() throws Exception {
+    testListCorruptFileBlocksInSafeModeInternal(false);
+  }
+
+  @Test
+  public void testListCorruptFileBlocksInSafeModeInlineChecksum()
+      throws Exception {
+    testListCorruptFileBlocksInSafeModeInternal(true);
+  }
+
+  
   /**
    * Check that listCorruptFileBlocks works while the namenode is still in
    * safemode.
    */
-  @Test
-  public void testListCorruptFileBlocksInSafeMode() throws Exception {
+  private void testListCorruptFileBlocksInSafeModeInternal(
+      boolean inlineChecksum) throws Exception {
     MiniDFSCluster cluster = null;
     Random random = new Random();
 
@@ -153,6 +179,7 @@ public void testListCorruptFileBlocksInSafeMode() throws Exception {
       // start populating repl queues immediately 
       conf.setFloat("dfs.namenode.replqueue.threshold-pct",
                     0f);
+      conf.setBoolean("dfs.use.inline.checksum", inlineChecksum);
       cluster = new MiniDFSCluster(conf, 1, true, null, false);
       cluster.getNameNode().
         setSafeMode(FSConstants.SafeModeAction.SAFEMODE_LEAVE);
@@ -176,8 +203,7 @@ public void testListCorruptFileBlocksInSafeMode() throws Exception {
       assertTrue("Blocks do not exist in data-dir", (blocks != null) &&
                  (blocks.length > 0));
       for (int idx = 0; idx < blocks.length; idx++) {
-        if (blocks[idx].getName().startsWith("blk_") &&
-            blocks[idx].getName().endsWith(".meta")) {
+        if (shouldSelectFile(blocks[idx].getName())) {
           //
           // shorten .meta file
           //
@@ -268,12 +294,23 @@ public void testListCorruptFileBlocksInSafeMode() throws Exception {
     }
   }
 
+  @Test
+  public void testListCorruptFileBlocksInSafeModeNotPopulated() throws Exception {
+    testListCorruptFileBlocksInSafeModeNotPopulatedInternal(false);
+  }
+
+  @Test
+  public void testListCorruptFileBlocksInSafeModeNotPopulatedInlineChecksum()
+      throws Exception {
+    testListCorruptFileBlocksInSafeModeNotPopulatedInternal(true);
+  }
+  
   /**
    * Check that listCorruptFileBlocks throws an exception if we try to run it
    * before the underreplicated block queues have been populated.
    */
-  @Test
-  public void testListCorruptFileBlocksInSafeModeNotPopulated() throws Exception {
+  private void testListCorruptFileBlocksInSafeModeNotPopulatedInternal(
+      boolean inlineChecksum) throws Exception {
     MiniDFSCluster cluster = null;
     Random random = new Random();
 
@@ -288,6 +325,7 @@ public void testListCorruptFileBlocksInSafeModeNotPopulated() throws Exception {
       // never leave safemode automatically
       conf.setFloat("dfs.safemode.threshold.pct",
                     10f);
+      conf.setBoolean("dfs.use.inline.checksum", inlineChecksum);
       // never populate repl queues
       // conf.setFloat("dfs.namenode.replqueue.threshold-pct",
       //              1.5f);
@@ -315,8 +353,7 @@ public void testListCorruptFileBlocksInSafeModeNotPopulated() throws Exception {
       assertTrue("Blocks do not exist in data-dir", (blocks != null) &&
                  (blocks.length > 0));
       for (int idx = 0; idx < blocks.length; idx++) {
-        if (blocks[idx].getName().startsWith("blk_") &&
-            blocks[idx].getName().endsWith(".meta")) {
+        if (shouldSelectFile(blocks[idx].getName())) {
           //
           // shorten .meta file
           //
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageConfiguration.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageConfiguration.java
new file mode 100644
index 00000000..f076cde4
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageConfiguration.java
@@ -0,0 +1,67 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class TestNNStorageConfiguration {
+  
+  final static Log LOG = LogFactory.getLog(TestNNStorageConfiguration.class);
+  
+  private Configuration getConf() {
+    Configuration conf = new Configuration();
+    // provide a clear configuration
+    conf.clear();
+    return conf;
+  }
+  
+  @Test
+  public void testCheckpointTriggerBasic() {
+    Configuration conf = getConf();
+    conf.setLong("fs.checkpoint.txns", 200);
+    
+    long count = NNStorageConfiguration.getCheckpointTxnCount(conf);
+    assertEquals(200, count);
+  }
+  
+  @Test
+  public void testCheckpointTriggerOld() {
+    Configuration conf = getConf();
+    conf.setLong("fs.checkpoint.size", 10000);
+    
+    // divided by 100 - if fs.checkpoint.txns is not present
+    long count = NNStorageConfiguration.getCheckpointTxnCount(conf);
+    assertEquals(100, count);
+  }
+  
+  @Test
+  public void testCheckpointTriggerBoth() {
+    Configuration conf = getConf();
+    conf.setLong("fs.checkpoint.size", 10000);
+    conf.setLong("fs.checkpoint.txns", 200);
+    
+    // if both are present we prioritize fs.checkpoint.txns
+    long count = NNStorageConfiguration.getCheckpointTxnCount(conf);
+    assertEquals(200, count);
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageFailures.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageFailures.java
new file mode 100644
index 00000000..708642db
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageFailures.java
@@ -0,0 +1,129 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+public class TestNNStorageFailures {
+
+  public static final Log LOG = LogFactory.getLog(TestNNStorageFailures.class);
+
+  private int editsPerformed = 0;
+  private MiniDFSCluster cluster;
+  private FileSystem fs;
+
+  @Before
+  public void setUpMiniCluster() throws IOException {
+    Configuration conf = new Configuration();
+    File baseDir = MiniDFSCluster.getBaseDirectory(conf);
+    File editDir1 = new File(baseDir, "edit1");
+    File editDir2 = new File(baseDir, "edit2");
+    conf.set("dfs.name.edits.dir",
+        editDir1.getPath() + "," + editDir2.getPath());
+
+    cluster = new MiniDFSCluster(conf, 0, true, null);
+    cluster.waitActive();
+    fs = cluster.getFileSystem();
+  }
+
+  @After
+  public void shutDownMiniCluster() throws IOException {
+    if (fs != null)
+      fs.close();
+    if (cluster != null)
+      cluster.shutdown();
+  }
+
+  /**
+   * Do a mutative metadata operation on the file system.
+   * 
+   * @return true if the operation was successful, false otherwise.
+   */
+  private boolean doAnEdit() throws IOException {
+    return fs.mkdirs(new Path("/tmp", Integer.toString(editsPerformed++)));
+  }
+
+  // check if exception is thrown when all image dirs fail
+  @Test
+  public void testAllImageDirsFailOnRoll() throws IOException {
+    assertTrue(doAnEdit());
+    Collection<File> namedirs = cluster.getNameDirs();
+    for (File f : namedirs) {
+      LOG.info("Changing permissions for directory " + f);
+      f.setExecutable(false);
+    }
+    try {
+      cluster.getNameNode().getNamesystem().rollEditLog();
+      fail("Should get an exception here");
+    } catch (IOException e) {
+      LOG.info(e);
+      assertTrue(e.toString()
+          .contains("No more image storage directories left"));
+    } finally {
+      for (File f : namedirs) {
+        LOG.info("Changing permissions for directory " + f);
+        f.setExecutable(true);
+      }
+    }
+  }
+  
+  // check if image directories are restored at two consecutive SN, 
+  // when one fails
+  @Test
+  public void testImageDirsRemainValidOnInodeMismatch() throws IOException {
+    for (int i = 0; i < 10; i++) {
+      assertTrue(doAnEdit());
+    }
+
+    // replace root dir with a spy
+    FSDirectory spyDir = spy(cluster.getNameNode().getNamesystem().dir);
+    long originalCount = spyDir.totalInodes();
+    cluster.getNameNode().getNamesystem().dir = spyDir;
+
+    doReturn(new Long(originalCount + 1)).when(spyDir).totalInodes();
+    // save namespace should fail, but not evict image directories
+    try {
+      cluster.getNameNode().getNamesystem().saveNamespace(true, false);
+      fail("Should get an exception here");
+    } catch (IOException e) {
+      LOG.info(e);
+    }
+    doReturn(new Long(originalCount)).when(spyDir).totalInodes();
+    cluster.getNameNode().getNamesystem().saveNamespace(true, false);
+    assertTrue(cluster.getNameNode().getNamesystem().getFSImage().storage.removedStorageDirs
+        .isEmpty());
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionFunctional.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionFunctional.java
new file mode 100644
index 00000000..f15fb026
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionFunctional.java
@@ -0,0 +1,148 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.junit.Test;
+
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getInProgressEditsFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getFinalizedEditsFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getImageFileName;
+
+
+/**
+ * Functional tests for NNStorageRetentionManager. This differs from
+ * {@link TestNNStorageRetentionManager} in that the other test suite
+ * is only unit/mock-based tests whereas this suite starts miniclusters,
+ * etc.
+ */
+public class TestNNStorageRetentionFunctional {
+
+  private static File TEST_ROOT_DIR =
+    new File(System.getProperty("test.build.data"));
+  private static Log LOG = LogFactory.getLog(
+      TestNNStorageRetentionFunctional.class);
+
+ /**
+  * Test case where two directories are configured as NAME_AND_EDITS
+  * and one of them fails to save storage. Since the edits and image
+  * failure states are decoupled, the failure of image saving should
+  * not prevent the purging of logs from that dir.
+  */
+  @Test
+  public void testPurgingWithNameEditsDirAfterFailure()
+      throws IOException {
+    MiniDFSCluster cluster = null;    
+    Configuration conf = new Configuration();
+
+    File sd0 = null;    
+    try {
+      cluster = new MiniDFSCluster(conf, 0, true, null);
+      File[] storageDirs = cluster.getNameDirs().toArray(new File[0]);
+      sd0 = storageDirs[0];
+      File cd0 = new File(storageDirs[0], "current");
+      File cd1 = new File(storageDirs[1], "current");
+  
+      NameNode nn = cluster.getNameNode();
+
+      doSaveNamespace(nn);
+      // special case of an empty image with txid = -1
+      LOG.info("After first save, images -1 and 1 should exist in both dirs");
+      GenericTestUtils.assertGlobEquals(cd0, "fsimage_(-?\\d+)", 
+          getImageFileName(-1), getImageFileName(1));
+      GenericTestUtils.assertGlobEquals(cd1, "fsimage_(-?\\d+)",
+          getImageFileName(-1), getImageFileName(1));
+      GenericTestUtils.assertGlobEquals(cd0, "edits_.*",
+          getFinalizedEditsFileName(0, 1),
+          getInProgressEditsFileName(2));
+      GenericTestUtils.assertGlobEquals(cd1, "edits_.*",
+          getFinalizedEditsFileName(0, 1),
+          getInProgressEditsFileName(2));
+      
+      doSaveNamespace(nn);
+      LOG.info("After second save, image 0 should be purged, " +
+          "and image 4 should exist in both.");
+      GenericTestUtils.assertGlobEquals(cd0, "fsimage_\\d*",
+          getImageFileName(1), getImageFileName(3));
+      GenericTestUtils.assertGlobEquals(cd1, "fsimage_\\d*",
+          getImageFileName(1), getImageFileName(3));
+      GenericTestUtils.assertGlobEquals(cd0, "edits_.*",
+          getFinalizedEditsFileName(2, 3),
+          getInProgressEditsFileName(4));
+      GenericTestUtils.assertGlobEquals(cd1, "edits_.*",
+          getFinalizedEditsFileName(2, 3),
+          getInProgressEditsFileName(4));
+      
+      LOG.info("Failing first storage dir by chmodding it");
+      sd0.setExecutable(false);
+      doSaveNamespace(nn);      
+      LOG.info("Restoring accessibility of first storage dir");      
+      sd0.setExecutable(true);
+
+      LOG.info("nothing should have been purged in first storage dir");
+      GenericTestUtils.assertGlobEquals(cd0, "fsimage_\\d*",
+          getImageFileName(1), getImageFileName(3));
+      GenericTestUtils.assertGlobEquals(cd0, "edits_.*",
+          getFinalizedEditsFileName(2, 3),
+          getInProgressEditsFileName(4));
+
+      LOG.info("fsimage_2 should be purged in second storage dir");
+      GenericTestUtils.assertGlobEquals(cd1, "fsimage_\\d*",
+          getImageFileName(3), getImageFileName(5));
+      GenericTestUtils.assertGlobEquals(cd1, "edits_.*",
+          getFinalizedEditsFileName(4, 5),
+          getInProgressEditsFileName(6));
+
+      LOG.info("On next save, we should purge logs and images from the failed dir," +
+          " , since the image directory is restored.");
+      doSaveNamespace(nn);
+      GenericTestUtils.assertGlobEquals(cd1, "fsimage_\\d*",
+          getImageFileName(5), getImageFileName(7));
+      GenericTestUtils.assertGlobEquals(cd1, "edits_.*",
+          getFinalizedEditsFileName(6, 7),
+          getInProgressEditsFileName(8));
+      GenericTestUtils.assertGlobEquals(cd0, "fsimage_\\d*",
+          getImageFileName(7));
+      GenericTestUtils.assertGlobEquals(cd0, "edits_.*",
+          getInProgressEditsFileName(8));
+    } finally {
+      if (sd0 != null)
+        sd0.setExecutable(true);
+
+      LOG.info("Shutting down...");
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+
+  private static void doSaveNamespace(NameNode nn) throws IOException {
+    LOG.info("Saving namespace...");
+    nn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+    nn.saveNamespace();
+    nn.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionManager.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionManager.java
new file mode 100644
index 00000000..4c894144
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionManager.java
@@ -0,0 +1,334 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.namenode.FileJournalManager.EditLogFile;
+import org.apache.hadoop.hdfs.server.namenode.FSImageStorageInspector.FSImageFile;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getInProgressEditsFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getFinalizedEditsFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getImageFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getCheckpointImageFileName;
+
+import org.apache.hadoop.hdfs.server.namenode.NNStorageRetentionManager.StoragePurger;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
+
+public class TestNNStorageRetentionManager {
+  /**
+   * Test the "easy case" where we have more images in the
+   * directory than we need to keep. Should purge the
+   * old ones.
+   */
+  @Test
+  public void testPurgeEasyCase() throws IOException {
+    TestCaseDescription tc = new TestCaseDescription();
+    tc.addRoot("/foo1", NameNodeDirType.IMAGE_AND_EDITS);
+    tc.addImage("/foo1/current/" + getImageFileName(100), true);
+    tc.addImage("/foo1/current/" + getImageFileName(200), true);
+    tc.addImage("/foo1/current/" + getImageFileName(300), false);
+    tc.addImage("/foo1/current/" + getImageFileName(400), false);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(101,200), true);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(201,300), true);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(301,400), false);
+    tc.addLog("/foo1/current/" + getInProgressEditsFileName(401), false);
+    // Test that other files don't get purged
+    tc.addLog("/foo1/current/VERSION", false);
+    runTest(tc);
+  }
+  
+  /**
+   * Same as above, but across multiple directories
+   */
+  @Test
+  public void testPurgeMultipleDirs() throws IOException {
+    TestCaseDescription tc = new TestCaseDescription();
+    tc.addRoot("/foo1", NameNodeDirType.IMAGE_AND_EDITS);
+    tc.addRoot("/foo2", NameNodeDirType.IMAGE_AND_EDITS);
+    tc.addImage("/foo1/current/" + getImageFileName(100), true);
+    tc.addImage("/foo1/current/" + getImageFileName(200), true);
+    tc.addImage("/foo2/current/" + getImageFileName(200), true);
+    tc.addImage("/foo1/current/" + getImageFileName(300), false);
+    tc.addImage("/foo1/current/" + getImageFileName(400), false);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(101, 200), true);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(201, 300), true);
+    tc.addLog("/foo2/current/" + getFinalizedEditsFileName(201, 300), true);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(301, 400), false);
+    tc.addLog("/foo2/current/" + getFinalizedEditsFileName(301, 400), false);
+    tc.addLog("/foo1/current/" + getInProgressEditsFileName(401), false);
+    runTest(tc);
+  }
+  
+  /**
+   * Test that if we have fewer fsimages than the configured
+   * retention, we don't purge any of them
+   */
+  @Test
+  public void testPurgeLessThanRetention() throws IOException {
+    TestCaseDescription tc = new TestCaseDescription();
+    tc.addRoot("/foo1", NameNodeDirType.IMAGE_AND_EDITS);
+    tc.addImage("/foo1/current/" + getImageFileName(100), false);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(101,200), false);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(201,300), false);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(301,400), false);
+    tc.addLog("/foo1/current/" + getInProgressEditsFileName(401), false);
+    runTest(tc);
+  }
+
+  /**
+   * Check for edge case with no logs present at all.
+   */
+  @Test
+  public void testNoLogs() throws IOException {
+    TestCaseDescription tc = new TestCaseDescription();
+    tc.addRoot("/foo1", NameNodeDirType.IMAGE_AND_EDITS);
+    tc.addImage("/foo1/current/" + getImageFileName(100), true);
+    tc.addImage("/foo1/current/" + getImageFileName(200), true);
+    tc.addImage("/foo1/current/" + getImageFileName(300), false);
+    tc.addImage("/foo1/current/" + getImageFileName(400), false);
+    runTest(tc);
+  }
+  
+  /**
+   * Check for edge case with no logs or images present at all.
+   */
+  @Test
+  public void testEmptyDir() throws IOException {
+    TestCaseDescription tc = new TestCaseDescription();
+    tc.addRoot("/foo1", NameNodeDirType.IMAGE_AND_EDITS);
+    runTest(tc);
+  }
+
+  /**
+   * Test that old in-progress logs are properly purged
+   */
+  @Test
+  public void testOldInProgress() throws IOException {
+    TestCaseDescription tc = new TestCaseDescription();
+    tc.addRoot("/foo1", NameNodeDirType.IMAGE_AND_EDITS);
+    tc.addImage("/foo1/current/" + getImageFileName(100), true);
+    tc.addImage("/foo1/current/" + getImageFileName(200), true);
+    tc.addImage("/foo1/current/" + getImageFileName(300), false);
+    tc.addImage("/foo1/current/" + getImageFileName(400), false);
+    tc.addLog("/foo1/current/" + getInProgressEditsFileName(101), true);
+    runTest(tc);
+  }
+
+  @Test
+  public void testSeparateEditDirs() throws IOException {
+    TestCaseDescription tc = new TestCaseDescription();
+    tc.addRoot("/foo1", NameNodeDirType.IMAGE);
+    tc.addRoot("/foo2", NameNodeDirType.EDITS);
+    tc.addImage("/foo1/current/" + getImageFileName(100), true);
+    tc.addImage("/foo1/current/" + getImageFileName(200), true);
+    tc.addImage("/foo1/current/" + getImageFileName(300), false);
+    tc.addImage("/foo1/current/" + getImageFileName(400), false);
+
+    tc.addLog("/foo2/current/" + getFinalizedEditsFileName(101, 200), true);
+    tc.addLog("/foo2/current/" + getFinalizedEditsFileName(201, 300), true);
+    tc.addLog("/foo2/current/" + getFinalizedEditsFileName(301, 400), false);
+    tc.addLog("/foo2/current/" + getInProgressEditsFileName(401), false);
+    runTest(tc);    
+  }
+  
+  @Test
+  public void testPurgeCkptImages() throws IOException {
+    TestCaseDescription tc = new TestCaseDescription();
+    tc.addRoot("/foo1", NameNodeDirType.IMAGE_AND_EDITS);
+    tc.addImage("/foo1/current/" + getImageFileName(100), true);
+    
+    // this should be purged as it's older than 200
+    tc.addImage("/foo1/current/" + getCheckpointImageFileName(150), true);
+    tc.addImage("/foo1/current/" + getCheckpointImageFileName(160), true);
+    tc.addImage("/foo1/current/" + getCheckpointImageFileName(200), true);
+    
+    tc.addImage("/foo1/current/" + getImageFileName(200), true);
+    tc.addImage("/foo1/current/" + getImageFileName(300), false);
+    
+    // this should not be purged as it's newer than 300
+    tc.addImage("/foo1/current/" + getCheckpointImageFileName(350), false);
+    
+    tc.addImage("/foo1/current/" + getImageFileName(400), false);
+    
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(101,200), true);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(201,300), true);
+    tc.addLog("/foo1/current/" + getFinalizedEditsFileName(301,400), false);
+    tc.addLog("/foo1/current/" + getInProgressEditsFileName(401), false);
+    // Test that other files don't get purged
+    tc.addLog("/foo1/current/VERSION", false);
+    runTest(tc);
+  }
+  
+  private void runTest(TestCaseDescription tc) throws IOException {
+    Configuration conf = new Configuration();
+
+    StoragePurger mockPurger =
+      Mockito.mock(NNStorageRetentionManager.StoragePurger.class);
+    ArgumentCaptor<FSImageFile> imagesPurgedCaptor =
+      ArgumentCaptor.forClass(FSImageFile.class);    
+    ArgumentCaptor<EditLogFile> logsPurgedCaptor =
+      ArgumentCaptor.forClass(EditLogFile.class);    
+
+    // Ask the manager to purge files we don't need any more
+    new NNStorageRetentionManager(conf,
+        tc.mockStorage(), tc.mockEditLog(mockPurger), mockPurger)
+      .purgeOldStorage();
+    
+    // Verify that it asked the purger to remove the correct files
+    Mockito.verify(mockPurger, Mockito.atLeast(0))
+      .purgeImage(imagesPurgedCaptor.capture());
+    Mockito.verify(mockPurger, Mockito.atLeast(0))
+      .purgeLog(logsPurgedCaptor.capture());
+
+    // Check images
+    Set<String> purgedPaths = Sets.newHashSet();
+    for (FSImageFile purged : imagesPurgedCaptor.getAllValues()) {
+      purgedPaths.add(purged.getFile().toString());
+    }    
+    Assert.assertEquals(Joiner.on(",").join(tc.expectedPurgedImages),
+        Joiner.on(",").join(purgedPaths));
+
+    // Check images
+    purgedPaths.clear();
+    for (EditLogFile purged : logsPurgedCaptor.getAllValues()) {
+      purgedPaths.add(purged.getFile().toString());
+    }    
+    Assert.assertEquals(Joiner.on(",").join(tc.expectedPurgedLogs),
+        Joiner.on(",").join(purgedPaths));
+  }
+  
+  private static class TestCaseDescription {
+    private Map<String, FakeRoot> dirRoots = Maps.newHashMap();
+    private Set<String> expectedPurgedLogs = Sets.newHashSet();
+    private Set<String> expectedPurgedImages = Sets.newHashSet();
+    
+    private static class FakeRoot {
+      NameNodeDirType type;
+      List<String> files;
+      
+      FakeRoot(NameNodeDirType type) {
+        this.type = type;
+        files = Lists.newArrayList();
+      }
+
+      StorageDirectory mockStorageDir() {
+        return FSImageTestUtil.mockStorageDirectory(
+            type, false,
+            files.toArray(new String[0]));
+      }
+    }
+
+    void addRoot(String root, NameNodeDirType dir) {
+      dirRoots.put(root, new FakeRoot(dir));
+    }
+
+    private void addFile(String path) {
+      for (Map.Entry<String, FakeRoot> entry : dirRoots.entrySet()) {
+        if (path.startsWith(entry.getKey())) {
+          entry.getValue().files.add(path);
+        }
+      }
+    }
+    
+    void addLog(String path, boolean expectPurge) {
+      addFile(path);
+      if (expectPurge) {
+        expectedPurgedLogs.add(path);
+      }
+    }
+    
+    void addImage(String path, boolean expectPurge) {
+      addFile(path);
+      if (expectPurge) {
+        expectedPurgedImages.add(path);
+      }
+    }
+    
+    NNStorage mockStorage() throws IOException {
+      List<StorageDirectory> sds = Lists.newArrayList();
+      for (FakeRoot root : dirRoots.values()) {
+        sds.add(root.mockStorageDir());
+      }
+      return mockStorageForDirs(sds.toArray(new StorageDirectory[0]));
+    }
+    
+    public FSEditLog mockEditLog(StoragePurger purger) {
+      final List<JournalManager> jms = Lists.newArrayList();
+      for (FakeRoot root : dirRoots.values()) {
+        if (!root.type.isOfType(NameNodeDirType.EDITS)) continue;
+        
+        FileJournalManager fjm = new FileJournalManager(
+            root.mockStorageDir(), null);
+        fjm.purger = purger;
+        jms.add(fjm);
+      }
+
+      FSEditLog mockLog = Mockito.mock(FSEditLog.class);
+      Mockito.doAnswer(new Answer<Void>() {
+
+        @Override
+        public Void answer(InvocationOnMock invocation) throws Throwable {
+          Object[] args = invocation.getArguments();
+          assert args.length == 1;
+          long txId = (Long) args[0];
+          
+          for (JournalManager jm : jms) {
+            jm.purgeLogsOlderThan(txId);
+          }
+          return null;
+        }
+      }).when(mockLog).purgeLogsOlderThan(Mockito.anyLong());
+      return mockLog;
+    }
+  }
+
+  private static NNStorage mockStorageForDirs(final StorageDirectory ... mockDirs)
+      throws IOException {
+    NNStorage mockStorage = Mockito.mock(NNStorage.class);
+    Mockito.doAnswer(new Answer<Void>() {
+      @Override
+      public Void answer(InvocationOnMock invocation) throws Throwable {
+        FSImageStorageInspector inspector =
+          (FSImageStorageInspector) invocation.getArguments()[0];
+        for (StorageDirectory sd : mockDirs) {
+          inspector.inspectDirectory(sd);
+        }
+        return null;
+      }
+    }).when(mockStorage).inspectStorageDirs(
+        Mockito.<FSImageStorageInspector>anyObject());
+    return mockStorage;
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameEditsConfigs.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameEditsConfigs.java
index d234c450..8c0532f3 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameEditsConfigs.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameEditsConfigs.java
@@ -19,9 +19,11 @@
 
 import junit.framework.TestCase;
 import java.io.*;
+import java.util.List;
 import java.util.Random;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
@@ -49,7 +51,7 @@ protected void setUp() throws java.lang.Exception {
   }
 
   protected void tearDown() throws java.lang.Exception {
-    if (!FileUtil.fullyDelete(base_dir)) 
+    if (base_dir.exists() && !FileUtil.fullyDelete(base_dir)) 
       throw new IOException("Cannot remove directory " + base_dir);
   }
 
@@ -65,11 +67,29 @@ private void writeFile(FileSystem fileSys, Path name, int repl)
     stm.close();
   }
 
-  void checkImageAndEditsFilesExistence(File dir, 
-                                        boolean imageMustExist,
-                                        boolean editsMustExist) {
-    assertTrue(imageMustExist == new File(dir, FILE_IMAGE).exists());
-    assertTrue(editsMustExist == new File(dir, FILE_EDITS).exists());
+  void checkImageAndEditsFilesExistence(File dir, boolean shouldHaveImages,
+      boolean shouldHaveEdits) throws IOException {
+    FSImageTransactionalStorageInspector ins = inspect(dir);
+
+    if (shouldHaveImages) {
+      assertTrue("Expect images in " + dir, ins.foundImages.size() > 0);
+    } else {
+      assertTrue("Expect no images in " + dir, ins.foundImages.isEmpty());
+    }
+
+    List<FileJournalManager.EditLogFile> editlogs = FileJournalManager
+        .matchEditLogs(new File(dir, "current").listFiles());
+    if (shouldHaveEdits) {
+      assertTrue("Expect edits in " + dir, editlogs.size() > 0);
+    } else {
+      assertTrue("Expect no edits in " + dir, editlogs.isEmpty());
+    }
+  }
+  
+  private FSImageTransactionalStorageInspector inspect(File storageDir)
+      throws IOException {
+    return FSImageTestUtil.inspectStorageDirectory(
+        new File(storageDir, "current"), NameNodeDirType.IMAGE_AND_EDITS);
   }
 
   private void checkFile(FileSystem fileSys, Path name, int repl)
@@ -94,6 +114,69 @@ SecondaryNameNode startSecondaryNameNode(Configuration conf
     return new SecondaryNameNode(conf);
   }
 
+  // Test dfs.name.dir.policy configuration with 0: success
+  public void testNameDirPolicy0() throws IOException {
+    MiniDFSCluster cluster = null;
+    SecondaryNameNode secondary = null;
+    Configuration conf = null;
+    FileSystem fileSys = null;
+    File nameAndEdits = new File(base_dir, "name_and_edits");
+    File checkpointNameAndEdits = new File(base_dir, "second_name_and_edits");
+    Path file1 = new Path("TestNameEditsConfigs1");
+
+    conf = new Configuration();
+    conf.set("dfs.name.dir.policy", "0");
+    conf.set("dfs.name.dir", nameAndEdits.getPath());
+    conf.set("dfs.name.edits.dir", nameAndEdits.getPath());
+    conf.set("fs.checkpoint.dir", checkpointNameAndEdits.getPath());
+    conf.set("fs.checkpoint.edits.dir", checkpointNameAndEdits.getPath());
+    replication = (short)conf.getInt("dfs.replication", 3);
+
+    cluster = new MiniDFSCluster(0, conf, NUM_DATA_NODES, true, false, true, null,
+                                  null, null, null);
+    cluster.waitActive();
+    secondary = startSecondaryNameNode(conf);
+    fileSys = cluster.getFileSystem();
+
+    try {
+      assertTrue(!fileSys.exists(file1));
+      writeFile(fileSys, file1, replication);
+      checkFile(fileSys, file1, replication);
+      secondary.doCheckpoint();
+    } finally {
+      fileSys.close();
+      cluster.shutdown();
+      secondary.shutdown();
+    }
+  }
+
+  // Test dfs.name.dir.policy configuration failure cases
+  private void testNameDirPolicyFailure(int policy, boolean useUri)
+      throws IOException {
+    Configuration conf = null;
+    MiniDFSCluster cluster = null;
+    String prefix = useUri ? "file:" : "";
+    File nameAndEdits = new File(base_dir, "name_and_edits");
+    String policyStr = Integer.toString(policy);
+
+    conf = new Configuration();
+    conf.set("dfs.name.dir.policy", policyStr);
+    conf.set("dfs.name.dir", prefix + nameAndEdits.getPath());
+    conf.set("dfs.name.edits.dir", prefix + nameAndEdits.getPath());
+
+    try {
+      cluster = new MiniDFSCluster(0, conf, NUM_DATA_NODES, false, false, true,
+                                   null, null, null, null);
+      fail("The startup should fail");
+    } catch (IOException e) { // expect to fail
+      System.out.println("cluster start failed due to name/edits dir " +
+                        "violating policy " + policyStr);
+    } finally {
+      cluster = null;
+    }
+  }
+
+
   /**
    * Test various configuration options of dfs.name.dir and dfs.name.edits.dir
    * The test creates files and restarts cluster with different configs.
@@ -230,8 +313,13 @@ public void testNameEditsConfigs() throws IOException {
 
     // Add old name_and_edits dir. File system should not read image or edits
     // from old dir
-    assertTrue(FileUtil.fullyDelete(new File(nameAndEdits, "current")));
-    assertTrue(FileUtil.fullyDelete(new File(checkpointNameAndEdits, "current")));
+    
+    // clear the directories entirely, otherwise the startup will fail
+    assertTrue(FileUtil.fullyDelete(nameAndEdits));
+    assertTrue(FileUtil.fullyDelete(checkpointNameAndEdits));
+    nameAndEdits.mkdirs();
+    checkpointNameAndEdits.mkdirs();
+    
     conf = new Configuration();
     conf.set("dfs.name.dir", nameAndEdits.getPath() +
               "," + newNameDir.getPath());
@@ -305,7 +393,8 @@ public void testNameEditsConfigsFailure() throws IOException {
       cluster.shutdown();
     }
 
-    // Start namenode with additional dfs.name.dir and dfs.name.edits.dir
+    // 2
+    // Start namenode with additional dfs.namenode.name.dir and dfs.namenode.edits.dir
     conf =  new Configuration();
     assertTrue(newNameDir.mkdir());
     assertTrue(newEditsDir.mkdir());
@@ -332,6 +421,7 @@ public void testNameEditsConfigsFailure() throws IOException {
       cluster.shutdown();
     }
     
+    // 3
     // Now remove common directory both have and start namenode with 
     // separate name and edits dirs
     conf =  new Configuration();
@@ -357,6 +447,7 @@ public void testNameEditsConfigsFailure() throws IOException {
       cluster.shutdown();
     }
 
+    // 4
     // Add old shared directory for name and edits along with latest name
     conf = new Configuration();
     conf.set("dfs.name.dir", newNameDir.getPath() + "," + 
@@ -374,7 +465,10 @@ public void testNameEditsConfigsFailure() throws IOException {
       cluster = null;
     }
 
-    // Add old shared directory for name and edits along with latest edits
+    // 5
+    // Add old shared directory for name and edits along with latest edits. 
+    // This is OK, since the latest edits will have segments leading all
+    // the way from the image in name_and_edits.
     conf = new Configuration();
     conf.set("dfs.name.dir", nameAndEdits.getPath());
     conf.set("dfs.name.edits.dir", newEditsDir.getPath() +
@@ -383,11 +477,71 @@ public void testNameEditsConfigsFailure() throws IOException {
     try {
       cluster = new MiniDFSCluster(0, conf, NUM_DATA_NODES, false, false, true,
                                    null, null, null, null);
-      assertTrue(false);
+      fileSys = cluster.getFileSystem();
+      
+      assertFalse(fileSys.exists(file1));
+      assertFalse(fileSys.exists(file2));
+      assertTrue(fileSys.exists(file3));
+      checkFile(fileSys, file3, replication);
+      cleanupFile(fileSys, file3);
+      writeFile(fileSys, file3, replication);
+      checkFile(fileSys, file3, replication);
     } catch (IOException e) { // expect to fail
       System.out.println("cluster start failed due to missing latest name dir");
     } finally {
       cluster = null;
+    }   
+  }
+  
+  public void testNameDirPolicyFailures() throws Exception {
+    // Test dfs.name.dir.policy configuration
+    // when using uri's
+    testNameDirPolicyFailure(1, true);
+    testNameDirPolicyFailure(2, true);
+
+    // when using simple directory names
+    testNameDirPolicyFailure(1, false);
+    testNameDirPolicyFailure(2, false);
+  }
+  
+  public void testNonEmptyStorageDirectory() throws IOException {
+    MiniDFSCluster cluster = null;
+    Configuration conf = null;
+    
+    File nameAndEdits = new File(base_dir, "name_and_edits1");
+    File nameAndEdits2 = new File(base_dir, "name_and_edits2");
+    
+    // Start namenode with same dfs.name.dir and dfs.name.edits.dir
+    conf = new Configuration();
+    conf.set("dfs.name.dir", nameAndEdits.getPath());
+    conf.set("dfs.name.edits.dir", nameAndEdits.getPath());
+    
+    cluster = new MiniDFSCluster(0, conf, NUM_DATA_NODES, true, false, true, null,
+                                  null, null, null);
+    cluster.shutdown();
+    
+    
+    File current = new File(nameAndEdits2, "current");
+    current.mkdirs();
+    
+    conf.set("dfs.name.dir",
+        nameAndEdits.getPath() + "," + nameAndEdits2.getPath());
+    conf.set("dfs.name.edits.dir",
+        nameAndEdits.getPath() + "," + nameAndEdits2.getPath());
+    
+    // added directories, we should fail, because the directories are non-empty   
+    try{
+      cluster = new MiniDFSCluster(0, conf, NUM_DATA_NODES, false, false, true, null,
+          null, null, null);
+      fail("We should not proceed with a non-empty directory");
+    } catch (Exception e) {
+      assertTrue(e.toString().contains("is not empty"));
     }
+    current.delete();
+    
+    // now we should be able to start
+    cluster = new MiniDFSCluster(0, conf, NUM_DATA_NODES, false, false, true, null,
+        null, null, null);
+    cluster.shutdown();    
   }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestOverReplicatedBlocks.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestOverReplicatedBlocks.java
index 5c401c87..9fc1b996 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestOverReplicatedBlocks.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestOverReplicatedBlocks.java
@@ -54,12 +54,16 @@ public void testProcesOverReplicateBlock() throws IOException {
       
       // corrupt the block on datanode 0
       Block block = DFSTestUtil.getFirstBlock(fs, fileName);
-      TestDatanodeBlockScanner.corruptReplica(block.getBlockName(), 0, cluster);
+      TestDatanodeBlockScanner.corruptReplica(block, 0, cluster);
       DataNodeProperties dnProps = cluster.stopDataNode(0);
-      // remove block scanner log to trigger block scanning
-      File scanLog = new File(cluster.getBlockDirectory("data1").getParent(), "dncp_block_verification.log.curr");
-      //wait for one minute for deletion to succeed;
-      scanLog.delete();
+      // remove block scanner log to trigger block scanning at startup
+      // remove curr and prev
+      File scanLogCurr = new File(cluster.getBlockDirectory("data1")
+          .getParent(), "dncp_block_verification.log.curr");
+      scanLogCurr.delete();
+      File scanLogPrev = new File(cluster.getBlockDirectory("data1")
+          .getParent(), "dncp_block_verification.log.prev");
+      scanLogPrev.delete();
       
       // restart the datanode so the corrupt replica will be detected
       cluster.restartDataNode(dnProps);
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestParallelImageWrite.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestParallelImageWrite.java
index f009bf7b..3faae515 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestParallelImageWrite.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestParallelImageWrite.java
@@ -24,31 +24,29 @@
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hdfs.server.namenode.FSImage;
+import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.DFSTestUtil;
-import org.apache.hadoop.io.MD5Hash;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
 
-import java.util.Collection;
-import java.util.Arrays;
-import java.util.Iterator;
+import java.util.Collections;
 import java.util.List;
-import java.util.ArrayList;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.net.URI;
 
 /**
  * A JUnit test for checking if restarting DFS preserves integrity.
  * Specifically with FSImage being written in parallel
  */
 public class TestParallelImageWrite extends TestCase {
+  private static final int NUM_DATANODES = 4;
   /** check if DFS remains in proper condition after a restart */
   public void testRestartDFS() throws Exception {
+    final Configuration conf = new Configuration();
     MiniDFSCluster cluster = null;
-    Configuration conf = new Configuration();
+    FSNamesystem fsn = null;
+    int numNamenodeDirs;
     DFSTestUtil files = new DFSTestUtil("TestRestartDFS", 200, 3, 8*1024);
 
     final String dir = "/srcdat";
@@ -60,7 +58,12 @@ public void testRestartDFS() throws Exception {
     FileStatus dirstatus;
 
     try {
-      cluster = new MiniDFSCluster(conf, 4, true, null);
+      cluster = new MiniDFSCluster(conf, NUM_DATANODES, true, null);
+      String[] nameNodeDirs = conf.getStrings(
+          "dfs.name.dir", new String[] {});
+      numNamenodeDirs = nameNodeDirs.length;
+      assertTrue("failed to get number of Namenode StorageDirs", 
+          numNamenodeDirs != 0);
       FileSystem fs = cluster.getFileSystem();
       files.createFiles(fs, dir);
 
@@ -74,8 +77,13 @@ public void testRestartDFS() throws Exception {
       if (cluster != null) { cluster.shutdown(); }
     }
     try {
+      // Force the NN to save its images on startup so long as
+      // there are any uncheckpointed txns
+      conf.setInt("fs.checkpoint.txns", 1);
+
       // Here we restart the MiniDFScluster without formatting namenode
-      cluster = new MiniDFSCluster(conf, 4, false, null);
+      cluster = new MiniDFSCluster(conf, NUM_DATANODES, false, null);
+      fsn = cluster.getNameNode().getNamesystem();
       FileSystem fs = cluster.getFileSystem();
       assertTrue("Filesystem corrupted after restart.",
                  files.checkFiles(fs, dir));
@@ -89,23 +97,59 @@ public void testRestartDFS() throws Exception {
       assertEquals(dirstatus.getOwner(), newdirstatus.getOwner());
       assertEquals(dirstatus.getGroup() + "_XXX", newdirstatus.getGroup());
       rootmtime = fs.getFileStatus(rootpath).getModificationTime();
-      List<MD5Hash> checksums = new ArrayList<MD5Hash>();
-      Collection<File> nameDirs = cluster.getNameDirs();
-      for (File nameDir : nameDirs) {
-        File current = new File(nameDir, "current/fsimage");
-        FileInputStream in = new FileInputStream(current);
-        MD5Hash hash = MD5Hash.digest(in);
-        
-        checksums.add(hash);
-      }
-      assertTrue("Not enough fsimage copies in MiniDFSCluster " + 
-                   "to test parallel write", checksums.size() > 1);
-      for (int i = 1; i < checksums.size(); i++) {
-        assertEquals(checksums.get(i - 1), checksums.get(i));
-      }
+
+      final String checkAfterRestart = checkImages(fsn, numNamenodeDirs);
+      
+      // Modify the system and then perform saveNamespace
+      files.cleanup(fs, dir);
+      files.createFiles(fs, dir);
+      fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+      fsn.saveNamespace(true, false);
+      final String checkAfterModify = checkImages(fsn, numNamenodeDirs);
+      assertFalse("Modified namespace should change fsimage contents. " +
+          "was: " + checkAfterRestart + " now: " + checkAfterModify,
+          checkAfterRestart.equals(checkAfterModify));
+      fsn.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
       files.cleanup(fs, dir);
     } finally {
       if (cluster != null) { cluster.shutdown(); }
     }
   }
+  
+  /**
+   * Confirm that FSImage files in all StorageDirectory are the same,
+   * and non-empty, and there are the expected number of them.
+   * @param fsn - the FSNamesystem being checked.
+   * @param numImageDirs - the configured number of StorageDirectory of type IMAGE. 
+   * @return - the md5 hash of the most recent FSImage files, which must all be the same.
+   * @throws AssertionFailedError if image files are empty or different,
+   *     if less than two StorageDirectory are provided, or if the
+   *     actual number of StorageDirectory is less than configured.
+   */
+  public static String checkImages(
+      FSNamesystem fsn, int numImageDirs)
+  throws Exception {    
+    NNStorage stg = fsn.getFSImage().storage;
+    //any failed StorageDirectory is removed from the storageDirs list
+    assertEquals("Some StorageDirectories failed Upgrade",
+        numImageDirs, stg.getNumStorageDirs(NameNodeDirType.IMAGE));
+    assertTrue("Not enough fsimage copies in MiniDFSCluster " + 
+        "to test parallel write", numImageDirs > 1);
+
+    // List of "current/" directory from each SD
+    List<File> dirs = FSImageTestUtil.getCurrentDirs(stg, NameNodeDirType.IMAGE);
+
+    // across directories, all files with same names should be identical hashes   
+    FSImageTestUtil.assertParallelFilesAreIdentical(
+        dirs, Collections.<String>emptySet());
+    FSImageTestUtil.assertSameNewestImage(dirs);
+    
+    // Return the hash of the newest image file
+    StorageDirectory firstSd = stg.dirIterator(NameNodeDirType.IMAGE).next();
+    File latestImage = FSImageTestUtil.findLatestImageFile(firstSd);
+    String md5 = FSImageTestUtil.getImageFileMD5IgnoringTxId(latestImage);
+    System.err.println("md5 of " + latestImage + ": " + md5);
+    return md5;
+  }
 }
+
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java
index cd271ded..a9b57c5e 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java
@@ -29,7 +29,7 @@ public class TestPendingReplication extends TestCase {
   public void testPendingReplication() {
     int timeout = 10;		// 10 seconds
     PendingReplicationBlocks pendingReplications;
-    pendingReplications = new PendingReplicationBlocks(timeout * 1000);
+    pendingReplications = new PendingReplicationBlocks(timeout * 1000, 5, null);
 
     //
     // Add 10 blocks to pendingReplications.
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestPersistTxId.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestPersistTxId.java
index 3ca2bab8..916be66d 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestPersistTxId.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestPersistTxId.java
@@ -3,12 +3,16 @@
 import java.io.IOException;
 import java.util.Random;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
-import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.util.InjectionEventI;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
 
 import org.junit.After;
 import static org.junit.Assert.*;
@@ -21,11 +25,15 @@ public class TestPersistTxId {
   private Configuration conf;
   private FileSystem fs;
   private Random random;
+  private static Log LOG = LogFactory.getLog(TestPersistTxId.class);
 
   public void setUp(boolean simulateEditLogCrash) throws IOException {
     conf = new Configuration();
+    MiniDFSCluster.clearBaseDirectory(conf);
     conf.set("dfs.secondary.http.address", "0.0.0.0:0");
-    conf.setBoolean("dfs.simulate.editlog.crash", simulateEditLogCrash);
+    TestPersistTxIdInjectionHandler h = new TestPersistTxIdInjectionHandler();
+    h.simulateEditLogCrash = simulateEditLogCrash;
+    InjectionHandler.set(h);
     cluster = new MiniDFSCluster(conf, 3, true, null);
     fs = cluster.getFileSystem();
     random = new Random();
@@ -33,12 +41,15 @@ public void setUp(boolean simulateEditLogCrash) throws IOException {
 
   @After
   public void tearDown() throws Exception {
-    fs.close();
-    cluster.shutdown();
+    if (fs != null)
+      fs.close();
+    if (cluster != null)
+      cluster.shutdown();
+    InjectionHandler.clear();
   }
 
-  private long getCurrentTxId() {
-    return cluster.getNameNode().getFSImage().getEditLog().getCurrentTxId();
+  private long getLastWrittenTxId() {
+    return cluster.getNameNode().getFSImage().getEditLog().getLastWrittenTxId();
   }
 
   public void createEdits(int nEdits) throws IOException {
@@ -54,12 +65,12 @@ public void testTxIdMismatchHard() throws IOException {
     setUp(false);
     // Create some edits and verify.
     createEdits(20);
-    assertEquals(20, getCurrentTxId());
-    cluster.getNameNode().getFSImage().getEditLog().setStartTransactionId(50);
+    assertEquals(20, getLastWrittenTxId());
+    cluster.getNameNode().getFSImage().getEditLog().setLastWrittenTxId(50);
 
     // Closing each file would generate 10 edits.
     fs.close();
-    assertEquals(60, getCurrentTxId());
+    assertEquals(60, getLastWrittenTxId());
     // Restart namenode and verify that it fails due to gap in txids.
     try {
       cluster.restartNameNode(0);
@@ -75,19 +86,20 @@ public void testTxIdMismatchSoft() throws IOException {
     setUp(false);
     // Create some edits and verify.
     createEdits(20);
-    assertEquals(20, getCurrentTxId());
-    cluster.getNameNode().getFSImage().getEditLog().setStartTransactionId(50);
+    assertEquals(20, getLastWrittenTxId());
+    cluster.getNameNode().getFSImage().getEditLog().setLastWrittenTxId(50);
 
     // Closing each file would generate 10 edits.
     fs.close();
-    assertEquals(60, getCurrentTxId());
+    assertEquals(60, getLastWrittenTxId());
     // Restart namenode and verify that it does not fail.
     cluster.restartNameNode(0,
         new String[] {StartupOption.IGNORETXIDMISMATCH.getName()});
     fs = cluster.getFileSystem();
-    assertEquals(60, getCurrentTxId());
+    // restarting generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+    assertEquals(60 + 2, getLastWrittenTxId());
     createEdits(20);
-    assertEquals(80, getCurrentTxId());
+    assertEquals(80 + 2, getLastWrittenTxId());
   }
 
   @Test
@@ -95,38 +107,43 @@ public void testPersistTxId() throws IOException {
     setUp(false);
     // Create some edits and verify.
     createEdits(20);
-    assertEquals(20, getCurrentTxId());
+    assertEquals(20, getLastWrittenTxId());
 
     // Closing each file would generate 10 edits.
     fs.close();
-    assertEquals(30, getCurrentTxId());
+    assertEquals(30, getLastWrittenTxId());
     // Restart namenode and verify.
     cluster.restartNameNode(0);
     fs = cluster.getFileSystem();
-    assertEquals(30, getCurrentTxId());
+    
+    // restarting generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+    assertEquals(30 + 2, getLastWrittenTxId());
 
     // Add some more edits and verify.
     createEdits(20);
-    assertEquals(50, getCurrentTxId());
+    assertEquals(50 + 2, getLastWrittenTxId());
 
     // Now save namespace and verify edits.
+    // savenamespace generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
     cluster.getNameNode().saveNamespace(true, false);
-    assertEquals(50, getCurrentTxId());
+    assertEquals(50 + 4, getLastWrittenTxId());
     createEdits(20);
-    assertEquals(70, getCurrentTxId());
+    assertEquals(70 + 4, getLastWrittenTxId());
   }
 
   @Test
   public void testRestartWithCheckpoint() throws IOException {
     setUp(false);
     createEdits(20);
-    assertEquals(20, getCurrentTxId());
+    assertEquals(20, getLastWrittenTxId());
     cluster.getNameNode().saveNamespace(true, false);
+    // SN generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
     createEdits(20);
-    assertEquals(40, getCurrentTxId());
+    assertEquals(40 + 2, getLastWrittenTxId());
     cluster.restartNameNode(0);
     createEdits(20);
-    assertEquals(60, getCurrentTxId());
+    // restarting generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+    assertEquals(60 + 4, getLastWrittenTxId());
   }
 
   @Test
@@ -135,13 +152,14 @@ public void testCheckpointBySecondary() throws IOException {
     SecondaryNameNode sn = new SecondaryNameNode(conf);
     try {
       createEdits(20);
-      assertEquals(20, getCurrentTxId());
+      assertEquals(20, getLastWrittenTxId());
 
       sn.doCheckpoint();
 
-      assertEquals(20, getCurrentTxId());
+      // checkpoint generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      assertEquals(20 + 2, getLastWrittenTxId());
       createEdits(20);
-      assertEquals(40, getCurrentTxId());
+      assertEquals(40 + 2, getLastWrittenTxId());
     } finally {
       sn.shutdown();
     }
@@ -153,19 +171,20 @@ public void testCheckpointBySecondaryAcrossRestart() throws IOException {
     SecondaryNameNode sn = new SecondaryNameNode(conf);
     try {
       createEdits(20);
-      assertEquals(20, getCurrentTxId());
+      assertEquals(20, getLastWrittenTxId());
 
       sn.doCheckpoint();
-
-      assertEquals(20, getCurrentTxId());
+      // checkpoint generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      assertEquals(20 + 2, getLastWrittenTxId());
       createEdits(20);
-      assertEquals(40, getCurrentTxId());
+      assertEquals(40 + 2, getLastWrittenTxId());
 
+      // restart generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
       cluster.restartNameNode(0);
 
-      assertEquals(40, getCurrentTxId());
+      assertEquals(40 + 4, getLastWrittenTxId());
       createEdits(20);
-      assertEquals(60, getCurrentTxId());
+      assertEquals(60 + 4, getLastWrittenTxId());
     } finally {
       sn.shutdown();
     }
@@ -184,15 +203,17 @@ public void testMultipleRestarts() throws IOException {
       System.out.println("Restarting namenode");
       cluster.restartNameNode(0);
       System.out.println("Restart done");
-      assertEquals(totalEdits, getCurrentTxId());
+      // restart generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      assertEquals(totalEdits + 2*(i+1), getLastWrittenTxId());
     }
     System.out.println("Number of restarts : " + restarts);
-    assertEquals(totalEdits, getCurrentTxId());
+    assertEquals(totalEdits + 2*restarts, getLastWrittenTxId());
   }
 
   @Test
   public void testMultipleRestartsWithCheckPoint() throws IOException {
     setUp(false);
+    int sn = 0;
     int restarts = random.nextInt(10);
     int totalEdits = 0;
     for (int i = 0; i < restarts; i++) {
@@ -200,18 +221,21 @@ public void testMultipleRestartsWithCheckPoint() throws IOException {
       totalEdits += edits;
       createEdits(edits);
       if (random.nextBoolean()) {
+        sn++;
         cluster.getNameNode().saveNamespace(true, false);
       }
       cluster.restartNameNode(0);
-      assertEquals(totalEdits, getCurrentTxId());
+      // restart generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      assertEquals(totalEdits + 2*(i+1) + (2*sn), getLastWrittenTxId());
     }
     System.out.println("Number of restarts : " + restarts);
-    assertEquals(totalEdits, getCurrentTxId());
+    assertEquals(totalEdits + 2*restarts + (2*sn), getLastWrittenTxId());
   }
 
   @Test
   public void testMultipleNameNodeCrashWithCheckpoint() throws Exception {
     setUp(true);
+    int sn = 0;
     int restarts = random.nextInt(10);
     int totalEdits = 0;
     for (int i = 0; i < restarts; i++) {
@@ -219,15 +243,17 @@ public void testMultipleNameNodeCrashWithCheckpoint() throws Exception {
       totalEdits += edits;
       createEdits(edits);
       if (random.nextBoolean()) {
+        sn++;
         cluster.getNameNode().saveNamespace(true, false);
       }
       cluster.getNameNode().getFSImage().getEditLog().logSync();
-      cluster.getNameNode().getFSImage().unlockAll();
+      cluster.getNameNode().getFSImage().storage.unlockAll();
       cluster.restartNameNode(0);
-      assertEquals(totalEdits, getCurrentTxId());
+      // restart/sn generates OP_END_LOG_SEGMENT, as the shutdown crashes
+      assertEquals(totalEdits + (i+1) + (sn*2), getLastWrittenTxId());
     }
     System.out.println("Number of restarts : " + restarts);
-    assertEquals(totalEdits, getCurrentTxId());
+    assertEquals(totalEdits + restarts + (sn*2), getLastWrittenTxId());
   }
 
   // Gets a random even int.
@@ -239,4 +265,19 @@ private int getRandomEvenInt(int limit) {
       return n + 1;
     }
   }
+  
+  class TestPersistTxIdInjectionHandler extends InjectionHandler {
+    boolean simulateEditLogCrash = false;
+
+    @Override
+    public boolean _trueCondition(InjectionEventI event, Object... args) {
+      if (event == InjectionEvent.FSNAMESYSTEM_CLOSE_DIRECTORY
+          && simulateEditLogCrash) {
+        LOG.warn("Simulating edit log crash, not closing edit log cleanly as"
+            + "part of shutdown");
+        return false;
+      }
+      return true;
+    }
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestPersistTxId.java.orig b/src/test/org/apache/hadoop/hdfs/server/namenode/TestPersistTxId.java.orig
new file mode 100644
index 00000000..879f48c6
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestPersistTxId.java.orig
@@ -0,0 +1,281 @@
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.IOException;
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+
+import org.junit.After;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestPersistTxId {
+
+  private MiniDFSCluster cluster;
+  private Configuration conf;
+  private FileSystem fs;
+  private Random random;
+  private static Log LOG = LogFactory.getLog(TestPersistTxId.class);
+
+  public void setUp(boolean simulateEditLogCrash) throws IOException {
+    conf = new Configuration();
+    MiniDFSCluster.clearBaseDirectory(conf);
+    conf.set("dfs.secondary.http.address", "0.0.0.0:0");
+    TestPersistTxIdInjectionHandler h = new TestPersistTxIdInjectionHandler();
+    h.simulateEditLogCrash = simulateEditLogCrash;
+    InjectionHandler.set(h);
+    cluster = new MiniDFSCluster(conf, 3, true, null);
+    fs = cluster.getFileSystem();
+    random = new Random();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    if (fs != null)
+      fs.close();
+    if (cluster != null)
+      cluster.shutdown();
+    InjectionHandler.clear();
+  }
+
+  private long getLastWrittenTxId() {
+    return cluster.getNameNode().getFSImage().getEditLog().getLastWrittenTxId();
+  }
+
+  public void createEdits(int nEdits) throws IOException {
+    for (int i = 0; i < nEdits / 2; i++) {
+      // Create file ends up logging two edits to the edit log, one for create
+      // file and one for bumping up the generation stamp
+      fs.create(new Path("/" + random.nextInt()));
+    }
+  }
+
+  @Test
+  public void testTxIdMismatchHard() throws IOException { 
+    setUp(false);
+    // Create some edits and verify.
+    createEdits(20);
+    assertEquals(20, getLastWrittenTxId());
+    cluster.getNameNode().getFSImage().getEditLog().setLastWrittenTxId(50);
+
+    // Closing each file would generate 10 edits.
+    fs.close();
+    assertEquals(60, getLastWrittenTxId());
+    // Restart namenode and verify that it fails due to gap in txids.
+    try {
+      cluster.restartNameNode(0);
+    } catch (IOException e) {
+      System.out.println("Expected exception : " + e);
+      return;
+    }
+    fail("Did not throw IOException");
+  }
+
+  @Test
+  public void testTxIdMismatchSoft() throws IOException { 
+    setUp(false);
+    // Create some edits and verify.
+    createEdits(20);
+    assertEquals(20, getLastWrittenTxId());
+    cluster.getNameNode().getFSImage().getEditLog().setLastWrittenTxId(50);
+
+    // Closing each file would generate 10 edits.
+    fs.close();
+    assertEquals(60, getLastWrittenTxId());
+    // Restart namenode and verify that it does not fail.
+    cluster.restartNameNode(0,
+        new String[] {StartupOption.IGNORETXIDMISMATCH.getName()});
+    fs = cluster.getFileSystem();
+    // restarting generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+    assertEquals(60 + 2, getLastWrittenTxId());
+    createEdits(20);
+    assertEquals(80 + 2, getLastWrittenTxId());
+  }
+
+  @Test
+  public void testPersistTxId() throws IOException {
+    setUp(false);
+    // Create some edits and verify.
+    createEdits(20);
+    assertEquals(20, getLastWrittenTxId());
+
+    // Closing each file would generate 10 edits.
+    fs.close();
+    assertEquals(30, getLastWrittenTxId());
+    // Restart namenode and verify.
+    cluster.restartNameNode(0);
+    fs = cluster.getFileSystem();
+    
+    // restarting generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+    assertEquals(30 + 2, getLastWrittenTxId());
+
+    // Add some more edits and verify.
+    createEdits(20);
+    assertEquals(50 + 2, getLastWrittenTxId());
+
+    // Now save namespace and verify edits.
+    // savenamespace generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+    cluster.getNameNode().saveNamespace(true, false);
+    assertEquals(50 + 4, getLastWrittenTxId());
+    createEdits(20);
+    assertEquals(70 + 4, getLastWrittenTxId());
+  }
+
+  @Test
+  public void testRestartWithCheckpoint() throws IOException {
+    setUp(false);
+    createEdits(20);
+    assertEquals(20, getLastWrittenTxId());
+    cluster.getNameNode().saveNamespace(true, false);
+    // SN generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+    createEdits(20);
+    assertEquals(40 + 2, getLastWrittenTxId());
+    cluster.restartNameNode(0);
+    createEdits(20);
+    // restarting generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+    assertEquals(60 + 4, getLastWrittenTxId());
+  }
+
+  @Test
+  public void testCheckpointBySecondary() throws IOException {
+    setUp(false);
+    SecondaryNameNode sn = new SecondaryNameNode(conf);
+    try {
+      createEdits(20);
+      assertEquals(20, getLastWrittenTxId());
+
+      sn.doCheckpoint();
+
+      // checkpoint generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      assertEquals(20 + 2, getLastWrittenTxId());
+      createEdits(20);
+      assertEquals(40 + 2, getLastWrittenTxId());
+    } finally {
+      sn.shutdown();
+    }
+  }
+
+  @Test
+  public void testCheckpointBySecondaryAcrossRestart() throws IOException {
+    setUp(false);
+    SecondaryNameNode sn = new SecondaryNameNode(conf);
+    try {
+      createEdits(20);
+      assertEquals(20, getLastWrittenTxId());
+
+      sn.doCheckpoint();
+      // checkpoint generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      assertEquals(20 + 2, getLastWrittenTxId());
+      createEdits(20);
+      assertEquals(40 + 2, getLastWrittenTxId());
+
+      // restart generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      cluster.restartNameNode(0);
+
+      assertEquals(40 + 4, getLastWrittenTxId());
+      createEdits(20);
+      assertEquals(60 + 4, getLastWrittenTxId());
+    } finally {
+      sn.shutdown();
+    }
+  }
+
+  @Test
+  public void testMultipleRestarts() throws IOException {
+    setUp(false);
+    int restarts = random.nextInt(10);
+    restarts = 2;
+    int totalEdits = 0;
+    for (int i = 0; i < restarts; i++) {
+      int edits = getRandomEvenInt(50);
+      totalEdits += edits;
+      createEdits(edits);
+      System.out.println("Restarting namenode");
+      cluster.restartNameNode(0);
+      System.out.println("Restart done");
+      // restart generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      assertEquals(totalEdits + 2*(i+1), getLastWrittenTxId());
+    }
+    System.out.println("Number of restarts : " + restarts);
+    assertEquals(totalEdits + 2*restarts, getLastWrittenTxId());
+  }
+
+  @Test
+  public void testMultipleRestartsWithCheckPoint() throws IOException {
+    setUp(false);
+    int sn = 0;
+    int restarts = random.nextInt(10);
+    int totalEdits = 0;
+    for (int i = 0; i < restarts; i++) {
+      int edits = getRandomEvenInt(50);
+      totalEdits += edits;
+      createEdits(edits);
+      if (random.nextBoolean()) {
+        sn++;
+        cluster.getNameNode().saveNamespace(true, false);
+      }
+      cluster.restartNameNode(0);
+      // restart generates OP_START_LOG_SEGMENT, OP_END_LOG_SEGMENT
+      assertEquals(totalEdits + 2*(i+1) + (2*sn), getLastWrittenTxId());
+    }
+    System.out.println("Number of restarts : " + restarts);
+    assertEquals(totalEdits + 2*restarts + (2*sn), getLastWrittenTxId());
+  }
+
+  @Test
+  public void testMultipleNameNodeCrashWithCheckpoint() throws Exception {
+    setUp(true);
+    int sn = 0;
+    int restarts = random.nextInt(10);
+    int totalEdits = 0;
+    for (int i = 0; i < restarts; i++) {
+      int edits = getRandomEvenInt(50);
+      totalEdits += edits;
+      createEdits(edits);
+      if (random.nextBoolean()) {
+        sn++;
+        cluster.getNameNode().saveNamespace(true, false);
+      }
+      cluster.getNameNode().getFSImage().getEditLog().logSync();
+      cluster.getNameNode().getFSImage().storage.unlockAll();
+      cluster.restartNameNode(0);
+      // restart/sn generates OP_END_LOG_SEGMENT, as the shutdown crashes
+      assertEquals(totalEdits + (i+1) + (sn*2), getLastWrittenTxId());
+    }
+    System.out.println("Number of restarts : " + restarts);
+    assertEquals(totalEdits + restarts + (sn*2), getLastWrittenTxId());
+  }
+
+  // Gets a random even int.
+  private int getRandomEvenInt(int limit) {
+    int n = random.nextInt(limit);
+    if (n % 2 == 0) {
+      return n;
+    } else {
+      return n + 1;
+    }
+  }
+  
+  class TestPersistTxIdInjectionHandler extends InjectionHandler {
+    boolean simulateEditLogCrash = false;
+
+    public boolean _trueCondition(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.FSNAMESYSTEM_CLOSE_DIRECTORY
+          && simulateEditLogCrash) {
+        LOG.warn("Simulating edit log crash, not closing edit log cleanly as"
+            + "part of shutdown");
+        return false;
+      }
+      return true;
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java
index e7a825e5..fecfc03d 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java
@@ -28,42 +28,44 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.junit.After;
+import org.junit.Before;
 
 import junit.framework.TestCase;
 
 public class TestReplicationPolicy extends TestCase {
   private static final int BLOCK_SIZE = 1024;
-  private static final int NUM_OF_DATANODES = 8;
-  private static final Configuration CONF = new Configuration();
-  private static final NetworkTopology cluster;
-  private static final NameNode namenode;
-  private static final BlockPlacementPolicy replicator;
+  private static final int NUM_OF_DATANODES = 8;  
   private static final String filename = "/dummyfile.txt";
-  private static final DatanodeDescriptor dataNodes[] = 
-    new DatanodeDescriptor[] {
-      new DatanodeDescriptor(new DatanodeID("h1:5020"), "/d1/r1"),
-      new DatanodeDescriptor(new DatanodeID("h2:5020"), "/d1/r1"),
-      new DatanodeDescriptor(new DatanodeID("h3:5020"), "/d1/r2"),
-      new DatanodeDescriptor(new DatanodeID("h4:5020"), "/d1/r2"),
-      new DatanodeDescriptor(new DatanodeID("h5:5020"), "/d2/r3"),
-      new DatanodeDescriptor(new DatanodeID("h6:5020"), "/d2/r3"),
-      new DatanodeDescriptor(new DatanodeID("h7:5020"), "/d1/r2"),
-      new DatanodeDescriptor(new DatanodeID("h8:5020"), "/d1/r1")
-    };
-   
-  private final static DatanodeDescriptor NODE = 
-    new DatanodeDescriptor(new DatanodeID("h7:5020"), "/d2/r4");
   
-  static {
-    try {
-      FileSystem.setDefaultUri(CONF, "hdfs://localhost:0");
-      CONF.set("dfs.http.address", "0.0.0.0:0");
-      NameNode.format(CONF);
-      namenode = new NameNode(CONF);
-    } catch (IOException e) {
-      e.printStackTrace();
-      throw (RuntimeException)new RuntimeException().initCause(e);
-    }
+  private Configuration CONF;
+  private NetworkTopology cluster;
+  private NameNode namenode;
+  private BlockPlacementPolicy replicator;
+  private DatanodeDescriptor dataNodes[];
+     
+  private DatanodeDescriptor NODE = 
+      new DatanodeDescriptor(new DatanodeID("h7:5020"), "/d2/r4");
+  
+  @Before
+  public void setUp() throws IOException {    
+    CONF = new Configuration();
+    dataNodes =
+        new DatanodeDescriptor[] {
+        new DatanodeDescriptor(new DatanodeID("h1:5020"), "/d1/r1"),
+        new DatanodeDescriptor(new DatanodeID("h2:5020"), "/d1/r1"),
+        new DatanodeDescriptor(new DatanodeID("h3:5020"), "/d1/r2"),
+        new DatanodeDescriptor(new DatanodeID("h4:5020"), "/d1/r2"),
+        new DatanodeDescriptor(new DatanodeID("h5:5020"), "/d2/r3"),
+        new DatanodeDescriptor(new DatanodeID("h6:5020"), "/d2/r3"),
+        new DatanodeDescriptor(new DatanodeID("h7:5020"), "/d1/r2"),
+        new DatanodeDescriptor(new DatanodeID("h8:5020"), "/d1/r1")
+      };
+    FileSystem.setDefaultUri(CONF, "hdfs://localhost:0");
+    CONF.set("dfs.http.address", "0.0.0.0:0");
+    
+    NameNode.format(CONF);
+    namenode = new NameNode(CONF);
     FSNamesystem fsNamesystem = namenode.getNamesystem();
     replicator = fsNamesystem.replicator;
     cluster = fsNamesystem.clusterMap;
@@ -78,6 +80,13 @@ public class TestReplicationPolicy extends TestCase {
     }
   }
   
+  @After
+  public void tearDown() {
+    if (namenode != null) {
+      namenode.stop();
+    }
+  }
+  
   
   /**
    * In this testcase, client is dataNodes[0]. So the 1st replica should be
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java
index 43242fd1..dd240679 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java
@@ -17,30 +17,37 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.spy;
 
-import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import java.io.OutputStream;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.fs.permission.PermissionStatus;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
 import org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics;
+import org.apache.hadoop.io.IOUtils;
+
+import org.apache.log4j.Level;
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -56,54 +63,151 @@
  * <li>Recover from failure while rolling edits file</li>
  * </ol>
  */
-public class TestSaveNamespace extends TestCase {
+public class TestSaveNamespace {
+  static {
+    ((Log4JLogger)FSImage.LOG).getLogger().setLevel(Level.ALL);
+  }
+  
   private static final Log LOG = LogFactory.getLog(TestSaveNamespace.class);
 
   private static class FaultySaveImage implements Answer<Void> {
     int count = 0;
-    boolean exceptionType = true;
-
-    public FaultySaveImage() {
-      this.exceptionType = true;
-    }
+    boolean throwRTE = true;
 
-    public FaultySaveImage(boolean ex) {
-      this.exceptionType = ex;
+    // generate either a RuntimeException or IOException
+    public FaultySaveImage(boolean throwRTE) {
+      this.throwRTE = throwRTE;
     }
 
     public Void answer(InvocationOnMock invocation) throws Throwable {
       Object[] args = invocation.getArguments();
-      File f = (File)args[0];
+      StorageDirectory sd = (StorageDirectory)args[1];
 
       if (count++ == 1) {
-        if (exceptionType) {
-        LOG.info("Injecting fault for file: " + f);
+        LOG.info("Injecting fault for sd: " + sd);
+        if (throwRTE) {
           throw new RuntimeException("Injected fault: saveFSImage second time");
         } else {
           throw new IOException("Injected fault: saveFSImage second time");
         }
       }
-      LOG.info("Not injecting fault for file: " + f);
-      return (Void) invocation.callRealMethod();
+      LOG.info("Not injecting fault for sd: " + sd);
+      return (Void)invocation.callRealMethod();
     }
   }
 
   private enum Fault {
-    SAVE_FSIMAGE,
-    MOVE_CURRENT,
-    MOVE_LAST_CHECKPOINT
+    SAVE_SECOND_FSIMAGE_RTE,
+    SAVE_SECOND_FSIMAGE_IOE,
+    SAVE_ALL_FSIMAGES,
+    WRITE_STORAGE_ALL,
+    WRITE_STORAGE_ONE
   };
 
+  private void saveNamespaceWithInjectedFault(Fault fault) throws Exception {
+    Configuration conf = getConf();
+    NameNode.myMetrics = new NameNodeMetrics(conf, null);
+    NameNode.format(conf);
+    NameNode nn = new NameNode(conf);
+    FSNamesystem fsn = nn.getNamesystem();
+
+    // Replace the FSImage with a spy
+    FSImage originalImage = fsn.dir.fsImage;
+    NNStorage storage = originalImage.storage;
+
+    NNStorage spyStorage = spy(storage);
+    originalImage.storage = spyStorage;
+
+    FSImage spyImage = spy(originalImage);
+    fsn.dir.fsImage = spyImage;
+
+    boolean shouldFail = false; // should we expect the save operation to fail
+    // inject fault
+    switch(fault) {
+    case SAVE_SECOND_FSIMAGE_RTE:
+      // The spy throws a RuntimeException when writing to the second directory
+      doAnswer(new FaultySaveImage(true)).
+        when(spyImage).saveFSImage(
+            (SaveNamespaceContext)anyObject(),
+            (StorageDirectory)anyObject(), anyBoolean());
+      shouldFail = false;
+      break;
+    case SAVE_SECOND_FSIMAGE_IOE:
+      // The spy throws an IOException when writing to the second directory
+      doAnswer(new FaultySaveImage(false)).
+        when(spyImage).saveFSImage(
+            (SaveNamespaceContext)anyObject(),
+            (StorageDirectory)anyObject(), anyBoolean());
+      shouldFail = false;
+      break;
+    case SAVE_ALL_FSIMAGES:
+      // The spy throws IOException in all directories
+      doThrow(new RuntimeException("Injected")).
+      when(spyImage).saveFSImage(
+          (SaveNamespaceContext)anyObject(),
+          (StorageDirectory)anyObject(), anyBoolean());
+      shouldFail = true;
+      break;
+    case WRITE_STORAGE_ALL:
+      // The spy throws an exception before writing any VERSION files
+      doThrow(new RuntimeException("Injected"))
+        .when(spyStorage).writeAll();
+      shouldFail = true;
+      break;
+    }
+
+    try {
+      doAnEdit(fsn, 1);
+
+      // Save namespace - this may fail, depending on fault injected
+      fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+      try {
+        fsn.saveNamespace(false, false);
+        if (shouldFail) {
+          fail("Did not fail!");
+        }
+      } catch (Exception e) {
+        if (! shouldFail) {
+          throw e;
+        } else {
+          LOG.info("Test caught expected exception", e);
+        }
+      }
+      
+      fsn.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
+      // Should still be able to perform edits
+      doAnEdit(fsn, 2);
+
+      // Now shut down and restart the namesystem
+      originalImage.close();
+      fsn.close();      
+      fsn = null;
+
+      // Start a new namesystem, which should be able to recover
+      // the namespace from the previous incarnation.
+      nn.stop();
+      nn = new NameNode(conf);
+      fsn = nn.getNamesystem();
+
+      // Make sure the image loaded including our edits.
+      checkEditExists(fsn, 1);
+      checkEditExists(fsn, 2);
+    } finally {
+      if (fsn != null) {
+        fsn.close();
+      }
+    }
+  }
 
   /**
    * Verify that a saveNamespace command brings faulty directories
    * in fs.name.dir and fs.edit.dir back online.
    */
+  @Test
   public void testReinsertnamedirsInSavenamespace() throws Exception {
     // create a configuration with the key to restore error
     // directories in fs.name.dir
     Configuration conf = getConf();
-    conf.setBoolean("dfs.name.dir.restore", true);
 
     MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
     cluster.waitActive();
@@ -112,13 +216,11 @@ public void testReinsertnamedirsInSavenamespace() throws Exception {
     // Replace the FSImage with a spy
     FSImage originalImage = fsn.dir.fsImage;
     FSImage spyImage = spy(originalImage);
-    spyImage.setImageDigest(originalImage.getImageDigest());
+    long mrctxid = originalImage.storage.getMostRecentCheckpointTxId();
+    spyImage.setImageDigest(mrctxid ,originalImage.getImageDigest(mrctxid));
     fsn.dir.fsImage = spyImage;
-    spyImage.setStorageDirectories(
-        FSNamesystem.getNamespaceDirs(conf),
-        FSNamesystem.getNamespaceEditsDirs(conf));
     
-    File rootDir = spyImage.getStorageDir(0).getRoot();
+    File rootDir = spyImage.storage.getStorageDir(0).getRoot();
     rootDir.setExecutable(false);
     rootDir.setWritable(false);
     rootDir.setReadable(false);
@@ -177,83 +279,120 @@ public void testReinsertnamedirsInSavenamespace() throws Exception {
       cluster.shutdown();
     }
   }
-  private void saveNamespaceWithInjectedFault(Fault fault) throws IOException {
+
+  @Test
+  public void testRTEWhileSavingSecondImage() throws Exception {
+    saveNamespaceWithInjectedFault(Fault.SAVE_SECOND_FSIMAGE_RTE);
+  }
+
+  @Test
+  public void testIOEWhileSavingSecondImage() throws Exception {
+    saveNamespaceWithInjectedFault(Fault.SAVE_SECOND_FSIMAGE_IOE);
+  }
+
+  @Test
+  public void testCrashInAllImageDirs() throws Exception {
+    saveNamespaceWithInjectedFault(Fault.SAVE_ALL_FSIMAGES);
+  }
+  
+  @Test
+  public void testCrashWhenWritingVersionFiles() throws Exception {
+    saveNamespaceWithInjectedFault(Fault.WRITE_STORAGE_ALL);
+  }
+ 
+
+  /**
+   * Test case where savenamespace fails in all directories
+   * and then the NN shuts down. Here we should recover from the
+   * failed checkpoint since it only affected ".ckpt" files, not
+   * valid image files
+   */
+  @Test
+  public void testFailedSaveNamespace() throws Exception {
+    doTestFailedSaveNamespace(false);
+  }
+
+  /**
+   * Test case where saveNamespace fails in all directories, but then
+   * the operator restores the directories and calls it again.
+   * This should leave the NN in a clean state for next start.
+   */
+  @Test
+  public void testFailedSaveNamespaceWithRecovery() throws Exception {
+    doTestFailedSaveNamespace(true);
+  }
+
+  /**
+   * Injects a failure on all storage directories while saving namespace.
+   *
+   * @param restoreStorageAfterFailure if true, will try to save again after
+   *   clearing the failure injection
+   */
+  private void doTestFailedSaveNamespace(boolean restoreStorageAfterFailure)
+  throws Exception {
     Configuration conf = getConf();
-    NameNode.myMetrics = new NameNodeMetrics(conf, null);
-    NameNode.format(conf);
-    NameNode nn = new NameNode(conf);
-    FSNamesystem fsn = nn.getNamesystem();
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 0, true, null);
+    cluster.waitActive();
+    FSNamesystem fsn = cluster.getNameNode().getNamesystem();
 
     // Replace the FSImage with a spy
-    FSImage originalImage = fsn.dir.fsImage;
+    final FSImage originalImage = fsn.dir.fsImage;
+    NNStorage storage = originalImage.storage;
+    storage.close(); // unlock any directories that FSNamesystem's initialization may have locked
+
+    NNStorage spyStorage = spy(storage);
+    originalImage.storage = spyStorage;
     FSImage spyImage = spy(originalImage);
-    spyImage.imageDigest = originalImage.imageDigest;
     fsn.dir.fsImage = spyImage;
+    spyImage.storage.setStorageDirectories(
+        NNStorageConfiguration.getNamespaceDirs(conf), 
+        NNStorageConfiguration.getNamespaceEditsDirs(conf));
 
-    // inject fault
-    switch(fault) {
-    case SAVE_FSIMAGE:
-      // The spy throws a RuntimeException when writing to the second directory
-      doAnswer(new FaultySaveImage()).
-        when(spyImage).saveFSImage((String)anyObject(), (DataOutputStream) anyObject());
-      break;
-    case MOVE_CURRENT:
-      // The spy throws a RuntimeException when calling moveCurrent()
-      doThrow(new RuntimeException("Injected fault: moveCurrent")).
-        when(spyImage).moveCurrent((StorageDirectory)anyObject());
-      break;
-    case MOVE_LAST_CHECKPOINT:
-      // The spy throws a RuntimeException when calling moveLastCheckpoint()
-      doThrow(new RuntimeException("Injected fault: moveLastCheckpoint")).
-        when(spyImage).moveLastCheckpoint((StorageDirectory)anyObject());
-      break;
-    }
+    doThrow(new IOException("Injected fault: saveFSImage")).
+        when(spyImage).saveFSImage(
+            (SaveNamespaceContext)anyObject(),
+            (StorageDirectory)anyObject(), anyBoolean());
 
     try {
       doAnEdit(fsn, 1);
 
-      // Save namespace - this will fail because we inject a fault.
+      // Save namespace
       fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
       try {
         fsn.saveNamespace(false, false);
-      } catch (Exception e) {
-        LOG.info("Test caught expected exception", e);
+        fail("saveNamespace did not fail even when all directories failed!");
+      } catch (IOException ioe) {
+        LOG.info("Got expected exception", ioe);
+      }
+      
+      // Ensure that, if storage dirs come back online, things work again.
+      if (restoreStorageAfterFailure) {
+        Mockito.reset(spyImage);
+        fsn.saveNamespace(false, false);
+        checkEditExists(fsn, 1);
       }
 
-      // Now shut down and restart the namesystem
-      nn.stop();
-      nn = null;
+      // Now shut down and restart the NN
+      originalImage.close();
+      fsn.close();
+      fsn = null;
 
       // Start a new namesystem, which should be able to recover
       // the namespace from the previous incarnation.
-      nn = new NameNode(conf);
-      fsn = nn.getNamesystem();
+      cluster = new MiniDFSCluster(conf, 0, false, null);
+      cluster.waitActive();
+      fsn = cluster.getNameNode().getNamesystem();
 
-      // Make sure the image loaded including our edit.
+      // Make sure the image loaded including our edits.
       checkEditExists(fsn, 1);
     } finally {
-      if (nn != null) {
-        nn.stop();
+      if (fsn != null) {
+        fsn.close();
       }
     }
   }
 
-  // @Test
-  public void testCrashWhileSavingSecondImage() throws Exception {
-    saveNamespaceWithInjectedFault(Fault.SAVE_FSIMAGE);
-  }
-
-  // @Test
-  public void testCrashWhileMoveCurrent() throws Exception {
-    saveNamespaceWithInjectedFault(Fault.MOVE_CURRENT);
-  }
-
-  // @Test
-  public void testCrashWhileMoveLastCheckpoint() throws Exception {
-    saveNamespaceWithInjectedFault(Fault.MOVE_LAST_CHECKPOINT);
-  }
-
-  // @Test
+  @Test
   public void testSaveWhileEditsRolled() throws Exception {
     Configuration conf = getConf();
     NameNode.myMetrics = new NameNodeMetrics(conf, null);
@@ -295,31 +434,72 @@ public void testSaveWhileEditsRolled() throws Exception {
       }
     }
   }
-
-  public void testSaveCorruptImage() throws Exception {
+  
+  @Test
+  public void testTxIdPersistence() throws Exception {
     Configuration conf = getConf();
-    NameNode.format(conf);
-    NameNode nn = new NameNode(conf);
-    FSNamesystem fsn = nn.getNamesystem();
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 0, true, null);
+    cluster.waitActive();
+    FSNamesystem fsn = cluster.getNameNode().getNamesystem();
 
     try {
-      // create one inode
+      // We have a BEGIN_LOG_SEGMENT txn to start
+      assertEquals(0, fsn.getEditLog().getLastWrittenTxId());
       doAnEdit(fsn, 1);
+      assertEquals(1, fsn.getEditLog().getLastWrittenTxId());
+      
+      fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+      fsn.saveNamespace(false, false);
 
-      // set an invalid namespace counter
-      fsn.dir.rootDir.setSpaceConsumed(1L, 0L);
+      // 2 more txns: END the first segment, BEGIN a new one
+      assertEquals(3, fsn.getEditLog().getLastWrittenTxId());
       
-      // Save namespace
-      fsn.saveNamespace(true, false);
+      // Shut down and restart
+      fsn.getFSImage().close();
+      fsn.close();
+      
+      // 1 more txn to END that segment
+      assertEquals(4, fsn.getEditLog().getLastWrittenTxId());
+      fsn = null;
+      
+      cluster = new MiniDFSCluster(conf, 0, false, null);
+      cluster.waitActive();
+      fsn = cluster.getNameNode().getNamesystem();
+      
+      // 1 more txn to start new segment on restart
+      assertEquals(5, fsn.getEditLog().getLastWrittenTxId());
+      
+    } finally {
+      if (fsn != null) {
+        fsn.close();
+      }
+    }
+  }
 
-      // should not get here
-      Assert.fail("Saving corrupt image should fail");
-    } catch (IOException e) {
-      assertTrue(e.getMessage().equals(
-          "No more storage directory left"));
+  /**
+   * Test for save namespace should succeed when parent directory renamed with
+   * open lease and destination directory exist. 
+   * This test is a regression for HDFS-2827
+   */
+  @Test
+  public void testSaveNamespaceWithRenamedLease() throws Exception {
+    MiniDFSCluster cluster = new MiniDFSCluster(new Configuration(), 1, true, (String[]) null);
+    cluster.waitActive();
+    DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
+    OutputStream out = null;
+    try {
+      fs.mkdirs(new Path("/test-target"));
+      out = fs.create(new Path("/test-source/foo")); // don't close
+      fs.rename(new Path("/test-source/"), new Path("/test-target/"));
+
+      fs.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+      cluster.getNameNode().saveNamespace();
+      fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
     } finally {
-      // Now shut down
-      nn.stop();
+      IOUtils.cleanup(LOG, out, fs);
+      if (cluster != null) {
+        cluster.shutdown();
+      }
     }
   }
   
@@ -335,7 +515,7 @@ private void checkEditExists(FSNamesystem fsn, int id) throws IOException {
     // Make sure the image loaded including our edit.
     assertNotNull(fsn.getFileInfo("/test" + id));
   }
-
+  
   private Configuration getConf() throws IOException {
     String baseDir = System.getProperty("test.build.data", "build/test/data/dfs/");
     String nameDirs = baseDir + "name1" + "," + baseDir + "name2";
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespaceCancel.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespaceCancel.java
new file mode 100644
index 00000000..b9527b5e
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespaceCancel.java
@@ -0,0 +1,98 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.hdfs.util.MD5FileUtils;
+import org.junit.After;
+import org.junit.Test;
+
+public class TestSaveNamespaceCancel {
+
+  private MiniDFSCluster cluster;
+  private Configuration conf;
+  private static Log LOG = LogFactory.getLog(TestSaveNamespaceCancel.class);
+
+  public void setUp(String name) throws IOException {
+    conf = new Configuration();
+    cluster = new MiniDFSCluster(conf, 3, true, null);
+  }
+
+  @Test
+  public void testSaveNamespaceCancelledCleanup() throws IOException {
+    setUp("testSaveNamespaceCancelledCleanup");
+    TestSaveNamespaceCancelHandler h = new TestSaveNamespaceCancelHandler();
+    InjectionHandler.set(h);
+
+    // first save namespace should succeed
+    cluster.getNameNode().saveNamespace(true, false);
+
+    long ckptTxId = cluster.getNameNode().getFSImage().getLastAppliedTxId() + 1;
+    h.disabled = false;
+
+    try {
+      cluster.getNameNode().saveNamespace(true, false);
+      fail("This should fail as we cancel SN");
+    } catch (IOException e) {
+      LOG.info("Got exception:", e);
+    }
+
+    // assert that all files for checkpoints have been deleted
+    for (Iterator<StorageDirectory> it = cluster.getNameNode().getFSImage().storage
+        .dirIterator(); it.hasNext();) {
+      StorageDirectory sd = it.next();
+      File image = NNStorage.getImageFile(sd, ckptTxId);
+      assertFalse(image.exists());
+      assertFalse(NNStorage.getCheckpointImageFile(sd, ckptTxId).exists());
+      assertFalse(MD5FileUtils.getDigestFileForFile(image).exists());
+    }
+  }
+
+  @After
+  public void tearDown() {
+    if (cluster != null) {
+      cluster.shutdown();
+    }
+  }
+
+  class TestSaveNamespaceCancelHandler extends InjectionHandler {
+    volatile boolean disabled = true;
+
+    @Override
+    public void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.FSIMAGE_SAVED_IMAGE && !disabled) {
+        cluster.getNameNode().getNamesystem()
+            .cancelSaveNamespace("Injected failure");
+      }
+    }
+  }
+
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestStartup.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
index de238789..79e900b4 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
@@ -5,6 +5,8 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
@@ -21,13 +23,17 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.fs.permission.PermissionStatus;
+import org.apache.hadoop.hdfs.DFSTestUtil;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeDirType;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeFile;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
+import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
+import org.apache.hadoop.hdfs.util.InjectionEvent;
+import org.apache.hadoop.hdfs.util.InjectionHandler;
+import org.apache.hadoop.hdfs.util.MD5FileUtils;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.MD5Hash;
 import org.apache.hadoop.util.StringUtils;
@@ -117,9 +123,6 @@ public void createCheckPoint() throws IOException {
 
       LOG.info("--doing checkpoint");
       sn.doCheckpoint();  // this shouldn't fail
-      // do it twice since after fresh startup we're 
-      // writing to edits.new
-      sn.doCheckpoint();
       LOG.info("--done checkpoint");
     } catch (IOException e) {
       fail(StringUtils.stringifyException(e));
@@ -139,8 +142,10 @@ public void createCheckPoint() throws IOException {
    */
   private void corruptNameNodeFiles() throws IOException {
     // now corrupt/delete the directrory
-    List<File> nameDirs = (List<File>)FSNamesystem.getNamespaceDirs(config);
-    List<File> nameEditsDirs = (List<File>)FSNamesystem.getNamespaceEditsDirs(config);
+    List<File> nameDirs = (List<File>)DFSTestUtil.getFileStorageDirs(
+        NNStorageConfiguration.getNamespaceDirs(config));
+    List<File> nameEditsDirs = (List<File>)DFSTestUtil.getFileStorageDirs(
+        NNStorageConfiguration.getNamespaceEditsDirs(config));
 
     // get name dir and its length, then delete and recreate the directory
     File dir = nameDirs.get(0); // has only one
@@ -203,11 +208,11 @@ private void verifyDifferentDirs(FSImage img, long expectedImgSize, long expecte
       sd = it.next();
 
       if(sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE)) {
-        File imf = FSImage.getImageFile(sd, NameNodeFile.IMAGE);
+        File imf = NNStorage.getStorageFile(sd, NameNodeFile.IMAGE);
         LOG.info("--image file " + imf.getAbsolutePath() + "; len = " + imf.length() + "; expected = " + expectedImgSize);
         assertEquals(expectedImgSize, imf.length());	
       } else if(sd.getStorageDirType().isOfType(NameNodeDirType.EDITS)) {
-        File edf = FSImage.getImageFile(sd, NameNodeFile.EDITS);
+        File edf = NNStorage.getStorageFile(sd, NameNodeFile.EDITS);
         LOG.info("-- edits file " + edf.getAbsolutePath() + "; len = " + edf.length()  + "; expected = " + expectedEditsSize);
         assertEquals(expectedEditsSize, edf.length());	
       } else {
@@ -295,10 +300,10 @@ public void testSNNStartup() throws IOException{
 
       // now verify that image and edits are created in the different directories
       FSImage image = nn.getFSImage();
-      StorageDirectory sd = image.getStorageDir(0); //only one
+      StorageDirectory sd = image.storage.getStorageDir(0); //only one
       assertEquals(sd.getStorageDirType(), NameNodeDirType.IMAGE_AND_EDITS);
-      File imf = FSImage.getImageFile(sd, NameNodeFile.IMAGE);
-      File edf = FSImage.getImageFile(sd, NameNodeFile.EDITS);
+      File imf = NNStorage.getStorageFile(sd, NameNodeFile.IMAGE);
+      File edf = NNStorage.getStorageFile(sd, NameNodeFile.EDITS);
       LOG.info("--image file " + imf.getAbsolutePath() + "; len = " + imf.length());
       LOG.info("--edits file " + edf.getAbsolutePath() + "; len = " + edf.length());
 
@@ -317,6 +322,41 @@ public void testSNNStartup() throws IOException{
     }
   }
   
+  public void testSNNStartupFailure() throws IOException{
+    LOG.info("--starting SecondNN startup test with wrong registration");
+    
+    // different name dirs
+    config.set("dfs.name.dir", new File(hdfsDir, "name").getPath());
+    config.set("dfs.name.edits.dir", new File(hdfsDir, "name").getPath());
+    // same checkpoint dirs
+    config.set("fs.checkpoint.edits.dir", new File(hdfsDir, "chkpt_edits").getPath());
+    config.set("fs.checkpoint.dir", new File(hdfsDir, "chkpt").getPath());
+    config.set("dfs.secondary.http.address", "localhost:0");
+
+    MiniDFSCluster cluster = null;
+    SecondaryNameNode sn = null;
+    TestStartupHandler h = new TestStartupHandler();
+    InjectionHandler.set(h);
+    
+    try {
+      cluster = new MiniDFSCluster(0, config, 1, true, false, false,  null, null, null, null);
+      cluster.waitActive();
+      // start secondary node
+      LOG.info("--starting SecondNN");
+      try {
+        sn = new SecondaryNameNode(config);
+        fail("Should fail to instantiate SNN");
+      } catch (IOException e) {
+        LOG.info("Got exception:", e);
+      }      
+    } finally {
+      if(sn!=null)
+        sn.shutdown();
+      if(cluster!=null)
+        cluster.shutdown();
+    }
+  }
+  
   public void testCompression() throws Exception {
     LOG.info("Test compressing image.");
     Configuration conf = new Configuration();
@@ -378,69 +418,72 @@ public void testImageChecksum() throws Exception {
   }
   
   private void testImageChecksum(boolean compress) throws Exception {
+    MiniDFSCluster cluster = null;
     Configuration conf = new Configuration();
-    FileSystem.setDefaultUri(conf, "hdfs://localhost:0");
-    conf.set("dfs.http.address", "127.0.0.1:0");  
-    File base_dir = new File(
-        System.getProperty("test.build.data", "build/test/data"), "dfs/");
-    conf.set("dfs.name.dir", new File(base_dir, "name").getPath());
-    conf.setBoolean("dfs.permissions", false);
     if (compress) {
-      conf.setBoolean(HdfsConstants.DFS_IMAGE_COMPRESS_KEY, true);
+      conf.setBoolean("dfs.image.compression.codec", true);
     }
 
-    NameNode.format(conf); 
-
-    // create an image
-    LOG.info("Create an fsimage");
-    NameNode namenode = new NameNode(conf);
-    namenode.getNamesystem().mkdirs("/test", 
-        new PermissionStatus("hairong", null, FsPermission.getDefault()));
-    assertTrue(namenode.getFileInfo("/test").isDir());
-    namenode.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
-    namenode.saveNamespace();
-    
-    FSImage image = namenode.getFSImage();
-    image.loadFSImage();
-
-    File versionFile = image.getStorageDir(0).getVersionFile();
-    
-    RandomAccessFile file = new RandomAccessFile(versionFile, "rws");
-    FileInputStream in = null;
-    FileOutputStream out = null;
     try {
-      // read the property from version file
-      in = new FileInputStream(file.getFD());
-      file.seek(0);
-      Properties props = new Properties();
-      props.load(in);
-      
-      // get the MD5 property and change it
-      String sMd5 = props.getProperty(FSImage.MESSAGE_DIGEST_PROPERTY);
-      MD5Hash md5 = new MD5Hash(sMd5);
-      byte[] bytes = md5.getDigest();
-      bytes[0] += 1;
-      md5 = new MD5Hash(bytes);
-      props.setProperty(FSImage.MESSAGE_DIGEST_PROPERTY, md5.toString());
-      
-      // write the properties back to version file
-      file.seek(0);
-      out = new FileOutputStream(file.getFD());
-      props.store(out, null);
-      out.flush();
-      file.setLength(out.getChannel().position());
-    
-      // now load the image again
-      image.loadFSImage();
-      
-      fail("Expect to get a checksumerror");
-    } catch(IOException e) {
-      assertTrue(e.getMessage().endsWith("is corrupt!"));
+        LOG.info("\n===========================================\n" +
+                 "Starting empty cluster");
+        
+        cluster = new MiniDFSCluster(conf, 0, true, null);
+        cluster.waitActive();
+        
+        FileSystem fs = cluster.getFileSystem();
+        fs.mkdirs(new Path("/test"));
+        
+        // Directory layout looks like:
+        // test/data/dfs/nameN/current/{fsimage,edits,...}
+        File nameDir = new File(cluster.getNameDirs(0).iterator().next().getPath());
+        File dfsDir = nameDir.getParentFile();
+        assertEquals(dfsDir.getName(), "dfs"); // make sure we got right dir
+        
+        LOG.info("Shutting down cluster #1");
+        cluster.shutdown();
+        cluster = null;
+
+        // Corrupt the md5 file to all 0s
+        File imageFile = new File(nameDir, "current/" + NNStorage.getImageFileName(-1));
+        MD5FileUtils.saveMD5File(imageFile, new MD5Hash(new byte[16]));
+        
+        // Try to start a new cluster
+        LOG.info("\n===========================================\n" +
+        "Starting same cluster after simulated crash");
+        try {
+          cluster = new MiniDFSCluster(conf, 0, false, null);
+          fail("Should not have successfully started with corrupt image");
+        } catch (IOException ioe) {
+          if (!ioe.getCause().getMessage().contains("is corrupt with MD5")) {
+            throw ioe;
+          }
+        }
     } finally {
-      IOUtils.closeStream(in);
-      IOUtils.closeStream(out);
-      namenode.stop();
-      namenode.join();
+      if (cluster != null) {
+        cluster.shutdown();
+      }
+    }
+  }
+  
+  class TestStartupHandler extends InjectionHandler {
+    @Override
+    protected void _processEvent(InjectionEvent event, Object... args) {
+      if (event == InjectionEvent.NAMENODE_REGISTER) {
+        if(args[0] == null)
+          return;
+        InetAddress addr = (InetAddress) args[0];
+        LOG.info("Processing event : " + event + " with address: " + addr);
+        try {
+          Field f = addr.getClass().getSuperclass().getDeclaredField("address");
+          f.setAccessible(true);
+          f.set(addr, 0);
+          LOG.info("Changed address to : " + addr);
+        } catch (Exception e) {
+          LOG.info("exception : ", e);
+          return;
+        }
+      }
     }
-  } 
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestStartupDefaultRack.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestStartupDefaultRack.java
new file mode 100644
index 00000000..f13594e4
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestStartupDefaultRack.java
@@ -0,0 +1,48 @@
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.net.NetworkTopology;
+import org.apache.hadoop.net.StaticMapping;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class TestStartupDefaultRack {
+
+  private static Configuration conf;
+  private static MiniDFSCluster cluster;
+
+  @Test
+  public void testStartup() throws Exception {
+    conf = new Configuration();
+    conf.setClass("dfs.block.replicator.classname",
+        BlockPlacementPolicyConfigurable.class, BlockPlacementPolicy.class);
+    File baseDir = MiniDFSCluster.getBaseDirectory(conf);
+    baseDir.mkdirs();
+    File hostsFile = new File(baseDir, "hosts");
+    FileOutputStream out = new FileOutputStream(hostsFile);
+    out.write("h1\n".getBytes());
+    out.write("h2\n".getBytes());
+    out.write("h3\n".getBytes());
+    out.close();
+    conf.set("dfs.hosts", hostsFile.getAbsolutePath());
+    StaticMapping.addNodeToRack("h1", "/r1");
+    StaticMapping.addNodeToRack("h2", "/r2");
+    StaticMapping.addNodeToRack("h3", NetworkTopology.DEFAULT_RACK);
+    cluster = new MiniDFSCluster(conf, 3, new String[] { "/r1", "/r2",
+        NetworkTopology.DEFAULT_RACK }, new String[] { "h1", "h2", "h3" },
+        true, false);
+    DFSTestUtil util = new DFSTestUtil("/testStartup", 10, 10, 1024);
+    util.createFiles(cluster.getFileSystem(), "/");
+    util.checkFiles(cluster.getFileSystem(), "/");
+    assertEquals(2,
+        cluster.getNameNode().getDatanodeReport(DatanodeReportType.LIVE).length);
+    cluster.shutdown();
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestStorageRestore.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestStorageRestore.java
index b58d38b8..3556823c 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestStorageRestore.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestStorageRestore.java
@@ -20,9 +20,10 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Random;
+import java.util.Set;
 
 import junit.framework.TestCase;
 
@@ -34,10 +35,18 @@
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.server.common.Storage;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeDirType;
-import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeFile;
+import org.apache.hadoop.hdfs.server.namenode.JournalSet.JournalAndStream;
+import org.mockito.Mockito;
+
+import com.google.common.collect.ImmutableSet;
+
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.spy;
+
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getInProgressEditsFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getFinalizedEditsFileName;
+import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getImageFileName;
 
 
 /**
@@ -101,9 +110,6 @@ protected void setUp() throws Exception {
     FileSystem.setDefaultUri(config, "hdfs://"+NAME_NODE_HOST + "0");
     
     config.set("dfs.secondary.http.address", "0.0.0.0:0");
-    
-    // set the restore feature on
-    config.setBoolean("dfs.name.dir.restore", true);
   }
 
   /**
@@ -116,70 +122,41 @@ public void tearDown() throws Exception {
   }
   
   /**
-   * invalidate storage by removing current directories
+   * invalidate storage by removing the second and third storage directories
    */
-  public void invalidateStorage(FSImage fi) throws IOException {
-    fi.getEditLog().processIOError(2); //name3
-    fi.getEditLog().processIOError(0); //name1
-  }
-  
-  /**
-   * test
-   */
-  public void printStorages(FSImage fs) {
-    LOG.info("current storages and corresoponding sizes:");
-    for(Iterator<StorageDirectory> it = fs.dirIterator(); it.hasNext(); ) {
+  public void invalidateStorage(FSImage fi, Set<File> filesToInvalidate) throws IOException {
+    ArrayList<StorageDirectory> al = new ArrayList<StorageDirectory>(2);
+    Iterator<StorageDirectory> it = fi.storage.dirIterator();
+    while(it.hasNext()) {
       StorageDirectory sd = it.next();
-      
-      if(sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE)) {
-        File imf = FSImage.getImageFile(sd, NameNodeFile.IMAGE);
-        LOG.info("  image file " + imf.getAbsolutePath() + "; len = " + imf.length());  
+      if(filesToInvalidate.contains(sd.getRoot())) {
+        LOG.info("causing IO error on " + sd.getRoot());
+        al.add(sd);
       }
-      if(sd.getStorageDirType().isOfType(NameNodeDirType.EDITS)) {
-        File edf = FSImage.getImageFile(sd, NameNodeFile.EDITS);
-        LOG.info("  edits file " + edf.getAbsolutePath() + "; len = " + edf.length()); 
+    }
+    // simulate an error
+    fi.storage.reportErrorsOnDirectories(al);
+    
+    for (JournalAndStream j : fi.getEditLog().getJournals()) {
+      if (j.getManager() instanceof FileJournalManager) {
+        FileJournalManager fm = (FileJournalManager)j.getManager();
+        if (fm.getStorageDirectory().getRoot().equals(path2)
+            || fm.getStorageDirectory().getRoot().equals(path3)) {
+          EditLogOutputStream mockStream = spy(j.getCurrentStream());
+          j.setCurrentStreamForTests(mockStream);
+          doThrow(new IOException("Injected fault: write")).
+            when(mockStream).write(Mockito.<FSEditLogOp>anyObject());
+        }
       }
     }
   }
-  
+
   /**
-   *  check if files exist/not exist
+   * test
    */
-  public void checkFiles(boolean valid) {
-    //look at the valid storage
-    File fsImg1 = new File(path1, Storage.STORAGE_DIR_CURRENT + "/" + NameNodeFile.IMAGE.getName());
-    File fsImg2 = new File(path2, Storage.STORAGE_DIR_CURRENT + "/" + NameNodeFile.IMAGE.getName());
-    File fsImg3 = new File(path3, Storage.STORAGE_DIR_CURRENT + "/" + NameNodeFile.IMAGE.getName());
-
-    File fsEdits1 = new File(path1, Storage.STORAGE_DIR_CURRENT + "/" + NameNodeFile.EDITS.getName());
-    File fsEdits2 = new File(path2, Storage.STORAGE_DIR_CURRENT + "/" + NameNodeFile.EDITS.getName());
-    File fsEdits3 = new File(path3, Storage.STORAGE_DIR_CURRENT + "/" + NameNodeFile.EDITS.getName());
-
-    this.printStorages(cluster.getNameNode().getFSImage());
-    
-    LOG.info("++++ image files = "+fsImg1.getAbsolutePath() + "," + fsImg2.getAbsolutePath() + ","+ fsImg3.getAbsolutePath());
-    LOG.info("++++ edits files = "+fsEdits1.getAbsolutePath() + "," + fsEdits2.getAbsolutePath() + ","+ fsEdits3.getAbsolutePath());
-    LOG.info("checkFiles compares lengths: img1=" + fsImg1.length()  + ",img2=" + fsImg2.length()  + ",img3=" + fsImg3.length());
-    LOG.info("checkFiles compares lengths: edits1=" + fsEdits1.length()  + ",edits2=" + fsEdits2.length()  + ",edits3=" + fsEdits3.length());
-    
-    if(valid) {
-      assertTrue(fsImg1.exists());
-      assertTrue(fsImg2.exists());
-      assertFalse(fsImg3.exists());
-      assertTrue(fsEdits1.exists());
-      assertTrue(fsEdits2.exists());
-      assertTrue(fsEdits3.exists());
-      
-     // should be the same
-      assertTrue(fsImg1.length() == fsImg2.length());
-      assertTrue(fsEdits1.length() == fsEdits2.length());
-      assertTrue(fsEdits1.length() == fsEdits3.length());
-    } else {
-      // should be different
-      assertTrue(fsEdits2.length() != fsEdits1.length());
-      assertTrue(fsEdits2.length() != fsEdits3.length());
-    }
-  }
+  private void printStorages(FSImage image) {
+    FSImageTestUtil.logStorageContents(LOG, image.storage);
+  }  
   
   /**
    * test 
@@ -194,8 +171,7 @@ public void checkFiles(boolean valid) {
    * 8. verify that all the image and edits files are the same.
    */
   public void testStorageRestore() throws Exception {
-    int numDatanodes = 2;
-    //Collection<String> dirs = config.getStringCollection("dfs.name.dir");
+    int numDatanodes = 0;
     cluster = new MiniDFSCluster(0, config, numDatanodes, true, false, true,  null, null, null, null);
     cluster.waitActive();
     
@@ -205,34 +181,87 @@ public void testStorageRestore() throws Exception {
     
     FileSystem fs = cluster.getFileSystem();
     Path path = new Path("/", "test");
-    writeFile(fs, path, 2);
-    System.out.println("****testStorageRestore: going to do checkpoint");
-    secondary.doCheckpoint();
-    checkFiles(true);
+    assertTrue(fs.mkdirs(path));
     
-    System.out.println("****testStorageRestore: file test written, invalidating storage...");
+    System.out.println("****testStorageRestore: dir 'test' created, invalidating storage...");
   
-    invalidateStorage(cluster.getNameNode().getFSImage());
-    //secondary.doCheckpoint(); // this will cause storages to be removed.
+    invalidateStorage(cluster.getNameNode().getFSImage(), ImmutableSet.of(path2, path3));
     printStorages(cluster.getNameNode().getFSImage());
-    System.out.println("****testStorageRestore: storage invalidated + doCheckpoint");
+    System.out.println("****testStorageRestore: storage invalidated");
 
     path = new Path("/", "test1");
-    writeFile(fs, path, 2);
-    System.out.println("****testStorageRestore: file test1 written");
-    
-    checkFiles(false); // SHOULD BE FALSE
-    
+    assertTrue(fs.mkdirs(path));
+
+    System.out.println("****testStorageRestore: dir 'test1' created");
+
+    // We did another edit, so the still-active directory at 'path1'
+    // should now differ from the others
+    FSImageTestUtil.assertFileContentsDifferent(2,
+        new File(path1, "current/" + getInProgressEditsFileName(0)),
+        new File(path2, "current/" + getInProgressEditsFileName(0)),
+        new File(path3, "current/" + getInProgressEditsFileName(0)));
+    FSImageTestUtil.assertFileContentsSame(
+        new File(path2, "current/" + getInProgressEditsFileName(0)),
+        new File(path3, "current/" + getInProgressEditsFileName(0)));
+        
     System.out.println("****testStorageRestore: checkfiles(false) run");
     
     secondary.doCheckpoint();  ///should enable storage..
-    System.out.println("****testStorageRestore: second Checkpoint done");
     
-    checkFiles(true);
+    // We should have a checkpoint through txid 4 in the two image dirs
+    // (txid=4 for BEGIN, mkdir, mkdir, END)
+    FSImageTestUtil.assertFileContentsSame(
+        new File(path1, "current/" + getImageFileName(3)),
+        new File(path2, "current/" + getImageFileName(3)));
+    assertFalse("Should not have any image in an edits-only directory",
+        new File(path3, "current/" + getImageFileName(3)).exists());
 
-    System.out.println("****testStorageRestore: checkFiles(true) run");
+    // Should have finalized logs in the directory that didn't fail
+    assertTrue("Should have finalized logs in the directory that didn't fail",
+        new File(path1, "current/" + getFinalizedEditsFileName(0,3)).exists());
+    // Should not have finalized logs in the failed directories
+    assertFalse("Should not have finalized logs in the failed directories",
+        new File(path2, "current/" + getFinalizedEditsFileName(0,3)).exists());
+    assertFalse("Should not have finalized logs in the failed directories",
+        new File(path3, "current/" + getFinalizedEditsFileName(0,3)).exists());
     
+    // The new log segment should be in all of the directories.
+    FSImageTestUtil.assertFileContentsSame(
+        new File(path1, "current/" + getInProgressEditsFileName(4)),
+        new File(path2, "current/" + getInProgressEditsFileName(4)),
+        new File(path3, "current/" + getInProgressEditsFileName(4)));
+    String md5BeforeEdit = FSImageTestUtil.getFileMD5(
+        new File(path1, "current/" + getInProgressEditsFileName(4)));
+    
+    // The original image should still be the previously failed image
+    // directory after it got restored, since it's still useful for
+    // a recovery!
+    FSImageTestUtil.assertFileContentsSame(
+            new File(path1, "current/" + getImageFileName(-1)),
+            new File(path2, "current/" + getImageFileName(-1)));
+    
+    // Do another edit to verify that all the logs are active.
+    path = new Path("/", "test2");
+    assertTrue(fs.mkdirs(path));
+
+    // Logs should be changed by the edit.
+    String md5AfterEdit =  FSImageTestUtil.getFileMD5(
+        new File(path1, "current/" + getInProgressEditsFileName(4)));
+    assertFalse(md5BeforeEdit.equals(md5AfterEdit));
+
+    // And all logs should be changed.
+    FSImageTestUtil.assertFileContentsSame(
+        new File(path1, "current/" + getInProgressEditsFileName(4)),
+        new File(path2, "current/" + getInProgressEditsFileName(4)),
+        new File(path3, "current/" + getInProgressEditsFileName(4)));
+
     secondary.shutdown();
     cluster.shutdown();
+    
+    // All logs should be finalized by clean shutdown
+    FSImageTestUtil.assertFileContentsSame(
+        new File(path1, "current/" + getFinalizedEditsFileName(4,6)),
+        new File(path2, "current/" + getFinalizedEditsFileName(4,6)),        
+        new File(path3, "current/" + getFinalizedEditsFileName(4,6)));
   }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestTransferFsImage.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestTransferFsImage.java
new file mode 100644
index 00000000..e4ecaef6
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestTransferFsImage.java
@@ -0,0 +1,95 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.util.StringUtils;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class TestTransferFsImage {
+
+  private static final File TEST_DIR = new File(
+      System.getProperty("test.build.data","build/test/data"));
+
+  /**
+   * Regression test for HDFS-1997. Test that, if an exception
+   * occurs on the client side, it is properly reported as such,
+   * and reported to the associated NNStorage object.
+   */
+  @Test
+  public void testClientSideException() throws IOException {
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 0, true, null);
+    NNStorage mockStorage = Mockito.mock(NNStorage.class);
+    
+    File[] localPath = new File[] { 
+        new File("/xxxxx-does-not-exist/blah"),   
+    };
+       
+    try {
+      String fsName = NameNode.getHostPortString(
+          cluster.getNameNode().getHttpAddress());
+      String id = "getimage=1&txid=-1";
+
+      TransferFsImage.getFileClient(fsName, id, localPath, mockStorage, false);      
+      fail("Didn't get an exception!");
+    } catch (IOException ioe) {
+      Mockito.verify(mockStorage).reportErrorOnFile(localPath[0]);
+      assertTrue(
+          "Unexpected exception: " + StringUtils.stringifyException(ioe),
+          ioe.getMessage().contains("Unable to download to any storage"));
+    } finally {
+      cluster.shutdown();      
+    }
+  }
+  
+  /**
+   * Similar to the above test, except that there are multiple local files
+   * and one of them can be saved.
+   */
+  @Test
+  public void testClientSideExceptionOnJustOneDir() throws IOException {
+    Configuration conf = new Configuration();
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, 0, true, null);
+    NNStorage mockStorage = Mockito.mock(NNStorage.class);
+    File[] localPaths = new File[] { 
+        new File("/xxxxx-does-not-exist/blah"),
+        new File(TEST_DIR, "testfile")    
+    };
+       
+    try {
+      String fsName = NameNode.getHostPortString(
+          cluster.getNameNode().getHttpAddress());
+      String id = "getimage=1&txid=-1";
+
+      TransferFsImage.getFileClient(fsName, id, localPaths, mockStorage, false);      
+      Mockito.verify(mockStorage).reportErrorOnFile(localPaths[0]);
+      assertTrue("The valid local file should get saved properly",
+          localPaths[1].length() > 0);
+    } finally {
+      cluster.shutdown();      
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/server/namenode/TestUnderReplicatedBlocks.java b/src/test/org/apache/hadoop/hdfs/server/namenode/TestUnderReplicatedBlocks.java
index d5b34230..bedff465 100644
--- a/src/test/org/apache/hadoop/hdfs/server/namenode/TestUnderReplicatedBlocks.java
+++ b/src/test/org/apache/hadoop/hdfs/server/namenode/TestUnderReplicatedBlocks.java
@@ -118,9 +118,8 @@ public void testLostDataNodeAfterDeleteExcessReplica() throws Exception {
       LOG.info("Schedule blockReceivedAndDeleted report: " + excessDN);
       int index = cluster.findDataNodeIndex(excessDN.getName());
       DataNode dn = cluster.getDataNodes().get(index);
-      Thread.sleep(3000);
-      dn.scheduleNSBlockReceivedAndDeleted(0);
-      Thread.sleep(3000);
+      waitForExcessReplicasToBeDeleted(namesystem, block, dn);
+      
       LOG.info("Start a new node");
       cluster.restartDataNode(dnprop);
       cluster.waitActive(false);
@@ -153,6 +152,7 @@ public void testDecommissionDataNodeAfterDeleteExcessReplica() throws Exception
     if (f.exists()) {
       f.delete();
     }
+    f.createNewFile();
     conf.set("dfs.hosts.exclude", HOST_FILE_PATH);
     final MiniDFSCluster cluster = 
       new MiniDFSCluster(conf, 5, true, null);
@@ -199,9 +199,8 @@ public void testDecommissionDataNodeAfterDeleteExcessReplica() throws Exception
       LOG.info("Schedule blockReceivedAndDeleted report: " + excessDN);
       int index = cluster.findDataNodeIndex(excessDN.getName());
       DataNode dn = cluster.getDataNodes().get(index);
-      Thread.sleep(3000);
-      dn.scheduleNSBlockReceivedAndDeleted(0);
-      Thread.sleep(3000);
+      waitForExcessReplicasToBeDeleted(namesystem, block, dn);
+      
       LOG.info("Start a new node");
       cluster.restartDataNode(dnprop);
       cluster.waitActive(false);
@@ -234,6 +233,7 @@ public void testUnderReplicationWithDecommissionDataNode() throws Exception {
     if (f.exists()) {
       f.delete();
     }
+    f.createNewFile();
     conf.set("dfs.hosts.exclude", HOST_FILE_PATH);
     LOG.info("Start the cluster");
     final MiniDFSCluster cluster = 
@@ -297,6 +297,7 @@ private void waitForExcessReplicasToChange(
       NumberReplicas num;
       long startChecking = System.currentTimeMillis();
       do {
+        LOG.info("Waiting for a replica to become excess");
         namesystem.readLock();
         try {
           num = namesystem.countNodes(block);
@@ -311,6 +312,27 @@ private void waitForExcessReplicasToChange(
       } while (num.excessReplicas() != newReplicas);
     }
   
+  private void waitForExcessReplicasToBeDeleted(FSNamesystem namesystem,
+      Block block, DataNode dn) throws Exception {
+    NumberReplicas num;
+    long startChecking = System.currentTimeMillis();
+    do {
+      LOG.info("Waiting for the excess replica to be deleted");
+      dn.scheduleNSBlockReceivedAndDeleted(0);
+      namesystem.readLock();
+      try {
+        num = namesystem.countNodes(block);
+      } finally {
+        namesystem.readUnlock();
+      }
+      Thread.sleep(100);
+      if (System.currentTimeMillis() - startChecking > 30000) {
+        fail("Timed out waiting for excess replicas to be deleted");
+      }
+
+    } while (num.excessReplicas() != 0);
+  }
+  
   private void addToExcludeFile(Configuration conf, DatanodeDescriptor[] dns) throws Exception {
     String excludeFN = conf.get("dfs.hosts.exclude", "");
     assertTrue(excludeFN.equals(HOST_FILE_PATH));
diff --git a/src/test/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java b/src/test/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java
index 9887c6f6..30abe8d6 100644
--- a/src/test/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java
+++ b/src/test/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.hdfs.tools.offlineEditsViewer;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -29,6 +30,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.hdfs.server.namenode.FSEditLogOpCodes;
 import org.apache.hadoop.hdfs.tools.offlineEditsViewer.OfflineEditsViewer;
 import org.apache.hadoop.hdfs.tools.offlineEditsViewer.TokenizerFactory;
@@ -37,6 +39,8 @@
 
 import org.apache.hadoop.hdfs.server.namenode.OfflineEditsViewerHelper;
 
+import sun.font.LayoutPathImpl.EndType;
+
 public class TestOfflineEditsViewer {
 
   private static final Log LOG = LogFactory.getLog(TestOfflineEditsViewer.class);
@@ -55,6 +59,10 @@ public class TestOfflineEditsViewer {
     codes.add(FSEditLogOpCodes.OP_TIMES);
     codes.add(FSEditLogOpCodes.OP_SET_QUOTA);
     codes.add(FSEditLogOpCodes.OP_CONCAT_DELETE);
+    codes.add(FSEditLogOpCodes.OP_HARDLINK);
+    codes.add(FSEditLogOpCodes.OP_START_LOG_SEGMENT);
+    codes.add(FSEditLogOpCodes.OP_END_LOG_SEGMENT);
+    codes.add(FSEditLogOpCodes.OP_HARDLINK);
   }
 
   private static String buildDir =
@@ -78,7 +86,6 @@ public void testEditsCrash() throws IOException {
     testEdits(true);
   }
   
-  
   /**
    * Test the OfflineEditsViewer
    */
@@ -86,35 +93,43 @@ private void testEdits(boolean simulateCrash) throws IOException {
 
     LOG.info("START - testing with generated edits, simulateCrash: " + simulateCrash);
 
-    nnHelper.startCluster(buildDir + "/dfs/", simulateCrash);
-    // force to rename edits.new into edits
-    nnHelper.saveNS();
-
-    // edits generated by nnHelper (MiniDFSCluster), should have all op codes
-    // binary, XML, reparsed binary
-    String edits          = nnHelper.generateEdits();
-    
-    //either clean or crash shutdown
-    nnHelper.closeNS();
-    
-    String editsParsedXml = cacheDir + "/editsParsed.xml";
-    String editsReparsed  = cacheDir + "/editsReparsed";
-
-    // parse to XML then back to binary
-    runOev(edits,          editsParsedXml, "xml");
-    runOev(editsParsedXml, editsReparsed,  "binary");
-    
-    // judgment time
-    assertTrue(
-      "Edits " + edits + " should have all op codes",
-      hasAllOpCodes(edits));
-    assertTrue(
-      "Generated edits and reparsed (bin to XML to bin) should be same",
-      filesEqualIgnoreTrailingZeros(edits, editsReparsed));
-
-    // removes edits so do this at the end
-    nnHelper.shutdownCluster();
-
+    try {
+      // cleanup the directory
+      File base_dir = new File(buildDir, "dfs");
+      FileUtil.fullyDelete(base_dir);
+      base_dir.mkdirs();
+      
+      nnHelper.startCluster(buildDir + "/dfs/", simulateCrash);
+   
+      // edits generated by nnHelper (MiniDFSCluster), should have all op codes
+      // binary, XML, reparsed binary
+      nnHelper.generateEdits();
+      
+      //either clean or crash shutdown
+      nnHelper.closeNS();
+      
+      // edits must be finalized by now
+      String edits = nnHelper.getEditsName();
+      
+      String editsParsedXml = cacheDir + "/editsParsed.xml";
+      String editsReparsed  = cacheDir + "/editsReparsed";
+  
+      // parse to XML then back to binary
+      runOev(edits,          editsParsedXml, "xml");
+      runOev(editsParsedXml, editsReparsed,  "binary");
+      
+      // judgment time
+      assertTrue(
+        "Edits " + edits + " should have all op codes",
+        hasAllOpCodes(edits, simulateCrash));
+      assertTrue(
+        "Generated edits and reparsed (bin to XML to bin) should be same",
+        filesEqualIgnoreTrailingZeros(edits, editsReparsed));
+  
+      // removes edits so do this at the end
+    } finally {
+      nnHelper.shutdownCluster();
+    }
     LOG.info("END");
   }
 
@@ -143,7 +158,8 @@ private void runOev(String inFilename, String outFilename, String processor)
    * @param filename edits file
    * @return true is edits (filename) has all opCodes
    */
-  private boolean hasAllOpCodes(String inFilename) throws IOException {
+  private boolean hasAllOpCodes(String inFilename, boolean skipEndLogSegment) 
+      throws IOException {
     String outFilename = inFilename + ".stats";
     StatisticsEditsVisitor visitor =
       (StatisticsEditsVisitor)EditsVisitorFactory.getEditsVisitor(
@@ -158,6 +174,8 @@ private boolean hasAllOpCodes(String inFilename) throws IOException {
     
     boolean hasAllOpCodes = true;
     for(FSEditLogOpCodes opCode : codes) {
+      if (skipEndLogSegment && opCode == FSEditLogOpCodes.OP_END_LOG_SEGMENT)
+        continue;
       Long count = visitor.getStatistics().get(opCode.getOpCode());
       if((count == null) || (count == 0)) {
         hasAllOpCodes = false;
diff --git a/src/test/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestDelimitedImageVisitor.java b/src/test/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestDelimitedImageVisitor.java
index 5417c538..6f9c6979 100644
--- a/src/test/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestDelimitedImageVisitor.java
+++ b/src/test/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestDelimitedImageVisitor.java
@@ -21,9 +21,11 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.Random;
 
 import junit.framework.TestCase;
 
+import org.apache.hadoop.hdfs.server.namenode.INode;
 import org.apache.hadoop.hdfs.tools.offlineImageViewer.ImageVisitor.ImageElement;
 
 /**
@@ -35,7 +37,7 @@ public class TestDelimitedImageVisitor extends TestCase {
   private static final String delim = "--";
   
   // Record an element in the visitor and build the expected line in the output
-  private void build(DelimitedImageVisitor div, ImageElement elem, String val, 
+  private void build(TextWriterImageVisitor div, ImageElement elem, String val, 
                      StringBuilder sb, boolean includeDelim) throws IOException {
     div.visit(elem, val);
     sb.append(val);
@@ -60,6 +62,8 @@ public void testDelimitedImageVisistor() {
       
       build(div, ImageElement.INODE_PATH,        "hartnell", sb, true);
       build(div, ImageElement.REPLICATION,       "99", sb, true);
+      build(div, ImageElement.INODE_TYPE,        INode.INodeType.REGULAR_INODE.toString(), sb, true);
+      build(div, ImageElement.INODE_HARDLINK_ID, "", sb, true);
       build(div, ImageElement.MODIFICATION_TIME, "troughton", sb, true);
       build(div, ImageElement.ACCESS_TIME,       "pertwee", sb, true);
       build(div, ImageElement.BLOCK_SIZE,        "baker", sb, true);
@@ -93,4 +97,79 @@ public void testDelimitedImageVisistor() {
         f.delete();
     }
   }
+  
+  public void testBlockDelimitedImageVisistor() {
+    Random rand = new Random();
+    String filename = ROOT + "/testDIV";
+    File f = new File(filename);
+    BufferedReader br = null;
+    StringBuilder sb = new StringBuilder();
+    
+    try {
+      BlockDelimitedImageVisitor div =
+          new BlockDelimitedImageVisitor(filename, true, delim);
+
+      div.visitEnclosingElement(ImageElement.FS_IMAGE);
+      sb.append(BlockDelimitedImageVisitor.defaultValue);
+      sb.append(delim);
+      sb.append(BlockDelimitedImageVisitor.defaultValue);
+      sb.append(delim);
+      build(div, ImageElement.GENERATION_STAMP, "9999", sb, false);
+      sb.append("\n");
+      div.visitEnclosingElement(ImageElement.INODE);
+      
+      div.visit(ImageElement.LAYOUT_VERSION, "not in");
+      div.visit(ImageElement.LAYOUT_VERSION, "the output");
+      div.visit(ImageElement.INODE_PATH, "hartnell");
+      div.visit(ImageElement.REPLICATION, "99");
+      div.visit(ImageElement.MODIFICATION_TIME, "troughton");
+      div.visit(ImageElement.ACCESS_TIME, "pertwee");
+      div.visit(ImageElement.BLOCK_SIZE, "baker");
+      
+      int n = 3;
+      div.visitEnclosingElement(ImageElement.BLOCKS, ImageElement.NUM_BLOCKS, 3);
+      for (int i = 0; i < n; i++) {
+        div.visitEnclosingElement(ImageElement.BLOCK);
+        build(div, ImageElement.BLOCK_ID, Long.toString(rand.nextLong()),
+            sb, true);
+        build(div, ImageElement.NUM_BYTES, Long.toString(rand.nextLong()),
+            sb, true);
+        // we don't print delimiter after generation stamp 
+        build(div, ImageElement.GENERATION_STAMP, Long.toString(rand.nextLong()),
+            sb, false);
+        sb.append("\n");
+        div.leaveEnclosingElement(); //BLOCK
+      }
+      div.leaveEnclosingElement(); // BLOCKS
+      
+      div.visit(ImageElement.NS_QUOTA, "baker2");
+      div.visit(ImageElement.DS_QUOTA, "mccoy");
+      div.visit(ImageElement.PERMISSION_STRING, "eccleston");
+      div.visit(ImageElement.USER_NAME, "tennant");
+      div.visit(ImageElement.GROUP_NAME, "smith");
+      
+      div.leaveEnclosingElement(); // INode
+      div.leaveEnclosingElement(); // FS_IMAGE
+      div.finish();
+      
+      br = new BufferedReader(new FileReader(f));
+      StringBuilder actual = new StringBuilder();
+      String curLine;
+      while ((curLine = br.readLine()) != null) {
+        actual.append(curLine);
+        actual.append("\n");
+      }
+      br.close();
+      String exepcted = sb.toString();
+      System.out.println("Expect to get: " + exepcted);
+      System.out.println("Actually got: " + actual);
+      assertEquals(exepcted.toString(), actual.toString());
+      
+    } catch (IOException e) {
+      fail("Error while testing delmitedImageVisitor" + e.getMessage());
+    } finally {
+      if(f.exists())
+        f.delete();
+    }
+  }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java b/src/test/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
index 237758bf..43892f60 100644
--- a/src/test/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
+++ b/src/test/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
@@ -41,6 +41,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
+import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil;
 
 /**
  * Test function of OfflineImageViewer by:
@@ -55,10 +56,21 @@ public class TestOfflineImageViewer extends TestCase {
   private static final int NUM_DIRS = 3;
   private static final int FILES_PER_DIR = 4;
 
+  private class FileStatusWithHardLink {
+    public FileStatus stat;
+    public long hardLinkId;
+
+    public FileStatusWithHardLink(FileStatus stat, long hardlinkId) {
+      this.stat = stat;
+      this.hardLinkId = hardlinkId;
+    }
+  }
+
   // Elements of lines of ls-file output to be compared to FileStatus instance
   private class LsElements {
     public String perms;
     public int replication;
+    public long hardlinkId;
     public String username;
     public String groupname;
     public long filesize;
@@ -66,8 +78,8 @@ private class LsElements {
   }
   
   // namespace as written to dfs, to be compared with viewer's output
-  final HashMap<String, FileStatus> writtenFiles 
-                                           = new HashMap<String, FileStatus>();
+  final HashMap<String, FileStatusWithHardLink> writtenFiles
+ = new HashMap<String, FileStatusWithHardLink>();
   
   
   private static String ROOT = System.getProperty("test.build.data",
@@ -111,15 +123,27 @@ private File initFsimage() throws IOException {
       // Create a reasonable namespace 
       for(int i = 0; i < NUM_DIRS; i++)  {
         Path dir = new Path("/dir" + i);
+        Path hardLinkDstDir = new Path("/hardLinkDstDir" + i);
         hdfs.mkdirs(dir);
-        writtenFiles.put(dir.toString(), pathToFileEntry(hdfs, dir.toString()));
+        writtenFiles.put(dir.toString(),
+            pathToFileEntry(hdfs, dir.toString(), cluster));
+        
+        hdfs.mkdirs(hardLinkDstDir);
+        writtenFiles.put(hardLinkDstDir.toString(),
+            pathToFileEntry(hdfs, hardLinkDstDir.toString(), cluster));
+
         for(int j = 0; j < FILES_PER_DIR; j++) {
           Path file = new Path(dir, "file" + j);
           FSDataOutputStream o = hdfs.create(file);
           o.write(new byte[ filesize++ ]);
           o.close();
           
-          writtenFiles.put(file.toString(), pathToFileEntry(hdfs, file.toString()));
+          Path dstFile = new Path(hardLinkDstDir, "hardlinkDstFile" + j);
+          hdfs.hardLink(file, dstFile);
+          writtenFiles.put(dstFile.toString(),
+              pathToFileEntry(hdfs, dstFile.toString(), cluster));
+          writtenFiles.put(file.toString(),
+              pathToFileEntry(hdfs, file.toString(), cluster));
         }
       }
 
@@ -129,7 +153,7 @@ private File initFsimage() throws IOException {
       
       // Determine location of fsimage file
       File [] files = cluster.getNameDirs().toArray(new File[0]);
-      orig =  new File(files[0].getPath(), "current/fsimage");
+      orig = FSImageTestUtil.findNewestImageFile(files[0].getPath() + "/current/");
       
       if (!orig.exists()) {
         fail("Didn't generate or can't find fsimage.");
@@ -143,9 +167,17 @@ private File initFsimage() throws IOException {
   
   // Convenience method to generate a file status from file system for 
   // later comparison
-  private FileStatus pathToFileEntry(FileSystem hdfs, String file) 
+  private FileStatusWithHardLink pathToFileEntry(FileSystem hdfs, String file,
+      MiniDFSCluster cluster)
         throws IOException {
-    return hdfs.getFileStatus(new Path(file));
+    long hardlinkId = -1;
+    try {
+      hardlinkId = cluster.getNameNode().namesystem.dir.getHardLinkId(file);
+    } catch (IOException ie) {
+      System.out.println("IOException for file : " + file + " " + ie);
+    }
+    return new FileStatusWithHardLink(hdfs.getFileStatus(new Path(file)),
+        hardlinkId);
   }
 
   // Verify that we can correctly generate an ls-style output for a valid 
@@ -223,7 +255,8 @@ private void truncatedFSImage(File originalFsimage) throws IOException {
   }
   
   // Test that our ls file has all the same compenents of the original namespace
-  private void compareNamespaces(HashMap<String, FileStatus> written,
+  private void compareNamespaces(
+      HashMap<String, FileStatusWithHardLink> written,
       HashMap<String, LsElements> fileOutput) {
     assertEquals( "Should be the same number of files in both, plus one for root"
             + " in fileoutput", fileOutput.keySet().size(), 
@@ -249,9 +282,16 @@ private void compareNamespaces(HashMap<String, FileStatus> written,
   
   // Compare two files as listed in the original namespace FileStatus and
   // the output of the ls file from the image processor
-  private void compareFiles(FileStatus fs, LsElements elements) {
-    assertEquals("directory listed as such",  
-                 fs.isDir() ? 'd' : '-', elements.dir);
+  private void compareFiles(FileStatusWithHardLink fsh, LsElements elements) {
+    FileStatus fs = fsh.stat;
+    char type = '-';
+    if (fs.isDir()) {
+      type = 'd';
+    } else if (fsh.hardLinkId != -1) {
+      type = 'h';
+    }
+    assertEquals("file type not equal for : " + fs.getPath(), type,
+        elements.dir);
     assertEquals("perms string equal", 
                                 fs.getPermission().toString(), elements.perms);
     assertEquals("replication equal", fs.getReplication(), elements.replication);
@@ -277,7 +317,7 @@ private HashMap<String, LsElements> readLsfile(File lsFile) throws IOException {
   private void readLsLine(String line, HashMap<String, LsElements> fileContents) {
     String elements [] = line.split("\\s+");
     
-    assertEquals("Not enough elements in ls output", 8, elements.length);
+    assertEquals("Not enough elements in ls output", 9, elements.length);
     
     LsElements lsLine = new LsElements();
     
@@ -285,12 +325,14 @@ private void readLsLine(String line, HashMap<String, LsElements> fileContents) {
     lsLine.perms = elements[0].substring(1);
     lsLine.replication = elements[1].equals("-") 
                                              ? 0 : Integer.valueOf(elements[1]);
-    lsLine.username = elements[2];
-    lsLine.groupname = elements[3];
-    lsLine.filesize = Long.valueOf(elements[4]);
+    lsLine.hardlinkId = elements[2].equals("-") ? -1 : Long
+        .valueOf(elements[2]);
+    lsLine.username = elements[3];
+    lsLine.groupname = elements[4];
+    lsLine.filesize = Long.valueOf(elements[5]);
     // skipping date and time 
     
-    String path = elements[7];
+    String path = elements[8];
     
     // Check that each file in the ls output was listed once
     assertFalse("LS file had duplicate file entries", 
@@ -390,6 +432,6 @@ private void outputOfFileDistributionVisitor(File originalFsimage) throws IOExce
       if(testFile.exists()) testFile.delete();
       if(outputFile.exists()) outputFile.delete();
     }
-    assertEquals(totalFiles, NUM_DIRS * FILES_PER_DIR);
+    assertEquals(totalFiles, 2 * NUM_DIRS * FILES_PER_DIR);
   }
 }
diff --git a/src/test/org/apache/hadoop/hdfs/util/TestAtomicFileOutputStream.java b/src/test/org/apache/hadoop/hdfs/util/TestAtomicFileOutputStream.java
new file mode 100644
index 00000000..d8f1de56
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/util/TestAtomicFileOutputStream.java
@@ -0,0 +1,131 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.util;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.base.Joiner;
+
+public class TestAtomicFileOutputStream {
+
+  private static final String TEST_STRING = "hello world";
+  private static final String TEST_STRING_2 = "goodbye world";
+
+  private static File BASE_DIR = new File(
+      System.getProperty("test.build.data", "build/test/data"));
+  private static File TEST_DIR = new File(BASE_DIR,
+      TestAtomicFileOutputStream.class.getName());
+  
+  private static File DST_FILE = new File(TEST_DIR, "test.txt");
+  
+  @Before
+  public void cleanupTestDir() throws IOException {
+    assertTrue(TEST_DIR.exists() || TEST_DIR.mkdirs());
+    DFSTestUtil.deleteContents(TEST_DIR);
+  }
+  
+  /**
+   * Test case where there is no existing file
+   */
+  @Test
+  public void testWriteNewFile() throws IOException {
+    OutputStream fos = new AtomicFileOutputStream(DST_FILE);
+    assertFalse(DST_FILE.exists());
+    fos.write(TEST_STRING.getBytes());
+    fos.flush();
+    assertFalse(DST_FILE.exists());
+    fos.close();
+    assertTrue(DST_FILE.exists());
+    
+    String readBackData = DFSTestUtil.readFile(DST_FILE);
+    assertEquals(TEST_STRING, readBackData);
+  }
+
+  /**
+   * Test case where there is no existing file
+   */
+  @Test
+  public void testOverwriteFile() throws IOException {
+    assertTrue("Creating empty dst file", DST_FILE.createNewFile());
+    
+    OutputStream fos = new AtomicFileOutputStream(DST_FILE);
+    
+    assertTrue("Empty file still exists", DST_FILE.exists());
+    fos.write(TEST_STRING.getBytes());
+    fos.flush();
+    
+    // Original contents still in place
+    assertEquals("", DFSTestUtil.readFile(DST_FILE));
+
+    fos.close();
+
+    // New contents replace original file
+    String readBackData = DFSTestUtil.readFile(DST_FILE);
+    assertEquals(TEST_STRING, readBackData);
+  }
+  
+  /**
+   * Test case where the flush() fails at close time - make sure
+   * that we clean up after ourselves and don't touch any
+   * existing file at the destination
+   */
+  @Test
+  public void testFailToFlush() throws IOException {
+    // Create a file at destination
+    FileOutputStream fos = new FileOutputStream(DST_FILE);
+    fos.write(TEST_STRING_2.getBytes());
+    fos.close();
+    
+    OutputStream failingStream = createFailingStream();
+    failingStream.write(TEST_STRING.getBytes());
+    try {
+      failingStream.close();
+      fail("Close didn't throw exception");
+    } catch (IOException ioe) {
+      // expected
+    }
+    
+    // Should not have touched original file
+    assertEquals(TEST_STRING_2, DFSTestUtil.readFile(DST_FILE));
+    
+    assertEquals("Temporary file should have been cleaned up",
+        DST_FILE.getName(), Joiner.on(",").join(TEST_DIR.list()));
+  }
+
+  /**
+   * Create a stream that fails to flush at close time
+   */
+  private OutputStream createFailingStream() throws FileNotFoundException {
+    return new AtomicFileOutputStream(DST_FILE) {
+      @Override
+      public void flush() throws IOException {
+        throw new IOException("injected failure");
+      }
+    };
+  }
+}
diff --git a/src/test/org/apache/hadoop/hdfs/util/TestMD5FileUtils.java b/src/test/org/apache/hadoop/hdfs/util/TestMD5FileUtils.java
new file mode 100644
index 00000000..a43774ab
--- /dev/null
+++ b/src/test/org/apache/hadoop/hdfs/util/TestMD5FileUtils.java
@@ -0,0 +1,111 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hdfs.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.util.MD5FileUtils;
+import org.apache.hadoop.io.MD5Hash;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class TestMD5FileUtils {
+  private static final File TEST_DIR_ROOT = new File(
+      System.getProperty("test.build.data","build/test/data"));
+  private static final File TEST_DIR = new File(TEST_DIR_ROOT,
+      "TestMD5FileUtils");
+  private static final File TEST_FILE = new File(TEST_DIR,
+      "testMd5File.dat");
+  
+  private static final int TEST_DATA_LEN = 128 * 1024; // 128KB test data
+  private static final byte[] TEST_DATA =
+    DFSTestUtil.generateSequentialBytes(0, TEST_DATA_LEN);
+  private static final MD5Hash TEST_MD5 = MD5Hash.digest(TEST_DATA);
+  
+  @Before
+  public void setup() throws IOException {
+    FileUtil.fullyDelete(TEST_DIR);
+    assertTrue(TEST_DIR.mkdirs());
+    
+    // Write a file out
+    FileOutputStream fos = new FileOutputStream(TEST_FILE);
+    fos.write(TEST_DATA);
+    fos.close();
+  }
+  
+  @Test
+  public void testComputeMd5ForFile() throws Exception {
+    MD5Hash computedDigest = MD5FileUtils.computeMd5ForFile(TEST_FILE);
+    assertEquals(TEST_MD5, computedDigest);    
+  }
+
+  @Test
+  public void testVerifyMD5FileGood() throws Exception {
+    MD5FileUtils.saveMD5File(TEST_FILE, TEST_MD5);
+    MD5FileUtils.verifySavedMD5(TEST_FILE, TEST_MD5);
+  }
+
+  /**
+   * Test when .md5 file does not exist at all
+   */
+  @Test(expected=IOException.class)
+  public void testVerifyMD5FileMissing() throws Exception {
+    MD5FileUtils.verifySavedMD5(TEST_FILE, TEST_MD5);
+  }
+
+  /**
+   * Test when .md5 file exists but incorrect checksum
+   */
+  @Test
+  public void testVerifyMD5FileBadDigest() throws Exception {
+    MD5FileUtils.saveMD5File(TEST_FILE, MD5Hash.digest(new byte[0]));
+    try {
+      MD5FileUtils.verifySavedMD5(TEST_FILE, TEST_MD5);
+      fail("Did not throw");
+    } catch (IOException ioe) {
+      // Expected
+    }
+  }
+  
+  /**
+   * Test when .md5 file exists but has a bad format
+   */
+  @Test
+  public void testVerifyMD5FileBadFormat() throws Exception {
+    FileWriter writer = new FileWriter(MD5FileUtils.getDigestFileForFile(TEST_FILE));
+    try {
+      writer.write("this is not an md5 file");
+    } finally {
+      writer.close();
+    }
+    
+    try {
+      MD5FileUtils.verifySavedMD5(TEST_FILE, TEST_MD5);
+      fail("Did not throw");
+    } catch (IOException ioe) {
+      // expected
+    }
+  }  
+}
diff --git a/src/test/org/apache/hadoop/io/TestUTF8.java b/src/test/org/apache/hadoop/io/TestUTF8.java
index 1a4ee6c7..4042cf9d 100644
--- a/src/test/org/apache/hadoop/io/TestUTF8.java
+++ b/src/test/org/apache/hadoop/io/TestUTF8.java
@@ -19,8 +19,12 @@
 package org.apache.hadoop.io;
 
 import junit.framework.TestCase;
+
+import java.util.Arrays;
 import java.util.Random;
 
+import org.apache.commons.lang.RandomStringUtils;
+
 /** Unit tests for UTF8. */
 @SuppressWarnings("deprecation")
 public class TestUTF8 extends TestCase {
@@ -30,7 +34,7 @@ public class TestUTF8 extends TestCase {
 
   public static String getTestString() throws Exception {
     StringBuffer buffer = new StringBuffer();
-    int length = RANDOM.nextInt(100);
+    int length = RANDOM.nextInt(1010);
     for (int i = 0; i < length; i++) {
       buffer.append((char)(RANDOM.nextInt(Character.MAX_VALUE)));
     }
@@ -83,6 +87,59 @@ public void testIO() throws Exception {
     }
 
   }
+  
+  public void testOpt() throws Exception {
+    testOpt(false);
+    testOpt(true);
+  }
+  
+  /**
+   * Test optimized writes
+   * @param utf - true for unicode, false for ascii
+   */
+  private void testOpt(boolean unicode) throws Exception {
+    DataOutputBuffer outOpt = new DataOutputBuffer();
+    DataOutputBuffer outReg = new DataOutputBuffer();
+    
+    DataInputBuffer in = new DataInputBuffer();
+    
+    for (int i = 0; i < 10000; i++) {
+      // generate a random string
+      String before = null;
+      if(unicode) {
+        before = RandomStringUtils.random(1010);
+      } else {
+        before = RandomStringUtils.randomAscii(1010);
+      }
+      // write it
+      outOpt.reset();
+      outReg.reset();
+      UTF8.writeStringOpt(outOpt, before);
+      UTF8.writeString(outReg, before);
+
+      // test that it reads correctly (opt)
+      in.reset(outOpt.getData(), outOpt.getLength());
+      String afterOpt = UTF8.readString(in);
+      assertTrue(before.equals(afterOpt));
+      
+      // test that it reads correctly (reg)
+      in.reset(outReg.getData(), outReg.getLength());
+      String afterReg = UTF8.readString(in);
+      assertTrue(before.equals(afterReg));
+      
+      // test setters
+      UTF8 optUTF8 = new UTF8();
+      optUTF8.set(before, true);
+      
+      UTF8 regUTF8 = new UTF8();
+      regUTF8.set(before, false);
+      
+      assertEquals(optUTF8.toString(), regUTF8.toString());
+      assertTrue(Arrays.equals(UTF8.getBytes(before), optUTF8.getBytes()));
+      assertTrue(Arrays.equals(UTF8.getBytes(before), regUTF8.getBytes()));
+    }
+
+  }
 
   public void testNullEncoding() throws Exception {
     String s = new String(new char[] { 0 });
diff --git a/src/test/org/apache/hadoop/io/TestWritableName.java b/src/test/org/apache/hadoop/io/TestWritableName.java
index d0447503..10e0bdce 100644
--- a/src/test/org/apache/hadoop/io/TestWritableName.java
+++ b/src/test/org/apache/hadoop/io/TestWritableName.java
@@ -81,6 +81,8 @@ public void testSetName() throws Exception {
 
   public void testAddName() throws Exception {
     Configuration conf = new Configuration();
+    WritableName.setName(SimpleWritable.class, testName);
+    
     String altName = testName + ".alt";
 
     WritableName.addName(SimpleWritable.class, altName);
diff --git a/src/test/org/apache/hadoop/io/compress/snappy/TestSnappyCodec.java b/src/test/org/apache/hadoop/io/compress/snappy/TestSnappyCodec.java
new file mode 100644
index 00000000..5d6219ec
--- /dev/null
+++ b/src/test/org/apache/hadoop/io/compress/snappy/TestSnappyCodec.java
@@ -0,0 +1,125 @@
+/*
+ * 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.
+ */
+
+package org.apache.hadoop.io.compress.snappy;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+  import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.compress.CodecUnavailableException;
+import org.apache.hadoop.io.compress.CompressionCodec;
+import org.apache.hadoop.io.compress.CompressionInputStream;
+import org.apache.hadoop.io.compress.CompressionOutputStream;
+import org.apache.hadoop.io.compress.SnappyCodec;
+import org.apache.hadoop.util.ReflectionUtils;
+
+public class TestSnappyCodec extends TestCase {
+
+  private Log LOG = LogFactory.getLog(TestSnappyCodec.class);
+
+  private String inputDir;
+  private String readFileDir;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    inputDir = System.getProperty("test.build.data", "target");
+    readFileDir = System.getProperty("test.cache.data");
+  }
+
+  public void testFile() throws Exception {
+    run("test.txt");
+  }
+
+  private void run(String filename) throws FileNotFoundException, IOException{
+    File snappyFile = new File(inputDir, filename + new SnappyCodec().getDefaultExtension());
+    Configuration conf = new Configuration();
+    CompressionCodec codec = (CompressionCodec) ReflectionUtils.newInstance(
+        SnappyCodec.class, conf);
+
+    // Compress
+    InputStream is = new FileInputStream(new File(readFileDir, "testsnappy.txt"));
+
+    FileOutputStream os = new FileOutputStream(snappyFile);
+
+    CompressionOutputStream cos;
+    try {
+      cos = codec.createOutputStream(os);
+    } catch (CodecUnavailableException ex) {
+      LOG.error("Native codec unavailable, skipping test", ex);
+      return;
+    }
+     
+
+    byte buffer[] = new byte[8192];
+    try {
+      int bytesRead = 0;
+      while ((bytesRead = is.read(buffer)) > 0) {
+        cos.write(buffer, 0, bytesRead);
+        System.out.println(new String(buffer));
+      }
+    } catch (IOException e) {
+      System.err.println("Compress Error");
+      e.printStackTrace();
+    } finally {
+      is.close();
+      cos.close();
+      os.close();
+    }
+
+    // Decompress
+    is = new FileInputStream(new File(readFileDir, "testsnappy.txt"));
+    FileInputStream is2 = new FileInputStream(snappyFile);
+    CompressionInputStream cis = codec.createInputStream(is2);
+    BufferedReader r = new BufferedReader(new InputStreamReader(is));
+    BufferedReader cr = new BufferedReader(new InputStreamReader(cis));
+
+
+    try {
+      String line, rline;
+      while ((line = r.readLine()) != null) {
+        rline = cr.readLine();
+        if (!rline.equals(line)) {
+          System.err.println("Decompress error at line " + line + " of file " + filename);
+          System.err.println("Original: [" + line + "]");
+          System.err.println("Decompressed: [" + rline + "]");
+        }
+        assertEquals(rline, line);
+      }
+      assertNull(cr.readLine());
+    } catch (IOException e) {
+      System.err.println("Decompress Error");
+      e.printStackTrace();
+    } finally {
+      cis.close();
+      is.close();
+      os.close();
+    }
+  }
+}
diff --git a/src/test/org/apache/hadoop/io/compress/snappy/testsnappy.txt b/src/test/org/apache/hadoop/io/compress/snappy/testsnappy.txt
new file mode 100644
index 00000000..73fed022
--- /dev/null
+++ b/src/test/org/apache/hadoop/io/compress/snappy/testsnappy.txt
@@ -0,0 +1,202 @@
+
+sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non,
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in,
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu
+amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum,
+velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec,
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra,
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac,
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat,
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec,
+malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus.
+dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.
+
diff --git a/src/test/org/apache/hadoop/io/nativeio/TestNativeIO.java b/src/test/org/apache/hadoop/io/nativeio/TestNativeIO.java
index ad1f7ba8..f6993db1 100644
--- a/src/test/org/apache/hadoop/io/nativeio/TestNativeIO.java
+++ b/src/test/org/apache/hadoop/io/nativeio/TestNativeIO.java
@@ -214,7 +214,6 @@ public void testChmod() throws Exception {
     assertPermissions(toChmod, 0644);
   }
 
-
   @Test
   public void testPosixFadvise() throws Exception {
     FileInputStream fis = new FileInputStream("/dev/zero");
@@ -411,11 +410,86 @@ public void testHardLinkNullFileNative() throws IOException {
     fail("No Exception thrown");
   }
 
+  @Test
+  public void testClockGetTimeNative() throws IOException {
+    // get first time
+    NativeIO.TimeSpec t1 = new NativeIO.TimeSpec();
+    NativeIO.clock_gettime(NativeIO.CLOCK_REALTIME, t1);
+    if(t1.tv_sec == 0 && t1.tv_nsec == 0)
+      fail("clock_gettime returned 0 for the time.");
+
+    // get second time
+    NativeIO.TimeSpec t2 = new NativeIO.TimeSpec();
+    NativeIO.clock_gettime(NativeIO.CLOCK_REALTIME, t2);
+    if(t2.tv_sec == 0 && t2.tv_nsec == 0)
+      fail("clock_gettime returned 0 for the time.");
+
+    // make sure time hasn't gone backwards
+    if(t2.tv_sec < t1.tv_sec ||
+       (t2.tv_sec == t1.tv_sec && t2.tv_nsec < t1.tv_nsec))
+      fail("2nd call to clock_gettime returned smaller value than 1s call");
+  }
+
+  @Test
+  public void testClockGetTimeNull() throws IOException {
+    try {
+      NativeIO.clock_gettime(NativeIO.CLOCK_REALTIME, null);
+    } catch (IOException ioe) {
+      LOG.info("Got expected exception", ioe);
+      return;
+    }
+    fail("No exception throw");
+  }
+
+  @Test
+  public void testClockGetTimeWithInvalidClock() throws IOException {
+    try {
+      // use a garbage number (i.e., 53715) for which_clock
+      NativeIO.clock_gettime(53715, null);
+    } catch (IOException ioe) {
+      LOG.info("Got expected exception", ioe);
+      return;
+    }
+    fail("No exception throw");
+  }
+
+  @Test
+  public void testClockGetTimeEachClock() throws IOException {
+    NativeIO.TimeSpec t = new NativeIO.TimeSpec();
+    NativeIO.clock_gettime(NativeIO.CLOCK_REALTIME, t);
+    NativeIO.clock_gettime(NativeIO.CLOCK_MONOTONIC, t);
+    NativeIO.clock_gettime(NativeIO.CLOCK_PROCESS_CPUTIME_ID, t);
+    NativeIO.clock_gettime(NativeIO.CLOCK_THREAD_CPUTIME_ID, t);
+    NativeIO.clock_gettime(NativeIO.CLOCK_MONOTONIC_RAW, t);
+    NativeIO.clock_gettime(NativeIO.CLOCK_REALTIME_COARSE, t);
+    NativeIO.clock_gettime(NativeIO.CLOCK_MONOTONIC_COARSE, t);
+  }
+
+  @Test
+  public void testClockGetTimeIfPossible() throws IOException {
+    // get first time
+    NativeIO.TimeSpec t1 = new NativeIO.TimeSpec();
+    NativeIO.clockGetTimeIfPossible(NativeIO.CLOCK_REALTIME, t1);
+    if(t1.tv_sec == 0 && t1.tv_nsec == 0)
+      fail("clockGetTimeIfPossible returned 0 for the time.");
+
+    // get second time
+    NativeIO.TimeSpec t2 = new NativeIO.TimeSpec();
+    NativeIO.clockGetTimeIfPossible(NativeIO.CLOCK_REALTIME, t2);
+    if(t2.tv_sec == 0 && t2.tv_nsec == 0)
+      fail("clockGetTimeIfPossible returned 0 for the time.");
+
+    // make sure time hasn't gone backwards
+    if(t2.tv_sec < t1.tv_sec ||
+       (t2.tv_sec == t1.tv_sec && t2.tv_nsec < t1.tv_nsec))
+      fail("2nd call to clockGetTimeIfPossible returned "+
+           "smaller value than 1s call");
+  }
+
   private void assertPermissions(File f, int expected) throws IOException {
     FileSystem localfs = FileSystem.getLocal(new Configuration());
     FsPermission perms = localfs.getFileStatus(
       new Path(f.getAbsolutePath())).getPermission();
     assertEquals(expected, perms.toShort());
   }
-
 }
diff --git a/src/test/org/apache/hadoop/ipc/TestRPC.java b/src/test/org/apache/hadoop/ipc/TestRPC.java
index 72950c21..755b2e6e 100644
--- a/src/test/org/apache/hadoop/ipc/TestRPC.java
+++ b/src/test/org/apache/hadoop/ipc/TestRPC.java
@@ -280,12 +280,12 @@ public void testDnsUpdate() throws Exception {
         proxy.echo("foo");
         TestCase.fail();
       } catch (IOException e) {
-        LOG.debug("Caught " + e);
+        LOG.info("Caught " + e);
       }
-      
+
       String stringResult = proxy.echo("foo");
       TestCase.assertEquals("foo", stringResult);
-      
+
       try {
         proxy.error();
         TestCase.fail();
@@ -385,7 +385,7 @@ public void testCalls() throws Exception {
       if(proxy!=null) RPC.stopProxy(proxy);
     }
   }
-  
+ 
   public void testStandaloneClient() throws IOException {
     try {
       RPC.waitForProxy(TestProtocol.class,
diff --git a/src/test/org/apache/hadoop/mapred/MiniMRCluster.java b/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
index e28a97af..29d82f36 100644
--- a/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
+++ b/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
@@ -28,6 +28,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.http.NettyMapOutputHttpServer;
 import org.apache.hadoop.net.DNSToSwitchMapping;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.net.NetworkTopology;
@@ -157,6 +158,7 @@ class TaskTrackerRunner implements Runnable {
       conf.set("mapred.task.tracker.http.address", "0.0.0.0:0");
       conf.set("mapred.task.tracker.report.address", 
                 "127.0.0.1:" + taskTrackerPort);
+      conf.setInt(NettyMapOutputHttpServer.MAXIMUM_THREAD_POOL_SIZE, 10);
       File localDirBase = 
         new File(conf.get("mapred.local.dir")).getAbsoluteFile();
       localDirBase.mkdirs();
diff --git a/src/test/org/apache/hadoop/mapred/TestJobClient.java b/src/test/org/apache/hadoop/mapred/TestJobClient.java
index 2ff43cbe..c3c38762 100644
--- a/src/test/org/apache/hadoop/mapred/TestJobClient.java
+++ b/src/test/org/apache/hadoop/mapred/TestJobClient.java
@@ -28,6 +28,9 @@
 import java.io.PrintStream;
 import java.io.Writer;
 
+import java.util.Map; 
+import java.util.HashMap; 
+  
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -41,7 +44,7 @@ public class TestJobClient extends ClusterMapReduceTestCase {
   
   private static final Log LOG = LogFactory.getLog(TestJobClient.class);
   
-  private String runJob() throws Exception {
+  private String runJob(Map<String,String> additionalConfValues) throws Exception {
     OutputStream os = getFileSystem().create(new Path(getInputDir(), "text.txt"));
     Writer wr = new OutputStreamWriter(os);
     wr.write("hello1\n");
@@ -64,13 +67,23 @@ private String runJob() throws Exception {
 
     conf.setMapperClass(org.apache.hadoop.mapred.lib.IdentityMapper.class);
     conf.setReducerClass(org.apache.hadoop.mapred.lib.IdentityReducer.class);
-
+    
+    if(additionalConfValues != null) {  
+      for (Map.Entry<String,String> entry : additionalConfValues.entrySet()) {  
+        conf.set(entry.getKey(),entry.getValue());  
+      } 
+    } 
+    
     FileInputFormat.setInputPaths(conf, getInputDir());
     FileOutputFormat.setOutputPath(conf, getOutputDir());
 
     return JobClient.runJob(conf).getID().toString();
   }
-  
+
+  private String runJob() throws Exception {  
+    return runJob(null);  
+  } 
+    
   private int runTool(Configuration conf, Tool tool, String[] args, OutputStream out) throws Exception {
     PrintStream oldOut = System.out;
     PrintStream newOut = new PrintStream(out, true);
@@ -98,6 +111,19 @@ public void testJobList() throws Exception {
     verifyJobPriority(jobId, "HIGH");
   }
 
+  public void testFailMaxMapTasks() throws Exception {  
+    Map<String,String> newMaxMap = new HashMap<String,String>();  
+    newMaxMap.put("mapred.jobtracker.maxtasks.per.job","0"); 
+    boolean exceptionThrown = false;  
+    try { 
+      String jobId = runJob(newMaxMap); 
+    } catch(IOException e) {  
+      exceptionThrown = true; 
+    } finally { 
+      assertTrue(exceptionThrown);  
+    } 
+  } 
+    
   private void verifyJobPriority(String jobId, String priority)
                             throws Exception {
     PipedInputStream pis = new PipedInputStream();
diff --git a/src/test/org/apache/hadoop/mapred/TestReduceFetch.java b/src/test/org/apache/hadoop/mapred/TestReduceFetch.java
index e8178406..7fab1160 100644
--- a/src/test/org/apache/hadoop/mapred/TestReduceFetch.java
+++ b/src/test/org/apache/hadoop/mapred/TestReduceFetch.java
@@ -105,9 +105,9 @@ public void testReduceFromDisk() throws Exception {
     job.set("mapred.job.reduce.input.buffer.percent", "0.0");
     job.setNumMapTasks(3);
     Counters c = runJob(job);
-    final long hdfsWritten = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP, 
+    final long hdfsWritten = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP,
         Task.getFileSystemCounterNames("hdfs")[1]).getCounter();
-    final long localRead = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP, 
+    final long localRead = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP,
         Task.getFileSystemCounterNames("file")[0]).getCounter();
     assertTrue("Expected more bytes read from local (" +
         localRead + ") than written to HDFS (" + hdfsWritten + ")",
@@ -126,9 +126,9 @@ public void testReduceFromPartialMem() throws Exception {
     job.setNumTasksToExecutePerJvm(1);
     job.set("mapred.job.shuffle.merge.percent", "1.0");
     Counters c = runJob(job);
-    final long hdfsWritten = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP, 
+    final long hdfsWritten = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP,
         Task.getFileSystemCounterNames("hdfs")[1]).getCounter();
-    final long localRead = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP, 
+    final long localRead = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP,
         Task.getFileSystemCounterNames("file")[0]).getCounter();
     assertTrue("Expected at least 1MB fewer bytes read from local (" +
         localRead + ") than written to HDFS (" + hdfsWritten + ")",
@@ -140,9 +140,36 @@ public void testReduceFromMem() throws Exception {
     job.set("mapred.job.reduce.input.buffer.percent", "1.0");
     job.setNumMapTasks(3);
     Counters c = runJob(job);
-    final long localRead = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP, 
+    final long localRead = c.findCounter(Task.FILESYSTEM_COUNTER_GROUP,
         Task.getFileSystemCounterNames("file")[0]).getCounter();
     assertTrue("Non-zero read from local: " + localRead, localRead == 0);
   }
 
+  /**
+   * Add a test that will ensure that multiple maps will be completed per task
+   * tracker (5).
+   *
+   * @throws Exception
+   */
+  public void testMultiMapFetch5() throws Exception {
+    JobConf job = mrCluster.createJobConf();
+    job.set("mapred.job.reduce.input.buffer.percent", "1.0");
+    job.setLong("mapred.event.sleep.ms", 10000);
+    job.setNumMapTasks(5);
+    Counters c = runJob(job);
+  }
+
+  /**
+   * Add a test that will ensure that multiple maps will be completed per task
+   * tracker (20) and that it is more than the default of 10 per host
+   *
+   * @throws Exception
+   */
+  public void testMultiMapFetch() throws Exception {
+    JobConf job = mrCluster.createJobConf();
+    job.set("mapred.job.reduce.input.buffer.percent", "1.0");
+    job.setLong("mapred.event.sleep.ms", 10000);
+    job.setNumMapTasks(20);
+    Counters c = runJob(job);
+  }
 }
diff --git a/src/test/org/apache/hadoop/mapreduce/TestLocalRunner.java b/src/test/org/apache/hadoop/mapreduce/TestLocalRunner.java
index 7d828e4d..05664579 100644
--- a/src/test/org/apache/hadoop/mapreduce/TestLocalRunner.java
+++ b/src/test/org/apache/hadoop/mapreduce/TestLocalRunner.java
@@ -32,6 +32,7 @@
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapred.TaskCompletionEvent;
 import org.apache.hadoop.mapred.LocalJobRunner;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
@@ -274,6 +275,12 @@ public void testMultiMaps() throws Exception {
 
     job.waitForCompletion(true);
 
+    TaskCompletionEvent[] taskCompletionEvents = job.getTaskCompletionEvents(0);
+    assertTrue(taskCompletionEvents.length == 6);
+    for(int i = 0; i < 6; i++) {
+      assertTrue(taskCompletionEvents[i].getTaskStatus() == TaskCompletionEvent.Status.SUCCEEDED);
+    }
+
     verifyOutput(outputPath);
   }
 }
diff --git a/src/test/org/apache/hadoop/metrics/BenchmarkAPITrace.java b/src/test/org/apache/hadoop/metrics/BenchmarkAPITrace.java
new file mode 100644
index 00000000..c58a63ec
--- /dev/null
+++ b/src/test/org/apache/hadoop/metrics/BenchmarkAPITrace.java
@@ -0,0 +1,73 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.metrics;
+
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.metrics.APITrace.*;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
+import java.io.IOException;
+
+
+/**
+ * 
+ */
+public class BenchmarkAPITrace extends Configured implements Tool {
+
+  // measure performance of logging method
+  public static void takeMeasurements() {
+    long startTime = System.currentTimeMillis();
+    long lastTime = startTime;
+    for (int i = 0; i < 10; i++) {
+      for (int j = 0; j < 1e5; j++) {
+        CallEvent event = new CallEvent();
+        event.logCall(0,
+                      100,
+                      new Object[] {"arg1", "arg2", "arg3"},
+                      123);
+      }
+      long currTime = System.currentTimeMillis();
+      System.out.println(i + " group: " + (currTime - lastTime));
+      lastTime = currTime;
+    }
+    long totalTime = System.currentTimeMillis() - startTime;
+    System.out.println("Total time: " + totalTime);
+  }
+
+  public int run(String[] args) throws IOException {
+    takeMeasurements();
+    return 0;
+  }
+
+  /**
+   * @param args
+   */
+  public static void main(String[] args) throws Exception {
+    // To execute, run:
+    //
+    // ./bin/hadoop jar build/hadoop-0.20.1-dev-core.jar
+    //    org.apache.hadoop.metrics.BenchmarkAPITrace 2> /dev/null
+
+    int res = ToolRunner.run(new Configuration(),
+                             new BenchmarkAPITrace(), args);
+    System.exit(res);
+  }
+
+}
diff --git a/src/test/org/apache/hadoop/net/TestNetUtils.java b/src/test/org/apache/hadoop/net/TestNetUtils.java
index 17c7c8ba..702a038d 100644
--- a/src/test/org/apache/hadoop/net/TestNetUtils.java
+++ b/src/test/org/apache/hadoop/net/TestNetUtils.java
@@ -84,4 +84,36 @@ public void testLocalhostCheck() throws Exception {
     assertTrue(NetUtils.isLocalAddress(InetAddress.getByName("127.0.0.1")));
     assertFalse(NetUtils.isLocalAddress(InetAddress.getByName("google.com")));    
   }
+  
+  /**
+   * Test local host check.
+   */
+  @Test
+  public void testLocalhostCheckWithCaching() throws Exception {
+    assertTrue(NetUtils.isLocalAddressWithCaching(InetAddress.getLocalHost()));
+    Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
+    while (ifaces.hasMoreElements()) {
+      NetworkInterface iface = ifaces.nextElement();
+      Enumeration<InetAddress> addresses = iface.getInetAddresses();
+      while (addresses.hasMoreElements()) {
+        InetAddress addr = addresses.nextElement();
+        assertTrue(NetUtils.isLocalAddressWithCaching(addr));
+      }
+    }
+    
+    assertTrue(NetUtils.knownLocalAddrs.containsKey(InetAddress.getLocalHost()));
+    while (ifaces.hasMoreElements()) {
+      NetworkInterface iface = ifaces.nextElement();
+      Enumeration<InetAddress> addresses = iface.getInetAddresses();
+      while (addresses.hasMoreElements()) {
+        InetAddress addr = addresses.nextElement();
+        assertTrue(NetUtils.knownLocalAddrs.containsKey(NetUtils.isLocalAddressWithCaching(addr)));
+      }
+    }
+    
+    assertTrue(NetUtils.isLocalAddressWithCaching(InetAddress.getByName("localhost")));
+    assertTrue(NetUtils.isLocalAddressWithCaching(InetAddress.getByName("127.0.0.1")));
+    assertFalse(NetUtils.isLocalAddressWithCaching(InetAddress.getByName("facebook.com")));    
+ 
+  }
 }
diff --git a/src/test/org/apache/hadoop/test/GenericTestUtils.java b/src/test/org/apache/hadoop/test/GenericTestUtils.java
new file mode 100644
index 00000000..13e96830
--- /dev/null
+++ b/src/test/org/apache/hadoop/test/GenericTestUtils.java
@@ -0,0 +1,179 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeoutException;
+
+import org.apache.commons.logging.Log;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.util.StringUtils;
+import org.junit.Assert;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Supplier;
+import com.google.common.collect.Sets;
+
+/**
+ * Test provides some very generic helpers which might be used across the tests
+ */
+public abstract class GenericTestUtils {
+
+  /**
+   * Extracts the name of the method where the invocation has happened
+   * @return String name of the invoking method
+   */
+  public static String getMethodName() {
+    return Thread.currentThread().getStackTrace()[2].getMethodName();
+  }
+  
+  /**
+   * Assert that a given file exists.
+   */
+  public static void assertExists(File f) {
+    Assert.assertTrue("File " + f + " should exist", f.exists());
+  }
+    
+  /**
+   * List all of the files in 'dir' that match the regex 'pattern'.
+   * Then check that this list is identical to 'expectedMatches'.
+   * @throws IOException if the dir is inaccessible
+   */
+  public static void assertGlobEquals(File dir, String pattern,
+      String ... expectedMatches) throws IOException {
+    
+    Set<String> found = Sets.newTreeSet();
+    for (File f : FileUtil.listFiles(dir)) {
+      if (f.getName().matches(pattern)) {
+        found.add(f.getName());
+      }
+    }
+    Set<String> expectedSet = Sets.newTreeSet(
+        Arrays.asList(expectedMatches));
+    Assert.assertEquals("Bad files matching " + pattern + " in " + dir,
+        Joiner.on(",").join(found),
+        Joiner.on(",").join(expectedSet));
+  }
+  
+  public static void assertExceptionContains(String string, Throwable t) {
+    String msg = t.getMessage();
+    Assert.assertTrue(
+        "Unexpected exception:" + StringUtils.stringifyException(t),
+        msg.contains(string));    
+  }  
+
+  public static void waitFor(Supplier<Boolean> check,
+      int checkEveryMillis, int waitForMillis)
+      throws TimeoutException, InterruptedException
+  {
+    long st = System.currentTimeMillis();
+    do {
+      boolean result = check.get();
+      if (result) {
+        return;
+      }
+      
+      Thread.sleep(checkEveryMillis);
+    } while (System.currentTimeMillis() - st < waitForMillis);
+    throw new TimeoutException("Timed out waiting for condition");
+  }
+  
+  
+  /**
+   * Mockito answer helper that triggers one latch as soon as the
+   * method is called, then waits on another before continuing.
+   */
+  public static class DelayAnswer implements Answer<Object> {
+    private final Log LOG;
+    
+    private final CountDownLatch fireLatch = new CountDownLatch(1);
+    private final CountDownLatch waitLatch = new CountDownLatch(1);
+  
+    
+    public DelayAnswer(Log log) {
+      this.LOG = log;
+    }
+
+    /**
+     * Wait until the method is called.
+     */
+    public void waitForCall() throws InterruptedException {
+      fireLatch.await();
+    }
+  
+    /**
+     * Tell the method to proceed.
+     * This should only be called after waitForCall()
+     */
+    public void proceed() {
+      waitLatch.countDown();
+    }
+  
+    public Object answer(InvocationOnMock invocation) throws Throwable {
+      LOG.info("DelayAnswer firing fireLatch");
+      fireLatch.countDown();
+      try {
+        LOG.info("DelayAnswer waiting on waitLatch");
+        waitLatch.await();
+        LOG.info("DelayAnswer delay complete");
+      } catch (InterruptedException ie) {
+        throw new IOException("Interrupted waiting on latch", ie);
+      }
+      return passThrough(invocation);
+    }
+
+    protected Object passThrough(InvocationOnMock invocation) throws Throwable {
+      return invocation.callRealMethod();
+    }
+  }
+  
+  /**
+   * An Answer implementation that simply forwards all calls through
+   * to a delegate.
+   * 
+   * This is useful as the default Answer for a mock object, to create
+   * something like a spy on an RPC proxy. For example:
+   * <code>
+   *    NamenodeProtocol origNNProxy = secondary.getNameNode();
+   *    NamenodeProtocol spyNNProxy = Mockito.mock(NameNodeProtocol.class,
+   *        new DelegateAnswer(origNNProxy);
+   *    doThrow(...).when(spyNNProxy).getBlockLocations(...);
+   *    ...
+   * </code>
+   */
+  public static class DelegateAnswer implements Answer<Object> { 
+    private final Object delegate;
+    
+    public DelegateAnswer(Object delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public Object answer(InvocationOnMock invocation) throws Throwable {
+      return invocation.getMethod().invoke(
+          delegate, invocation.getArguments());
+    }
+  }
+
+}
diff --git a/src/test/org/apache/hadoop/util/TestHostsFileReader.java b/src/test/org/apache/hadoop/util/TestHostsFileReader.java
index 023d4e86..11724938 100644
--- a/src/test/org/apache/hadoop/util/TestHostsFileReader.java
+++ b/src/test/org/apache/hadoop/util/TestHostsFileReader.java
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.util.Set;
 import junit.framework.TestCase;
 
@@ -226,5 +227,59 @@ public void testHostFileReaderWithTabs() throws Exception {
 		assertFalse(hfp.getExcludedHosts().contains("somehost5"));
 
 	}
+	
+  public void testHostsFileReaderValidate() {
+
+    // test constructor and update
+    testConstructAndSet(true);
+    testConstructAndSet(false);
+
+    // validation should throw an exception
+    testFailure("/foo/bar/include", "/foo/bar/exclude");
+    testFailure("", "/foo/bar/exclude");
+    testFailure("/foo/bar/include", "");
+    
+    try {
+      HostsFileReader.validateHostFiles("", "");
+    } catch (IOException e) {
+      fail("Validation for empty files should succeed");
+    }
+  }
+  
+  private void testConstructAndSet(boolean enforce) {
+    HostsFileReader hfp = null;
+    try {
+      hfp = new HostsFileReader("/foo/bar/include", "/foo/bar/exclude", enforce);
+      if (enforce)
+        fail("This should fail since the files do not exist");
+    } catch (IOException e) {
+      if (enforce)
+        assertTrue(e.toString().contains("does not exist"));
+      else
+        fail("This should succeed since we don't enforce validation");
+    }
+
+    try {
+      hfp = new HostsFileReader("", "");
+      hfp.updateFileNames("/foo/bar/include", "/foo/bar/exclude", enforce);
+      if (enforce)
+        fail("This should fail since the files do not exist");
+    } catch (IOException e) {
+      if (enforce)
+        assertTrue(e.toString().contains("does not exist"));
+      else
+        fail("This should succeed since we don't enforce validation");
+    }
+
+  }
+  
+  private void testFailure(String in, String ex) {
+    try {
+      HostsFileReader.validateHostFiles(in, ex);
+      fail("This should fail since the files do not exist (either of them)");
+    } catch (IOException e) {
+      assertTrue(e.toString().contains("does not exist"));
+    }
+  }
 
 }
diff --git a/src/tools/org/apache/hadoop/tools/DistCp.java b/src/tools/org/apache/hadoop/tools/DistCp.java
index 89881f01..8663e7a4 100644
--- a/src/tools/org/apache/hadoop/tools/DistCp.java
+++ b/src/tools/org/apache/hadoop/tools/DistCp.java
@@ -72,6 +72,7 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.SequenceFileRecordReader;
+import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.AccessControlException;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.Tool;
@@ -85,6 +86,7 @@ public class DistCp implements Tool {
   public static final Log LOG = LogFactory.getLog(DistCp.class);
 
   private static final String NAME = "distcp";
+  private static final int DEFAULT_TOS_VALUE = 4;
 
   private static final String usage = NAME
     + " [OPTIONS] <srcurl>* <desturl>" +
@@ -102,6 +104,7 @@ public class DistCp implements Tool {
     "\n-log <logdir>          Write logs to <logdir>" +
     "\n-m <num_maps>          Maximum number of simultaneous copies" +
     "\n-r <num_reducers>      Maximum number of reducers" +
+    "\n-tos <tos_value>       The TOS value (valid values are from -1 to 191, inclusive)" +
     "\n-overwrite             Overwrite destination" +
     "\n-update                Overwrite if src size different from dst size" +
     "\n-skipcrccheck          Do not use CRC check to determine if src is " +
@@ -1312,6 +1315,10 @@ private void setupJob() throws IOException  {
       } else {
         job = createJobConf(conf, useFastCopy);
       }
+      
+      // set the tos value for each task
+      job.setInt(NetUtils.DFS_CLIENT_TOS_CONF,
+          conf.getInt(NetUtils.DFS_CLIENT_TOS_CONF, DEFAULT_TOS_VALUE));
       if (args.preservedAttributes != null) {
         job.set(PRESERVE_STATUS_LABEL, args.preservedAttributes);
       }
@@ -1691,6 +1698,7 @@ static Arguments valueOf(String[] args, Configuration conf
       String mapredSslConf = null;
       long filelimit = Long.MAX_VALUE;
       long sizelimit = Long.MAX_VALUE;
+      int tosValue = DEFAULT_TOS_VALUE;
 
       for (int idx = 0; idx < args.length; idx++) {
         Options[] opt = Options.values();
@@ -1750,6 +1758,23 @@ else if (opt[i] == Options.SIZE_LIMIT) {
             throw new IllegalArgumentException("Invalid argument to -m: "
                 + args[idx]);
           }
+        } else if ("-tos".equals(args[idx])) {
+          if (++idx == args.length) {
+            throw new IllegalArgumentException(
+                "tos value not specified in -tos");
+          }
+          try {
+            int value = Integer.valueOf(args[idx]);
+            if (NetUtils.isValidTOSValue(value)) {
+              tosValue = value;
+            } else {
+              throw new IllegalArgumentException(
+                  "Invalid argument to -tos: " + args[idx]);
+            }
+          } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("Invalid argument to -tos: "
+                + args[idx]);
+          }
         } else if ('-' == args[idx].codePointAt(0)) {
           throw new IllegalArgumentException("Invalid switch " + args[idx]);
         } else if (idx == args.length -1) {
@@ -1758,6 +1783,9 @@ else if (opt[i] == Options.SIZE_LIMIT) {
           srcs.add(new Path(args[idx]));
         }
       }
+      
+      // overwrite the tos value
+      conf.setInt(NetUtils.DFS_CLIENT_TOS_CONF, tosValue);
       // mandatory command-line parameters
       if (srcs.isEmpty() || dst == null) {
         throw new IllegalArgumentException("Missing "
@@ -1941,6 +1969,7 @@ private static JobConf createJobConf(Configuration conf, boolean useFastCopy) {
     // Prevent the reducer from starting until all maps are done.
     jobconf.setInt("mapred.job.rushreduce.reduce.threshold", 0);
     jobconf.setFloat("mapred.reduce.slowstart.completed.maps", 1.0f);
+    
     return jobconf;
   }
 
diff --git a/src/webapps/hdfs/dfsclusterhealth.jsp b/src/webapps/hdfs/dfsclusterhealth.jsp
index a874e311..1a6153dc 100644
--- a/src/webapps/hdfs/dfsclusterhealth.jsp
+++ b/src/webapps/hdfs/dfsclusterhealth.jsp
@@ -51,8 +51,12 @@
     } else if (statName.equals("DFS Used%") ||
         statName.equals("DFS Remaining%")) {
       return StringUtils.limitDecimalTo2((Float)stat) + "%";
+    } else if (stat == null) {
+      return "-";
+    } else if (stat.toString().length() == 0) {
+      return spaces(1);
     } else {
-      return (stat == null) ? "-" : stat.toString();
+      return stat.toString();
     }
   }
 
@@ -65,11 +69,11 @@
                                 Map<Integer, Integer> nnMap,
                                 NameNodeKey specificKey)
                                 throws IOException {
-    String bold = (statNum == -1) ? "" : "<b>";
+    String boldName = (statNum == -1) ? statName : "<b>" + statName + "</b>";
     out.print(rowTxt() + "<td id=\"col1\" class=\"metric\" align=\""
               + ((statNum == -1) ? "left" : "center") + "\">"
               + "<a title=\"" + statName + "\"> "
-              + spaces(4) + bold + statName + bold + spaces(4) + " </a>");
+              + spaces(4) + boldName + spaces(4) + " </a>");
     out.print("<td class=\"overallstatus\"> "
               + ((totalStat != null) ? format(statName, totalStat) : ""));
     for (int i = 0; i < nnAddrs.size(); i++) {
@@ -84,9 +88,9 @@
       if(statNum > -1){
         statStr = format(statName, stats[statNum]);
       } else {
-    	Map<NameNodeKey, String> kvMap 
-    		= nnList.get(index).getNamenodeSpecificKeys(); 
-    	statStr = format(statName, kvMap.get(specificKey));
+        Map<NameNodeKey, String> kvMap =
+          nnList.get(index).getNamenodeSpecificKeys();
+        statStr = format(statName, kvMap.get(specificKey));
       }
       if (!statName.equals("Missing Blocks") || statNum < 0 || (Long)stats[statNum] == 0) {
         out.print(statStr);
@@ -98,8 +102,6 @@
     }
     out.print("\n");
   }
-  
-  
 
   @SuppressWarnings("unchecked")
   public void generateNameNodeReport(JspWriter out,
@@ -135,24 +137,25 @@
       for (int i = 0; i < statNames.length; i++) {
         generateStatsData(out, i, statNames[i], totalStats[i], nnAddrs, nnList, nnMaps, null);
       }
-      out.print("<tr class=\"headRow\"> "
-              + "<th " + NodeHeaderStr(cInfo.getNamenodeSpecificKeysName())
-              + ">" + cInfo.getNamenodeSpecificKeysName());
-      
-      ArrayList<NameNodeKey> nnKeys = new ArrayList<NameNodeKey>();
-      for (int i = 0; i < nnAddrs.size(); i++) {
-    	Map<NameNodeKey, String> map 
-    		= (Map<NameNodeKey, String>) nnList.get(i).getNamenodeSpecificKeys();
-    	for(NameNodeKey key : map.keySet()){
-    	  if(!nnKeys.contains(key))
-    	    nnKeys.add(key);
-    	}
-      }
-      Collections.sort(nnKeys);         
-      for(NameNodeKey key : nnKeys){
-    	generateStatsData(out, -1, key.getKey(), null, nnAddrs, nnList, nnMaps, key);
+      if (cInfo.isAvatar()) {
+        out.print("<tr class=\"headRow\"> "
+                + "<th " + NodeHeaderStr(cInfo.getNamenodeSpecificKeysName())
+                + ">" + cInfo.getNamenodeSpecificKeysName());
+        ArrayList<NameNodeKey> nnKeys = new ArrayList<NameNodeKey>();
+        for (int i = 0; i < nnAddrs.size(); i++) {
+          Map<NameNodeKey, String> map = (Map<NameNodeKey, String>)
+            nnList.get(i).getNamenodeSpecificKeys();
+          for(NameNodeKey key : map.keySet()){
+            if(!nnKeys.contains(key))
+              nnKeys.add(key);
+            }
+          }
+          Collections.sort(nnKeys);
+          for(NameNodeKey key : nnKeys){
+            generateStatsData(out, -1, key.getKey(), null, nnAddrs, nnList, nnMaps, key);
+        }
       }
- 
+
       out.print("</table>\n");
       out.print("<hr>");
       out.print("<h3> DataNode Health: </h3>");
diff --git a/src/webapps/hdfs/dfshealth.jsp b/src/webapps/hdfs/dfshealth.jsp
index 815f366c..112ba42a 100644
--- a/src/webapps/hdfs/dfshealth.jsp
+++ b/src/webapps/hdfs/dfshealth.jsp
@@ -7,6 +7,8 @@
   import="org.apache.hadoop.fs.*"
   import="org.apache.hadoop.hdfs.*"
   import="org.apache.hadoop.hdfs.server.namenode.*"
+  import="org.apache.hadoop.hdfs.server.namenode.JournalSet.JournalAndStream"
+  import="org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType"
   import="org.apache.hadoop.hdfs.server.datanode.*"
   import="org.apache.hadoop.hdfs.server.common.Storage"
   import="org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory"
@@ -126,17 +128,19 @@
   throws IOException {
 	  long underReplicatedBlocks = fsn.getUnderReplicatedBlocks();
 	  FSImage fsImage = fsn.getFSImage();
-	  List<Storage.StorageDirectory> removedStorageDirs = fsImage.getRemovedStorageDirs();
+	  List<Storage.StorageDirectory> removedStorageDirs = fsImage.storage.getRemovedStorageDirs();
 	  String storageDirsSizeStr="", removedStorageDirsSizeStr="", storageDirsStr="", removedStorageDirsStr="", storageDirsDiv="", removedStorageDirsDiv="";
 
 	  //FS Image storage configuration
 	  out.print("<h3> NameNode Storage: </h3>");
 	  out.print("<div id=\"dfstable\"> <table border=1 cellpadding=10 cellspacing=0 title=\"NameNode Storage\">\n"+
-	  "<thead><tr><td><b>Storage Directory</b></td><td><b>Type</b></td><td><b>State</b></td></tr></thead>");
+	  "<thead><tr><td><b>Images:</b></td><td><b>Type</b></td><td><b>State</b></td></tr></thead>");
 	  
 	  StorageDirectory st =null;
-	  for (Iterator<StorageDirectory> it = fsImage.dirIterator(); it.hasNext();) {
+	  for (Iterator<StorageDirectory> it = fsImage.storage.dirIterator(); it.hasNext();) {
 	      st = it.next();
+	      if(st.getStorageDirType() == NameNodeDirType.EDITS)
+	        continue;
 	      String dir = "" +  st.getRoot();
 		  String type = "" + st.getStorageDirType();
 		  out.print("<tr><td>"+dir+"</td><td>"+type+"</td><td>Active</td></tr>");
@@ -145,11 +149,23 @@
 	  long storageDirsSize = removedStorageDirs.size();
 	  for(int i=0; i< storageDirsSize; i++){
 		  st = removedStorageDirs.get(i);
+		  if(st.getStorageDirType() == NameNodeDirType.EDITS)
+        	continue;
 		  String dir = "" +  st.getRoot();
 		  String type = "" + st.getStorageDirType();
 		  out.print("<tr><td>"+dir+"</td><td>"+type+"</td><td><font color=red>Failed</font></td></tr>");
 	  }
 	  
+	  out.print("<thead><tr><td><b>Edits:</b></td><td><b>Required</b></td><td><b>State</b></td></tr></thead>");
+	  List<JournalAndStream> journals = fsImage.getEditLog().getJournals();
+	  for(int i =0; i<journals.size(); i++) {
+	    JournalAndStream jas = journals.get(i);
+	    if (!jas.isResourceAvailable())
+	      out.print("<tr><td>"+jas.toStringShort()+"</td><td>" + jas.isRequired() + "</td><td><font color=red>Failed</font></td></tr>");
+	    else
+	      out.print("<tr><td>"+jas.toStringShort()+"</td><td>" + jas.isRequired() + "</td><td>Active</td></tr>");
+	  }
+	  
 	  out.print("</table></div><br>\n");
   }
 
diff --git a/src/webapps/static/cm.js b/src/webapps/static/cm.js
index d5f59e41..dca04e03 100644
--- a/src/webapps/static/cm.js
+++ b/src/webapps/static/cm.js
@@ -16,9 +16,6 @@
  */
 
 $(document).ready(function() {
-   $('#switcher').themeswitcher({
-     loadTheme: "UI lightness"
-   });
    // Multi select objects
    $("#poolGroupSelect").multiselect({
        noneSelectedText: 'Select pool group(s)',
@@ -65,28 +62,76 @@ $(document).ready(function() {
     "bJQueryUI": true,
     "bPaginate": false,
     "bSearchable": false,
+    "bSortClasses": false,
     "sScrollX": "100%",
     "bScrollCollapse": true,
   });
   $("#activeTable").dataTable({
     "bJQueryUI": true,
-    "bPaginate": false,
+    "bPaginate": true,
+    "bSortClasses": false,
+    "bStateSave": false,
     "sScrollX": "100%",
     "bScrollCollapse": true,
+    "iDisplayLength": 10,
+    "aLengthMenu": [[10, 25, 50, 100, -1],[10, 25, 50, 100, "All"]],
+    "bProcessing": true,
+    "fnServerParams": function (aoData) {
+        aoData.push({
+            "name": "users",
+            "value": getParameterByName("users")});
+        aoData.push({
+            "name": "poolGroups",
+            "value": getParameterByName("poolGroups")});
+        aoData.push({
+            "name" : "poolInfos",
+            "value": getParameterByName("poolInfos")});
+    },
+    "sAjaxSource": "/active_json.jsp",
   });
   $("#poolTable").dataTable({
     "bJQueryUI": true,
     "bPaginate": false,
+    "bSortClasses": false,
+    "bStateSave": false,
     "sScrollX": "100%",
     "bScrollCollapse": true,
+    "bProcessing": true,
+    "fnServerParams": function (aoData) {
+        aoData.push({
+            "name": "users",
+            "value": getParameterByName("users")});
+        aoData.push({
+            "name": "poolGroups",
+            "value": getParameterByName("poolGroups")});
+        aoData.push({
+            "name" : "poolInfos",
+            "value": getParameterByName("poolInfos")});
+    },
+    "sAjaxSource": "/pool_json.jsp",
   });
   $("#retiredTable").dataTable({
     "bJQueryUI": true,
     "bPaginate": true,
+    "bSortClasses": false,
+    "bStateSave": false,
     "sScrollX": "100%",
     "bScrollCollapse": true,
     "iDisplayLength": 10,
-    "aLengthMenu": [[10, 25, 50, 100, -1],[10, 25, 50, 100, "All"]]
+    "aLengthMenu": [[10, 25, 50, 100, -1],[10, 25, 50, 100, "All"]],
+    "bProcessing": true,
+    "fnServerParams": function (aoData) {
+        aoData.push({
+            "name": "users",
+            "value": getParameterByName("users")});
+        aoData.push({
+            "name": "poolGroups",
+            "value": getParameterByName("poolGroups")});
+        aoData.push({
+            "name" : "poolInfos",
+            "value": getParameterByName("poolInfos")});
+    },
+    "sAjaxSource": "/retired_json.jsp",
   });
 
   // Hide the retired table
@@ -102,6 +147,10 @@ $(document).ready(function() {
   $("#retiredToggle").click(function () {
     $("#retiredTable").toggle();
   });
+
+  $('#switcher').themeswitcher({
+    loadTheme: "UI lightness"
+  });
 });
 
 function toggle(id) {
@@ -112,3 +161,10 @@ function toggle(id) {
     document.getElementById(id).style.display = 'none';
   }
 }
+
+function getParameterByName(name) {
+    var match = RegExp('[?&]' + name + '=([^&]*)')
+        .exec(window.location.search);
+    return match && decodeURIComponent(match[1].replace(/\+/g, ' '));
+}
+
diff --git a/src/webapps/static/cm_old.js b/src/webapps/static/cm_old.js
new file mode 100644
index 00000000..d5f59e41
--- /dev/null
+++ b/src/webapps/static/cm_old.js
@@ -0,0 +1,114 @@
+/*
+ * 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.
+ */
+
+$(document).ready(function() {
+   $('#switcher').themeswitcher({
+     loadTheme: "UI lightness"
+   });
+   // Multi select objects
+   $("#poolGroupSelect").multiselect({
+       noneSelectedText: 'Select pool group(s)',
+       minWidth: "300",
+   });
+   $("#poolInfoSelect").multiselect({
+       noneSelectedText: 'Select pool info(s)',
+       minWidth: "300",
+   });
+
+   // Buttons
+  $("button").button();
+
+  // Add the filtering redirect
+  $("#addFilter").click(function() {
+    var poolGroupValues = $("#poolGroupSelect").val();
+    var poolInfoValues = $("#poolInfoSelect").val();
+
+    var queryStringQuery = window.location.href.split('?')[0];
+    var queryStringLink = window.location.href.split('#')[0];
+    var queryString = "";
+    if (queryStringQuery.length < queryStringLink.length) {
+      queryString = queryStringQuery;
+    } else {
+      queryString = queryStringLink;
+    }
+
+    if (poolGroupValues == null && poolInfoValues == null) {
+      // do nothing
+    } else {
+      queryString += "?";
+      if (poolGroupValues != null) {
+        queryString += "poolGroups=" + poolGroupValues + "&";
+      }
+      if (poolInfoValues != null) {
+        queryString += "poolInfos=" + poolInfoValues + "&";
+      }
+    }
+    location.href = queryString;
+  });
+
+  // Make all tables data tables
+  $("#summaryTable").dataTable({
+    "bJQueryUI": true,
+    "bPaginate": false,
+    "bSearchable": false,
+    "sScrollX": "100%",
+    "bScrollCollapse": true,
+  });
+  $("#activeTable").dataTable({
+    "bJQueryUI": true,
+    "bPaginate": false,
+    "sScrollX": "100%",
+    "bScrollCollapse": true,
+  });
+  $("#poolTable").dataTable({
+    "bJQueryUI": true,
+    "bPaginate": false,
+    "sScrollX": "100%",
+    "bScrollCollapse": true,
+  });
+  $("#retiredTable").dataTable({
+    "bJQueryUI": true,
+    "bPaginate": true,
+    "sScrollX": "100%",
+    "bScrollCollapse": true,
+    "iDisplayLength": 10,
+    "aLengthMenu": [[10, 25, 50, 100, -1],[10, 25, 50, 100, "All"]]
+  });
+
+  // Hide the retired table
+  $("#retiredTable").hide();
+
+  // Add toggling for showing the tables
+  $("#activeToggle").click(function () {
+    $("#activeTable").toggle();
+  });
+  $("#poolToggle").click(function () {
+    $("#poolTable").toggle();
+  });
+  $("#retiredToggle").click(function () {
+    $("#retiredTable").toggle();
+  });
+});
+
+function toggle(id) {
+  if ( document.getElementById(id).style.display != 'block') {
+    document.getElementById(id).style.display = 'block';
+  }
+  else {
+    document.getElementById(id).style.display = 'none';
+  }
+}
diff --git a/src/webapps/static/jqueryThemeRoller.js b/src/webapps/static/jqueryThemeRoller.js
new file mode 100644
index 00000000..a826b262
--- /dev/null
+++ b/src/webapps/static/jqueryThemeRoller.js
@@ -0,0 +1,250 @@
+/* jQuery plugin themeswitcher
+---------------------------------------------------------------------*/
+$.fn.themeswitcher = function(settings){
+	var options = jQuery.extend({
+		loadTheme: null,
+		initialText: 'Switch Theme',
+		width: 150,
+		height: 200,
+		buttonPreText: 'Theme: ',
+		closeOnSelect: true,
+		buttonHeight: 14,
+		cookieName: 'jquery-ui-theme',
+		onOpen: function(){},
+		onClose: function(){},
+		onSelect: function(){}
+	}, settings);
+
+	//markup 
+	var button = $('<a href="#" class="jquery-ui-themeswitcher-trigger"><span class="jquery-ui-themeswitcher-icon"></span><span class="jquery-ui-themeswitcher-title">'+ options.initialText +'</span></a>');
+	var switcherpane = $('<div class="jquery-ui-themeswitcher"><div id="themeGallery">	<ul>		<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Trebuchet+MS,+Tahoma,+Verdana,+Arial,+sans-serif&amp;fwDefault=bold&amp;fsDefault=1.1em&amp;cornerRadius=4px&amp;bgColorHeader=f6a828&amp;bgTextureHeader=12_gloss_wave.png&amp;bgImgOpacityHeader=35&amp;borderColorHeader=e78f08&amp;fcHeader=ffffff&amp;iconColorHeader=ffffff&amp;bgColorContent=eeeeee&amp;bgTextureContent=03_highlight_soft.png&amp;bgImgOpacityContent=100&amp;borderColorContent=dddddd&amp;fcContent=333333&amp;iconColorContent=222222&amp;bgColorDefault=f6f6f6&amp;bgTextureDefault=02_glass.png&amp;bgImgOpacityDefault=100&amp;borderColorDefault=cccccc&amp;fcDefault=1c94c4&amp;iconColorDefault=ef8c08&amp;bgColorHover=fdf5ce&amp;bgTextureHover=02_glass.png&amp;bgImgOpacityHover=100&amp;borderColorHover=fbcb09&amp;fcHover=c77405&amp;iconColorHover=ef8c08&amp;bgColorActive=ffffff&amp;bgTextureActive=02_glass.png&amp;bgImgOpacityActive=65&amp;borderColorActive=fbd850&amp;fcActive=eb8f00&amp;iconColorActive=ef8c08&amp;bgColorHighlight=ffe45c&amp;bgTextureHighlight=03_highlight_soft.png&amp;bgImgOpacityHighlight=75&amp;borderColorHighlight=fed22f&amp;fcHighlight=363636&amp;iconColorHighlight=228ef1&amp;bgColorError=b81900&amp;bgTextureError=08_diagonals_thick.png&amp;bgImgOpacityError=18&amp;borderColorError=cd0a0a&amp;fcError=ffffff&amp;iconColorError=ffd27a&amp;bgColorOverlay=666666&amp;bgTextureOverlay=08_diagonals_thick.png&amp;bgImgOpacityOverlay=20&amp;opacityOverlay=50&amp;bgColorShadow=000000&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=10&amp;opacityShadow=20&amp;thicknessShadow=5px&amp;offsetTopShadow=-5px&amp;offsetLeftShadow=-5px&amp;cornerRadiusShadow=5px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_ui_light.png" alt="UI Lightness" title="UI Lightness" />			<span class="themeName">UI lightness</span>		</a></li>				<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Segoe+UI%2C+Arial%2C+sans-serif&amp;fwDefault=bold&amp;fsDefault=1.1em&amp;cornerRadius=6px&amp;bgColorHeader=333333&amp;bgTextureHeader=12_gloss_wave.png&amp;bgImgOpacityHeader=25&amp;borderColorHeader=333333&amp;fcHeader=ffffff&amp;iconColorHeader=ffffff&amp;bgColorContent=000000&amp;bgTextureContent=05_inset_soft.png&amp;bgImgOpacityContent=25&amp;borderColorContent=666666&amp;fcContent=ffffff&amp;iconColorContent=cccccc&amp;bgColorDefault=555555&amp;bgTextureDefault=02_glass.png&amp;bgImgOpacityDefault=20&amp;borderColorDefault=666666&amp;fcDefault=eeeeee&amp;iconColorDefault=cccccc&amp;bgColorHover=0078a3&amp;bgTextureHover=02_glass.png&amp;bgImgOpacityHover=40&amp;borderColorHover=59b4d4&amp;fcHover=ffffff&amp;iconColorHover=ffffff&amp;bgColorActive=f58400&amp;bgTextureActive=05_inset_soft.png&amp;bgImgOpacityActive=30&amp;borderColorActive=ffaf0f&amp;fcActive=ffffff&amp;iconColorActive=222222&amp;bgColorHighlight=eeeeee&amp;bgTextureHighlight=03_highlight_soft.png&amp;bgImgOpacityHighlight=80&amp;borderColorHighlight=cccccc&amp;fcHighlight=2e7db2&amp;iconColorHighlight=4b8e0b&amp;bgColorError=ffc73d&amp;bgTextureError=02_glass.png&amp;bgImgOpacityError=40&amp;borderColorError=ffb73d&amp;fcError=111111&amp;iconColorError=a83300&amp;bgColorOverlay=5c5c5c&amp;bgTextureOverlay=01_flat.png&amp;bgImgOpacityOverlay=50&amp;opacityOverlay=80&amp;bgColorShadow=cccccc&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=30&amp;opacityShadow=60&amp;thicknessShadow=7px&amp;offsetTopShadow=-7px&amp;offsetLeftShadow=-7px&amp;cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_ui_dark.png" alt="UI Darkness" title="UI Darkness" />			<span class="themeName">UI darkness</span>		</a></li>			<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Verdana,Arial,sans-serif&amp;fwDefault=normal&amp;fsDefault=1.1em&amp;cornerRadius=4px&amp;bgColorHeader=cccccc&amp;bgTextureHeader=03_highlight_soft.png&amp;bgImgOpacityHeader=75&amp;borderColorHeader=aaaaaa&amp;fcHeader=222222&amp;iconColorHeader=222222&amp;bgColorContent=ffffff&amp;bgTextureContent=01_flat.png&amp;bgImgOpacityContent=75&amp;borderColorContent=aaaaaa&amp;fcContent=222222&amp;iconColorContent=222222&amp;bgColorDefault=e6e6e6&amp;bgTextureDefault=02_glass.png&amp;bgImgOpacityDefault=75&amp;borderColorDefault=d3d3d3&amp;fcDefault=555555&amp;iconColorDefault=888888&amp;bgColorHover=dadada&amp;bgTextureHover=02_glass.png&amp;bgImgOpacityHover=75&amp;borderColorHover=999999&amp;fcHover=212121&amp;iconColorHover=454545&amp;bgColorActive=ffffff&amp;bgTextureActive=02_glass.png&amp;bgImgOpacityActive=65&amp;borderColorActive=aaaaaa&amp;fcActive=212121&amp;iconColorActive=454545&amp;bgColorHighlight=fbf9ee&amp;bgTextureHighlight=02_glass.png&amp;bgImgOpacityHighlight=55&amp;borderColorHighlight=fcefa1&amp;fcHighlight=363636&amp;iconColorHighlight=2e83ff&amp;bgColorError=fef1ec&amp;bgTextureError=02_glass.png&amp;bgImgOpacityError=95&amp;borderColorError=cd0a0a&amp;fcError=cd0a0a&amp;iconColorError=cd0a0a&amp;bgColorOverlay=aaaaaa&amp;bgTextureOverlay=01_flat.png&amp;bgImgOpacityOverlay=0&amp;opacityOverlay=30&amp;bgColorShadow=aaaaaa&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=0&amp;opacityShadow=30&amp;thicknessShadow=8px&amp;offsetTopShadow=-8px&amp;offsetLeftShadow=-8px&amp;cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_smoothness.png" alt="Smoothness" title="Smoothness" />			<span class="themeName">Smoothness</span>		</a></li>							<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Verdana%2CArial%2Csans-serif&amp;fwDefault=normal&amp;fsDefault=1.1em&amp;cornerRadius=5px&amp;bgColorHeader=2191c0&amp;bgTextureHeader=12_gloss_wave.png&amp;bgImgOpacityHeader=75&amp;borderColorHeader=4297d7&amp;fcHeader=eaf5f7&amp;iconColorHeader=d8e7f3&amp;bgColorContent=fcfdfd&amp;bgTextureContent=06_inset_hard.png&amp;bgImgOpacityContent=100&amp;borderColorContent=a6c9e2&amp;fcContent=222222&amp;iconColorContent=0078ae&amp;bgColorDefault=0078ae&amp;bgTextureDefault=02_glass.png&amp;bgImgOpacityDefault=45&amp;borderColorDefault=77d5f7&amp;fcDefault=ffffff&amp;iconColorDefault=e0fdff&amp;bgColorHover=79c9ec&amp;bgTextureHover=02_glass.png&amp;bgImgOpacityHover=75&amp;borderColorHover=448dae&amp;fcHover=026890&amp;iconColorHover=056b93&amp;bgColorActive=6eac2c&amp;bgTextureActive=12_gloss_wave.png&amp;bgImgOpacityActive=50&amp;borderColorActive=acdd4a&amp;fcActive=ffffff&amp;iconColorActive=f5e175&amp;bgColorHighlight=f8da4e&amp;bgTextureHighlight=02_glass.png&amp;bgImgOpacityHighlight=55&amp;borderColorHighlight=fcd113&amp;fcHighlight=915608&amp;iconColorHighlight=f7a50d&amp;bgColorError=e14f1c&amp;bgTextureError=12_gloss_wave.png&amp;bgImgOpacityError=45&amp;borderColorError=cd0a0a&amp;fcError=ffffff&amp;iconColorError=fcd113&amp;bgColorOverlay=aaaaaa&amp;bgTextureOverlay=01_flat.png&amp;bgImgOpacityOverlay=75&amp;opacityOverlay=30&amp;bgColorShadow=999999&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=55&amp;opacityShadow=45&amp;thicknessShadow=0px&amp;offsetTopShadow=5px&amp;offsetLeftShadow=5px&amp;cornerRadiusShadow=5px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_start_menu.png" alt="Start" title="Start" />			<span class="themeName">Start</span>		</a></li>				<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Lucida+Grande,+Lucida+Sans,+Arial,+sans-serif&amp;fwDefault=bold&amp;fsDefault=1.1em&amp;cornerRadius=5px&amp;bgColorHeader=5c9ccc&amp;bgTextureHeader=12_gloss_wave.png&amp;bgImgOpacityHeader=55&amp;borderColorHeader=4297d7&amp;fcHeader=ffffff&amp;iconColorHeader=d8e7f3&amp;bgColorContent=fcfdfd&amp;bgTextureContent=06_inset_hard.png&amp;bgImgOpacityContent=100&amp;borderColorContent=a6c9e2&amp;fcContent=222222&amp;iconColorContent=469bdd&amp;bgColorDefault=dfeffc&amp;bgTextureDefault=02_glass.png&amp;bgImgOpacityDefault=85&amp;borderColorDefault=c5dbec&amp;fcDefault=2e6e9e&amp;iconColorDefault=6da8d5&amp;bgColorHover=d0e5f5&amp;bgTextureHover=02_glass.png&amp;bgImgOpacityHover=75&amp;borderColorHover=79b7e7&amp;fcHover=1d5987&amp;iconColorHover=217bc0&amp;bgColorActive=f5f8f9&amp;bgTextureActive=06_inset_hard.png&amp;bgImgOpacityActive=100&amp;borderColorActive=79b7e7&amp;fcActive=e17009&amp;iconColorActive=f9bd01&amp;bgColorHighlight=fbec88&amp;bgTextureHighlight=01_flat.png&amp;bgImgOpacityHighlight=55&amp;borderColorHighlight=fad42e&amp;fcHighlight=363636&amp;iconColorHighlight=2e83ff&amp;bgColorError=fef1ec&amp;bgTextureError=02_glass.png&amp;bgImgOpacityError=95&amp;borderColorError=cd0a0a&amp;fcError=cd0a0a&amp;iconColorError=cd0a0a&amp;bgColorOverlay=aaaaaa&amp;bgTextureOverlay=01_flat.png&amp;bgImgOpacityOverlay=0&amp;opacityOverlay=30&amp;bgColorShadow=aaaaaa&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=0&amp;opacityShadow=30&amp;thicknessShadow=8px&amp;offsetTopShadow=-8px&amp;offsetLeftShadow=-8px&amp;cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_windoze.png" alt="Redmond" title="Redmond" />			<span class="themeName">Redmond</span>		</a></li>						<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Segoe+UI%2C+Arial%2C+sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=817865&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=ffffff&iconColorHeader=fadc7a&bgColorContent=feeebd&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=12_gloss_wave.png&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=07_diagonals_medium.png&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_sunny.png" alt="Sunny" title="Sunny" />			<span class="themeName">Sunny</span>		</a></li>						<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Trebuchet+MS%2C+Helvetica%2C+Arial%2C+sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=dddddd&bgTextureHeader=02_glass.png&bgImgOpacityHeader=35&borderColorHeader=bbbbbb&fcHeader=444444&iconColorHeader=999999&bgColorContent=c9c9c9&bgTextureContent=05_inset_soft.png&bgImgOpacityContent=50&borderColorContent=aaaaaa&fcContent=333333&iconColorContent=999999&bgColorDefault=eeeeee&bgTextureDefault=02_glass.png&bgImgOpacityDefault=60&borderColorDefault=cccccc&fcDefault=3383bb&iconColorDefault=70b2e1&bgColorHover=f8f8f8&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=bbbbbb&fcHover=599fcf&iconColorHover=3383bb&bgColorActive=999999&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=75&borderColorActive=999999&fcActive=ffffff&iconColorActive=454545&bgColorHighlight=eeeeee&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=ffffff&fcHighlight=444444&iconColorHighlight=3383bb&bgColorError=c0402a&bgTextureError=01_flat.png&bgImgOpacityError=55&borderColorError=c0402a&fcError=ffffff&iconColorError=fbc856&bgColorOverlay=eeeeee&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=80&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=60&thicknessShadow=4px&offsetTopShadow=-4px&offsetLeftShadow=-4px&cornerRadiusShadow=0px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_overcast.png" alt="Overcast" title="Overcast" />			<span class="themeName">Overcast</span>				</a></li>						<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Lucida+Grande%2C+Lucida+Sans%2C+Arial%2C+sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=10px&bgColorHeader=3a8104&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=33&borderColorHeader=3f7506&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=285c00&bgTextureContent=05_inset_soft.png&bgImgOpacityContent=10&borderColorContent=72b42d&fcContent=ffffff&iconColorContent=72b42d&bgColorDefault=4ca20b&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=60&borderColorDefault=45930b&fcDefault=ffffff&iconColorDefault=ffffff&bgColorHover=4eb305&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=50&borderColorHover=8bd83b&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=285c00&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=30&borderColorActive=72b42d&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=fbf5d0&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=f9dd34&fcHighlight=363636&iconColorHighlight=4eb305&bgColorError=ffdc2e&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=95&borderColorError=fad000&fcError=2b2b2b&iconColorError=cd0a0a&bgColorOverlay=444444&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=15&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=07_diagonals_small.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=0px&offsetTopShadow=4px&offsetLeftShadow=4px&cornerRadiusShadow=4px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_le_frog.png" alt="Le Frog" title="Le Frog" />			<span class="themeName">Le Frog</span>		</a></li>								<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Helvetica%2C+Arial%2C+sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=2px&bgColorHeader=dddddd&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=50&borderColorHeader=dddddd&fcHeader=444444&iconColorHeader=0073ea&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=dddddd&fcContent=444444&iconColorContent=ff0084&bgColorDefault=f6f6f6&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=100&borderColorDefault=dddddd&fcDefault=0073ea&iconColorDefault=666666&bgColorHover=0073ea&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=25&borderColorHover=0073ea&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=dddddd&fcActive=ff0084&iconColorActive=454545&bgColorHighlight=ffffff&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=cccccc&fcHighlight=444444&iconColorHighlight=0073ea&bgColorError=ffffff&bgTextureError=01_flat.png&bgImgOpacityError=55&borderColorError=ff0084&fcError=222222&iconColorError=ff0084&bgColorOverlay=eeeeee&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=80&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=60&thicknessShadow=4px&offsetTopShadow=-4px&offsetLeftShadow=-4px&cornerRadiusShadow=0px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_flick.png" alt="Flick" title="Flick" />			<span class="themeName">Flick</span>				</a></li>				<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Trebuchet+MS%2C+Tahoma%2C+Verdana%2C+Arial%2C+sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=ffffff&bgTextureHeader=23_fine_grain.png&bgImgOpacityHeader=15&borderColorHeader=d4d1bf&fcHeader=453821&iconColorHeader=b83400&bgColorContent=eceadf&bgTextureContent=23_fine_grain.png&bgImgOpacityContent=10&borderColorContent=d9d6c4&fcContent=1f1f1f&iconColorContent=222222&bgColorDefault=f8f7f6&bgTextureDefault=23_fine_grain.png&bgImgOpacityDefault=10&borderColorDefault=cbc7bd&fcDefault=654b24&iconColorDefault=b83400&bgColorHover=654b24&bgTextureHover=23_fine_grain.png&bgImgOpacityHover=65&borderColorHover=654b24&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=eceadf&bgTextureActive=23_fine_grain.png&bgImgOpacityActive=15&borderColorActive=d9d6c4&fcActive=140f06&iconColorActive=8c291d&bgColorHighlight=f7f3de&bgTextureHighlight=23_fine_grain.png&bgImgOpacityHighlight=15&borderColorHighlight=b2a266&fcHighlight=3a3427&iconColorHighlight=3572ac&bgColorError=b83400&bgTextureError=23_fine_grain.png&bgImgOpacityError=68&borderColorError=681818&fcError=ffffff&iconColorError=fbdb93&bgColorOverlay=6e4f1c&bgTextureOverlay=16_diagonal_maze.png&bgImgOpacityOverlay=20&opacityOverlay=60&bgColorShadow=000000&bgTextureShadow=16_diagonal_maze.png&bgImgOpacityShadow=40&opacityShadow=60&thicknessShadow=5px&offsetTopShadow=0&offsetLeftShadow=-10px&cornerRadiusShadow=18px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_pepper_grinder.png" alt="Pepper Grinder" title="Pepper Grinder" />			<span class="themeName">Pepper Grinder</span>				</a></li>								<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Lucida+Grande%2C+Lucida+Sans%2C+Arial%2C+sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=30273a&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=25&borderColorHeader=231d2b&fcHeader=ffffff&iconColorHeader=a8a3ae&bgColorContent=3d3644&bgTextureContent=12_gloss_wave.png&bgImgOpacityContent=30&borderColorContent=7e7783&fcContent=ffffff&iconColorContent=ffffff&bgColorDefault=dcd9de&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=100&borderColorDefault=dcd9de&fcDefault=665874&iconColorDefault=8d78a5&bgColorHover=eae6ea&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=100&borderColorHover=d1c5d8&fcHover=734d99&iconColorHover=734d99&bgColorActive=5f5964&bgTextureActive=03_highlight_soft.png&bgImgOpacityActive=45&borderColorActive=7e7783&fcActive=ffffff&iconColorActive=454545&bgColorHighlight=fafafa&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=ffdb1f&fcHighlight=333333&iconColorHighlight=8d78a5&bgColorError=994d53&bgTextureError=01_flat.png&bgImgOpacityError=55&borderColorError=994d53&fcError=ffffff&iconColorError=ebccce&bgColorOverlay=eeeeee&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=80&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=60&thicknessShadow=4px&offsetTopShadow=-4px&offsetLeftShadow=-4px&cornerRadiusShadow=0px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_eggplant.png" alt="Eggplant" title="Eggplant" />			<span class="themeName">Eggplant</span>				</a></li>								<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Verdana%2C+Arial%2C+sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=444444&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=44&borderColorHeader=333333&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=000000&bgTextureContent=14_loop.png&bgImgOpacityContent=25&borderColorContent=555555&fcContent=ffffff&iconColorContent=cccccc&bgColorDefault=222222&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=35&borderColorDefault=444444&fcDefault=eeeeee&iconColorDefault=cccccc&bgColorHover=003147&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=33&borderColorHover=0b93d5&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=0972a5&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=20&borderColorActive=26b3f7&fcActive=ffffff&iconColorActive=222222&bgColorHighlight=eeeeee&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=80&borderColorHighlight=cccccc&fcHighlight=2e7db2&iconColorHighlight=4b8e0b&bgColorError=ffc73d&bgTextureError=02_glass.png&bgImgOpacityError=40&borderColorError=ffb73d&fcError=111111&iconColorError=a83300&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_dark_hive.png" alt="Dark Hive" title="Dark Hive" />			<span class="themeName">Dark Hive</span>		</a></li>										<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Lucida+Grande%2C+Lucida+Sans%2C+Arial%2C+sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=deedf7&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=100&borderColorHeader=aed0ea&fcHeader=222222&iconColorHeader=72a7cf&bgColorContent=f2f5f7&bgTextureContent=04_highlight_hard.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=362b36&iconColorContent=72a7cf&bgColorDefault=d7ebf9&bgTextureDefault=02_glass.png&bgImgOpacityDefault=80&borderColorDefault=aed0ea&fcDefault=2779aa&iconColorDefault=3d80b3&bgColorHover=e4f1fb&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=74b2e2&fcHover=0070a3&iconColorHover=2694e8&bgColorActive=3baae3&bgTextureActive=02_glass.png&bgImgOpacityActive=50&borderColorActive=2694e8&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=ffef8f&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=25&borderColorHighlight=f9dd34&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=cd0a0a&bgTextureError=01_flat.png&bgImgOpacityError=15&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffffff&bgColorOverlay=eeeeee&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=90&opacityOverlay=80&bgColorShadow=000000&bgTextureShadow=04_highlight_hard.png&bgImgOpacityShadow=70&opacityShadow=30&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_cupertino.png" alt="Cupertino" title="Cupertino" />			<span class="themeName">Cupertino</span>				</a></li>				<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=segoe+ui%2C+Arial%2C+sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=ece8da&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=100&borderColorHeader=d4ccb0&fcHeader=433f38&iconColorHeader=847e71&bgColorContent=f5f3e5&bgTextureContent=04_highlight_hard.png&bgImgOpacityContent=100&borderColorContent=dfd9c3&fcContent=312e25&iconColorContent=808080&bgColorDefault=459e00&bgTextureDefault=04_highlight_hard.png&bgImgOpacityDefault=15&borderColorDefault=327E04&fcDefault=ffffff&iconColorDefault=eeeeee&bgColorHover=67b021&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=25&borderColorHover=327E04&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=fafaf4&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=100&borderColorActive=d4ccb0&fcActive=459e00&iconColorActive=8DC262&bgColorHighlight=fcf0ba&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=e8e1b5&fcHighlight=363636&iconColorHighlight=8DC262&bgColorError=ffedad&bgTextureError=03_highlight_soft.png&bgImgOpacityError=95&borderColorError=e3a345&fcError=cd5c0a&iconColorError=cd0a0a&bgColorOverlay=2b2922&bgTextureOverlay=05_inset_soft.png&bgImgOpacityOverlay=15&opacityOverlay=90&bgColorShadow=cccccc&bgTextureShadow=04_highlight_hard.png&bgImgOpacityShadow=95&opacityShadow=20&thicknessShadow=12px&offsetTopShadow=-12px&offsetLeftShadow=-12px&cornerRadiusShadow=10px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_south_street.png" alt="South St" title="South St" />			<span class="themeName">South Street</span>				</a></li>		<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Arial,sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=cc0000&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=15&borderColorHeader=e3a1a1&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=eeeeee&fcContent=333333&iconColorContent=cc0000&bgColorDefault=eeeeee&bgTextureDefault=04_highlight_hard.png&bgImgOpacityDefault=100&borderColorDefault=d8dcdf&fcDefault=004276&iconColorDefault=cc0000&bgColorHover=f6f6f6&bgTextureHover=04_highlight_hard.png&bgImgOpacityHover=100&borderColorHover=cdd5da&fcHover=111111&iconColorHover=cc0000&bgColorActive=ffffff&bgTextureActive=01_flat.png&bgImgOpacityActive=65&borderColorActive=eeeeee&fcActive=cc0000&iconColorActive=cc0000&bgColorHighlight=fbf8ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcd3a1&fcHighlight=444444&iconColorHighlight=004276&bgColorError=f3d8d8&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=75&borderColorError=cc0000&fcError=2e2e2e&iconColorError=cc0000&bgColorOverlay=a6a6a6&bgTextureOverlay=09_dots_small.png&bgImgOpacityOverlay=65&opacityOverlay=40&bgColorShadow=333333&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=10&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_blitzer.png" alt="Blitzer" title="Blitzer" />			<span class="themeName">Blitzer</span>		</a></li>			<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?tr=ffDefault=Helvetica,Arial,sans-serif&amp;fwDefault=normal&amp;fsDefault=1.1em&amp;cornerRadius=6px&amp;bgColorHeader=cb842e&amp;bgTextureHeader=02_glass.png&amp;bgImgOpacityHeader=25&amp;borderColorHeader=d49768&amp;fcHeader=ffffff&amp;iconColorHeader=ffffff&amp;bgColorContent=f4f0ec&amp;bgTextureContent=05_inset_soft.png&amp;bgImgOpacityContent=100&amp;borderColorContent=e0cfc2&amp;fcContent=1e1b1d&amp;iconColorContent=c47a23&amp;bgColorDefault=ede4d4&amp;bgTextureDefault=02_glass.png&amp;bgImgOpacityDefault=70&amp;borderColorDefault=cdc3b7&amp;fcDefault=3f3731&amp;iconColorDefault=f08000&amp;bgColorHover=f5f0e5&amp;bgTextureHover=02_glass.png&amp;bgImgOpacityHover=100&amp;borderColorHover=f5ad66&amp;fcHover=a46313&amp;iconColorHover=f08000&amp;bgColorActive=f4f0ec&amp;bgTextureActive=04_highlight_hard.png&amp;bgImgOpacityActive=100&amp;borderColorActive=e0cfc2&amp;fcActive=b85700&amp;iconColorActive=f35f07&amp;bgColorHighlight=f5f5b5&amp;bgTextureHighlight=04_highlight_hard.png&amp;bgImgOpacityHighlight=75&amp;borderColorHighlight=d9bb73&amp;fcHighlight=060200&amp;iconColorHighlight=cb672b&amp;bgColorError=fee4bd&amp;bgTextureError=04_highlight_hard.png&amp;bgImgOpacityError=65&amp;borderColorError=f8893f&amp;fcError=592003&amp;iconColorError=ff7519&amp;bgColorOverlay=aaaaaa&amp;bgTextureOverlay=01_flat.png&amp;bgImgOpacityOverlay=75&amp;opacityOverlay=30&amp;bgColorShadow=aaaaaa&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=75&amp;opacityShadow=30&amp;thicknessShadow=8px&amp;offsetTopShadow=-8px&amp;offsetLeftShadow=-8px&amp;cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_humanity.png" alt="Humanity" title="Humanity" />			<span class="themeName">Humanity</span>		</a></li>			<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Gill+Sans,Arial,sans-serif&amp;fwDefault=bold&amp;fsDefault=1.2em&amp;cornerRadius=4px&amp;bgColorHeader=35414f&amp;bgTextureHeader=09_dots_small.png&amp;bgImgOpacityHeader=35&amp;borderColorHeader=2c4359&amp;fcHeader=e1e463&amp;iconColorHeader=e1e463&amp;bgColorContent=ffffff&amp;bgTextureContent=01_flat.png&amp;bgImgOpacityContent=75&amp;borderColorContent=aaaaaa&amp;fcContent=2c4359&amp;iconColorContent=c02669&amp;bgColorDefault=93c3cd&amp;bgTextureDefault=07_diagonals_small.png&amp;bgImgOpacityDefault=50&amp;borderColorDefault=93c3cd&amp;fcDefault=333333&amp;iconColorDefault=ffffff&amp;bgColorHover=ccd232&amp;bgTextureHover=07_diagonals_small.png&amp;bgImgOpacityHover=75&amp;borderColorHover=999999&amp;fcHover=212121&amp;iconColorHover=454545&amp;bgColorActive=db4865&amp;bgTextureActive=07_diagonals_small.png&amp;bgImgOpacityActive=40&amp;borderColorActive=ff6b7f&amp;fcActive=ffffff&amp;iconColorActive=ffffff&amp;bgColorHighlight=ffff38&amp;bgTextureHighlight=10_dots_medium.png&amp;bgImgOpacityHighlight=80&amp;borderColorHighlight=b4d100&amp;fcHighlight=363636&amp;iconColorHighlight=88a206&amp;bgColorError=ff3853&amp;bgTextureError=07_diagonals_small.png&amp;bgImgOpacityError=50&amp;borderColorError=ff6b7f&amp;fcError=ffffff&amp;iconColorError=ffeb33&amp;bgColorOverlay=f7f7ba&amp;bgTextureOverlay=11_white_lines.png&amp;bgImgOpacityOverlay=85&amp;opacityOverlay=80&amp;bgColorShadow=ba9217&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=75&amp;opacityShadow=20&amp;thicknessShadow=10px&amp;offsetTopShadow=8px&amp;offsetLeftShadow=8px&amp;cornerRadiusShadow=5px">		<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_hot_sneaks.png" alt="Hot Sneaks" title="Hot Sneaks" />			<span class="themeName">Hot sneaks</span>		</a></li>			<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=segoe+ui,+Arial,+sans-serif&amp;fwDefault=bold&amp;fsDefault=1.1em&amp;cornerRadius=3px&amp;bgColorHeader=f9f9f9&amp;bgTextureHeader=03_highlight_soft.png&amp;bgImgOpacityHeader=100&amp;borderColorHeader=cccccc&amp;fcHeader=e69700&amp;iconColorHeader=5fa5e3&amp;bgColorContent=eeeeee&amp;bgTextureContent=06_inset_hard.png&amp;bgImgOpacityContent=100&amp;borderColorContent=aaaaaa&amp;fcContent=222222&amp;iconColorContent=0a82eb&amp;bgColorDefault=1484e6&amp;bgTextureDefault=08_diagonals_thick.png&amp;bgImgOpacityDefault=22&amp;borderColorDefault=ffffff&amp;fcDefault=ffffff&amp;iconColorDefault=fcdd4a&amp;bgColorHover=2293f7&amp;bgTextureHover=08_diagonals_thick.png&amp;bgImgOpacityHover=26&amp;borderColorHover=2293f7&amp;fcHover=ffffff&amp;iconColorHover=ffffff&amp;bgColorActive=e69700&amp;bgTextureActive=08_diagonals_thick.png&amp;bgImgOpacityActive=20&amp;borderColorActive=e69700&amp;fcActive=ffffff&amp;iconColorActive=ffffff&amp;bgColorHighlight=c5ddfc&amp;bgTextureHighlight=07_diagonals_small.png&amp;bgImgOpacityHighlight=25&amp;borderColorHighlight=ffffff&amp;fcHighlight=333333&amp;iconColorHighlight=0b54d5&amp;bgColorError=e69700&amp;bgTextureError=08_diagonals_thick.png&amp;bgImgOpacityError=20&amp;borderColorError=e69700&amp;fcError=ffffff&amp;iconColorError=ffffff&amp;bgColorOverlay=e6b900&amp;bgTextureOverlay=01_flat.png&amp;bgImgOpacityOverlay=0&amp;opacityOverlay=30&amp;bgColorShadow=e69700&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=0&amp;opacityShadow=20&amp;thicknessShadow=0px&amp;offsetTopShadow=6px&amp;offsetLeftShadow=6px&amp;cornerRadiusShadow=3px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_excite_bike.png" alt="Excite Bike" title="Excite Bike" />			<span class="themeName">Excite Bike</span>			</a></li>		<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?tr&amp;ffDefault=Helvetica,+Arial,+sans-serif&amp;fwDefault=normal&amp;fsDefault=1.1&amp;fsDefaultUnit=em&amp;cornerRadius=5&amp;cornerRadiusUnit=px&amp;bgColorHeader=888888&amp;bgTextureHeader=04_highlight_hard.png&amp;bgImgOpacityHeader=15&amp;borderColorHeader=404040&amp;fcHeader=ffffff&amp;iconColorHeader=cccccc&amp;bgColorContent=121212&amp;bgTextureContent=12_gloss_wave.png&amp;bgImgOpacityContent=16&amp;borderColorContent=404040&amp;fcContent=eeeeee&amp;iconColorContent=bbbbbb&amp;bgColorDefault=adadad&amp;bgTextureDefault=03_highlight_soft.png&amp;bgImgOpacityDefault=35&amp;borderColorDefault=cccccc&amp;fcDefault=333333&amp;iconColorDefault=666666&amp;bgColorHover=dddddd&amp;bgTextureHover=03_highlight_soft.png&amp;bgImgOpacityHover=60&amp;borderColorHover=dddddd&amp;fcHover=000000&amp;iconColorHover=c98000&amp;bgColorActive=121212&amp;bgTextureActive=05_inset_soft.png&amp;bgImgOpacityActive=15&amp;borderColorActive=000000&amp;fcActive=ffffff&amp;iconColorActive=f29a00&amp;bgColorHighlight=555555&amp;bgTextureHighlight=04_highlight_hard.png&amp;bgImgOpacityHighlight=55&amp;borderColorHighlight=404040&amp;fcHighlight=cccccc&amp;iconColorHighlight=aaaaaa&amp;bgColorError=fef1ec&amp;bgTextureError=02_glass.png&amp;bgImgOpacityError=95&amp;borderColorError=cd0a0a&amp;fcError=cd0a0a&amp;iconColorError=cd0a0a">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_black_matte.png" alt="Vader" title="Vader" />			<span class="themeName">Vader</span>			</a></li>				<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Arial,+sans-serif&amp;fwDefault=bold&amp;fsDefault=1.3em&amp;cornerRadius=4px&amp;bgColorHeader=0b3e6f&amp;bgTextureHeader=08_diagonals_thick.png&amp;bgImgOpacityHeader=15&amp;borderColorHeader=0b3e6f&amp;fcHeader=f6f6f6&amp;iconColorHeader=98d2fb&amp;bgColorContent=111111&amp;bgTextureContent=12_gloss_wave.png&amp;bgImgOpacityContent=20&amp;borderColorContent=000000&amp;fcContent=d9d9d9&amp;iconColorContent=9ccdfc&amp;bgColorDefault=333333&amp;bgTextureDefault=09_dots_small.png&amp;bgImgOpacityDefault=20&amp;borderColorDefault=333333&amp;fcDefault=ffffff&amp;iconColorDefault=9ccdfc&amp;bgColorHover=00498f&amp;bgTextureHover=09_dots_small.png&amp;bgImgOpacityHover=40&amp;borderColorHover=222222&amp;fcHover=ffffff&amp;iconColorHover=ffffff&amp;bgColorActive=292929&amp;bgTextureActive=01_flat.png&amp;bgImgOpacityActive=40&amp;borderColorActive=096ac8&amp;fcActive=75abff&amp;iconColorActive=00498f&amp;bgColorHighlight=0b58a2&amp;bgTextureHighlight=10_dots_medium.png&amp;bgImgOpacityHighlight=30&amp;borderColorHighlight=052f57&amp;fcHighlight=ffffff&amp;iconColorHighlight=ffffff&amp;bgColorError=a32d00&amp;bgTextureError=09_dots_small.png&amp;bgImgOpacityError=30&amp;borderColorError=cd0a0a&amp;fcError=ffffff&amp;iconColorError=ffffff&amp;bgColorOverlay=aaaaaa&amp;bgTextureOverlay=01_flat.png&amp;bgImgOpacityOverlay=0&amp;opacityOverlay=30&amp;bgColorShadow=aaaaaa&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=0&amp;opacityShadow=30&amp;thicknessShadow=8px&amp;offsetTopShadow=-8px&amp;offsetLeftShadow=-8px&amp;cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_dot_luv.png" alt="Dot Luv" title="Dot Luv" />			<span class="themeName">Dot Luv</span>			</a></li>			<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Segoe+UI%2C+Helvetica%2C+Arial%2C+sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=453326&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=25&borderColorHeader=695649&fcHeader=e3ddc9&iconColorHeader=e3ddc9&bgColorContent=201913&bgTextureContent=05_inset_soft.png&bgImgOpacityContent=10&borderColorContent=9c947c&fcContent=ffffff&iconColorContent=222222&bgColorDefault=1c160d&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=20&borderColorDefault=695444&fcDefault=9bcc60&iconColorDefault=9bcc60&bgColorHover=44372c&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=30&borderColorHover=9c947c&fcHover=baec7e&iconColorHover=add978&bgColorActive=201913&bgTextureActive=03_highlight_soft.png&bgImgOpacityActive=20&borderColorActive=9c947c&fcActive=e3ddc9&iconColorActive=e3ddc9&bgColorHighlight=619226&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=20&borderColorHighlight=add978&fcHighlight=ffffff&iconColorHighlight=ffffff&bgColorError=5f391b&bgTextureError=02_glass.png&bgImgOpacityError=15&borderColorError=5f391b&fcError=ffffff&iconColorError=f1fd86&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_mint_choco.png" alt="Mint Choc" title="Mint Choc" />			<span class="themeName">Mint Choc</span>		</a></li>		<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Verdana,+Arial,+sans-serif&amp;fwDefault=normal&amp;fsDefault=1.1em&amp;cornerRadius=4px&amp;bgColorHeader=333333&amp;bgTextureHeader=08_diagonals_thick.png&amp;bgImgOpacityHeader=8&amp;borderColorHeader=a3a3a3&amp;fcHeader=eeeeee&amp;iconColorHeader=bbbbbb&amp;bgColorContent=f9f9f9&amp;bgTextureContent=04_highlight_hard.png&amp;bgImgOpacityContent=100&amp;borderColorContent=cccccc&amp;fcContent=222222&amp;iconColorContent=222222&amp;bgColorDefault=111111&amp;bgTextureDefault=02_glass.png&amp;bgImgOpacityDefault=40&amp;borderColorDefault=777777&amp;fcDefault=e3e3e3&amp;iconColorDefault=ededed&amp;bgColorHover=1c1c1c&amp;bgTextureHover=02_glass.png&amp;bgImgOpacityHover=55&amp;borderColorHover=000000&amp;fcHover=ffffff&amp;iconColorHover=ffffff&amp;bgColorActive=ffffff&amp;bgTextureActive=01_flat.png&amp;bgImgOpacityActive=65&amp;borderColorActive=cccccc&amp;fcActive=222222&amp;iconColorActive=222222&amp;bgColorHighlight=ffeb80&amp;bgTextureHighlight=06_inset_hard.png&amp;bgImgOpacityHighlight=55&amp;borderColorHighlight=ffde2e&amp;fcHighlight=363636&amp;iconColorHighlight=4ca300&amp;bgColorError=cd0a0a&amp;bgTextureError=06_inset_hard.png&amp;bgImgOpacityError=45&amp;borderColorError=9e0505&amp;fcError=ffffff&amp;iconColorError=ffcf29&amp;bgColorOverlay=aaaaaa&amp;bgTextureOverlay=04_highlight_hard.png&amp;bgImgOpacityOverlay=40&amp;opacityOverlay=30&amp;bgColorShadow=aaaaaa&amp;bgTextureShadow=03_highlight_soft.png&amp;bgImgOpacityShadow=50&amp;opacityShadow=20&amp;thicknessShadow=8px&amp;offsetTopShadow=-8px&amp;offsetLeftShadow=-8px&amp;cornerRadiusShadow=8px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_black_tie.png" alt="Black Tie" title="Black Tie" />			<span class="themeName">Black Tie</span>		</a></li>		<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Segoe+UI,+Helvetica,+Arial,+sans-serif&amp;fwDefault=bold&amp;fsDefault=1.1em&amp;cornerRadius=6px&amp;bgColorHeader=9fda58&amp;bgTextureHeader=12_gloss_wave.png&amp;bgImgOpacityHeader=85&amp;borderColorHeader=000000&amp;fcHeader=222222&amp;iconColorHeader=1f1f1f&amp;bgColorContent=000000&amp;bgTextureContent=12_gloss_wave.png&amp;bgImgOpacityContent=55&amp;borderColorContent=4a4a4a&amp;fcContent=ffffff&amp;iconColorContent=9fda58&amp;bgColorDefault=0a0a0a&amp;bgTextureDefault=02_glass.png&amp;bgImgOpacityDefault=40&amp;borderColorDefault=1b1613&amp;fcDefault=b8ec79&amp;iconColorDefault=b8ec79&amp;bgColorHover=000000&amp;bgTextureHover=02_glass.png&amp;bgImgOpacityHover=60&amp;borderColorHover=000000&amp;fcHover=96f226&amp;iconColorHover=b8ec79&amp;bgColorActive=4c4c4c&amp;bgTextureActive=01_flat.png&amp;bgImgOpacityActive=0&amp;borderColorActive=696969&amp;fcActive=ffffff&amp;iconColorActive=ffffff&amp;bgColorHighlight=f1fbe5&amp;bgTextureHighlight=02_glass.png&amp;bgImgOpacityHighlight=55&amp;borderColorHighlight=8cce3b&amp;fcHighlight=030303&amp;iconColorHighlight=000000&amp;bgColorError=f6ecd5&amp;bgTextureError=12_gloss_wave.png&amp;bgImgOpacityError=95&amp;borderColorError=f1ac88&amp;fcError=74736d&amp;iconColorError=cd0a0a&amp;bgColorOverlay=262626&amp;bgTextureOverlay=07_diagonals_small.png&amp;bgImgOpacityOverlay=50&amp;opacityOverlay=30&amp;bgColorShadow=303030&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=0&amp;opacityShadow=50&amp;thicknessShadow=6px&amp;offsetTopShadow=-6px&amp;offsetLeftShadow=-6px&amp;cornerRadiusShadow=12px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_trontastic.png" alt="Trontastic" title="Trontastic" />			<span class="themeName">Trontastic</span>			</a></li>			<li><a href="http://jqueryui.com/themeroller/css/parseTheme.css.php?ffDefault=Georgia%2C+Verdana%2CArial%2Csans-serif&amp;fwDefault=bold&amp;fsDefault=1.2em&amp;cornerRadius=5px&amp;bgColorHeader=261803&amp;bgTextureHeader=13_diamond.png&amp;bgImgOpacityHeader=8&amp;borderColorHeader=baaa5a&amp;fcHeader=eacd86&amp;iconColorHeader=e9cd86&amp;bgColorContent=443113&amp;bgTextureContent=13_diamond.png&amp;bgImgOpacityContent=8&amp;borderColorContent=efec9f&amp;fcContent=efec9f&amp;iconColorContent=efec9f&amp;bgColorDefault=4f4221&amp;bgTextureDefault=13_diamond.png&amp;bgImgOpacityDefault=10&amp;borderColorDefault=362917&amp;fcDefault=f8eec9&amp;iconColorDefault=e8e2b5&amp;bgColorHover=675423&amp;bgTextureHover=13_diamond.png&amp;bgImgOpacityHover=25&amp;borderColorHover=362917&amp;fcHover=f8eec9&amp;iconColorHover=f2ec64&amp;bgColorActive=443113&amp;bgTextureActive=13_diamond.png&amp;bgImgOpacityActive=8&amp;borderColorActive=efec9f&amp;fcActive=f9f2bd&amp;iconColorActive=f9f2bd&amp;bgColorHighlight=d5ac5d&amp;bgTextureHighlight=13_diamond.png&amp;bgImgOpacityHighlight=25&amp;borderColorHighlight=362917&amp;fcHighlight=060200&amp;iconColorHighlight=070603&amp;bgColorError=fee4bd&amp;bgTextureError=04_highlight_hard.png&amp;bgImgOpacityError=65&amp;borderColorError=c26629&amp;fcError=803f1e&amp;iconColorError=ff7519&amp;bgColorOverlay=372806&amp;bgTextureOverlay=13_diamond.png&amp;bgImgOpacityOverlay=20&amp;opacityOverlay=80&amp;bgColorShadow=ddd4b0&amp;bgTextureShadow=01_flat.png&amp;bgImgOpacityShadow=75&amp;opacityShadow=30&amp;thicknessShadow=8px&amp;offsetTopShadow=-8px&amp;offsetLeftShadow=-8px&amp;cornerRadiusShadow=12px">			<img src="http://jqueryui.com/themeroller/images/themeGallery/theme_90_swanky_purse.png" alt="Swanky Purse" title="Swanky Purse" />			<span class="themeName">Swanky Purse</span>			</a></li>	</ul></div></div>').find('div').removeAttr('id');
+	
+	//button events
+	button.click(
+		function(){
+			if(switcherpane.is(':visible')){ switcherpane.spHide(); }
+			else{ switcherpane.spShow(); }
+					return false;
+		}
+	);
+	
+	//menu events (mouseout didn't work...)
+	switcherpane.hover(
+		function(){},
+		function(){if(switcherpane.is(':visible')){$(this).spHide();}}
+	);
+
+	//show/hide panel functions
+	$.fn.spShow = function(){ $(this).css({top: button.offset().top + options.buttonHeight + 6, left: button.offset().left}).slideDown(50); button.css(button_active); options.onOpen(); }
+	$.fn.spHide = function(){ $(this).slideUp(50, function(){options.onClose();}); button.css(button_default); }
+	
+		
+	/* Theme Loading
+	---------------------------------------------------------------------*/
+	switcherpane.find('a').click(function(){
+		updateCSS( $(this).attr('href') );
+		var themeName = $(this).find('span').text();
+		button.find('.jquery-ui-themeswitcher-title').text( options.buttonPreText + themeName );
+		$.cookie(options.cookieName, themeName);
+		options.onSelect();
+		if(options.closeOnSelect && switcherpane.is(':visible')){ switcherpane.spHide(); }
+		return false;
+	});
+	
+	//function to append a new theme stylesheet with the new style changes
+	function updateCSS(locStr){
+		var cssLink = $('<link href="'+locStr+'" type="text/css" rel="Stylesheet" class="ui-theme" />');
+		$("head").append(cssLink);
+		
+		
+		if( $("link.ui-theme").size() > 3){
+			$("link.ui-theme:first").remove();
+		}	
+	}	
+	
+	/* Inline CSS 
+	---------------------------------------------------------------------*/
+	var button_default = {
+		fontFamily: 'Trebuchet MS, Verdana, sans-serif',
+		fontSize: '11px',
+		color: '#666',
+		background: '#eee url(http://jqueryui.com/themeroller/themeswitchertool/images/buttonbg.png) 50% 50% repeat-x',
+		border: '1px solid #ccc',
+		'-moz-border-radius': '6px',
+		'-webkit-border-radius': '6px',
+		textDecoration: 'none',
+		padding: '3px 3px 3px 8px',
+		width: options.width - 11,//minus must match left and right padding 
+		display: 'block',
+		height: options.buttonHeight,
+		outline: '0'
+	};
+	var button_hover = {
+		'borderColor':'#bbb',
+		'background': '#f0f0f0',
+		cursor: 'pointer',
+		color: '#444'
+	};
+	var button_active = {
+		color: '#aaa',
+		background: '#000',
+		border: '1px solid #ccc',
+		borderBottom: 0,
+		'-moz-border-radius-bottomleft': 0,
+		'-webkit-border-bottom-left-radius': 0,
+		'-moz-border-radius-bottomright': 0,
+		'-webkit-border-bottom-right-radius': 0,
+		outline: '0'
+	};
+	
+	
+	
+	//button css
+	button.css(button_default)
+	.hover(
+		function(){ 
+			$(this).css(button_hover); 
+		},
+		function(){ 
+		 if( !switcherpane.is(':animated') && switcherpane.is(':hidden') ){	$(this).css(button_default);  }
+		}	
+	)
+	.find('.jquery-ui-themeswitcher-icon').css({
+		float: 'right',
+		width: '16px',
+		height: '16px',
+		background: 'url(http://jqueryui.com/themeroller/themeswitchertool/images/icon_color_arrow.gif) 50% 50% no-repeat'
+	});	
+	//pane css
+	switcherpane.css({
+		position: 'absolute',
+		float: 'left',
+		fontFamily: 'Trebuchet MS, Verdana, sans-serif',
+		fontSize: '12px',
+		background: '#000',
+		color: '#fff',
+		padding: '8px 3px 3px',
+		border: '1px solid #ccc',
+		'-moz-border-radius-bottomleft': '6px',
+		'-webkit-border-bottom-left-radius': '6px',
+		'-moz-border-radius-bottomright': '6px',
+		'-webkit-border-bottom-right-radius': '6px',
+		borderTop: 0,
+		zIndex: 999999,
+		width: options.width-6//minus must match left and right padding
+	})
+	.find('ul').css({
+		listStyle: 'none',
+		margin: '0',
+		padding: '0',
+		overflow: 'auto',
+		height: options.height
+	}).end()
+	.find('li').hover(
+		function(){ 
+			$(this).css({
+				'borderColor':'#555',
+				'background': 'url(http://jqueryui.com/themeroller/themeswitchertool/images/menuhoverbg.png) 50% 50% repeat-x',
+				cursor: 'pointer'
+			}); 
+		},
+		function(){ 
+			$(this).css({
+				'borderColor':'#111',
+				'background': '#000',
+				cursor: 'auto'
+			}); 
+		}
+	).css({
+		width: options.width-30,
+		height: '',
+		padding: '2px',
+		margin: '1px',
+		border: '1px solid #111',
+		'-moz-border-radius': '4px',
+		clear: 'left',
+		float: 'left'
+	}).end()
+	.find('a').css({
+		color: '#aaa',
+		textDecoration: 'none',
+		float: 'left',
+		width: '100%',
+		outline: '0'
+	}).end()
+	.find('img').css({
+		float: 'left',
+		border: '1px solid #333',
+		margin: '0 2px'
+	}).end()
+	.find('.themeName').css({
+		float: 'left',
+		margin: '3px 0'
+	}).end();
+	
+
+
+	$(this).append(button);
+	$('body').append(switcherpane);
+	switcherpane.hide();
+	if( $.cookie(options.cookieName) || options.loadTheme ){
+		var themeName = $.cookie(options.cookieName) || options.loadTheme;
+		switcherpane.find('a:contains('+ themeName +')').trigger('click');
+	}
+
+	return this;
+};
+
+
+
+
+/**
+ * Cookie plugin
+ *
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+jQuery.cookie = function(name, value, options) {
+    if (typeof value != 'undefined') { // name and value given, set cookie
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options.expires = -1;
+        }
+        var expires = '';
+        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+            var date;
+            if (typeof options.expires == 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+        }
+        // CAUTION: Needed to parenthesize options.path and options.domain
+        // in the following expressions, otherwise they evaluate to undefined
+        // in the packed version for some reason...
+        var path = options.path ? '; path=' + (options.path) : '';
+        var domain = options.domain ? '; domain=' + (options.domain) : '';
+        var secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    } else { // only name given, get cookie
+        var cookieValue = null;
+        if (document.cookie && document.cookie != '') {
+            var cookies = document.cookie.split(';');
+            for (var i = 0; i < cookies.length; i++) {
+                var cookie = jQuery.trim(cookies[i]);
+                // Does this cookie string begin with the name we want?
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
+    }
+};